生物安全车辆修改8

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

@@ -536,19 +536,18 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             } else {
                 if (billClean.getDestId() > billClean.getTestLocationId()) { //不是目的地
                     if ("1".equals(result)) {
+                        billClean.setBillStatus(1);
+                        billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                        billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                        billClean.setTestLocation(baseLocation.getLocationName());
+                        billClean.setTestLocationId(baseLocation.getId());
+                        billClean.setCheckDate(sdf.parse(date));
+                        billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                        billClean.setImgUrl(s);
+                        billClean.setImgStatus(1);
+                        cleanMapper.updateById(billClean);
                         //第一次通过生成洗消
                         if (billClean.getTestLocationId() == 33) {
-                            billClean.setBillStatus(1);
-                            billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                            billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                            billClean.setTestLocation(baseLocation.getLocationName());
-                            billClean.setTestLocationId(baseLocation.getId());
-                            billClean.setCheckDate(sdf.parse(date));
-                            billClean.setPassDate(sdf.parse(sdf.format(new Date())));
-                            billClean.setImgUrl(s);
-                            billClean.setImgStatus(1);
-                            cleanMapper.updateById(billClean);
-
                             BillClean clean = new BillClean();
                             clean.setVistitType(billClean.getVistitType());
                             clean.setVistitDate(billClean.getVistitDate());
@@ -562,21 +561,12 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             clean.setFarmId(billClean.getFarmId());
                             clean.setCarNum(billClean.getCarNum());
                             clean.setPhone(billClean.getPhone());
+                            clean.setProcessId(billClean.getProcessId());
                             clean.setTestLocationId(baseLocation.getNextId());
                             clean.setTestLocation(baseLocation.getNextLocation());
                             cleanMapper.insert(clean);
                         }
                         if (billClean.getTestLocationId() == 35) {
-                            billClean.setBillStatus(1);
-                            billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                            billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                            billClean.setTestLocation(baseLocation.getLocationName());
-                            billClean.setTestLocationId(baseLocation.getId());
-                            billClean.setCheckDate(sdf.parse(date));
-                            billClean.setPassDate(sdf.parse(sdf.format(new Date())));
-                            billClean.setImgUrl(s);
-                            billClean.setImgStatus(1);
-                            cleanMapper.updateById(billClean);
                             //生成烘干申请
                             BillDry billPcr = new BillDry();
                             billPcr.setPhone(billClean.getPhone());