更新

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java

@@ -164,7 +164,7 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
             if (allotBillSelectVo.getEndTime() != null) {
                 predicateBuilder.lt("sendTime", allotBillSelectVo.getEndTime());
             }
-            predicateBuilder.eq("backStatus", 3);
+            predicateBuilder.notIn("backStatus", 1);
         }
         return predicateBuilder.build();
     }

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java

@@ -169,7 +169,7 @@ public class AllotBillServiceImpl implements AllotBillService {
             if (allotBillSelectVo.getEndTime() != null) {
                 predicateBuilder.lt("sendTime", allotBillSelectVo.getEndTime());
             }
-            predicateBuilder.eq("allotStatus", 5);
+            predicateBuilder.notIn("allotStatus", 0);
         }
         return predicateBuilder.build();
     }

dev-excel/src/main/java/com/tykj/dev/device/excel/controller/ExeclController.java

@@ -55,7 +55,7 @@ public class ExeclController {
     @ApiOperation(value = "下载培训excel", notes = "下载培训excel")
     public ResponseEntity saveDeviceDestroyBill(HttpServletRequest request, HttpServletResponse response){
         List<DeviceExcel> excelList=deviceLibraryDao.findAll().stream()
-                .filter(deviceLibrary -> deviceLibrary.getLifeStatus()!=12)
+                .filter(deviceLibrary -> deviceLibrary.getLifeStatus()==12&& "浙江省委机要局".equals(deviceLibrary.getOwnUnit()))
                 .map(DeviceLibrary::parseExcel)
                 .sorted(Comparator.comparing(DeviceExcel::getSeqNumber,Comparator.nullsLast(String::compareTo)).thenComparing(DeviceExcel::getName))
                 .collect(Collectors.toList());

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

@@ -49,7 +49,7 @@ public class DeviceLibrarySaveVo {
     private Integer manageStatus;
 
     @ApiModelProperty(value = "是不是单独的配件,0-不是,1-是")
-    private Integer isSinglePart = 0;
+    private Integer isSinglePart = 1;
 
     @ApiModelProperty(value = "货架位置")
     private String position;

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

@@ -248,6 +248,10 @@ public class PackingLibrary {
     @Transient
     private Integer devNum;
 
+    @Transient
+    @ApiModelProperty(value = "是不是单独的配件,0-不是,1-是")
+    private Integer isSinglePart;
+
     public void addChildNode(PackingLibrary packingLibraryEntity) {
         childs.add(packingLibraryEntity);
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -139,7 +139,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
                 predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
             }
         }
-        predicateBuilder.eq("backStatus", 5);
+        predicateBuilder.notIn("backStatus", 0);
         return predicateBuilder.build();
     }
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBillServiceImpl.java

@@ -125,7 +125,7 @@ public class RepairBillServiceImpl implements RepairBillService {
                 predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
             }
         }
-        predicateBuilder.eq("repairStatus", 4);
+        predicateBuilder.notIn("repairStatus", 0);
         return predicateBuilder.build();
     }
 }

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

@@ -190,6 +190,7 @@ public class StorageBillController {
                     PackingLibrary packingLibraryEntity = new PackingLibrary();
                     BeanUtils.copyProperties(packingLibraryService.getOne(s.getPackingId()), packingLibraryEntity);
                     packingLibraryEntity.setCorresponding(count);
+                    packingLibraryEntity.setIsSinglePart(1);
                     if (!strings3.isEmpty()) {
                         packingLibraryEntity.setProdNumber(strings3.get(0));
                         strings3.remove(0);
@@ -217,6 +218,7 @@ public class StorageBillController {
                             List<String> strings2 = sons.get(j);
                             List<String> strings1 = sons2.get(j);
                             if (s2.getStorageCount() >= count) {
+                                packingLibraryEntity.setIsSinglePart(0);
                                 packingLibraryEntity.setCorresponding(count);
                                 if (!strings2.isEmpty()) {
                                     if (deviceLibraryDao.getAllBySeqNumber(strings2.get(0)).size() > 0) {
@@ -240,6 +242,7 @@ public class StorageBillController {
                                 for (int i = 0; i < s2.getStorageCount() - deviceNum; i++) {
                                     packingLibraryEntity = packingLibraryService.getOne(s2.getPackingId());
                                     packingLibraryEntity.setCorresponding(0);
+                                    packingLibraryEntity.setIsSinglePart(1);
                                     if (!strings2.isEmpty()) {
                                         if (deviceLibraryDao.getAllBySeqNumber(strings2.get(0)).size() > 0) {
                                             throw new ApiException("序列号" + strings2.get(0) + "已存在");
@@ -270,6 +273,7 @@ public class StorageBillController {
                                     List<String> strings4 = sons3.get(k);
                                     List<String> strings5 = sons4.get(k);
                                     if (s3.getStorageCount() >= count) {
+                                        packingLibraryEntity.setIsSinglePart(0);
                                         packingLibraryEntity.setCorresponding(count);
                                         if (!strings4.isEmpty()) {
                                             if (deviceLibraryDao.getAllBySeqNumber(strings4.get(0)).size() > 0) {
@@ -293,6 +297,7 @@ public class StorageBillController {
                                         for (int i = 0; i < s3.getStorageCount() - deviceNum; i++) {
                                             packingLibraryEntity = packingLibraryService.getOne(s3.getPackingId());
                                             packingLibraryEntity.setCorresponding(0);
+                                            packingLibraryEntity.setIsSinglePart(1);
                                             if (!strings4.isEmpty()) {
                                                 if (deviceLibraryDao.getAllBySeqNumber(strings4.get(0)).size() > 0) {
                                                     throw new ApiException("序列号" + strings4.get(0) + "已存在");