feat(维修模块,配发模块,退回模块): 新增装备日志，判断是签章还是签字

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

@@ -354,9 +354,15 @@ public class AllotBillController {
                 //改变装备管理状态为不在本单位
                 deviceLibraryEntity.setManageStatus(0);
                 deviceLibraryService.update(deviceLibraryEntity);
-                //存装备日志
+                //存装备日志 判断是签字还是签章
 //                DeviceLogDto deviceLogDto = new DeviceLogDto(id, "对" + allotBillEntity.getReceiveUnit() + "发起配发", fileVoList, saveEntity.getId(), null);
-                DeviceLogDto deviceLogDto = new DeviceLogDto(id, "对" + allotBillEntity.getReceiveUnit() + "发起配发", fileVoList, saveEntity.getId(), saveEntity.getId());
+                DeviceLogDto deviceLogDto = new DeviceLogDto();
+                if (allotBillSaveVo.getIsSigned() == 0){
+                    //签字配发
+                    deviceLogDto= new DeviceLogDto(id, "对" + allotBillEntity.getReceiveUnit() + "发起配发(签字出库)", fileVoList, saveEntity.getId(), saveEntity.getId());
+                }else {
+                    deviceLogDto = new DeviceLogDto(id, "对" + allotBillEntity.getReceiveUnit() + "发起配发(签章出库)", fileVoList, saveEntity.getId(), saveEntity.getId());
+                }
                 deviceLogService.addLog(deviceLogDto);
             }
         }
@@ -498,9 +504,16 @@ public class AllotBillController {
                     if (allotReceiveVo.getMap().get(id) != null) {
                         deviceLibraryEntity.setProdNumber(allotReceiveVo.getMap().get(id));
                     }
-                    //存装备日志
+                    //判断是签字入库还是签章入库
+                    DeviceLogDto deviceLogDto = new DeviceLogDto();
+                    if (allotReceiveVo.getRightSignatureId() != null && !"".equals(allotReceiveVo.getRightSignatureId())){
+                        //签章
+                         deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签章入库)", fileVoList, taskBto.getId(), taskBto.getId());
+                    }else {
+                        //存装备日志
 //                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId(), null);
-                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId(), taskBto.getId());
+                         deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签字入库)", fileVoList, taskBto.getId(), taskBto.getId());
+                    }
                     deviceLogService.addLog(deviceLogDto);
                     deviceLibraryService.update(deviceLibraryEntity);
                 }

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

@@ -207,9 +207,15 @@ public class BackController {
 //                deviceLibraryEntity.setLifeStatus(6);
                 deviceLibraryEntity.setManageStatus(0);
                 deviceLibraryService.update(deviceLibraryEntity);
+                DeviceLogDto deviceLogDto = new DeviceLogDto();
+                if (allotBillSaveVo.getIsSigned() == 0){
+                    //签字退回
+                    deviceLogDto= new DeviceLogDto(id, "对" + allotBackBill.getReceiveUnit() + "发起退回(签字出库)", fileVoList, saveEntity.getId(), saveEntity.getId());
+                }else {
+                    deviceLogDto = new DeviceLogDto(id, "对" + allotBackBill.getReceiveUnit() + "发起退回(签章出库)", fileVoList, saveEntity.getId(), saveEntity.getId());
+                }
                 //存装备日志
 //                DeviceLogDto deviceLogDto = new DeviceLogDto(id, "对" + allotBackBill.getReceiveUnit() + "发起退回", fileVoList,saveEntity.getId(),null);
-                DeviceLogDto deviceLogDto = new DeviceLogDto(id, "对" + allotBackBill.getReceiveUnit() + "发起退回", fileVoList,saveEntity.getId(),saveEntity.getId());
                 deviceLogService.addLog(deviceLogDto);
             }
         }
@@ -314,9 +320,16 @@ public class BackController {
                     deviceLibraryEntity.setLifeStatus(2);
                     deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
                     deviceLibraryEntity.setManageStatus(1);
-                    //存装备日志
+                    //判断是签字入库还是签章入库
+                    DeviceLogDto deviceLogDto = new DeviceLogDto();
+                    if (allotBackReceiveVo.getRightSignatureId()!=null&&!"".equals(allotBackReceiveVo.getRightSignatureId())) {
+                         deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签章入库)", fileVoList,taskBto.getId(),taskBto.getId());
+                    }else {
+                        //存装备日志
 //                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList,taskBto.getId(),null);
-                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList,taskBto.getId(),taskBto.getId());
+                         deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签字入库)", fileVoList,taskBto.getId(),taskBto.getId());
+                    }
+
                     deviceLogService.addLog(deviceLogDto);
                     deviceLibraryService.update(deviceLibraryEntity);
                 }

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

@@ -601,7 +601,13 @@ public class RepairController {
             //存装备日志
 //            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null);
 //            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null);
-            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修", null, null,saveEntity.getId());
+            DeviceLogDto deviceLogDto;
+            if (repairBillSaveVo.getLeftSignatureId() != null && "".equals(repairBillSaveVo.getLeftSignatureId())){
+                //说明是签章出库
+                deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修(签章出库)", null, null,saveEntity.getId());
+            }else {
+                deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBillSaveVo.getReceiveUnit() + "发起装备维修(签字出库)", null, null,saveEntity.getId());
+            }
             deviceLogService.addLog(deviceLogDto);
         }
 //        //gg
@@ -772,7 +778,11 @@ public class RepairController {
                     deviceLibraryEntity.setManageStatus(1);
                     //存装备日志
 //                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId());
-                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收并发起入库", fileVoList, taskBto.getId(),taskBto.getId());
+                    DeviceLogDto deviceLogDto;
+                    if (repairReceiveVo.getRightSignatureId() != null && "".equals(repairReceiveVo.getRightSignatureId())){
+                         deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签章入库)", fileVoList, taskBto.getId(),taskBto.getId());
+                    }
+                     deviceLogDto = new DeviceLogDto(id, "接收并发起入库(签字入库)", fileVoList, taskBto.getId(),taskBto.getId());
                     deviceLogService.addLog(deviceLogDto);
                     deviceLibraryService.update(deviceLibraryEntity);
                 }
@@ -1125,7 +1135,15 @@ public class RepairController {
             deviceLibraryEntity.setLifeStatus(4);
             deviceLibraryEntity.setManageStatus(0);
 //            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBackBillSaveVo.getReceiveUnit() + "退还维修装备", fileVoList, taskBto2.getId());
-            DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBackBillSaveVo.getReceiveUnit() + "退还维修装备", fileVoList, taskBto2.getId(),taskBto2.getId());
+            //判断是签字还是签章
+            DeviceLogDto deviceLogDto;
+            if (repairBackBillSaveVo.getLeftSignatureId()!=null && "".equals(repairBackBillSaveVo.getLeftSignatureId())){
+                 deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBackBillSaveVo.getReceiveUnit() + "退还维修装备(签章)", fileVoList, taskBto2.getId(),taskBto2.getId());
+
+            }else {
+                 deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBackBillSaveVo.getReceiveUnit() + "退还维修装备(签字)", fileVoList, taskBto2.getId(),taskBto2.getId());
+
+            }
             deviceLogService.addLog(deviceLogDto);
         }
         String deviceIdDetail = repairBackBill.getBackCheckDetail();
@@ -1351,7 +1369,12 @@ public class RepairController {
                     deviceLibraries.add(deviceLibraryEntity);
                     //添加装备日志
 //                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "维修退回装备接收并发起入库", fileVoList, taskBto2.getId());
-                    DeviceLogDto deviceLogDto = new DeviceLogDto(id, "维修退回装备接收并发起入库", fileVoList, taskBto2.getId(),taskBto2.getId());
+                    DeviceLogDto deviceLogDto;
+                    if (repairReceiveVo.getRightSignatureId() != null && "".equals(repairReceiveVo.getRightSignatureId())){
+                         deviceLogDto = new DeviceLogDto(id, "维修退回装备接收并发起入库(签章入库)", fileVoList, taskBto2.getId(),taskBto2.getId());
+                    }else {
+                         deviceLogDto = new DeviceLogDto(id, "维修退回装备接收并发起入库(签字入库)", fileVoList, taskBto2.getId(),taskBto2.getId());
+                    }
                     deviceLogService.addLog(deviceLogDto);
                     deviceLibraryService.update(deviceLibraryEntity);
                 }