feat(装备入库，任务模块): task新增状态过滤，生成配件的序列号

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -861,7 +861,7 @@ public class DeviceCheckController {
         Integer startUnitId = ccVO.getUnitId();
         Units startUnit = unitsRepo.findById(startUnitId).get();
         List<Units> checkedUnits = unitsRepo.findAllById(ccVO.getUnitRange());
-        // 1.发起自己的自查 (市,tpy2=2,省 level = 0,1,2)
+        // 1.发起自己的自查 (市,tpye=2,省 level = 0,1,2)
         // 2.发起自己的检查(只是市级别的 level=2)
         List<String> checkedUnitNames = checkedUnits.stream().map(Units::getName).collect(toList());
 
@@ -911,7 +911,7 @@ public class DeviceCheckController {
             cityExamIdMap.put(unit.getUnitId(), cityStatTask.getId());
         }
 
-        // 构建自查任务(levl = 1,2) tpye = 2
+        // 构建自查任务(levl = 0,1) tpye = 2
         List<Units> selfCheckUnits = checkedUnits.stream()
                 .filter(units -> Arrays.asList(0, 1).contains(units.getLevel()) || units.getType() == 2)
                 .collect(toList());
@@ -1742,7 +1742,6 @@ public class DeviceCheckController {
         //将当前的统计task办结
         TaskBto currentTask = taskService.get(statId, CONFIRM_CHECK_STAT.id);
         currentTask = taskService.moveToEnd(currentTask);
-
         Integer parentTaskId = currentTask.getParentTaskId();
         boolean hasParent = parentTaskId != 0;
 
@@ -1932,7 +1931,7 @@ public class DeviceCheckController {
             CheckAreaStatVo checkAreaStatVo;
             // 百位数 0/1 待审核 2 无误 3未通过
             // 十位数 1 人工 2 自动
-            // 0缺失1无误2新增3不在库 8已退回 9未检查
+            // 0缺失1无b误2新增3不在库 8已退回 9未检查
             int digits = proofResult % 10;
             int tens = proofResult / 10 % 10;
             int huns = proofResult / 100 % 10;
@@ -2026,7 +2025,7 @@ public class DeviceCheckController {
      * @param unitsList     被核查单位列表
      * @return 一份初始化好统计数据(没有向上合并 ， 只做了同级地区数据合并)的核查统计单
      */
-    private DeviceCheckStat initStatData(String title, String remark, Integer checkAId, Integer checkBId, String startUnitName, List<Units> unitsList, LocalDateTime endTime) {
+    private DeviceCheckStat  initStatData(String title, String remark, Integer checkAId, Integer checkBId, String startUnitName, List<Units> unitsList, LocalDateTime endTime) {
         //获得要被统计的单位名列表
         List<String> unitNameList = unitsList.stream()
                 .map(Units::getName)

dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java

@@ -179,5 +179,7 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
     @Modifying
     @Query("update DeviceLibrary d set d.ownUnit = :ownUnit,d.locationUnit = :ownUnit,d.lifeStatus = 2 where d.id in :deviceIds")
     int updateDevicesOwnUnit(@Param("ownUnit") String ownUnit,@Param("deviceIds") List<Integer> deviceIds);
+
+    List<DeviceLibrary> findByModelAndIsPart(String model,Integer isPart);
 }
 

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

@@ -251,4 +251,6 @@ public interface DeviceLibraryService {
      * 根据型号查询序列号 取最大值的Device对象
      */
     int getMaxSeqNumber(String model);
+
+    List<String> getMaxPartSeqNumber(String model,Integer isPart);
 }

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

@@ -757,8 +757,20 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
 //                .collect(Collectors.toList());
     }
 
+    @Override
+    public List<String> getMaxPartSeqNumber(String model, Integer isPart) {
+        //查询配件型号中是否存在随机生成4位数的
+        List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findByModelAndIsPart(model, isPart);
+        //如果是老数据则是从0开始  老数据就是12035412   新的数据就是AA021234
+
+        return  deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getSeqNumber().contains(model))
+                .map(deviceLibrary -> deviceLibrary.getSeqNumber().substring(deviceLibrary.getSeqNumber().length()-4))
+                .sorted(Comparator.comparing(String::toString).reversed())
+                .collect(Collectors.toList());
 
 
+    }
+
 
     @Override
     public DeviceLibrary update(DeviceLibrary deviceLibraryEntity) {

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

@@ -263,6 +263,7 @@ public enum StatusEnum {
      * 维修送修状态
      */
     REPAIR_SEND_CONFIRM(700, "维修送修出库待审核"),
+
     WAIT_RECEIVE(701, "等待接收维修装备"),
     REPAIR_RECEIVE_CONFIRM(702, "接收维修装备待审核"),
     REPAIRING(703, "维修中"),

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -178,37 +178,27 @@ public class StorageBillController {
     @PostMapping(value = "/autoCreateForPart")
     public ResponseEntity autoCreateForPart(@RequestBody CreateSeqVo createSeqVo){
         Integer num = createSeqVo.getNum();
-        //获取集合中的元素
-//        List<String> seq = createSeq();
-        //方法生成满的 0001-9999 list1
-        //getModel idList list2
-        //list1 list2 取差集 list3
-        //list3 next model下的可用
-        //getcurrentId max = n , 需要生成 m个 ,(n,n+m] n=0,m=5 (0,5]
-        // (5,11]
 
         //根据型号查询数据库
-        int maxSeqNumber = deviceLibraryService.getMaxSeqNumber(createSeqVo.getModel());
-        List<String> seqList = IntStream.rangeClosed(maxSeqNumber + 1, num)
-                .mapToObj(DeviceNumberUtils::parseNumber2Seq)
-                .collect(Collectors.toList());
-
-
-
-//        int start =0;
-//        if (!CollectionUtils.isEmpty(allSeq)){
-//            //说明数据库中存有该集合中的数字
-//            String s = allSeq.get(0);
-//            start = Integer.parseInt(s);
-//        }
-//        List<String> seq2 = createSeq2(start+1, start+1+num);
-//        StringJoiner stringBuffer = new StringJoiner("-");
-//        String modelStyle = createSeqVo.getModel()+createSeqVo.getStyle();
-//        for (String s : seq2) {
-//            stringBuffer.add(modelStyle+s);
-//        }
-//        return ResponseEntity.ok(stringBuffer.toString());
-        return ResponseEntity.ok(seqList);
+//        int maxSeqNumber = deviceLibraryService.getMaxSeqNumber(createSeqVo.getModel());
+//        List<String> seqList = IntStream.rangeClosed(maxSeqNumber + 1, num)
+//                .mapToObj(DeviceNumberUtils::parseNumber2Seq)
+//                .collect(Collectors.toList());
+        List<String> strings = deviceLibraryService.getMaxPartSeqNumber(createSeqVo.getModel(), 1);
+        int start =0;
+        if (!CollectionUtils.isEmpty(strings)){
+            //说明数据库中存有该集合中的数字
+            String s = strings.get(0);
+            start = Integer.parseInt(s);
+        }
+        List<String> seq2 = createSeq2(start+1, start+1+num);
+        StringJoiner stringBuffer = new StringJoiner("-");
+        String modelStyle = createSeqVo.getModel()+createSeqVo.getStyle();
+        for (String s : seq2) {
+            stringBuffer.add(modelStyle+s);
+        }
+        return ResponseEntity.ok(stringBuffer.toString());
+//        return ResponseEntity.ok(seqList);
     }
 
     @ApiOperation(value = "获取序列号区间列表", notes = "可以通过这个接口获取序列号区间列表")

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -647,7 +647,8 @@ public class TaskServiceImpl implements TaskService {
                 List<Integer>  unitIds = unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList());
                 List<Integer>  userIDs= userService.findUnitsIdInUsers(unitIds).stream().map(User::getUserId).collect(Collectors.toList());
                 taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
-            }else {
+            }
+            if (taskSelectVo.getUnitId()!=null){
                 List<Integer>  userIDs= userService.findAllByUnite(taskSelectVo.getUnitId()).stream().map(User::getUserId).collect(Collectors.toList());
                 taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
             }