[zjm] 负责模块代码提交

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java

@@ -167,6 +167,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
                 deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
                 deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
             }
+            deviceDecommissioningDetail.setLeftSignatureId(decommissioningOrderOutData.getLeftSignatureId());
             deviceDecommissioningDetail.setApplyNumber(decommissioningOrderOutData.getApplyNumber());
             deviceDecommissioningDetail.setReplayNumber(decommissioningOrderOutData.getReplayNumber());
             deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -131,7 +131,7 @@ public class JavaToPdfHtmlFreeMarker {
             }
                 Long endTime = System.currentTimeMillis();
                 System.out.print("Itext parse Html to Pdf End -> " + (endTime - startTime));
-            return new FileRet("", pdfPath, preview +folderName+ name);
+            return new FileRet(name, pdfPath, preview +folderName+ name);
         } catch (IOException | DocumentException | com.lowagie.text.DocumentException e) {
             e.printStackTrace();
         } finally {

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -233,7 +233,7 @@ public class MatchingDeviceController {
         if (m.getDeviceId() != 0) {
             list.add(deviceLibraryService.getOne(m.getDeviceId()));
         } else {
-            list.add(new DeviceLibrary());
+            list.add(null);
         }
         //添加设备履历日志
         List<DeviceLogUserVo> deviceLogs = deviceLogDao.getAllByDeviceIdAndType(id, 1).stream()

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -269,7 +269,7 @@ public enum StatusEnum {
     /**
      * 报废状态
      */
-    SCRAP_2222(2222, "等待上传废签收单"),
+    SCRAP_2222(2222, "等待上传报废签收单"),
     SCRAP_2223(2223, "报废草稿"),
     SCRAP_2224(2224, "报废出库签章审核"),
     SCRAP_2225(2225, "报废出库等待盖电子签章");

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

@@ -161,6 +161,9 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
             scrap.setScrapStatus(taskBto.getBillStatus());
         }
+        scrap.setLeftSignatureId(scrapOrderOutData.getLeftSignatureId());
+        scrap.setSendUserbId(scrapOrderOutData.getSendUserbId());
+        scrap.setSenderUserB(scrapOrderOutData.getSenderUserB());
         scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
         scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
         scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

@@ -136,7 +136,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
 
 
     private List<DeviceLibrary> findInvoleDevice(String involeDevice){
-        if (involeDevice!=null && !involeDevice.equals(",") ) {
+        if (involeDevice!=null && !involeDevice.equals(",")&&!involeDevice.equals("")) {
         List<String> idStringList = Arrays.asList(involeDevice.split(","));
         List<String> idListString = idStringList.stream().filter(list2->!list2.equals("")).collect(Collectors.toList());
         List<Integer> devIds = idListString.stream().map(Integer::parseInt).collect(Collectors.toList());

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -426,7 +426,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         list.add(StatusEnum.SEND_BACK_1206);
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),list);
 
-        DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
+        DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
         TaskBto parentTask= taskService.get(taskBto.getParentTaskId());
         taskService.moveToSpecial(parentTask, GlobalMap.getStatusEnumMap().get(parentTask.getBillStatus()),0);
         taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1207,-1);
@@ -467,7 +467,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         repelTaskStatistical.setDes(resolveConfirm.getDes());
         repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
         //装备状态改为锁定
-        deviceLibraryDao.upDateLockStatus(1,resolveConfirm.getDevIds());
+        if (resolveConfirm.getDevIds()!=null&&resolveConfirm.getDevIds().size()!=0) {
+            deviceLibraryDao.upDateLockStatus(1, resolveConfirm.getDevIds());
+        }
         deviceRepelDetail.setDeviceIds(StringUtils.ListToString(resolveConfirm.getDevIds()));
         deviceRepelDetail.setSubmitDescription(resolveConfirm.getDes());
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
@@ -487,26 +489,33 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
         RepelTaskStatistical repelTaskStatistical= repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
         repelTaskStatistical.setTaskStatus(0);
-        repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
-            //1 审核通过
+
+        //1 审核通过
         if (repelAuditResult.getType()==1){
            List<Integer> list= StringUtils.stringToList(deviceRepelDetail.getDeviceIds());
-            if (list!=null&&list.size()!=0) {
+           repelTaskStatistical.setTaskStatus(5);
+           if (list!=null&&list.size()!=0) {
                 taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1208, 0);
             }else {
                 taskBto = taskService.moveToEnd(taskBto);
                 deviceRepelDetail.setRepelStatus(3);
+                repelTaskStatistical.setTaskStatus(1);
                 addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"清退任务审核通过,无提交装备任务结束",findUnitId(taskBto.getOwnUnit())));
             }
         }else {
             //审核失败
             taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1206,0);
-            deviceLibraryDao.upDateLockStatus(0,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
+            if (deviceRepelDetail.getDeviceIds()!=null&&!deviceRepelDetail.getDeviceIds().equals("")) {
+                deviceLibraryDao.upDateLockStatus(0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
+                deviceRepelDetail.setDeviceIds(null);
+            }
         }
+        repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
         deviceRepelDetail.setAuditingFeedback(repelAuditResult.getDes());
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         // 判读是否还有需要审核待task
         isCommission(taskBto,deviceRepelDetail.getRepelId());
+        isEnd(taskBto,deviceRepelDetail.getRepelId());
     }
 
 
@@ -750,28 +759,31 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
         deviceRepelDetail.setRepelStatus(2);
         taskService.moveToEnd(taskBto);
-        StringBuffer ids=new StringBuffer();
-        List<DeviceLibrary> libraries=  deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(storageDeviceRepel.getDeviceIds());
-        libraries.forEach(
-                deviceLibrary -> {
-                    ids.append(",").append(deviceLibrary.getId());
-                }
-        );
-        log.info("更新数据装备以及所属单位-{}",libraries.size());
-        long time=System.currentTimeMillis();
-        DeviceRepel deviceRepel=  deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
-        if (units.getLevel()==2){
-            deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SEND_BACK.id, deviceRepelDetail.getSendUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
-        }else {
-            deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getSendUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
-            log.info("更新数据装备以及所属单位{}", System.currentTimeMillis() - time);
+        DeviceRepel deviceRepel = deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
+        if (storageDeviceRepel.getDeviceIds()!=null&&storageDeviceRepel.getDeviceIds().size()!=0) {
+            StringBuffer ids = new StringBuffer();
+            List<DeviceLibrary> libraries = deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(storageDeviceRepel.getDeviceIds());
+            libraries.forEach(
+                    deviceLibrary -> {
+                        ids.append(",").append(deviceLibrary.getId());
+                    }
+            );
+            log.info("更新数据装备以及所属单位-{}", libraries.size());
+            long time = System.currentTimeMillis();
+            if (units.getLevel() == 2) {
+                deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SEND_BACK.id, deviceRepelDetail.getSendUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
+            } else {
+                deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getSendUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
+                log.info("更新数据装备以及所属单位{}", System.currentTimeMillis() - time);
+            }
+            devLogAdd(libraries,"省本级清退，把装备转变为待清退",userId);
+
         }
         RepelTaskStatistical repelTaskStatistical= repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
         repelTaskStatistical.setTaskStatus(1);
         repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         isEnd(taskBto,deviceRepelDetail.getRepelId());
-        devLogAdd(libraries,"省本级清退，把装备转变为待清退",userId);
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"完成["+deviceRepel.getTitle()+"]本级清退任务",gainThisUser(user.getUserId(),user.getUnitsId())));
 
     }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -95,7 +95,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         Map<Integer,String> typeMapAbnormal=new HashMap<>();
         Map<String,String> modelMapAbnormal=new HashMap<>();
         Units units= unitsService.findById(deviceChoosePageVo.getUnitId());
-        DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskService.get(deviceChoosePageVo.getTaskId()).getBillId());
+        DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetailNoDev(taskService.get(deviceChoosePageVo.getTaskId()).getBillId());
         DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
         if (deviceRepel.getSeqNumbers()==null||deviceRepel.getSeqNumbers().equals("")) {
             deviceLibraryDao.findAllByPackingIdInAndOwnUnit(deviceChoosePageVo.getFielding(), units.getName()).stream()

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainUser.java

@@ -121,8 +121,24 @@ public class TrainUser {
      * 是否发证
      */
     @ApiModelProperty(value = "是否发证", name = "certificate")
-        private Integer certificate;
-
+    private Integer certificate;
+
+
+//    @ApiModelProperty(value = "到达时间", name = "arriveTime")
+//    private Integer arriveTime;
+//
+//
+//    @ApiModelProperty(value = "离开时间", name = "leaveTime")
+//    private Integer leaveTime;
+//
+//
+//    @ApiModelProperty(value = "到达就餐 1.午饭 2.晚饭", name = "arriveMeal")
+//    private Integer arriveMeal;
+//
+//
+//    @ApiModelProperty(value = "离开就餐 1.午饭 2.晚饭", name = "leaveMeal")
+//    private Integer leaveMeal;
+//
     /**
      * 是否必须报名 1.必须 2.不必须
      */