更新

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

@@ -609,6 +609,18 @@ public class AllotBillController {
         return ResponseEntity.ok("删除成功");
     }
 
+//    @ApiOperation(value = "删除配发单草稿", notes = "可以通过这个接口删除配发单草稿")
+//    @PostMapping(value = "/deleteAllotBill/{taskId}")
+//    @Transactional(rollbackFor = Exception.class)
+//    public ResponseEntity deleteAllotBill(@PathVariable("taskId") int taskId) {
+//        //任务封存
+//        TaskBto taskBto = taskService.get(taskId);
+//        TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userUtils.getCurrentUserId());
+//        taskService.moveToArchive(taskBto1);
+//        myWebSocket.sendMessage1();
+//        return ResponseEntity.ok("删除成功");
+//    }
+
     @ApiOperation(value = "查询配发草稿详情", notes = "可以通过这个接口查询配发草稿详情")
     @PostMapping(value = "/selectAllotDetail/{taskId}")
     @Transactional(rollbackFor = Exception.class)

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java

@@ -51,6 +51,9 @@ public class AllotBillSaveVo {
     @ApiModelProperty(value = "发件方(B岗位)")
     private Integer sendUserbId;
 
+//    @ApiModelProperty(value = "签章审核方")
+//    private Integer confirmUserId;
+
 //    @NotNull(message = "receiveUseraId不能为空")
     @Min(value = 1,message = "receiveUseraId不能小于1")
     @ApiModelProperty(value = "收件方(A岗位)")

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -113,7 +113,7 @@ public class DeviceApplyController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addDeviceApplyBill(@RequestBody @Validated DeviceApplySaveVo deviceApplySaveVo) {
         if (deviceApplySaveVo.getApplyType()!=1) {
-            for (ApplyBillDetailVo applyBillDetailVo : deviceApplySaveVo.getStorageBillDetailVoList()) {
+            for (ApplyBillDetailVo applyBillDetailVo : GetTreeUtils.splitTree2(deviceApplySaveVo.getStorageBillDetailVoList(),ApplyBillDetailVo::getChilds)) {
                 ResponseEntity responseEntity = packingController.seqsExist(applyBillDetailVo.getPackingId(), applyBillDetailVo.getStorageCount(), applyBillDetailVo.getSeqInterval());
                 if (!"ok".equals(responseEntity.getBody())) {
                     return responseEntity;

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/vo/ApplyBillDetailVo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author dengdiyi
  */
@@ -26,4 +28,10 @@ public class ApplyBillDetailVo {
 
     @ApiModelProperty(value = "序列号区间", example = "1")
     private String seqInterval;
+
+    private List<ApplyBillDetailVo> childs;
+
+    public void setChildNull() {
+        childs=null;
+    }
 }

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/vo/DeviceApplySaveVo.java

@@ -4,6 +4,7 @@ import com.tykj.dev.device.apply.subject.domin.DeviceApplyBill;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.misc.base.BeanHelper;
+import com.tykj.dev.misc.utils.GetTreeUtils;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -75,8 +76,9 @@ public class DeviceApplySaveVo {
         deviceApplyBillEntity.setApplyStatus(0);
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("x");
-        if (this.storageBillDetailVoList.size() > 0) {
-            for (ApplyBillDetailVo s : storageBillDetailVoList) {
+        if (this.storageBillDetailVoList!=null&&this.storageBillDetailVoList.size() > 0) {
+            List<ApplyBillDetailVo> applyBillDetailVos = GetTreeUtils.splitTree(storageBillDetailVoList,ApplyBillDetailVo::getChilds,ApplyBillDetailVo::setChildNull);
+            for (ApplyBillDetailVo s : applyBillDetailVos) {
                 stringBuffer.append(s.getPackingId()).append("x");
                 if (s.getStorageCount()!=null) {
                     stringBuffer.append(s.getStorageCount()).append("x");
@@ -85,12 +87,10 @@ public class DeviceApplySaveVo {
                     stringBuffer.append(0).append("x");
                 }
             }
-        }
-        if (this.storageBillDetailVoList!=null){
-            deviceApplyBillEntity.setApplyStat(JacksonUtil.toJSon(this.storageBillDetailVoList));
+            deviceApplyBillEntity.setApplyStat(JacksonUtil.toJSon(applyBillDetailVos));
             if (this.applyType!=1){
                 List<ReplyVo> replyVos = new ArrayList<>();
-                for (ApplyBillDetailVo applyBillDetailVo : storageBillDetailVoList){
+                for (ApplyBillDetailVo applyBillDetailVo : applyBillDetailVos){
                     ReplyVo replyVo = new ReplyVo();
                     replyVo.setId(applyBillDetailVo.getPackingId());
                     replyVo.setNum(applyBillDetailVo.getStorageCount());

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

@@ -263,6 +263,11 @@ public enum LogType {
     REPAIR_BACK_9(105,REPAIR_BACK.id, WAIT_UPLOAD_BACK_FILE.id, ARCHIVE.id, "取消上传领取单"),
     APPLY_5(106,APPLY.id, WAIT_APPLY_FILE.id, WAIT_CONFIRM_APPLY_DEVICE.id, "上传批复单"),
     APPLY_6(107,APPLY.id, WAIT_CONFIRM_APPLY_DEVICE.id, END.id, "业务办结"),
+    ALLOT_15(108, ALLOT.id, ORIGIN_STATUS.id, SIGN_WAIT_CONFIRM.id, "申请电子签章"),
+    ALLOT_16(109,ALLOT.id, ALLOT_DRAFT.id, SIGN_WAIT_CONFIRM.id, "申请电子签章"),
+    ALLOT_17(110,ALLOT.id, SIGN_WAIT_CONFIRM.id, ALLOT_DRAFT.id, "拒绝电子签章申请"),
+    ALLOT_18(111,ALLOT.id, SIGN_WAIT_CONFIRM.id, WAIT_SIGN.id, "同意电子签章申请"),
+    ALLOT_19(112,ALLOT.id, WAIT_SIGN.id, ALLOTING.id, "盖电子签章并出库"),
     ;
 
     public Integer id;

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -148,7 +148,7 @@ public class DeviceLibraryController {
     @PostMapping("/core/feature/summary")
     public ResponseEntity selectCoreDevicePage(@RequestBody DeviceLibrarySelectVo deviceLibrarySelectVo) {
         List<DeviceVo> resultList = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo).stream().map(DeviceLibrary::parseVo).collect(Collectors.toList());
-        resultList.forEach(deviceVo -> deviceVo.setChilds(null));
+//        resultList.forEach(deviceVo -> deviceVo.setChilds(null));
 //        List<Comparator<DeviceVo>> comparators = new ArrayList<>();
 //        if (deviceLibrarySelectVo.getOrders().size() > 0) {
 //            for (CustomOrder c:deviceLibrarySelectVo.getOrders()) {

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -103,17 +103,17 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 libraryEntities = getList3(deviceLibrarySelectVo, unitName);
             }
             //按照子装备跟在父装备后面排列返回
-            List<DeviceLibrary> resultList = new ArrayList<>();
-            for (DeviceLibrary d : libraryEntities) {
-                resultList.add(d);
-                if (d.getChilds().size() > 0) {
-                    resultList.addAll(d.getChilds());
-                }
-            }
+//            List<DeviceLibrary> resultList = new ArrayList<>();
+//            for (DeviceLibrary d : libraryEntities) {
+//                resultList.add(d);
+//                if (d.getChilds().size() > 0) {
+//                    resultList.addAll(d.getChilds());
+//                }
+//            }
 //            if (deviceLibrarySelectVo.getContent()!=null){
 //                resultList = resultList.stream().filter(deviceLibrary -> deviceLibrary.getKeyWords().contains(deviceLibrarySelectVo.getContent())).collect(Collectors.toList());
 //            }
-            return resultList;
+            return GetTreeUtils.splitTree(libraryEntities,DeviceLibrary::getChilds,DeviceLibrary::setChildNull);
         }
         //areId不为空，查询某个区域下的所有单位的所有装备
         else {
@@ -127,32 +127,32 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                         .filter(deviceLibraryEntity -> units.contains(deviceLibraryEntity.getOwnUnit()))
                         .collect(Collectors.toList());
                 List<DeviceLibrary> deviceLibraries = getList4(libraryEntities);
-                List<DeviceLibrary> resultList = new ArrayList<>();
-                for (DeviceLibrary d : deviceLibraries) {
-                    resultList.add(d);
-                    if (d.getChilds().size() > 0) {
-                        resultList.addAll(d.getChilds());
-                    }
-                }
+//                List<DeviceLibrary> resultList = new ArrayList<>();
+//                for (DeviceLibrary d : deviceLibraries) {
+//                    resultList.add(d);
+//                    if (d.getChilds().size() > 0) {
+//                        resultList.addAll(d.getChilds());
+//                    }
+//                }
 //                if (deviceLibrarySelectVo.getContent()!=null){
 //                    resultList = resultList.stream().filter(deviceLibrary -> deviceLibrary.getKeyWords().contains(deviceLibrarySelectVo.getContent())).collect(Collectors.toList());
 //                }
-                return resultList;
+                return GetTreeUtils.splitTree(deviceLibraries,DeviceLibrary::getChilds,DeviceLibrary::setChildNull);
             }
             //省能看到所有装备
             if (selectLevel == 1) {
                 List<DeviceLibrary> libraryEntities = getList4(getAllList(deviceLibrarySelectVo));
-                List<DeviceLibrary> resultList = new ArrayList<>();
-                for (DeviceLibrary d : libraryEntities) {
-                    resultList.add(d);
-                    if (d.getChilds().size() > 0) {
-                        resultList.addAll(d.getChilds());
-                    }
-                }
+//                List<DeviceLibrary> resultList = new ArrayList<>();
+//                for (DeviceLibrary d : libraryEntities) {
+//                    resultList.add(d);
+//                    if (d.getChilds().size() > 0) {
+//                        resultList.addAll(d.getChilds());
+//                    }
+//                }
 //                if (deviceLibrarySelectVo.getContent()!=null){
 //                    resultList = resultList.stream().filter(deviceLibrary -> deviceLibrary.getKeyWords().contains(deviceLibrarySelectVo.getContent())).collect(Collectors.toList());
 //                }
-                return resultList;
+                return GetTreeUtils.splitTree(libraryEntities,DeviceLibrary::getChilds,DeviceLibrary::setChildNull);
             } else {
                 throw new ApiException(ResultUtil.failed("区域等级只能为1，2，3"));
             }

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

@@ -262,6 +262,10 @@ public class DeviceLibrary {
         childs.add(deviceLibraryEntity);
     }
 
+    public void setChildNull() {
+        childs=null;
+    }
+
     public DeviceVo parseVo(){
         setConfigName();
         //modelMap复制

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

@@ -182,6 +182,16 @@ public enum StatusEnum {
      */
     ALLOT_DRAFT(333,"草稿"),
 
+    /**
+     * 申请签章待审核
+     */
+    SIGN_WAIT_CONFIRM(340,"申请签章待审核"),
+
+    /**
+     * 待盖章出库
+     */
+    WAIT_SIGN(341,"待盖章出库"),
+
     /**
      * 待自查
      */

dev-misc/src/main/java/com/tykj/dev/misc/utils/GetTreeUtils.java

@@ -2,6 +2,7 @@ package com.tykj.dev.misc.utils;
 
 import java.util.*;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -61,4 +62,34 @@ public class GetTreeUtils {
         //根据rootIds返回所有的顶层节点
         return rootIds.stream().map(map::get).collect(Collectors.toList());
     }
+
+    /**
+     *  拆分父子结构列装,set child null
+     */
+    public static <T> List<T> splitTree(List<T> treeList, Function<T, List<T>> getChild, Consumer<T> setChild) {
+        List<T> resultList = new ArrayList<>();
+        for (T p:treeList){
+            resultList.add(p);
+            if (getChild.apply(p)!=null&&getChild.apply(p).size()>0){
+                resultList.addAll(splitTree(getChild.apply(p),getChild,setChild));
+                setChild.accept(p);
+            }
+        }
+        return resultList;
+    }
+
+    /**
+     *  拆分父子结构列装
+     */
+    public static <T> List<T> splitTree2(List<T> treeList, Function<T, List<T>> getChild) {
+        List<T> resultList = new ArrayList<>();
+        for (T p:treeList){
+            resultList.add(p);
+            if (getChild.apply(p)!=null&&getChild.apply(p).size()>0){
+                resultList.addAll(splitTree2(getChild.apply(p),getChild));
+            }
+        }
+        return resultList;
+    }
+
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -149,4 +149,11 @@ public interface PackingLibraryService {
      * 查询对应横向或纵向列装
      */
     PackingLibrary findSamePacking(Integer parentId,Integer matchingRange);
+
+    /**
+     * @param packingLibraries 父子结构列装
+     * 拆分父子结构列装
+     */
+    List<PackingLibrary> splitTree(List<PackingLibrary> packingLibraries);
+
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -560,6 +560,22 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         }
     }
 
+    /**
+     * @param packingLibraries 父子结构列装
+     *                         拆分父子结构列装
+     */
+    @Override
+    public List<PackingLibrary> splitTree(List<PackingLibrary> packingLibraries) {
+        List<PackingLibrary> resultList = new ArrayList<>();
+        for (PackingLibrary p:packingLibraries){
+            resultList.add(p);
+            if (p.getChilds()!=null&&p.getChilds().size()>0){
+                resultList.addAll(splitTree(p.getChilds()));
+            }
+        }
+        return resultList;
+    }
+
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         Integer level = userUtils.getCurrentUnitLevel();

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

@@ -252,6 +252,10 @@ public class PackingLibrary {
         childs.add(packingLibraryEntity);
     }
 
+    public void setChildNull() {
+        this.childs=null;
+    }
+
     public PackingLibrary setConfigName(){
         ConfigCache configCache = SpringUtils.getBean("initConfigCache");
         if (configCache != null) {

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

@@ -88,12 +88,17 @@ public class RepairBillSelectController {
     @GetMapping(value = "/repairNum")
     public ResponseEntity getRepairNum(){
         RepairNum repairNum = new RepairNum();
-        List<RepairDetail> repairDetails = (ArrayList)repairController.getRepairList(new RepairTaskSelectVo(1)).getBody();
-        List<RepairDetail> repairDetails2 = (ArrayList)repairController.getRepairList(new RepairTaskSelectVo(2)).getBody();
-        List<RepairDetail> repairDetails3 = (ArrayList)repairController.getRepairList(new RepairTaskSelectVo(3)).getBody();
-        repairNum.setNum1(repairDetails.size());
-        repairNum.setNum2(repairDetails2.size());
-        repairNum.setNum3(repairDetails3.size());
+        RepairTaskSelectVo repairTaskSelectVo = new RepairTaskSelectVo(1);
+        repairTaskSelectVo.setPage(0);
+        repairTaskSelectVo.setSize(Integer.MAX_VALUE);
+        Page<RepairDetail> repairDetails = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        repairTaskSelectVo.setType(2);
+        Page<RepairDetail> repairDetails2 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        repairTaskSelectVo.setType(3);
+        Page<RepairDetail> repairDetails3 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        repairNum.setNum1(Long.valueOf(repairDetails.getTotalElements()).intValue());
+        repairNum.setNum2(Long.valueOf(repairDetails2.getTotalElements()).intValue());
+        repairNum.setNum3(Long.valueOf(repairDetails3.getTotalElements()).intValue());
         return ResponseEntity.ok(repairNum);
     }
 

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

@@ -1484,7 +1484,8 @@ public class RepairController {
                 repairDetail.setLocationUnit(deviceLibraryMap.get(repairDetail.getDeviceId()).getLocationUnit());
                 repairDetail.setConfigName();
             });
-            return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList()));
+            List<RepairDetail> repairDetails1 = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList());
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(),repairTaskSelectVo.getSize(),repairDetails1,repairTaskSelectVo.getPageable()));
         }
         //送修装备
         else if(type==2){
@@ -1496,7 +1497,8 @@ public class RepairController {
                 repairDetail.setLocationUnit(deviceLibraryMap.get(repairDetail.getDeviceId()).getLocationUnit());
                 repairDetail.setConfigName();
             });
-            return ResponseEntity.ok(repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).collect(Collectors.toList()));
+            List<RepairDetail> repairDetails2 = repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).collect(Collectors.toList());
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(),repairTaskSelectVo.getSize(),repairDetails2,repairTaskSelectVo.getPageable()));
         }
         //待领取装备
         else if(type==3){
@@ -1505,7 +1507,8 @@ public class RepairController {
                 repairDetail.setLocationUnit(deviceLibraryMap.get(repairDetail.getDeviceId()).getLocationUnit());
                 repairDetail.setConfigName();
             });
-            return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList()));
+            List<RepairDetail> repairDetails2 = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList());
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(),repairTaskSelectVo.getSize(),repairDetails2,repairTaskSelectVo.getPageable()));
         }
 //        else if(type==4){
 //            List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(2,repairTaskSelectVo.getPageable().getSort());

dev-retired/src/main/java/com/tykj/dev/device/retired/controller/DeviceRetiredController.java

@@ -237,10 +237,10 @@ public class DeviceRetiredController {
             childDeviceRetiredResultVo.setCount(deviceRetiredBillService.getCantPackingCount(p.getId()));
             if (!p.getChilds().isEmpty()){
                 for (PackingLibrary pack:p.getChilds()) {
-                    childDeviceRetiredResultVo.getChildNodes().add(calcDeviceRetiredResultVo(pack));
+                    childDeviceRetiredResultVo.getChilds().add(calcDeviceRetiredResultVo(pack));
                 }
             }
-            deviceRetiredResultVo.getChildNodes().add(childDeviceRetiredResultVo);
+            deviceRetiredResultVo.getChilds().add(childDeviceRetiredResultVo);
         }
         return deviceRetiredResultVo;
     }

dev-retired/src/main/java/com/tykj/dev/device/retired/entity/vo/DeviceRetiredFormVo.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 public class DeviceRetiredFormVo {
 
-    @NotNull
+//    @NotNull
     private Integer confirmUserId;
 
     @NotNull

dev-retired/src/main/java/com/tykj/dev/device/retired/entity/vo/DeviceRetiredResultVo.java

@@ -44,12 +44,12 @@ public class DeviceRetiredResultVo {
     private Integer isPart;
 
     @ApiModelProperty(value = "数量", example = "1")
-    private List<DeviceRetiredResultVo> childNodes = new ArrayList<>();
+    private List<DeviceRetiredResultVo> childs = new ArrayList<>();
 
     public boolean devNumIsZero(){
         if (this.count==0){
-            if (this.childNodes.size()>0){
-                for (DeviceRetiredResultVo d:this.childNodes) {
+            if (this.childs.size()>0){
+                for (DeviceRetiredResultVo d:this.childs) {
                     if (d.getCount()>0){
                         return false;
                     }