生物安全车辆修改

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

@@ -1,6 +1,7 @@
 package com.huimv.admin.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.service.IBillCleanService;
@@ -82,6 +83,11 @@ public class BillCleanController {
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.listById(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listByIdCar")
+    public Result listByIdDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return cleanService.listByIdDry(httpServletRequest, paramsMap);
+    }
     @RequestMapping("/editClean")
     public Result editClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return cleanService.commitClean(httpServletRequest, paramsMap);
@@ -89,8 +95,12 @@ public class BillCleanController {
     @PostMapping("/carCommit")
     public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
                                @RequestParam("data") String data,
-                               @RequestParam("img") MultipartFile img,
+                               @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) throws IOException, ParseException {
-        return cleanService.carClean(httpServletRequest, id, data,farmId,img);
+        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5);
     }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/CleanAndDryVo2.java

@@ -0,0 +1,96 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class CleanAndDryVo2 {
+    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;
+    private Integer type;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.BillClean;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.admin.entity.vo.CleanAndDryVo;
+import com.huimv.admin.entity.vo.CleanAndDryVo2;
 
 /**
  * <p>
@@ -20,4 +21,8 @@ public interface BillCleanMapper extends BaseMapper<BillClean> {
     Page<CleanAndDryVo> listCleanAndDry(Page<CleanAndDryVo> page,Integer farmId);
 
     Page<CleanAndDryVo> listPersonalCleanAndDry(Page<CleanAndDryVo> page, Integer userId);
+
+    Page<CleanAndDryVo2> CleanAndDry(Page<CleanAndDryVo2> page, String farmId,String type,String status);
+
+    Page<CleanAndDryVo2> CleanAndDry2(Page<CleanAndDryVo2> page, String farmId,String status);
 }

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

@@ -26,13 +26,16 @@ public interface IBillCleanService extends IService<BillClean> {
 
     Result listById(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
+    Result listByIdDry(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
     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 carClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img1,MultipartFile img2,MultipartFile img3,MultipartFile img4,MultipartFile img5) 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/impl/BillCleanServiceImpl.java

@@ -7,10 +7,9 @@ import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.*;
 import com.huimv.admin.entity.*;
 import com.huimv.admin.entity.vo.CleanAndDryVo;
+import com.huimv.admin.entity.vo.CleanAndDryVo2;
 import com.huimv.admin.mapper.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.entity.BillClean;
@@ -30,8 +29,6 @@ import java.util.Date;
 import java.util.Map;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 
 /**
  * <p>
@@ -56,6 +53,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private BaseLocationMapper locationMapper;
     @Autowired
     private UploadImage uploadImage;
+    @Autowired
+    private BillDryMapper dryMapper;
 
     @Override
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -76,20 +75,39 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if ("".equals(data) || null == data) {
             data = "0";
         }
-        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
-                .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
-        if ("0".equals(data)) {
-            queryWrapper.in("bill_status", 0, 1, 2);
-        }
-        if ("1".equals(data)) {
-            queryWrapper.eq("bill_status", 0);
-        }
-        if ("2".equals(data)) {
-            queryWrapper.eq("bill_status", 1);
+        if (type.equals("0")) {
+            Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
+                    .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+
+            if ("0".equals(data)) {
+                queryWrapper.in("bill_status", 0, 1, 2);
+            }
+            if ("1".equals(data)) {
+                queryWrapper.eq("bill_status", 0);
+            }
+            if ("2".equals(data)) {
+                queryWrapper.eq("bill_status", 1);
+            }
+            return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
+        } else {
+            Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
+            Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            if ("0".equals(data)) {
+             cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1");
+            }
+            if ("1".equals(data)) {
+               cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, "0");
+            }
+            if ("2".equals(data)) {
+             cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, "1");
+            }
+            return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
         }
-        return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page,queryWrapper));
+
+
+
     }
 
     @Override
@@ -100,6 +118,12 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     }
 
     @Override
+    public Result listByIdDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return new Result(ResultCode.SUCCESS, dryMapper.selectById(id));
+    }
+
+    @Override
     public Result commitClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
         String result = paramsMap.get("result");// 结果
         String farmId = paramsMap.get("farmId");
@@ -213,7 +237,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
-                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() );
+                baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
                 baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
                 String status = baseProcess.getCurrentStatus();
                 String substring = status.substring(0, status.length() - 1);
@@ -224,6 +248,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             }
         }
     }
+
     @Resource
     private BillCleanMapper billCleanMapper;
 
@@ -231,19 +256,21 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     public Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
-        Page<BillClean> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billCleanMapper.selectPage(page,new QueryWrapper<BillClean>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("img_status",1).orderByDesc("sub_date")));
+        Page<BillClean> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, billCleanMapper.selectPage(page, new QueryWrapper<BillClean>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("img_status", 1).orderByDesc("sub_date")));
     }
 
     @Override
-    public Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String data, MultipartFile img) throws ParseException, IOException {
+    public Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String data, MultipartFile img1, MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5) 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);//某条洗消记录
+        System.out.println("洗消记录的id:" + billClean.getTestLocationId());
+        Integer testId = billClean.getTestLocationId();
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        locationQueryWrapper.eq("farm_id", farmId).eq("id", testId);
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
 
         QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
@@ -258,15 +285,48 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         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("上传失败")) {
+        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, "图片上传失败", false);
+                return new Result(10001, "图片1上传失败", false);
             }
-            billClean.setImgUrl(uploadImage.getImageCom(img));
-        } else {
-            return new Result(10001, "图片不能为空", 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;
+        billClean.setImgUrl(s);
         cleanMapper.updateById(billClean);
         return new Result(10000, "提交成功！", true);
     }
@@ -276,33 +336,34 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         String type = paramsMap.get("type");
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
-        Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<CleanAndDryVo> cleanAndDryVoPage;
-        switch (type){
+        switch (type) {
             case "1":
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)),0);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page, Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)), 0);
                 break;
             case "2":
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)),1);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page, Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)), 1);
                 break;
             case "3":
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)),2);
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page, Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)), 2);
                 break;
             default:
-                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page,Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)));
+                cleanAndDryVoPage = billCleanMapper.listCleanAndDry(page, Integer.parseInt(TokenSign.getFarmIds(httpServletRequest)));
                 break;
         }
 
-        return new Result(ResultCode.SUCCESS,cleanAndDryVoPage);
+        return new Result(ResultCode.SUCCESS, cleanAndDryVoPage);
     }
 
     @Override
     public Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
-        Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<CleanAndDryVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
-        Page<CleanAndDryVo> cleanAndDryVoPage = cleanMapper.listPersonalCleanAndDry(page,userId);
-        return new Result(ResultCode.SUCCESS,cleanAndDryVoPage);
+        Page<CleanAndDryVo> cleanAndDryVoPage = cleanMapper.listPersonalCleanAndDry(page, userId);
+        return new Result(ResultCode.SUCCESS, cleanAndDryVoPage);
     }
+
 }

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

@@ -9,6 +9,7 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.*;
+import com.huimv.admin.entity.vo.CleanAndDryVo2;
 import com.huimv.admin.mapper.*;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -78,7 +79,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public 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 {
+    public 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 {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
             return new Result(10001, "手机号格式错误！", false);
@@ -102,7 +103,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         billPersonnelAdmission.setWorkName(workName);
         billPersonnelAdmission.setPapersType(Integer.parseInt(papersType));
         billPersonnelAdmission.setPapersCode(papersCode);
-        if (ObjectUtil.isNotEmpty(carNum)){
+        if (ObjectUtil.isNotEmpty(carNum)) {
             billPersonnelAdmission.setCarNum(carNum);
         }
         if (ObjectUtil.isNotEmpty(imgUrl)) {
@@ -115,7 +116,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (ObjectUtil.isNotEmpty(img)) {
             billPersonnelAdmission.setImgUrl(img);
         }
-        if (ObjectUtil.isNotEmpty(source)){
+        if (ObjectUtil.isNotEmpty(source)) {
             billPersonnelAdmission.setSource(source);
         }
         billPersonnelAdmission.setVistitReson(vistitReson);
@@ -247,7 +248,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     billPcr.setFarmId(billPersonnelAdmission.getFarmId());
                     billPcr.setProcessId(billPersonnelAdmission.getProcessId());
                     billPcr.setAdmissionId(Integer.parseInt(id));
-                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())){
+                    if (ObjectUtil.isNotEmpty(billPersonnelAdmission.getCarNum())) {
                         billPcr.setCarNum(billPersonnelAdmission.getCarNum());
                     }
                     billPcr.setTestLocation(baseLocation.getLocationName());
@@ -274,9 +275,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String pageSize = paramsMap.get("pageSize");
         Page<FactoryDirectorVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         IPage<FactoryDirectorVo> factoryDirectorList;
-        if (type.equals("0")){
+        if (type.equals("0")) {
             factoryDirectorList = billPersonnelAdmissionMapper.listAll(type, farmId, page);
-        }else {
+        } else {
             factoryDirectorList = billPersonnelAdmissionMapper.listCarAll(type, farmId, page);
         }
 
@@ -742,26 +743,28 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "20";
         }
-        Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
+        Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         if ("".equals(type) || null == type) {
             type = "0";
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
+        queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date");
         if ("0".equals(type)) {
-            queryWrapper.in("bill_status", 0, 1, 2);
+            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "(0,1,2)");
         }
         if ("1".equals(type)) {
-            queryWrapper.eq("bill_status", 0);
+            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "0");
         }
         if ("2".equals(type)) {
-            queryWrapper.eq("bill_status", 1);
+            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "1");
         }
         if ("3".equals(type)) {
-            queryWrapper.eq("bill_status", 2);
+            cleanAndDryVo2Page =   cleanMapper.CleanAndDry2(page, farmId, "2");
         }
-        return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
+
+        return new Result(ResultCode.SUCCESS,cleanAndDryVo2Page);
 
     }
 
@@ -827,7 +830,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         dryMapper.insert(billDry);
                     }
                     //拉猪车洗消合格生成烘干申请
-                    if (billClean.getDestId() == 27 ) {
+                    if (billClean.getDestId() == 27) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -847,7 +850,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         dryMapper.insert(billDry);
                     }
                     //送猪车洗消合格生成烘干申请
-                    if (billClean.getDestId() == 42 ) {
+                    if (billClean.getDestId() == 42) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillCleanMapper.xml

@@ -50,4 +50,22 @@
         ORDER BY sub_date DESC
     </select>
 
+    <select id="CleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
+        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        and img_status in (#{status})
+        union all
+        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
+        and img_status in (#{status})
+    </select>
+
+
+    <select id="CleanAndDry2" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
+        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and
+        vistit_type in (1,2,3,4,5,6)
+        and bill_status in (#{status})
+        union all
+        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and
+        vistit_type in (1,2,3,4,5,6)
+        and bill_status in (#{status})
+    </select>
 </mapper>