生物安全车辆

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

@@ -12,8 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -82,4 +84,11 @@ public class BillCleanController {
     public Result editClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return cleanService.commitClean(httpServletRequest, paramsMap);
     }
+    @PostMapping("/carCommit")
+    public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
+                               @RequestParam("data") String data,
+                               @RequestParam("img") MultipartFile img,
+                               @RequestParam("farmId") String farmId) throws IOException, ParseException {
+        return cleanService.carClean(httpServletRequest, id, data,farmId,img);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 洗消表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-18
+ */
+@RestController
+@RequestMapping("/bill-dry")
+public class BillDryController {
+
+}

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

@@ -126,4 +126,18 @@ public class BillPersonnelAdmissionController {
     public Result listClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return admissionService.listClean(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/cleanById")
+    public Result cleanById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return admissionService.listByIdClean(httpServletRequest, paramsMap);
+    }
+    @RequestMapping("/editClean")
+    public Result editClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.editClean(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/editDry")
+    public Result editDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.editDry(httpServletRequest, paramsMap);
+    }
 }

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

@@ -108,4 +108,10 @@ public class BillClean implements Serializable {
     private Integer testLocationId;
 
     private String phone;
+
+    private String carNum;
+
+    private String imgUrl;
+
+    private Integer imgStatus;
 }

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

@@ -0,0 +1,130 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 洗消表
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_dry")
+public class BillDry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime subDate;
+
+    private Integer farmId;
+
+    /**
+     * 当前状态 0待审批 1合格  2异常
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+    /**
+     * 检测时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date checkDate;
+
+    /**
+     * 检测地点
+     */
+    private String testLocation;
+
+    private Integer testLocationId;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 车牌号
+     */
+    private String carNum;
+
+    /**
+     * 烘干照片
+     */
+    private String imgUrl;
+
+    private Integer imgStatus;
+
+
+}

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

@@ -119,5 +119,4 @@ public class BillPcr implements Serializable {
     private String phone;
 
     private String carNum;
-
 }

huimv-admin/src/main/java/com/huimv/admin/mapper/BillDryMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BillDry;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 洗消表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-18
+ */
+public interface BillDryMapper extends BaseMapper<BillDry> {
+
+}

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

@@ -3,8 +3,10 @@ package com.huimv.admin.service;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BillClean;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,6 +29,9 @@ public interface IBillCleanService extends IService<BillClean> {
     Result commitClean(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) throws ParseException;
     Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    //环保车
+    Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img) throws ParseException, IOException;
+
     Result listCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BillDry;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 洗消表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-18
+ */
+public interface IBillDryService extends IService<BillDry> {
+
+}

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

@@ -40,6 +40,10 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result editIsolate(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
 
     Result listClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listByIdClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+    Result editClean(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
+    Result editDry(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
     Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName, String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl,String img, String vistitDate, String vistitReson, String destId, String destName, String farmId, String carNum,String source) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);

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

@@ -1,10 +1,10 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.token.TokenSign;
-import com.huimv.admin.common.utils.Result;
-import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.common.utils.*;
 import com.huimv.admin.entity.*;
 import com.huimv.admin.entity.vo.CleanAndDryVo;
 import com.huimv.admin.mapper.*;
@@ -19,8 +19,11 @@ import com.huimv.admin.service.IBillCleanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -51,6 +54,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private BaseProcessMapper processMapper;
     @Autowired
     private BaseLocationMapper locationMapper;
+    @Autowired
+    private UploadImage uploadImage;
 
     @Override
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -231,6 +236,42 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     }
 
     @Override
+    public Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String data, MultipartFile img) throws ParseException, IOException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        if (StringUtils.isBlank(data)) {
+            data = sdf.format(new Date());
+        }
+        BillClean billClean = cleanMapper.selectById(id);//某条洗消记录
+        QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
+        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
+
+        QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
+        BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
+
+        billClean.setBillStatus(0);
+        billClean.setImgStatus(1);
+        billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+        billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        billClean.setTestLocation(baseLocation.getLocationName());
+        billClean.setTestLocationId(baseLocation.getId());
+        billClean.setCheckDate(sdf.parse(data));
+        billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+        if (ObjectUtil.isNotEmpty(img)) {
+            if (uploadImage.getImageCom(img).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }
+            billClean.setImgUrl(uploadImage.getImageCom(img));
+        } else {
+            return new Result(10001, "图片不能为空", false);
+        }
+        cleanMapper.updateById(billClean);
+        return new Result(10000, "提交成功！", true);
+    }
+
+    @Override
     public Result listCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String pageNo = paramsMap.get("pageNum");

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BillDry;
+import com.huimv.admin.mapper.BillDryMapper;
+import com.huimv.admin.service.IBillDryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 洗消表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-18
+ */
+@Service
+public class BillDryServiceImpl extends ServiceImpl<BillDryMapper, BillDry> implements IBillDryService {
+
+}

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

@@ -159,6 +159,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billClean.setTestLocation(baseLocation.getNextLocation());
                     billClean.setTestLocationId(baseLocation.getNextId());
                     billClean.setPhone(billPcr.getPhone());
+                    billClean.setImgStatus(0);
+                    billClean.setCarNum(billPcr.getCarNum());
                     cleanMapper.insert(billClean);
 
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
@@ -200,12 +202,30 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
 
-                    baseProcess.setCurrentStatus(substring + "2,"+0);
+                    baseProcess.setCurrentStatus(substring + "2," + 0);
                     if (baseLocation.getId() == 2) {
                         //第一次检测不合格
                         billPcr.setPcrType(1);
-                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+",初级洗消站污区");
-                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId()+",2");
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",初级洗消站污区");
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
+                    }
+                    if (baseLocation.getId() == 17) {
+                        //环保车第一次不合格
+                        billPcr.setPcrType(1);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",育肥淘汰有机肥洗消中心");
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
+                    }
+                    if (baseLocation.getId() == 26) {
+                        //拉猪车第一次不合格
+                        billPcr.setPcrType(1);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",育肥淘汰有机肥洗消中心");
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
+                    }
+                    if (baseLocation.getId() == 32) {
+                        //饲料车第一次不合格
+                        billPcr.setPcrType(1);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + ",猪场初级中转站");
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + ",2");
                     }
                     if (baseLocation.getId() == 6) {
                         //第二次检测不合格
@@ -263,6 +283,18 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         //第一次检测不合格
                         billPcr.setPcrType(1);
                         baseProcess.setProcessType(2);
+                    } else if (baseLocation.getId() == 17) {
+                        //环保车检测不合格
+                        billPcr.setPcrType(1);
+                        baseProcess.setProcessType(2);
+                    } else if (baseLocation.getId() == 26) {
+                        //拉猪车检测不合格
+                        billPcr.setPcrType(1);
+                        baseProcess.setProcessType(2);
+                    } else if (baseLocation.getId() == 32) {
+                        //饲料车检测不合格
+                        billPcr.setPcrType(1);
+                        baseProcess.setProcessType(2);
                     } else {
                         baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
                         baseProcess.setProcessType(2);
@@ -272,7 +304,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                     String status = baseProcess.getCurrentStatus();
                     String substring = status.substring(0, status.length() - 1);
-                    baseProcess.setCurrentStatus(substring + "2,"+0);
+                    baseProcess.setCurrentStatus(substring + "2," + 0);
 
                     billPcr.setBillStatus(2);
                     billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));

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

@@ -73,6 +73,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     private SysAccountMultilevelMapper sysAccountMultilevelMapper;
     @Autowired
     private UploadImage uploadImage;
+    @Autowired
+    private BillDryMapper dryMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -399,6 +401,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billClean.setProcessId(billPcr.getProcessId());
                     billClean.setTestLocation(baseLocation.getNextLocation());
                     billClean.setTestLocationId(baseLocation.getNextId());
+                    billClean.setImgStatus(0);
+                    billClean.setCarNum(billPcr.getCarNum());
                     cleanMapper.insert(billClean);
 
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
@@ -760,4 +764,325 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
 
     }
+
+    @Override
+    public Result listByIdClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return new Result(ResultCode.SUCCESS, cleanMapper.selectById(id));
+    }
+
+    //清洗和洗消的检测
+    @Override
+    public Result editClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
+        String result = paramsMap.get("result");
+        String id = paramsMap.get("id");
+        String farmId = paramsMap.get("farmId");
+        BillClean billClean = cleanMapper.selectById(id);
+        QueryWrapper<BaseProcess> processQueryWrapper = new QueryWrapper<>();
+        processQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
+        BaseProcess baseProcess = processMapper.selectOne(processQueryWrapper);//进程
+
+        QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
+        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
+            return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
+        } 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.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
+
+                    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);
+
+                    //环保车洗消合格生成烘干申请
+                    if (billClean.getDestId() == 18 || billClean.getDestId() == 21) {
+                        BillDry billDry = new BillDry();
+                        billDry.setVistitType(billClean.getVistitType());
+                        billDry.setDestName(billClean.getDestName());
+                        billDry.setDestId(billClean.getDestId());
+                        billDry.setAdmissionUserName(billClean.getAdmissionUserName());
+                        billDry.setAdmissionUserId(billClean.getAdmissionUserId());
+                        billDry.setVistitDate(billClean.getVistitDate());
+                        billDry.setSubDate(billClean.getSubDate());
+                        billDry.setFarmId(billClean.getFarmId());
+                        billDry.setBillStatus(0);
+                        billDry.setProcessId(billClean.getProcessId());
+                        billDry.setTestLocation(baseLocation.getNextLocation());
+                        billDry.setTestLocationId(baseLocation.getNextId());
+                        billDry.setPhone(billClean.getPhone());
+                        billDry.setCarNum(billClean.getCarNum());
+                        billDry.setImgStatus(0);
+                        dryMapper.insert(billDry);
+                    }
+                    //拉猪车洗消合格生成烘干申请
+                    if (billClean.getDestId() == 27 ) {
+                        BillDry billDry = new BillDry();
+                        billDry.setVistitType(billClean.getVistitType());
+                        billDry.setDestName(billClean.getDestName());
+                        billDry.setDestId(billClean.getDestId());
+                        billDry.setAdmissionUserName(billClean.getAdmissionUserName());
+                        billDry.setAdmissionUserId(billClean.getAdmissionUserId());
+                        billDry.setVistitDate(billClean.getVistitDate());
+                        billDry.setSubDate(billClean.getSubDate());
+                        billDry.setFarmId(billClean.getFarmId());
+                        billDry.setBillStatus(0);
+                        billDry.setProcessId(billClean.getProcessId());
+                        billDry.setTestLocation(baseLocation.getNextLocation());
+                        billDry.setTestLocationId(baseLocation.getNextId());
+                        billDry.setPhone(billClean.getPhone());
+                        billDry.setCarNum(billClean.getCarNum());
+                        billDry.setImgStatus(0);
+                        dryMapper.insert(billDry);
+                    }
+                    //送猪车洗消合格生成烘干申请
+                    if (billClean.getDestId() == 42 ) {
+                        BillDry billDry = new BillDry();
+                        billDry.setVistitType(billClean.getVistitType());
+                        billDry.setDestName(billClean.getDestName());
+                        billDry.setDestId(billClean.getDestId());
+                        billDry.setAdmissionUserName(billClean.getAdmissionUserName());
+                        billDry.setAdmissionUserId(billClean.getAdmissionUserId());
+                        billDry.setVistitDate(billClean.getVistitDate());
+                        billDry.setSubDate(billClean.getSubDate());
+                        billDry.setFarmId(billClean.getFarmId());
+                        billDry.setBillStatus(0);
+                        billDry.setProcessId(billClean.getProcessId());
+                        billDry.setTestLocation(baseLocation.getNextLocation());
+                        billDry.setTestLocationId(baseLocation.getNextId());
+                        billDry.setPhone(billClean.getPhone());
+                        billDry.setCarNum(billClean.getCarNum());
+                        billDry.setImgStatus(0);
+                        dryMapper.insert(billDry);
+                    }
+                    processMapper.updateById(baseProcess);
+                    cleanMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                } else {
+                    billClean.setBillStatus(2);
+                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    billClean.setTestLocation(baseLocation.getLocationName());
+                    billClean.setTestLocationId(baseLocation.getId());
+                    billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setImgStatus(0);
+
+                    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);
+                    processMapper.updateById(baseProcess);
+                    cleanMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                }
+            } else {
+                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.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(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");
+                    baseProcess.setProcessType(1);
+                    processMapper.updateById(baseProcess);
+                    cleanMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                } else {
+                    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);
+                    billClean.setBillStatus(2);
+                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    billClean.setTestLocation(baseLocation.getLocationName());
+                    billClean.setTestLocationId(baseLocation.getId());
+                    billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setImgStatus(0);
+
+                    processMapper.updateById(baseProcess);
+                    cleanMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                }
+
+            }
+        }
+    }
+
+    //烘干检测
+    @Override
+    public Result editDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
+        String result = paramsMap.get("result");
+        String id = paramsMap.get("id");
+        String farmId = paramsMap.get("farmId");
+        BillDry billClean = dryMapper.selectById(id);
+        QueryWrapper<BaseProcess> processQueryWrapper = new QueryWrapper<>();
+        processQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
+        BaseProcess baseProcess = processMapper.selectOne(processQueryWrapper);//进程
+
+        QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
+        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
+            return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);
+        } 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.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
+
+                    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);
+
+                    //环保车烘干合格生成洗消申请
+                    if (billClean.getDestId() == 19) {
+                        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.getNextId());
+                        clean.setTestLocation(baseLocation.getNextLocation());
+                        clean.setPhone(billClean.getPhone());
+                        clean.setCarNum(billClean.getCarNum());
+                        clean.setImgStatus(0);
+                        cleanMapper.insert(clean);
+                    }
+
+                    //拉猪车烘干合格生成洗消申请
+                    if (billClean.getDestId() == 28) {
+                        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.getNextId());
+                        clean.setTestLocation(baseLocation.getNextLocation());
+                        clean.setPhone(billClean.getPhone());
+                        clean.setCarNum(billClean.getCarNum());
+                        clean.setImgStatus(0);
+                        cleanMapper.insert(clean);
+                    }
+
+                    processMapper.updateById(baseProcess);
+                    dryMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                } else {
+                    billClean.setBillStatus(2);
+                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    billClean.setTestLocation(baseLocation.getLocationName());
+                    billClean.setTestLocationId(baseLocation.getId());
+                    billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setImgStatus(0);
+
+                    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);
+                    processMapper.updateById(baseProcess);
+                    dryMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                }
+            } else {
+                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.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(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");
+                    baseProcess.setProcessType(1);
+                    processMapper.updateById(baseProcess);
+                    dryMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                } else {
+                    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);
+                    billClean.setBillStatus(2);
+                    billClean.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    billClean.setTestLocation(baseLocation.getLocationName());
+                    billClean.setTestLocationId(baseLocation.getId());
+                    billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCheckDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setImgStatus(0);
+
+                    processMapper.updateById(baseProcess);
+                    dryMapper.updateById(billClean);
+                    return new Result(10000, "修改成功！", true);
+                }
+
+            }
+        }
+    }
+
 }

huimv-admin/src/main/resources/mapper/BillDryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.BillDryMapper">
+
+</mapper>