feat(装备管理): 新增了是否是配件字段

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceNewVo.java

@@ -42,4 +42,7 @@ public class DeviceNewVo {
     @ApiModelProperty(value = "装备id")
     private List<Integer> devicesId;
 
+    @ApiModelProperty("是否是配件")
+    private Integer isPart;
+
 }

dev-statistical/src/main/java/com/tykj/dev/statistical/controller/StatisticalController.java

@@ -299,7 +299,7 @@ public class StatisticalController {
         List<ScrappedDestroyedRetiredVo> destroyedRetiredVoList = new ArrayList<>();
         if (lifeStatus.containsAll(deviceLibrarySelectVo.getLifeStatus())){
             //进行组合
-            Map<String, List<DeviceLibrary>> map = libraryList.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ" + deviceLibrary.getName() + "Ǵ" + deviceLibrary.getMatchingRangeName()));
+            Map<String, List<DeviceLibrary>> map = libraryList.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ" + deviceLibrary.getName() + "Ǵ" + deviceLibrary.getMatchingRangeName()+"Ǵ"+deviceLibrary.getIsPart()));
             if (map.size()>0){
                 for (String s : map.keySet()) {
                     String[] strings = s.split("Ǵ");
@@ -308,6 +308,7 @@ public class StatisticalController {
                     scrappedDestroyedRetiredVo.setModel(strings[0]);
                     scrappedDestroyedRetiredVo.setName(strings[1]);
                     scrappedDestroyedRetiredVo.setMatchingRangeName(strings[2]);
+                    scrappedDestroyedRetiredVo.setIsPart(Integer.valueOf(strings[3]));
                     scrappedDestroyedRetiredVo.setNum(map.get(s).size());
                     List<Integer> ids = new ArrayList<>();
                     List<DeviceLibrary> deviceLibraries = map.get(s);

dev-statistical/src/main/java/com/tykj/dev/statistical/vo/ScrappedDestroyedRetiredVo.java

@@ -38,4 +38,8 @@ public class ScrappedDestroyedRetiredVo {
 
     @ApiModelProperty(value = "装备id")
     private List<Integer> devicesId;
+
+    @ApiModelProperty(value = "是否是配件")
+    private Integer isPart;
+
 }