生物安全车辆修改10

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

@@ -356,20 +356,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             billClean.setImgUrl(s);
             cleanMapper.updateById(billClean);
             //物资车生成二次申请
-            if (billClean.getTestLocationId() == 47 || billClean.getTestLocationId() == 50) {
-                if (billClean.getDestId() > 47 || billClean.getDestId() > 50) {
-                    Integer processId = billClean.getProcessId();
-                    QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
-                    BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
-                    admission.setBillStatus(3);
-                    admission.setPassDate(LocalDateTime.now());
-                    admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                    admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                    admissionMapper.updateById(admission);
-                }
 
-            }
         } else {
             BillDry billClean = dryMapper.selectById(id);//某条烘干记录
             System.out.println("洗消记录的id:" + billClean.getTestLocationId());
@@ -546,6 +533,22 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billClean.setImgUrl(s);
                         billClean.setImgStatus(1);
                         cleanMapper.updateById(billClean);
+
+                        if (billClean.getTestLocationId() == 47 || billClean.getTestLocationId() == 50) {
+                            if (billClean.getDestId() > 47 || billClean.getDestId() > 50) {
+                                Integer processId = billClean.getProcessId();
+                                QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                                queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
+                                BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
+                                admission.setBillStatus(3);
+                                admission.setPassDate(LocalDateTime.now());
+                                admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                                admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                                admissionMapper.updateById(admission);
+                            }
+
+                        }
+
                         //第一次通过生成洗消
                         if (billClean.getTestLocationId() == 33) {
                             BillClean clean = new BillClean();
@@ -578,7 +581,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             billPcr.setVistitDate(billClean.getVistitDate());
                             billPcr.setSubDate(billClean.getSubDate());
                             billPcr.setBillStatus(0);
-                            billPcr.setImgStatus(1);
+                            billPcr.setImgStatus(0);
                             billPcr.setCarNum(billClean.getCarNum());
                             billPcr.setProcessId(billClean.getProcessId());
                             billPcr.setFarmId(billClean.getFarmId());
@@ -616,6 +619,40 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         processMapper.updateById(baseProcess);
                     }
                     return new Result(10000, "修改成功！", true);
+                } else if (billClean.getDestId() == 53) {
+                    if ("1".equals(result)) {
+                        billClean.setBillStatus(1);
+                        baseProcess.setProcessType(1);
+                    } else {
+                        billClean.setBillStatus(2);
+                        baseProcess.setProcessType(2);
+                    }
+                    Integer processId = billClean.getProcessId();
+                    QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
+                    BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
+                    admission.setBillStatus(1);
+                    admission.setPassDate(LocalDateTime.now());
+                    admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    admissionMapper.updateById(admission);
+                    billClean.setImgStatus(1);
+                    billClean.setImgUrl(s);
+                    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())));
+                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                    String status = baseProcess.getCurrentStatus();
+                    String substring = status.substring(0, status.length() - 1);
+                    baseProcess.setCurrentStatus(substring + "1");
+                    processMapper.updateById(baseProcess);
+                    cleanMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
                 } else {
                     //当前是目的地
                     if ("1".equals(result)) {
@@ -656,52 +693,52 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
                 return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
             } else {
-                    if ("1".equals(result)) {
-                        //烘干通过
-                        billClean.setImgUrl(s);
-                        billClean.setBillStatus(1);
-                        billClean.setPassDate(new Date());
-                        billClean.setCheckDate(new Date());
-                        billClean.setPhone(billClean.getPhone());
-                        billClean.setCarNum(billClean.getCarNum());
-                        billClean.setImgStatus(1);
-                        billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
-                        billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                        billClean.setTestLocation(baseLocation.getLocationName());
-                        billClean.setTestLocationId(baseLocation.getId());
-                        dryMapper.updateById(billClean);
+                if ("1".equals(result)) {
+                    //烘干通过
+                    billClean.setImgUrl(s);
+                    billClean.setBillStatus(1);
+                    billClean.setPassDate(new Date());
+                    billClean.setCheckDate(new Date());
+                    billClean.setPhone(billClean.getPhone());
+                    billClean.setCarNum(billClean.getCarNum());
+                    billClean.setImgStatus(1);
+                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    billClean.setTestLocation(baseLocation.getLocationName());
+                    billClean.setTestLocationId(baseLocation.getId());
+                    dryMapper.updateById(billClean);
 
-                        baseProcess.setProcessType(1);
-                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
-                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
-                        String status = baseProcess.getCurrentStatus();
-                        String substring = status.substring(0, status.length() - 1);
-                        baseProcess.setCurrentStatus(substring + "1");
-                        processMapper.updateById(baseProcess);
-                    } else {
-                        billClean.setImgStatus(1);
-                        billClean.setImgUrl(s);
-                        billClean.setBillStatus(2);
-                        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())));
-                        dryMapper.updateById(billClean);
+                    baseProcess.setProcessType(1);
+                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                    String status = baseProcess.getCurrentStatus();
+                    String substring = status.substring(0, status.length() - 1);
+                    baseProcess.setCurrentStatus(substring + "1");
+                    processMapper.updateById(baseProcess);
+                } else {
+                    billClean.setImgStatus(1);
+                    billClean.setImgUrl(s);
+                    billClean.setBillStatus(2);
+                    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())));
+                    dryMapper.updateById(billClean);
 
-                        baseProcess.setProcessType(2);
-                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
-                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
-                        String status = baseProcess.getCurrentStatus();
-                        String substring = status.substring(0, status.length() - 1);
-                        baseProcess.setCurrentStatus(substring + "2");
+                    baseProcess.setProcessType(2);
+                    baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                    baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                    baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                    String status = baseProcess.getCurrentStatus();
+                    String substring = status.substring(0, status.length() - 1);
+                    baseProcess.setCurrentStatus(substring + "2");
 
-                        processMapper.updateById(baseProcess);
-                    }
-                    return new Result(10000, "修改成功！", true);
+                    processMapper.updateById(baseProcess);
+                }
+                return new Result(10000, "修改成功！", true);
             }
 
         }