出发地增加

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

@@ -115,4 +115,8 @@ public class BillClean implements Serializable {
     private Integer imgStatus;
 
     private String cleanTime;
+
+    private String departureName;
+
+    private Integer departureId;
 }

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

@@ -127,5 +127,7 @@ public class BillCleanBefore implements Serializable {
      */
     private Integer imgStatus;
 
+    private String departureName;
 
+    private Integer departureId;
 }

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

@@ -130,5 +130,9 @@ public class BillDry implements Serializable {
 
     private String dryTem;
 
+    private String departureName;
+
+    private Integer departureId;
+
 
 }

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

@@ -134,4 +134,8 @@ public class BillIsolate implements Serializable {
 
     private String phone;
 
+    private String departureName;
+
+    private Integer departureId;
+
 }

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

@@ -124,4 +124,8 @@ public class BillPcr implements Serializable {
     private String imgUrl;
 
     private Integer imgStatus;
+
+    private String departureName;
+
+    private Integer departureId;
 }

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

@@ -128,5 +128,8 @@ public class BillSampling implements Serializable {
      */
     private Integer imgStatus;
 
+    private String departureName;
+
+    private Integer departureId;
 
 }

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

@@ -165,7 +165,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         Object newObject = BillPcrServiceImpl.getNewObject(nextId, cleanBefore.getDestName(), cleanBefore.getDestId(), cleanBefore.getAdmissionUserName(),
                 cleanBefore.getAdmissionUserId(), cleanBefore.getVistitDate(), cleanBefore.getSubDate(),
                 cleanBefore.getProcessId(), Integer.parseInt(cleanBefore.getFarmId()), cleanBefore.getTestLocation(), cleanBefore.getTestLocationId(),
-                cleanBefore.getVistitType(), cleanBefore.getPhone());
+                cleanBefore.getVistitType(), cleanBefore.getPhone(),cleanBefore.getDepartureName(),cleanBefore.getDepartureId());
         if (nextId == 0) {
             int index = allLocationId.indexOf(baseLocation.getId());
             StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());

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

@@ -865,7 +865,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 Object newObject = BillPcrServiceImpl.getNewObject(nextId, billClean.getDestName(), billClean.getDestId(), billClean.getAdmissionUserName(),
                         billClean.getAdmissionUserId(), billClean.getVistitDate(), billClean.getSubDate(),
                         billClean.getProcessId(), billClean.getFarmId(), billClean.getTestLocation(), billClean.getTestLocationId(),
-                        billClean.getVistitType(),billClean.getPhone());
+                        billClean.getVistitType(),billClean.getPhone(),billClean.getDepartureName(),billClean.getDepartureId());
                 if (nextId == 0) {
                     int index = allLocationId.indexOf(baseLocation.getId());
                     StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());
@@ -970,7 +970,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     Object newObject = BillPcrServiceImpl.getNewObject(nextId, billClean.getDestName(), billClean.getDestId(), billClean.getAdmissionUserName(),
                             billClean.getAdmissionUserId(), billClean.getVistitDate(), billClean.getSubDate(),
                             billClean.getProcessId(), billClean.getFarmId(), billClean.getTestLocation(), billClean.getTestLocationId(),
-                            billClean.getVistitType(),billClean.getPhone());
+                            billClean.getVistitType(),billClean.getPhone(),billClean.getDepartureName(),billClean.getDepartureId());
                     if (nextId == 0) {
                         int index = allLocationId.indexOf(baseLocation.getId());
                         StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());

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

@@ -405,7 +405,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                 Object newObject = getNewObject(nextId, billPcr.getDestName(), billPcr.getDestId(), billPcr.getAdmissionUserName(),
                         billPcr.getAdmissionUserId(), billPcr.getVistitDate(), billPcr.getSubDate(),
                         billPcr.getProcessId(), billPcr.getFarmId(), billPcr.getTestLocation(), billPcr.getTestLocationId(),
-                        billPcr.getVistitType(),billPcr.getPhone());
+                        billPcr.getVistitType(),billPcr.getPhone(),billPcr.getDepartureName(),billPcr.getDepartureId());
                 System.out.println("这里是pcr通过的下一个流程id：" + nextId);
                 if (nextId == 0) {
                     int index = allLocationId.indexOf(baseLocation.getId());
@@ -582,7 +582,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
 
     public static Object getNewObject(Integer id, String destName, Integer destId, String admissionUserName, Integer admissionUserId
             , LocalDateTime vistitDate, LocalDateTime subDate, Integer processId, Integer farmId, String testLocation
-            , Integer testLocationId,Integer vistitType,String phone) {
+            , Integer testLocationId,Integer vistitType,String phone,String departureName,Integer departureId) {
         if (id == 1) {
             //采样
             BillSampling billSampling = new BillSampling();
@@ -598,6 +598,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billSampling.setTestLocationId(testLocationId);
             billSampling.setProcessId(processId);
             billSampling.setFarmId(String.valueOf(farmId));
+            billSampling.setDepartureName(departureName);
+            billSampling.setDepartureId(departureId);
             return billSampling;
         }
         if (id == 2) {
@@ -614,6 +616,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setFarmId(farmId);
             billPcr.setTestLocationId(testLocationId);
             billPcr.setTestLocation(testLocation);
+            billPcr.setDepartureName(departureName);
+            billPcr.setDepartureId(departureId);
             return billPcr;
         }
         if (id == 3) {
@@ -630,6 +634,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setFarmId(farmId);
             billPcr.setTestLocationId(testLocationId);
             billPcr.setTestLocation(testLocation);
+            billPcr.setDepartureName(departureName);
+            billPcr.setDepartureId(departureId);
             return billPcr;
         }
         if (id == 4) {
@@ -646,6 +652,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setFarmId(farmId);
             billPcr.setIsolateLocation(testLocation);
             billPcr.setIsolateLocationId(testLocationId);
+            billPcr.setDepartureName(departureName);
+            billPcr.setDepartureId(departureId);
             return billPcr;
         }
         if (id == 5) {
@@ -662,6 +670,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billPcr.setFarmId(farmId);
             billPcr.setTestLocationId(testLocationId);
             billPcr.setTestLocation(testLocation);
+            billPcr.setDepartureName(departureName);
+            billPcr.setDepartureId(departureId);
             return billPcr;
         }
         if (id == 6) {
@@ -679,6 +689,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             billCleanBefore.setTestLocationId(testLocationId);
             billCleanBefore.setProcessId(processId);
             billCleanBefore.setFarmId(String.valueOf(farmId));
+            billCleanBefore.setDepartureName(departureName);
+            billCleanBefore.setDepartureId(departureId);
             return billCleanBefore;
         }
         return null;

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

@@ -1074,7 +1074,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 Object newObject = BillPcrServiceImpl.getNewObject(nextId, billPcr.getDestName(), billPcr.getDestId(), billPcr.getAdmissionUserName(),
                         billPcr.getAdmissionUserId(), billPcr.getVistitDate(), billPcr.getSubDate(),
                         billPcr.getProcessId(), billPcr.getFarmId(), billPcr.getTestLocation(), billPcr.getTestLocationId(),billPcr.getVistitType(),
-                        billPcr.getPhone());
+                        billPcr.getPhone(),billPcr.getDepartureName(),billPcr.getDepartureId());
                 if (nextId == 0) {
                     int index = allLocationId.indexOf(baseLocation.getId());
                     StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());
@@ -1288,7 +1288,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         Object newObject = BillPcrServiceImpl.getNewObject(nextId, billIsolate.getDestName(), billIsolate.getDestId(), billIsolate.getAdmissionUserName(),
                 billIsolate.getAdmissionUserId(), billIsolate.getVistitDate(), billIsolate.getSubDate(),
                 billIsolate.getProcessId(), billIsolate.getFarmId(), billIsolate.getIsolateLocation(), billIsolate.getIsolateLocationId(),
-                billIsolate.getVistitType(),billIsolate.getPhone());
+                billIsolate.getVistitType(),billIsolate.getPhone(),billIsolate.getDepartureName(),billIsolate.getDepartureId());
         if (nextId == 0) {
             int index = allLocationId.indexOf(baseLocation.getId());
             StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());

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

@@ -166,7 +166,7 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         Object newObject = BillPcrServiceImpl.getNewObject(nextId, sampling.getDestName(), sampling.getDestId(), sampling.getAdmissionUserName(),
                 sampling.getAdmissionUserId(), sampling.getVistitDate(), sampling.getSubDate(),
                 sampling.getProcessId(), Integer.parseInt(sampling.getFarmId()), sampling.getTestLocation(), sampling.getTestLocationId(),
-                sampling.getVistitType(), sampling.getPhone());
+                sampling.getVistitType(), sampling.getPhone(),sampling.getDepartureName(),sampling.getDepartureId());
         if (nextId == 0) {
             int index = allLocationId.indexOf(baseLocation.getId());
             StringBuilder status = new StringBuilder(baseProcess.getAllLocationId());