修改配发日志bug

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -185,8 +185,8 @@ public class AllotBillController {
         AllotBill allotBillEntity = allotBillService.getOne(taskBto.getBillId());
         //添加业务日志
         List<FileVo> fileVoList = new ArrayList<>();
-        fileVoList.add(new FileVo("配发单", allotBillEntity.getBillFileName(), allotBillEntity.getBillFileUrl()));
-        fileVoList.add(new FileVo("入库确认单", allotBillEntity.getReceiveFileName(), allotBillEntity.getReceiveFileUrl()));
+        fileVoList.add(new FileVo("配发单", allotReceiveVo.getBillFileName(), allotReceiveVo.getBillFileUrl()));
+        fileVoList.add(new FileVo("入库确认单", allotReceiveVo.getReceiveFileName(), allotReceiveVo.getReceiveFileUrl()));
         TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(), "接收并发起入库", fileVoList);
         taskLogService.addLog(taskLogBto);
         //更新账单状态

dev-union/src/test/java/com/tykj/dev/repair/RepairControllerTest.java

 package com.tykj.dev.repair;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.wenhao.jpa.Specifications;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.repair.repository.RepairDetailDao;
 import com.tykj.dev.device.repair.subject.domin.RepairDetail;
 import com.tykj.dev.device.repair.subject.vo.*;
@@ -10,11 +12,12 @@ import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.util.AuthenticationUtils;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.ResultObj;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.SpringUtils;
 import com.tykj.dev.union.BaseTest;
 import com.tykj.dev.union.BeanConfig;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -54,9 +57,9 @@ public class RepairControllerTest extends BaseTest {
     @Autowired
     private UserUtils userUtils;
 
-    int repairSendTaskId;
+    static int repairSendTaskId;
 
-    int repairBackTaskId;
+    static int repairBackTaskId;
 
     /**
      * 发起维修运输过程单元测试
@@ -99,7 +102,7 @@ public class RepairControllerTest extends BaseTest {
                 .sorted(Comparator.comparing(Task::getCreateTime).reversed())
                 .collect(Collectors.toList())
                 .get(0);
-        this.repairSendTaskId = initTask.getId();
+        repairSendTaskId = initTask.getId();
         //审核通过
         RepairConfirmVo repairConfirmVo = new RepairConfirmVo();
         repairConfirmVo.setStatus(0);
@@ -158,14 +161,16 @@ public class RepairControllerTest extends BaseTest {
         Integer level = userUtils.getCurrentUnitLevel();
         RequestBuilder request;
         if (level==2||level==3){
-            request = get("/repair/backDeviceSelect"+repairSendTaskId)
+            request = get("/repair/backDeviceSelect/"+repairSendTaskId)
                     .header("Origin", "*")
                     .contentType(MediaType.APPLICATION_JSON);
             MvcResult result = mockMvc.perform(request)
                     .andExpect(status().isOk())
                     .andDo(mvcResult1 -> System.out.println("[测试结果] 维修退回装备出库查询成功"))
                     .andReturn();
-            System.out.println(result.getAsyncResult());
+            String body = result.getResponse().getContentAsString();
+            ResultObj resultObj = JSONObject.parseObject(body,ResultObj.class);
+            System.out.println("出库装备详情:"+resultObj.getData());
         }
     }
 }