[决算]修改部件为形态的bug,按型号+部件（名称）分类

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

@@ -227,8 +227,21 @@ public class AllotBillController {
         }
         //横向配发
         else {
-            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备共"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
-            saveEntity = taskService.start(taskBto2);
+            //直接发起
+            if (allotBillSaveVo.getTaskId() == null) {
+                TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, allotBillSaveVo.getSendUnit() + "配发型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件至" + allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
+                saveEntity = taskService.start(taskBto2);
+            }
+            //从草稿发起
+            else {
+                TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
+                taskBto.setTitle(allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备共"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit());
+                taskBto.setCustomInfo("country");
+                //添加当前操作人为涉及人员
+                TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
+                //推动任务到配发中状态
+                saveEntity = taskService.moveToSpecial(taskBto1, StatusEnum.WAIT_UPLOAD_CROSS_FILE, userId);
+            }
         }
         List<FileVo> fileVoList = new ArrayList<>();
         //分解装备id字符串

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/domain/FinalDetail.java

@@ -23,7 +23,7 @@ public class FinalDetail extends BaseEntity {
 
     private String model;
 
-    private Integer type;
+    private String type;
 
     private Integer vertical;
 

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/entity/vo/FinalDetailVo.java

@@ -27,7 +27,7 @@ public class FinalDetailVo {
     private String model;
 
     @ApiModelProperty("部件")
-    private Integer type;
+    private String type;
 
     @ApiModelProperty("纵向")
     private Integer vertical;

dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java

@@ -64,24 +64,24 @@ public class FinalCheckServiceImpl implements FinalCheckService {
         List<DeviceLibrary> devices = deviceDao.findAllByUnitBetweenTime(unitName, localDateToDate(startTime), localDateToDate(endTime));
         // 纵向-查 横向-0 委托-0 合计-合计 代管0 收到 发出 报废0
         Map<String, List<DeviceLibrary>> map = devices.stream()
-                .collect(groupingBy(DeviceLibrary::getModel));
+                .collect(groupingBy(deviceLibrary -> deviceLibrary.getModel()+"Ǵ"+deviceLibrary.getName()));
 
         List<FinalDetail> detailList = new ArrayList<>();
 
         Map<String, DeviceStatistics> storageMap = dataService.getStorageStatistics(localDateToDate(startTime), localDateToDate(endTime))
                 .stream()
-                .collect(toMap(DeviceStatistics::getModel, Function.identity()));
+                .collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
 
         Map<String, DeviceStatistics> repairMap = dataService.getRepairStatistics(localDateToDate(startTime), localDateToDate(endTime))
                 .stream()
-                .collect(toMap(DeviceStatistics::getModel, Function.identity()));
+                .collect(toMap(deviceStatistics -> deviceStatistics.getModel()+"Ǵ"+deviceStatistics.getName(), Function.identity()));
 
         for (Map.Entry<String, List<DeviceLibrary>> entry : map.entrySet()) {
-            String model = entry.getKey();
+            String key = entry.getKey();
             List<DeviceLibrary> v = entry.getValue();
-            Integer received = storageMap.get(model) == null ? 0 : storageMap.get(model).getNum();
-            Integer sending = repairMap.get(model) == null ? 0 : repairMap.get(model).getNum();
-            detailList.add(new FinalDetail(model, v.get(0).getType(), v.size(), 0, 0, 0, v.size(),
+            Integer received = storageMap.get(key) == null ? 0 : storageMap.get(key).getNum();
+            Integer sending = repairMap.get(key) == null ? 0 : repairMap.get(key).getNum();
+            detailList.add(new FinalDetail(v.get(0).getModel(), v.get(0).getName(), v.size(), 0, 0, 0, v.size(),
                     0, received, sending, 0, report.getId()));
         }
 

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

@@ -579,11 +579,11 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         predicateBuilder.eq("isRoot", 0);
         predicateBuilder.eq("partParentId", parentId);
         predicateBuilder.eq("matchingRange", matchingRange);
-        predicateBuilder.eq("type",type);
-        predicateBuilder.eq("style",style);
+//        predicateBuilder.eq("type",type);
+//        predicateBuilder.eq("style",style);
         predicateBuilder.eq("name",name);
-        predicateBuilder.eq("secretLevel",secretLevel);
-        predicateBuilder.eq("invisibleRange",invisibleRange);
+//        predicateBuilder.eq("secretLevel",secretLevel);
+//        predicateBuilder.eq("invisibleRange",invisibleRange);
         return packingLibraryDao.findAll(predicateBuilder.build()).size()>0;
     }
 

dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java

@@ -389,11 +389,15 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
     private List<DeviceStatistics> getDeviceStatistics(List<DeviceLibrary> deviceLibraries) {
         List<DeviceStatistics> deviceStatisticsList = new ArrayList<>();
         //按型号组合成map
-        Map<String, List<DeviceLibrary>> map = deviceLibraries.stream().collect(groupingBy(DeviceLibrary::getModel));
+        Map<String, List<DeviceLibrary>> map = deviceLibraries.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel()+"Ǵ"+deviceLibrary.getName()));
         //不同型号生成统计vo
         for (String s:map.keySet()) {
+            String[] strings = s.split("Ǵ");
+            String model = strings[0];
+            String name = strings[1];
             DeviceStatistics deviceStatistics = new DeviceStatistics();
-            deviceStatistics.setModel(s);
+            deviceStatistics.setModel(model);
+            deviceStatistics.setName(name);
             deviceStatistics.setNum(map.get(s).size());
             deviceStatisticsList.add(deviceStatistics);
         }