更新

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java

@@ -57,7 +57,7 @@ public class FinalCheckServiceImpl implements FinalCheckService {
     public FinalReportVo generateReport(LocalDate startTime, LocalDate endTime) {
         String name = startTime+"～"+endTime + "决算报告";
         String unitName = userService.getCurrentUserUnitName();
-        String operatorName = userService.getCurrentUserName();
+        String operatorName = userService.getCurrentName();
         FinalReport report = new FinalReport(name, unitName, startTime, endTime, LocalDateTime.now(), operatorName);
         report = reportDao.save(report);
         // 查询这段时间内该单位下的所有装备 并且计数

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -479,7 +479,7 @@ public class RepairController {
             repairBill.setRightSignatureId(repairReceiveVo.getRightSignatureId());
         }
         if (repairSendBill.getRepairUseraId() == null) {
-            repairBill.setRepairUserA(userUtils.getCurrentUserName());
+            repairBill.setRepairUserA(userUtils.getCurrentName());
             repairSendBill.setRepairUseraId(userId);
             taskService.addInvolveUser(taskBto, userId);
         }
@@ -1333,6 +1333,16 @@ public class RepairController {
                 RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
                 repairSendBill.setSendFileList(FilesUtil.stringFileToList(repairSendBill.getSendFiles()));
                 repairSendBill.setReceiveFileList(FilesUtil.stringFileToList(repairSendBill.getReceiveFiles()));
+                if (repairSendBill.getStartUseraId() != null) {
+                    repairSendBill.setStartUserA(userPublicService.getOne(repairSendBill.getStartUseraId()).getName());
+                }
+                repairSendBill.setStartUserB(repairSendBill.getAgent());
+                if (repairSendBill.getRepairUseraId() != null) {
+                    repairSendBill.setRepairUserA(userPublicService.getOne(repairSendBill.getRepairUseraId()).getName());
+                }
+                if (repairSendBill.getRepairUserbId() != null) {
+                    repairSendBill.setRepairUserB(userPublicService.getOne(repairSendBill.getRepairUserbId()).getName());
+                }
                 if (repairSendBill.getScriptJson()!=null){
                     repairSendBill.setScripts(JacksonUtil.readValue(repairSendBill.getScriptJson(),new TypeReference<List<ScriptSaveVo>>() {}));
                 }