补贴修改

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillBuyInfoController.java

@@ -80,7 +80,7 @@ public class BillBuyInfoController {
                                  @RequestParam(value = "buyImage3", required = false) MultipartFile buyImage3,
                                  @RequestParam(value = "buyImage4", required = false) MultipartFile buyImage4,
                                  @RequestParam(value = "buyImage5", required = false) MultipartFile buyImage5,
-                                 @RequestParam("quarantineImage") MultipartFile quarantineImage,
+                                 @RequestParam(value = "quarantineImage", required = false) MultipartFile quarantineImage,
                                  @RequestParam("image1") MultipartFile image1,
                                  @RequestParam("image2") MultipartFile image2,
                                  @RequestParam("inspectionNum") String inspectionNum,

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -62,7 +62,7 @@ public class BillLandingInspectionController {
                                  @RequestParam("reachTran") String reachTran,
                                  @RequestParam("veterId") String veter,
                                  @RequestParam("eartags") String eartags,
-                                 @RequestParam("quarantineImage") MultipartFile quarantineImage,
+                                 @RequestParam(value = "quarantineImage", required = false) MultipartFile quarantineImage,
                                  @RequestParam(value = "image1", required = false) MultipartFile image1,
                                  @RequestParam(value ="image2", required = false) MultipartFile image2,
                                  @RequestParam(value ="image3", required = false) MultipartFile image3,

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -105,7 +105,10 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         String content3 = "";
         String content = uploadImage.getImageCom(image1);
         String content2 = uploadImage.getImageCom(image2);
-        String imageCom = uploadImage.getImageCom(quarantineImage);
+        String imageCom = "";
+        if (ObjectUtil.isNotEmpty(quarantineImage)){
+            imageCom = uploadImage.getImageCom(quarantineImage);
+        }
         content3 = getUrl(content3,buyImage1);
         content3 = getUrl(content3,buyImage2);
         content3 = getUrl(content3,buyImage3);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -189,7 +189,10 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         content = getUrl(content,image3);
         content = getUrl(content,image4);
         content = getUrl(content,image5);
-        String imageCom = uploadImage.getImageCom(quarantineImage);
+        String imageCom = "";
+        if (ObjectUtil.isNotEmpty(quarantineImage)){
+            imageCom = uploadImage.getImageCom(quarantineImage);
+        }
         BillLandingInspection billLandingInspection = new BillLandingInspection();
         billLandingInspection.setInspectionNum(inspectionNum);
         billLandingInspection.setCargoOwner(cargoOwner);