增加接口2

huimv-receive/src/main/java/com/huimv/receive/entity/BillClean.java

@@ -119,4 +119,14 @@ public class BillClean implements Serializable {
     private String departureName;
 
     private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillCleanBefore.java

@@ -130,4 +130,14 @@ public class BillCleanBefore implements Serializable {
     private String departureName;
 
     private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillDry.java

@@ -134,5 +134,15 @@ public class BillDry implements Serializable {
 
     private Integer departureId;
 
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
 
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillGoodsInventory.java

@@ -113,4 +113,13 @@ public class BillGoodsInventory implements Serializable {
 
     private String carNum;
 
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillIsolate.java

@@ -138,4 +138,16 @@ public class BillIsolate implements Serializable {
 
     private Integer departureId;
 
+    private String carNum;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillPcr.java

@@ -128,4 +128,14 @@ public class BillPcr implements Serializable {
     private String departureName;
 
     private Integer departureId;
+
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillSampling.java

@@ -132,4 +132,14 @@ public class BillSampling implements Serializable {
 
     private Integer departureId;
 
+    private String resource;
+
+    private String feedImgUrl;
+
+    private Integer cleanId;
+
+    private String cleanName;
+
+    private String remark;
+
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanBeforeServiceImpl.java

@@ -217,6 +217,9 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 } else if (Integer.parseInt(split[1]) == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) entity;
+                    if (cleanBefore.getVistitType() != 0) {
+                        pcr.setCarNum(cleanBefore.getCarNum());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(split[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
@@ -278,6 +281,9 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         }else if (nextId == 4) {
             //新增隔离
             BillIsolate pcr = (BillIsolate) newObject;
+            if (cleanBefore.getVistitType() != 0) {
+                pcr.setCarNum(cleanBefore.getCarNum());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -65,6 +65,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private ConfigurationMapper configurationMapper;
     @Autowired
     private ExistMapper existMapper;
+    @Autowired
+    private BillGoodsInventoryMapper inventoryMapper;
 
     @Override
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -86,10 +88,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             data = "0";
         }
         if (type.equals("0")) {
-
             BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
-
-
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
@@ -109,23 +108,29 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     .eq("test_location_id", baseLocation.getId()).eq("bill_status", 0);
 
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper), cleanMapper.selectCount(queryWrapper2));
-        }/* else if (type.equals("4")) {
-            Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 4).orderByDesc("sub_date")
-                    .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        }
+        else if ("5".equals(type)) {
+            BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
+            Page<BillGoodsInventory> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            QueryWrapper<BillGoodsInventory> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date")
+                    .eq("current_location_id", baseLocation.getId());
 
             if ("0".equals(data)) {
-                queryWrapper.in("bill_status", 0, 1, 2);
+                queryWrapper.in("status", 0, 1);
             }
             if ("1".equals(data)) {
-                queryWrapper.eq("bill_status", 0);
+                queryWrapper.eq("status", 0);
             }
             if ("2".equals(data)) {
-                queryWrapper.eq("bill_status", 1);
+                queryWrapper.eq("status", 1);
             }
-            return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
-        }*/ else {
+            QueryWrapper<BillGoodsInventory> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("farm_id", farmId).orderByDesc("sub_date")
+                    .eq("current_location_id", baseLocation.getId()).eq("status", 0);
+
+            return new Result(ResultCode.SUCCESS, inventoryMapper.selectPage(page, queryWrapper), inventoryMapper.selectCount(queryWrapper2));
+        } else {
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
@@ -566,8 +571,6 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private BillCleanBeforeMapper beforeMapper;
     @Autowired
     private BillSamplingMapper samplingMapper;
-    @Autowired
-    private BillGoodsInventoryMapper inventoryMapper;
 
 
     @Override
@@ -906,6 +909,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         } else if (Integer.parseInt(splits[1]) == 4) {
                             //新增隔离
                             BillIsolate pcr = (BillIsolate) entity;
+                            if (billClean.getVistitType() != 0) {
+                                pcr.setCarNum(billClean.getCarNum());
+                            }
                             isolateMapper.insert(pcr);
                         } else if (Integer.parseInt(splits[1]) == 5) {
                             BillDry billClean1 = (BillDry) entity;
@@ -967,6 +973,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 }else if (nextId == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) newObject;
+                    if (billClean.getVistitType() != 0) {
+                        pcr.setCarNum(billClean.getCarNum());
+                    }
                     isolateMapper.insert(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 5) {
@@ -1119,6 +1128,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             } else if (Integer.parseInt(splits[1]) == 4) {
                                 //新增隔离
                                 BillIsolate pcr = (BillIsolate) entity;
+                                if (billClean.getVistitType() != 0) {
+                                    pcr.setCarNum(billClean.getCarNum());
+                                }
                                 isolateMapper.insert(pcr);
                             } else if (Integer.parseInt(splits[1]) == 5) {
                                 BillDry billClean1 = (BillDry) entity;
@@ -1180,6 +1192,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     }else if (nextId == 4) {
                         //新增隔离
                         BillIsolate pcr = (BillIsolate) newObject;
+                        if (billClean.getVistitType() != 0) {
+                            pcr.setCarNum(billClean.getCarNum());
+                        }
                         isolateMapper.insert(pcr);
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     }else if (nextId == 5) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGoodsInventoryServiceImpl.java

@@ -152,6 +152,9 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 } else if (Integer.parseInt(split[1]) == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) entity;
+                    if (goodsInventory.getVistitType() != 0) {
+                        pcr.setCarNum(goodsInventory.getCarNum());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(split[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
@@ -214,6 +217,9 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
         }else if (nextId == 4) {
             //新增隔离
             BillIsolate pcr = (BillIsolate) newObject;
+            if (goodsInventory.getVistitType() != 0) {
+                pcr.setCarNum(goodsInventory.getCarNum());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -462,6 +462,9 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         } else if (Integer.parseInt(split[1]) == 4) {
                             //新增隔离
                             BillIsolate pcr = (BillIsolate) entity;
+                            if (billPcr.getVistitType() != 0) {
+                                pcr.setCarNum(billPcr.getCarNum());
+                            }
                             isolateMapper.insert(pcr);
                         } else if (Integer.parseInt(split[1]) == 5) {
                             BillDry billClean = (BillDry) entity;
@@ -524,6 +527,9 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                 } else if (nextId == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) newObject;
+                    if (billPcr.getVistitType() != 0) {
+                        pcr.setCarNum(billPcr.getCarNum());
+                    }
                     isolateMapper.insert(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 } else if (nextId == 5) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -1467,30 +1467,51 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 if (Integer.parseInt(splits[1]) == 1) {
                     //新增采样
                     BillSampling billSampling = (BillSampling) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        billSampling.setCarNum(billIsolate.getCarNum());
+                    }
                     samplingMapper.insert(billSampling);
                 } else if (Integer.parseInt(splits[1]) == 2) {
                     //新增pcr
                     BillPcr billClean = (BillPcr) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        billClean.setCarNum(billIsolate.getCarNum());
+                    }
                     pcrMapper.insert(billClean);
                 } else if (Integer.parseInt(splits[1]) == 3) {
                     //新增洗澡
                     BillClean billClean = (BillClean) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        billClean.setCarNum(billIsolate.getCarNum());
+                    }
                     cleanMapper.insert(billClean);
                 } else if (Integer.parseInt(splits[1]) == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        pcr.setCarNum(billIsolate.getCarNum());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(splits[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        billClean.setCarNum(billIsolate.getCarNum());
+                    }
                     dryMapper.insert(billClean);
                     //新增烘干
                 } else if (Integer.parseInt(splits[1]) == 6) {
                     //新增洗澡前拍照
                     BillCleanBefore before = (BillCleanBefore) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        before.setCarNum(billIsolate.getCarNum());
+                    }
                     beforeMapper.insert(before);
                 }else if (Integer.parseInt(splits[1]) == 7) {
                     //新增洗澡前拍照
                     BillGoodsInventory before = (BillGoodsInventory) entity;
+                    if (billIsolate.getVistitType() != 0) {
+                        before.setCarNum(billIsolate.getCarNum());
+                    }
                     inventoryMapper.insert(before);
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
@@ -1507,36 +1528,57 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         } else if (nextId == 1) {
             //新增采样
             BillSampling billSampling = (BillSampling) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                billSampling.setCarNum(billIsolate.getCarNum());
+            }
             samplingMapper.insert(billSampling);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 2) {
             //新增pcr
             BillPcr pcr = (BillPcr) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                pcr.setCarNum(billIsolate.getCarNum());
+            }
             pcrMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 3) {
             //新增洗澡
             BillClean pcr = (BillClean) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                pcr.setCarNum(billIsolate.getCarNum());
+            }
             cleanMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 4) {
             //新增隔离
             BillIsolate pcr = (BillIsolate) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                pcr.setCarNum(billIsolate.getCarNum());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {
             BillDry pcr = (BillDry) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                pcr.setCarNum(billIsolate.getCarNum());
+            }
             dryMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
             //新增烘干
         }else if (nextId == 6) {
             //新增洗澡前拍照
             BillCleanBefore before = (BillCleanBefore) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                before.setCarNum(billIsolate.getCarNum());
+            }
             beforeMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 7) {
             //新增洗澡前拍照
             BillGoodsInventory before = (BillGoodsInventory) newObject;
+            if (billIsolate.getVistitType() != 0) {
+                before.setCarNum(billIsolate.getCarNum());
+            }
             inventoryMapper.insert(before);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -220,6 +220,9 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 } else if (Integer.parseInt(split[1]) == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) entity;
+                    if (sampling.getVistitType() != 0) {
+                        pcr.setCarNum(sampling.getCarNum());
+                    }
                     isolateMapper.insert(pcr);
                 } else if (Integer.parseInt(split[1]) == 5) {
                     BillDry billClean = (BillDry) entity;
@@ -281,6 +284,9 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         }else if (nextId == 4) {
             //新增隔离
             BillIsolate pcr = (BillIsolate) newObject;
+            if (sampling.getVistitType() != 0) {
+                pcr.setCarNum(sampling.getCarNum());
+            }
             isolateMapper.insert(pcr);
             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
         }else if (nextId == 5) {

huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

@@ -114,30 +114,51 @@ public class SafeTimer {
                         if (Integer.parseInt(splits[1]) == 1) {
                             //新增采样
                             BillSampling billSampling = (BillSampling) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                billSampling.setCarNum(billIsolate.getCarNum());
+                            }
                             samplingService.save(billSampling);
                         } else if (Integer.parseInt(splits[1]) == 2) {
                             //新增pcr
                             BillPcr billClean = (BillPcr) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                billClean.setCarNum(billIsolate.getCarNum());
+                            }
                             pcrService.save(billClean);
                         } else if (Integer.parseInt(splits[1]) == 3) {
                             //新增洗澡
                             BillClean billClean = (BillClean) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                billClean.setCarNum(billIsolate.getCarNum());
+                            }
                             cleanService.save(billClean);
                         } else if (Integer.parseInt(splits[1]) == 4) {
                             //新增隔离
                             BillIsolate pcr = (BillIsolate) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                pcr.setCarNum(billIsolate.getCarNum());
+                            }
                             isolateService.save(pcr);
                         } else if (Integer.parseInt(splits[1]) == 5) {
                             BillDry billClean = (BillDry) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                billClean.setCarNum(billIsolate.getCarNum());
+                            }
                             dryService.save(billClean);
                             //新增烘干
                         } else if (Integer.parseInt(splits[1]) == 6) {
                             //新增洗澡前拍照
                             BillCleanBefore before = (BillCleanBefore) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                before.setCarNum(billIsolate.getCarNum());
+                            }
                             beforeService.save(before);
                         } else if (Integer.parseInt(splits[1]) == 7) {
                             //新增洗澡前拍照
                             BillGoodsInventory before = (BillGoodsInventory) entity;
+                            if (billIsolate.getVistitType() != 0) {
+                                before.setCarNum(billIsolate.getCarNum());
+                            }
                             inventoryService.save(before);
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
@@ -154,36 +175,57 @@ public class SafeTimer {
                 } else if (nextId == 1) {
                     //新增采样
                     BillSampling billSampling = (BillSampling) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        billSampling.setCarNum(billIsolate.getCarNum());
+                    }
                     samplingService.save(billSampling);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 2) {
                     //新增pcr
                     BillPcr pcr = (BillPcr) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        pcr.setCarNum(billIsolate.getCarNum());
+                    }
                     pcrService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 3) {
                     //新增洗澡
                     BillClean pcr = (BillClean) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        pcr.setCarNum(billIsolate.getCarNum());
+                    }
                     cleanService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 4) {
                     //新增隔离
                     BillIsolate pcr = (BillIsolate) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        pcr.setCarNum(billIsolate.getCarNum());
+                    }
                     isolateService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 5) {
                     BillDry pcr = (BillDry) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        pcr.setCarNum(billIsolate.getCarNum());
+                    }
                     dryService.save(pcr);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                     //新增烘干
                 }else if (nextId == 6) {
                     //新增洗澡前拍照
                     BillCleanBefore before = (BillCleanBefore) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        before.setCarNum(billIsolate.getCarNum());
+                    }
                     beforeService.save(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }else if (nextId == 7) {
                     //新增洗澡前拍照
                     BillGoodsInventory before = (BillGoodsInventory) newObject;
+                    if (billIsolate.getVistitType() != 0) {
+                        before.setCarNum(billIsolate.getCarNum());
+                    }
                     inventoryService.save(before);
                     baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId);
                 }