修改日志bug

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -97,7 +97,7 @@ public enum LogType {
 
     REPAIR_BACK_3(39, REPAIR_BACK_CONFIRM.id, ARCHIVE.id, "维修退回出库审核失败"),
 
-    REPAIR_BACK_4(40, WAIT_BACK_RECEIVE.id, REPAIR_BACK_RECEIVE_CONFIRM.id, "维修退回装备接收并发起入库"),
+    REPAIR_BACK_4(40, WAIT_BACK_RECEIVE.id, END.id, "维修退回装备接收并发起入库"),
 
     REPAIR_BACK_5(41, REPAIR_BACK_RECEIVE_CONFIRM.id, END.id, "维修退回装备入库审核成功"),
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java

@@ -203,6 +203,10 @@ public class DeviceLibrary {
     @Transient
     private String remark;
 
+    @ApiModelProperty(value = "维修状态")
+    @Transient
+    private Integer repairStatus;
+
     @Transient
     private List<DeviceLibrary> childs = new ArrayList<>();
 

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

@@ -163,6 +163,11 @@ public class RepairController {
         deviceRepairSendBillEntity.setRepairStatus(0);
         deviceRepairSendBillEntity.setSendTime(new Date());
         StringBuffer stringBuffer = new StringBuffer();
+        List<RepairDetail> repairDetails = new ArrayList<>();
+        if (repairBillSaveVo.getTaskId()!=null) {
+            TaskBto parentTask = taskService.get(repairBillSaveVo.getTaskId());
+            repairDetails = repairDetailDao.findByDeviceRepairBillId(parentTask.getBillId());
+        }
         //存维修详情单
         for (DeviceDetailVo d : repairBillSaveVo.getDeviceList()) {
             stringBuffer.append(d.getDeviceId());
@@ -176,7 +181,17 @@ public class RepairController {
             repairDetail.setModel(deviceLibraryEntity.getModel());
             repairDetail.setName(deviceLibraryEntity.getName());
             repairDetail.setOwnUnit(deviceLibraryEntity.getOwnUnit());
-            repairDetail.setRemark(d.getRemark());
+            if (d.getRemark()==null){
+                for (RepairDetail r :repairDetails){
+                    if (r.getDeviceId().equals(d.getDeviceId())){
+                        repairDetail.setRemark(r.getRemark());
+                        break;
+                    }
+                }
+            }
+            else {
+                repairDetail.setRemark(d.getRemark());
+            }
             repairDetail.setRepairStatus(0);
             repairDetail.setRfidSurfaceId(deviceLibraryEntity.getRfidSurfaceId());
             repairDetail.setSeqNumber(deviceLibraryEntity.getSeqNumber());
@@ -234,11 +249,11 @@ public class RepairController {
                 List<Integer> fathers = StringSplitUtil.taskIdSplit(parentTask.getNodeIdDetail()+ repairBillSaveVo.getTaskId() + ".");
                 fathers.forEach(integer -> {
                     //筛选出父业务相同装备的维修详情
-                    List<RepairDetail> repairDetails = repairDetailDao.findByDeviceRepairBillId(taskService.get(integer).getBillId()).stream()
+                    List<RepairDetail> repairDetails2 = repairDetailDao.findByDeviceRepairBillId(taskService.get(integer).getBillId()).stream()
                             .filter(repairDetail -> idList.contains(repairDetail.getDeviceId()))
                             .collect(Collectors.toList());
                     //添加维修详情
-                    repairDetailEntities.addAll(repairDetails);
+                    repairDetailEntities.addAll(repairDetails2);
                 });
             }
             //改变维修详情装备所在单位为中办,状态为维修中
@@ -773,9 +788,6 @@ public class RepairController {
         if (repairBackBill.getReceiveUseraId() == null) {
             repairBackBill.setReceiveUseraId(userId);
         }
-        List<FileVo> fileVoList = new ArrayList<>();
-        fileVoList.add(new FileVo("维修单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
-        fileVoList.add(new FileVo("入库确认单", repairBackBill.getReceiveFileName(), repairBackBill.getReceiveFileUrl()));
         //更新退回单
         repairBackBill.setBackStatus(5);
         repairBackBill.setBillFileName(repairReceiveVo.getBillFileName());
@@ -788,6 +800,9 @@ public class RepairController {
         repairBackBill.setBackReciveCheckResult(repairReceiveVo.getReceiveCheckResult());
         repairBackBill.setReceiveUserbId(repairReceiveVo.getReceiveUserbId());
         RepairBackBill repairBackBill1 = deviceRepairBackBillService.update(repairBackBill);
+        List<FileVo> fileVoList = new ArrayList<>();
+        fileVoList.add(new FileVo("维修单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
+        fileVoList.add(new FileVo("入库确认单", repairBackBill.getReceiveFileName(), repairBackBill.getReceiveFileUrl()));
         TaskBto taskBto2;
         if (level == 1) {
             List<Integer> userIds = new ArrayList<>();
@@ -795,7 +810,7 @@ public class RepairController {
             TaskBto taskBto1 = new TaskBto(StatusEnum.END.id, "维修退回", taskBto.getId(), taskBto.getNodeIdDetail() + taskBto.getId() + ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, null, userIds);
             taskBto2 = taskService.start(taskBto1);
             //添加业务日志
-            TaskLogBto taskLogBto2 = new TaskLogBto(taskBto1.getId(), "维修退回装备接收并发起入库", fileVoList);
+            TaskLogBto taskLogBto2 = new TaskLogBto(taskBto2.getId(), "维修退回装备接收并发起入库", fileVoList);
             taskLogService.addLog(taskLogBto2);
         } else {
             //任务推至下一阶段
@@ -1097,6 +1112,7 @@ public class RepairController {
                     for (RepairDetail r : repairDetails) {
                         if (r.getDeviceId().equals(deviceLibrary.getId())) {
                             deviceLibrary.setRemark(r.getRemark());
+                            deviceLibrary.setRepairStatus(r.getRepairStatus());
                         }
                     }
                 });
@@ -1178,6 +1194,15 @@ public class RepairController {
                     for (RepairDetail r : repairDetailList) {
                         if (r.getDeviceId().equals(deviceLibrary.getId())) {
                             deviceLibrary.setRemark(r.getRemark());
+                            deviceLibrary.setRepairStatus(r.getRepairStatus());
+                        }
+                    }
+                });
+                deviceLibraryList2.forEach(deviceLibrary -> {
+                    for (RepairDetail r : repairDetailList) {
+                        if (r.getDeviceId().equals(deviceLibrary.getId())) {
+                            deviceLibrary.setRemark(r.getRemark());
+                            deviceLibrary.setRepairStatus(r.getRepairStatus());
                         }
                     }
                 });

dev-union/src/main/java/com/tykj/dev/union/LogAspect.java

@@ -189,6 +189,7 @@ public class LogAspect {
                 TaskLogBto taskLogBto = new TaskLogBto(this.outPutTask.getId(), this.opreation, this.fileVos);
                 taskLogService.addLog(taskLogBto);
                 this.fileVos = new ArrayList<>();
+                this.opreation = null;
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -275,11 +276,11 @@ public class LogAspect {
                 if (allotBillService != null) {
                     AllotBill allotBill = allotBillService.getOne(outPutTask.getBillId());
                     getFieldsParam(allotBill);
-                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.ALLOT_SEND_CONFIRM.id))
-                            || (this.oldStatus.equals(StatusEnum.WAIT_ALLOT.id) && this.newStatus.equals(StatusEnum.ALLOT_SEND_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.ALLOTING.id))
+                            || (this.oldStatus.equals(StatusEnum.WAIT_ALLOT.id) && this.newStatus.equals(StatusEnum.ALLOTING.id))) {
                         this.fileVos.add(new FileVo("出库确认单", allotBill.getFileName(), allotBill.getFileUrl()));
                     }
-                    if ((this.oldStatus.equals(StatusEnum.ALLOTING.id) && this.newStatus.equals(StatusEnum.ALLOT_RECEIVE_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.ALLOTING.id) && this.newStatus.equals(StatusEnum.END.id))) {
                         this.fileVos.add(new FileVo("配发单", allotBill.getBillFileName(), allotBill.getBillFileUrl()));
                         this.fileVos.add(new FileVo("入库确认单", allotBill.getReceiveFileName(), allotBill.getReceiveFileUrl()));
                     }
@@ -293,7 +294,7 @@ public class LogAspect {
                     if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.ALLOT_BACKING.id))) {
                         this.fileVos.add(new FileVo("出库确认单", allotBackBill.getFileName(), allotBackBill.getFileUrl()));
                     }
-                    if ((this.oldStatus.equals(StatusEnum.ALLOT_BACKING.id) && this.newStatus.equals(StatusEnum.ALLOT_BACK_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.ALLOT_BACKING.id) && this.newStatus.equals(StatusEnum.END.id))) {
                         this.fileVos.add(new FileVo("退回单", allotBackBill.getBillFileName(), allotBackBill.getBillFileUrl()));
                         this.fileVos.add(new FileVo("入库确认单", allotBackBill.getReceiveFileName(), allotBackBill.getReceiveFileUrl()));
                     }
@@ -312,10 +313,11 @@ public class LogAspect {
                     RepairBill repairBill = repairBillService.getOne(outPutTask.getBillId());
                     RepairSendBill repairSendBill = repairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
                     getFieldsParam(repairBillService.getOne(outPutTask.getBillId()));
-                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.REPAIR_SEND_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_RECEIVE.id))
+                    ||(this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.COUNTRY_REPAIRING.id))) {
                         this.fileVos.add(new FileVo("出库确认单", repairSendBill.getFileName(), repairSendBill.getFileUrl()));
                     }
-                    if ((this.oldStatus.equals(StatusEnum.WAIT_RECEIVE.id) && this.newStatus.equals(StatusEnum.REPAIR_RECEIVE_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.WAIT_RECEIVE.id) && this.newStatus.equals(StatusEnum.REPAIRING.id))) {
                         this.fileVos.add(new FileVo("维修单", repairSendBill.getBillFileName(), repairSendBill.getBillFileUrl()));
                         this.fileVos.add(new FileVo("入库确认单", repairSendBill.getReceiveFileName(), repairSendBill.getReceiveFileUrl()));
                     }
@@ -350,10 +352,10 @@ public class LogAspect {
                 if (repairBackBillDao != null) {
                     RepairBackBill repairBackBill = repairBackBillDao.getOne(outPutTask.getBillId());
                     getFieldsParam(repairBackBill);
-                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.REPAIR_BACK_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_BACK_RECEIVE.id))) {
                         this.fileVos.add(new FileVo("出库确认单", repairBackBill.getFileName(), repairBackBill.getFileUrl()));
                     }
-                    if ((this.oldStatus.equals(StatusEnum.WAIT_BACK_RECEIVE.id) && this.newStatus.equals(StatusEnum.REPAIR_BACK_RECEIVE_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.WAIT_BACK_RECEIVE.id) && this.newStatus.equals(StatusEnum.END.id))) {
                         this.fileVos.add(new FileVo("维修单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
                         this.fileVos.add(new FileVo("入库确认单", repairBackBill.getReceiveFileName(), repairBackBill.getReceiveFileUrl()));
                     }