生物安全车辆修改14

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

@@ -221,7 +221,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
                         billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
                         billPcr.setVistitDate(billClean.getVistitDate());
-                        billPcr.setSubDate(billClean.getSubDate());
+                        billPcr.setSubDate(LocalDateTime.now());
                         billPcr.setBillStatus(0);
                         billPcr.setProcessId(billClean.getProcessId());
                         billPcr.setFarmId(billClean.getFarmId());
@@ -260,7 +260,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
                         billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
                         billPcr.setVistitDate(billClean.getVistitDate());
-                        billPcr.setSubDate(billClean.getSubDate());
+                        billPcr.setSubDate(LocalDateTime.now());
                         billPcr.setBillStatus(0);
                         billPcr.setProcessId(billClean.getProcessId());
                         billPcr.setFarmId(billClean.getFarmId());
@@ -277,7 +277,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setAdmissionUserName(billClean.getAdmissionUserName());
                         isolate.setAdmissionUserId(billClean.getAdmissionUserId());
                         isolate.setVistitDate(billClean.getVistitDate());
-                        isolate.setSubDate(billClean.getSubDate());
+                        isolate.setSubDate(LocalDateTime.now());
                         isolate.setFarmId(billClean.getFarmId());
                         isolate.setBillStatus(0);
                         isolate.setProcessId(billClean.getProcessId());
@@ -610,7 +610,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                                 QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
                                 queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
                                 BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
-                                admission.setBillStatus(3);
+                                admission.setBillStatus(1);
                                 admission.setPassDate(LocalDateTime.now());
                                 admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                                 admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
@@ -628,7 +628,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             clean.setDestId(billClean.getDestId());
                             clean.setAdmissionUserId(billClean.getAdmissionUserId());
                             clean.setAdmissionUserName(billClean.getAdmissionUserName());
-                            clean.setSubDate(billClean.getSubDate());
+                            clean.setSubDate(LocalDateTime.now());
                             clean.setBillStatus(0);
                             clean.setImgStatus(0);
                             clean.setFarmId(billClean.getFarmId());
@@ -649,7 +649,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
                             billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
                             billPcr.setVistitDate(billClean.getVistitDate());
-                            billPcr.setSubDate(billClean.getSubDate());
+                            billPcr.setSubDate(LocalDateTime.now());
                             billPcr.setBillStatus(0);
                             billPcr.setImgStatus(0);
                             billPcr.setCarNum(billClean.getCarNum());

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

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 
 import javax.annotation.Resource;
@@ -153,7 +154,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billClean.setAdmissionUserName(billPcr.getAdmissionUserName());
                     billClean.setAdmissionUserId(billPcr.getAdmissionUserId());
                     billClean.setVistitDate(billPcr.getVistitDate());
-                    billClean.setSubDate(billPcr.getSubDate());
+                    billClean.setSubDate(LocalDateTime.now());
                     billClean.setFarmId(billPcr.getFarmId());
                     billClean.setPassUserName(billPcr.getPassUserName());
                     billClean.setPassDate(billPcr.getPassDate());

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

@@ -443,7 +443,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setAdmissionUserName(billPcr.getAdmissionUserName());
                     billClean.setAdmissionUserId(billPcr.getAdmissionUserId());
                     billClean.setVistitDate(billPcr.getVistitDate());
-                    billClean.setSubDate(billPcr.getSubDate());
+                    billClean.setSubDate(LocalDateTime.now());
                     billClean.setFarmId(billPcr.getFarmId());
                     billClean.setPassUserName(billPcr.getPassUserName());
                     billClean.setPassDate(billPcr.getPassDate());
@@ -687,7 +687,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setAdmissionUserName(billIsolate.getAdmissionUserName());
                 billClean.setAdmissionUserId(billIsolate.getAdmissionUserId());
                 billClean.setVistitDate(billIsolate.getVistitDate());
-                billClean.setSubDate(billIsolate.getSubDate());
+                billClean.setSubDate(LocalDateTime.now());
                 billClean.setFarmId(billIsolate.getFarmId());
                 billClean.setPassUserName(billIsolate.getPassUserName());
                 billClean.setPassDate(billIsolate.getPassDate());
@@ -744,7 +744,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 billClean.setAdmissionUserName(billIsolate.getAdmissionUserName());
                 billClean.setAdmissionUserId(billIsolate.getAdmissionUserId());
                 billClean.setVistitDate(billIsolate.getVistitDate());
-                billClean.setSubDate(billIsolate.getSubDate());
+                billClean.setSubDate(LocalDateTime.now());
                 billClean.setFarmId(billIsolate.getFarmId());
                 billClean.setPassUserName(billIsolate.getPassUserName());
                 billClean.setPassDate(billIsolate.getPassDate());
@@ -885,7 +885,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setAdmissionUserName(billClean.getAdmissionUserName());
                         billDry.setAdmissionUserId(billClean.getAdmissionUserId());
                         billDry.setVistitDate(billClean.getVistitDate());
-                        billDry.setSubDate(billClean.getSubDate());
+                        billDry.setSubDate(LocalDateTime.now());
                         billDry.setFarmId(billClean.getFarmId());
                         billDry.setBillStatus(0);
                         billDry.setProcessId(billClean.getProcessId());
@@ -905,7 +905,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setAdmissionUserName(billClean.getAdmissionUserName());
                         billDry.setAdmissionUserId(billClean.getAdmissionUserId());
                         billDry.setVistitDate(billClean.getVistitDate());
-                        billDry.setSubDate(billClean.getSubDate());
+                        billDry.setSubDate(LocalDateTime.now());
                         billDry.setFarmId(billClean.getFarmId());
                         billDry.setBillStatus(0);
                         billDry.setProcessId(billClean.getProcessId());
@@ -925,7 +925,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         billDry.setAdmissionUserName(billClean.getAdmissionUserName());
                         billDry.setAdmissionUserId(billClean.getAdmissionUserId());
                         billDry.setVistitDate(billClean.getVistitDate());
-                        billDry.setSubDate(billClean.getSubDate());
+                        billDry.setSubDate(LocalDateTime.now());
                         billDry.setFarmId(billClean.getFarmId());
                         billDry.setBillStatus(0);
                         billDry.setProcessId(billClean.getProcessId());
@@ -1036,7 +1036,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
 
                     //最终结束
-                    if (billClean.getTestLocationId() == 60 || billClean.getTestLocationId() == 58 || billClean.getTestLocationId() == 43) {
+                    if (billClean.getTestLocationId() == 13 || billClean.getTestLocationId() == 58 || billClean.getTestLocationId() == 43) {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
@@ -1062,7 +1062,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setAdmissionUserName(billClean.getAdmissionUserName());
                         clean.setAdmissionUserId(billClean.getAdmissionUserId());
                         clean.setVistitDate(billClean.getVistitDate());
-                        clean.setSubDate(billClean.getSubDate());
+                        clean.setSubDate(LocalDateTime.now());
                         clean.setFarmId(billClean.getFarmId());
                         clean.setBillStatus(0);
                         clean.setProcessId(billClean.getProcessId());
@@ -1073,25 +1073,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setImgStatus(0);
                         cleanMapper.insert(clean);
                     }
-                    if (billClean.getTestLocationId() == 13) {
-                        BillClean clean = new BillClean();
-                        clean.setVistitType(billClean.getVistitType());
-                        clean.setDestName(billClean.getDestName());
-                        clean.setDestId(billClean.getDestId());
-                        clean.setAdmissionUserName(billClean.getAdmissionUserName());
-                        clean.setAdmissionUserId(billClean.getAdmissionUserId());
-                        clean.setVistitDate(billClean.getVistitDate());
-                        clean.setSubDate(billClean.getSubDate());
-                        clean.setFarmId(billClean.getFarmId());
-                        clean.setBillStatus(0);
-                        clean.setProcessId(billClean.getProcessId());
-                        clean.setTestLocationId(baseLocation.getId());
-                        clean.setTestLocation(baseLocation.getLocationName());
-                        clean.setPhone(billClean.getPhone());
-                        clean.setCarNum(billClean.getCarNum());
-                        clean.setImgStatus(0);
-                        cleanMapper.insert(clean);
-                    }
+
 
                     //拉猪车烘干合格生成洗消申请
                     if (billClean.getTestLocationId() == 15) {
@@ -1102,7 +1084,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         clean.setAdmissionUserName(billClean.getAdmissionUserName());
                         clean.setAdmissionUserId(billClean.getAdmissionUserId());
                         clean.setVistitDate(billClean.getVistitDate());
-                        clean.setSubDate(billClean.getSubDate());
+                        clean.setSubDate(LocalDateTime.now());
                         clean.setFarmId(billClean.getFarmId());
                         clean.setBillStatus(0);
                         clean.setProcessId(billClean.getProcessId());