生物安全车辆修改7

huimv-admin/src/main/java/com/huimv/admin/controller/BillCleanController.java

@@ -104,4 +104,18 @@ public class BillCleanController {
                                @RequestParam("type") String type) throws IOException, ParseException {
         return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5,type);
     }
+
+    @PostMapping("/goodsCarClean")
+    public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+                               @RequestParam("data") String data,
+                               @RequestParam(value = "img1",required = false) MultipartFile img1,
+                               @RequestParam(value = "img2",required = false) MultipartFile img2,
+                               @RequestParam(value = "img3",required = false) MultipartFile img3,
+                               @RequestParam(value = "img4",required = false) MultipartFile img4,
+                               @RequestParam(value = "img5",required = false) MultipartFile img5,
+                               @RequestParam("farmId") String farmId,
+                               @RequestParam("type") String type,
+                                @RequestParam("result") String result) throws IOException, ParseException {
+        return cleanService.goodsCarClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5,type,result);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/BillPersonnelAdmission.java

@@ -114,7 +114,7 @@ public class BillPersonnelAdmission implements Serializable {
      * 处理时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
-    private Date passDate;
+    private LocalDateTime passDate;
 
     /**
      * 处理人

huimv-admin/src/main/java/com/huimv/admin/service/IBillCleanService.java

@@ -38,4 +38,7 @@ public interface IBillCleanService extends IService<BillClean> {
 
     Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    //饲料车
+    Result goodsCarClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img1,MultipartFile img2,MultipartFile img3,MultipartFile img4,MultipartFile img5,String type,String result) throws ParseException, IOException;
+
 }

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

@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Map;
@@ -97,7 +98,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         } 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", 5).orderByDesc("sub_date")
+            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 4).orderByDesc("sub_date")
                     .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
 
             if ("0".equals(data)) {
@@ -362,7 +363,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
                     BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
                     admission.setBillStatus(3);
-                    admission.setPassDate(sdf.parse(sdf.format(new Date())));
+                    admission.setPassDate(LocalDateTime.now());
                     admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
                     admissionMapper.updateById(admission);
@@ -472,4 +473,247 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         return new Result(ResultCode.SUCCESS, cleanAndDryVoPage);
     }
 
+    @Override
+    public Result goodsCarClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img1,
+                                MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5, String type, String result
+    ) throws ParseException, IOException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        if (StringUtils.isBlank(date)) {
+            date = sdf.format(new Date());
+        }
+        String s1 = "";
+        String s2 = "";
+        String s3 = "";
+        String s4 = "";
+        String s5 = "";
+        if (ObjectUtil.isNotEmpty(img1)) {
+            if (uploadImage.getImageCom(img1).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片1上传失败", false);
+            }
+            s1 = uploadImage.uploadImg(img1);
+        }
+        if (ObjectUtil.isNotEmpty(img2)) {
+            if (uploadImage.getImageCom(img2).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片2上传失败", false);
+            }
+            s2 = "," + uploadImage.uploadImg(img2);
+        }
+        if (ObjectUtil.isNotEmpty(img3)) {
+            if (uploadImage.getImageCom(img3).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片3上传失败", false);
+            }
+            s3 = "," + uploadImage.uploadImg(img3);
+        }
+        if (ObjectUtil.isNotEmpty(img4)) {
+            if (uploadImage.getImageCom(img4).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片4上传失败", false);
+            }
+            s4 = "," + uploadImage.uploadImg(img4);
+        }
+        if (ObjectUtil.isNotEmpty(img5)) {
+            if (uploadImage.getImageCom(img5).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片5上传失败", false);
+            }
+            s5 = "," + uploadImage.uploadImg(img5);
+        }
+        String s = s1 + s2 + s3 + s4 + s5;
+
+        if ("1".equals(type)) {
+            BillClean billClean = cleanMapper.selectById(id);//某条洗消记录
+            QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
+            BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
+            QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
+            locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+            BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
+            if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
+                return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
+            } else {
+                if (billClean.getDestId() > billClean.getTestLocationId()) { //不是目的地
+                    if ("1".equals(result)) {
+                        //第一次通过生成洗消
+                        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());
+                            clean.setDestName(billClean.getDestName());
+                            clean.setDestId(billClean.getDestId());
+                            clean.setAdmissionUserId(billClean.getAdmissionUserId());
+                            clean.setAdmissionUserName(billClean.getAdmissionUserName());
+                            clean.setSubDate(billClean.getSubDate());
+                            clean.setBillStatus(0);
+                            clean.setImgStatus(0);
+                            clean.setFarmId(billClean.getFarmId());
+                            clean.setCarNum(billClean.getCarNum());
+                            clean.setPhone(billClean.getPhone());
+                            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());
+                            billPcr.setVistitType(billClean.getVistitType());
+                            billPcr.setDestName(billClean.getDestName());
+                            billPcr.setDestId(billClean.getDestId());
+                            billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
+                            billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
+                            billPcr.setVistitDate(billClean.getVistitDate());
+                            billPcr.setSubDate(billClean.getSubDate());
+                            billPcr.setBillStatus(0);
+                            billPcr.setProcessId(billClean.getProcessId());
+                            billPcr.setFarmId(billClean.getFarmId());
+                            billPcr.setTestLocation(baseLocation.getNextLocation());
+                            billPcr.setTestLocationId(baseLocation.getNextId());
+                            dryMapper.insert(billPcr);
+                        }
+                        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getNextLocation());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getNextId());
+                        String status = baseProcess.getCurrentStatus();
+                        String substring = status.substring(0, status.length() - 1);
+                        baseProcess.setCurrentStatus(substring + "1," + 0);
+                        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())));
+                        cleanMapper.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");
+
+                        processMapper.updateById(baseProcess);
+                    }
+                    return new Result(10000, "修改成功！", true);
+                } else {
+                    //当前是目的地
+                    if ("1".equals(result)) {
+                        billClean.setBillStatus(1);
+                        baseProcess.setProcessType(1);
+                    } else {
+                        billClean.setBillStatus(2);
+                        baseProcess.setProcessType(2);
+                    }
+                    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 {
+            BillDry billClean = dryMapper.selectById(id);//某条烘干记录
+            QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
+            BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
+            QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
+            locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+            BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
+            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);
+
+                        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");
+
+                        processMapper.updateById(baseProcess);
+                    }
+                    return new Result(10000, "修改成功！", true);
+            }
+
+        }
+
+
+    }
 }