生物安全车辆修改3

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

@@ -100,7 +100,8 @@ public class BillCleanController {
                                @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, farmId, id, data, img1, img2, img3, img4, img5);
+                               @RequestParam("farmId") String farmId,
+                               @RequestParam("type") String type) throws IOException, ParseException {
+        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5,type);
     }
 }

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

@@ -32,7 +32,7 @@ public interface IBillCleanService extends IService<BillClean> {
     Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     //环保车
-    Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img1,MultipartFile img2,MultipartFile img3,MultipartFile img4,MultipartFile img5) throws ParseException, IOException;
+    Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img1,MultipartFile img2,MultipartFile img3,MultipartFile img4,MultipartFile img5,String type) throws ParseException, IOException;
 
     Result listCleanAndDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -96,24 +96,23 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             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".split(","));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","));
             }
             ArrayList<String> arrayList = new ArrayList<>();
             if ("1".equals(data)) {
                 arrayList.add("0");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-               cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, s);
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s);
             }
             if ("2".equals(data)) {
                 arrayList.add("1");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-             cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, s);
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s);
             }
             return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
         }
 
 
-
     }
 
     @Override
@@ -267,73 +266,141 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     }
 
     @Override
-    public Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String data, MultipartFile img1, MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5) throws ParseException, IOException {
+    public Result carClean(HttpServletRequest httpServletRequest, String farmId, String id, String data, MultipartFile img1, MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5, String type) 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", testId);
-        BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
+        if ("1".equals(type)) {
+            //洗消上传
+            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", testId);
+            BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
 
-        QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
-        BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
+            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())));
-        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);
+            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())));
+            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);
             }
-            s1 = uploadImage.uploadImg(img1);
-        }
-        if (ObjectUtil.isNotEmpty(img2)) {
-            if (uploadImage.getImageCom(img2).equals("上传失败")) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001, "图片2上传失败", false);
+            if (ObjectUtil.isNotEmpty(img2)) {
+                if (uploadImage.getImageCom(img2).equals("上传失败")) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return new Result(10001, "图片2上传失败", false);
+                }
+                s2 = "," + uploadImage.uploadImg(img2);
             }
-            s2 = uploadImage.uploadImg(img2);
-        }
-        if (ObjectUtil.isNotEmpty(img3)) {
-            if (uploadImage.getImageCom(img3).equals("上传失败")) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001, "图片3上传失败", false);
+            if (ObjectUtil.isNotEmpty(img3)) {
+                if (uploadImage.getImageCom(img3).equals("上传失败")) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return new Result(10001, "图片3上传失败", false);
+                }
+                s3 = "," + uploadImage.uploadImg(img3);
             }
-            s3 = uploadImage.uploadImg(img3);
-        }
-        if (ObjectUtil.isNotEmpty(img4)) {
-            if (uploadImage.getImageCom(img4).equals("上传失败")) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001, "图片4上传失败", false);
+            if (ObjectUtil.isNotEmpty(img4)) {
+                if (uploadImage.getImageCom(img4).equals("上传失败")) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return new Result(10001, "图片4上传失败", false);
+                }
+                s4 = "," + uploadImage.uploadImg(img4);
             }
-            s4 = uploadImage.uploadImg(img4);
-        }
-        if (ObjectUtil.isNotEmpty(img5)) {
-            if (uploadImage.getImageCom(img5).equals("上传失败")) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001, "图片5上传失败", false);
+            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);
+        } else {
+            BillDry billClean = dryMapper.selectById(id);//某条烘干记录
+            System.out.println("洗消记录的id:" + billClean.getTestLocationId());
+            Integer testId = billClean.getTestLocationId();
+            QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
+            locationQueryWrapper.eq("farm_id", farmId).eq("id", testId);
+            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())));
+            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);
             }
-            s5 = uploadImage.uploadImg(img5);
+            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);
+            dryMapper.updateById(billClean);
         }
-        String s = s1 + "," + s2 + "," + s3 + "," + s4 + "," + s5;
-        billClean.setImgUrl(s);
-        cleanMapper.updateById(billClean);
+
         return new Result(10000, "提交成功！", true);
     }
 

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

@@ -816,7 +816,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "1," + 0);
 
                     //环保车洗消合格生成烘干申请
-                    if (billClean.getDestId() == 18 || billClean.getDestId() == 21) {
+                    if (billClean.getTestLocationId() == 18 || billClean.getTestLocationId() == 21) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -836,7 +836,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         dryMapper.insert(billDry);
                     }
                     //拉猪车洗消合格生成烘干申请
-                    if (billClean.getDestId() == 27) {
+                    if (billClean.getTestLocationId() == 27) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -856,7 +856,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         dryMapper.insert(billDry);
                     }
                     //送猪车洗消合格生成烘干申请
-                    if (billClean.getDestId() == 42) {
+                    if (billClean.getTestLocationId() == 42) {
                         BillDry billDry = new BillDry();
                         billDry.setVistitType(billClean.getVistitType());
                         billDry.setDestName(billClean.getDestName());
@@ -982,7 +982,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     baseProcess.setCurrentStatus(substring + "1," + 0);
 
                     //环保车烘干合格生成洗消申请
-                    if (billClean.getDestId() == 19) {
+                    if (billClean.getTestLocationId() == 19) {
                         BillClean clean = new BillClean();
                         clean.setVistitType(billClean.getVistitType());
                         clean.setDestName(billClean.getDestName());
@@ -1003,7 +1003,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                     }
 
                     //拉猪车烘干合格生成洗消申请
-                    if (billClean.getDestId() == 28) {
+                    if (billClean.getTestLocationId() == 28) {
                         BillClean clean = new BillClean();
                         clean.setVistitType(billClean.getVistitType());
                         clean.setDestName(billClean.getDestName());

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

@@ -79,5 +79,6 @@
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
+        ORDER BY sub_date DESC
     </select>
 </mapper>