[文件枚举类]新增配发单

dev-config/src/main/java/com/tykj/dev/config/base/FileName.java

@@ -24,7 +24,12 @@ public enum FileName {
     /**
      * 销毁单
      */
-    DESTROY(5,"销毁单");
+    DESTROY(5,"销毁单"),
+
+    /**
+     * 配发单
+     */
+    ALLOT(6,"配发单");
 
     public Integer id;
 

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

@@ -29,6 +29,7 @@ import com.tykj.dev.misc.utils.PageUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
@@ -46,6 +47,7 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/business")
 @AutoDocument
 @Api(tags = "业务模块", description = "业务模块")
+@Slf4j
 public class RepairBillSelectController {
 
     @Autowired
@@ -91,16 +93,22 @@ public class RepairBillSelectController {
         repairTaskSelectVo.setPage(0);
         repairTaskSelectVo.setSize(Integer.MAX_VALUE);
         //type=1的记录
+        long l = System.currentTimeMillis();
         Page<RepairDetail> repairDetails = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        log.info("type1:{}"+(System.currentTimeMillis()-l));
         //type=2的记录
+        long l2 = System.currentTimeMillis();
         repairTaskSelectVo.setType(2);
         Page<WaitingRepairEquipmentVo> waitingRepaireEquipmentVos = (Page) repairController.getRepairList(repairTaskSelectVo).getBody();
-//        Page<RepairDetail> repairDetails2 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        log.info("type2:{}"+(System.currentTimeMillis()-l2));
+
+        //        Page<RepairDetail> repairDetails2 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
         //type=3的记录
+        long l3 = System.currentTimeMillis();
         repairTaskSelectVo.setType(3);
 //        Page<RepairDetail> repairDetails3 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
         Page<WaitingRepairEquipmentVo> waitingRepaireEquipmentVos2 = (Page) repairController.getRepairList(repairTaskSelectVo).getBody();
-
+        log.info("type3:{}"+(System.currentTimeMillis()-l3));
         //set数量
         repairNum.setNum1(Long.valueOf(repairDetails.getTotalElements()).intValue());
 //        repairNum.setNum2(Long.valueOf(repairDetails2.getTotalElements()).intValue());

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

@@ -1650,7 +1650,6 @@ public class RepairController {
                     .collect(Collectors.toList());
             List<WaitingRepairEquipmentVo> waitingRepairEquipments = new ArrayList<>();
             for (RepairDetail repairDetail : repairDetails2) {
-
                 TaskBto taskBto = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5);
                 TaskUserVo taskUserVo = taskBto.toVo();
                 WaitingRepairEquipmentVo waitingRepairEquipment = new WaitingRepairEquipmentVo();

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -697,13 +697,13 @@ public class SelfCheckController {
     public void findBySystem1() {
         //通过billId和businessType 和 ownUnit
         List<Task>  allByBillAndBusinessTypeAndOwnUnit = taskService.findAllByBillAndBusinessTypeAndOwnUnit(4, userUtils.getCurrentUnitId());
-        System.out.println("allByBillAndBusinessTypeAndOwnUnit = " + allByBillAndBusinessTypeAndOwnUnit);
-        if (allByBillAndBusinessTypeAndOwnUnit.size()>0){
-            for (Task task : allByBillAndBusinessTypeAndOwnUnit) {
-                taskService.moveToArchive(task.parse2Bto());
-                //删除
-                selfCheckBillService.delete(task.getBillId());
-            }
+        if (allByBillAndBusinessTypeAndOwnUnit.size() == 0){
+            throw new ApiException("该时间段没有系统发起的自查");
+        }
+        for (Task task : allByBillAndBusinessTypeAndOwnUnit) {
+            taskService.moveToArchive(task.parse2Bto());
+            //删除
+            selfCheckBillService.delete(task.getBillId());
         }
     }
 

dev-storage/src/main/java/com/tykj/dev/device/storage/service/impl/StorageBillServiceImpl.java

@@ -107,15 +107,12 @@ public class StorageBillServiceImpl implements StorageBillService {
         if (storageBillDaoById.isPresent()){
             storageBill = storageBillDaoById.get();
         }
-
-        //收件方签收单集合
-//        map.put(FileName.SIGN.name, FilesUtil.stringFileToList(allotBill.getReceiveFiles()));
 //        //申请文号文件集合
-//        map.put(FileName.APPLY.name,FilesUtil.stringFileToList(storageBill.getApplyFiles()));
+        map.put(FileName.APPLY.name,FilesUtil.stringFileToList(storageBill.getApplyFiles()));
 //        //批复文号文件集合
-//        map.put(FileName.REPLY.name,FilesUtil.stringFileToList(storageBill.getfil));
+        map.put(FileName.REPLY.name,FilesUtil.stringFileToList(storageBill.getReplyFiles()));
 //        //发件方回执单集合
-//        map.put(FileName.RECEIPT.name,FilesUtil.stringFileToList(allotBill.getSendFiles()));
+        map.put(FileName.ALLOT.name,FilesUtil.stringFileToList(storageBill.getAllotFiles()));
         return map;
     }
 }