落地检、交易保存检疫证图片

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

@@ -6,15 +6,18 @@ import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.IntegerUtil;
 import com.huimv.farm.damsubsidy.common.utils.PageUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BaseFarmerTypeInfo;
 import com.huimv.farm.damsubsidy.service.IBaseFarmerTypeInfoService;
+import com.huimv.farm.damsubsidy.service.ISysUserService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Map;
 
@@ -32,6 +35,8 @@ import java.util.Map;
 public class BaseFarmerTypeInfoController {
     @Resource
     private IBaseFarmerTypeInfoService baseFarmerTypeInfoService;
+    @Resource
+    private ISysUserService sysUserService;
 
     @PostMapping("/addType")
     public Result addType(@RequestBody Map map){
@@ -103,11 +108,14 @@ public class BaseFarmerTypeInfoController {
     }
 
     @PostMapping("/getRewardMoney")
-    public Result getRewardMoney(@RequestBody Map map){
+    public Result getRewardMoney(HttpServletRequest httpServletRequest, @RequestBody Map map){
         String rewardNum = (String) map.get("rewardNum");
         Integer farmerType = (Integer) map.get("farmerType");
         Integer animalType = (Integer) map.get("animalType");
 
+        if (ObjectUtil.isEmpty(sysUserService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest)).getFarmType())) {
+            return new Result(10001,"企业自填奖补金额",false);
+        }
         BaseFarmerTypeInfo baseFarmerTypeInfo = baseFarmerTypeInfoService.getOne(new QueryWrapper<BaseFarmerTypeInfo>().eq("farmer_type", farmerType).eq("animal_type", animalType));
         if (ObjectUtil.isEmpty(baseFarmerTypeInfo)){
             return new Result(10001,"奖补类型不存在",false);

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

@@ -73,6 +73,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("image1") MultipartFile image1,
                                  @RequestParam("image2") MultipartFile image2,
                                  @RequestParam("inspectionNum") String inspectionNum,
@@ -90,7 +91,7 @@ public class BillBuyInfoController {
                                  @RequestParam("buyerId") String buyerId,
                                  @RequestParam("sellerPhone") String sellerPhone,
                                  @RequestParam("buyerPhone")String buyerPhone) throws IOException {
-        return billBuyInfoService.addTransaction(httpServletRequest,buyImage1,buyImage2,buyImage3,buyImage4,buyImage5,image1,image2,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,seller,sellerId,buyer,buyerId,eartags,buyerPhone,sellerPhone);
+        return billBuyInfoService.addTransaction(httpServletRequest,buyImage1,buyImage2,buyImage3,buyImage4,buyImage5,quarantineImage,image1,image2,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,seller,sellerId,buyer,buyerId,eartags,buyerPhone,sellerPhone);
     }
 
     @PostMapping("/saveTransaction")

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

@@ -62,12 +62,13 @@ public class BillLandingInspectionController {
                                  @RequestParam("reachTran") String reachTran,
                                  @RequestParam("veterId") String veter,
                                  @RequestParam("eartags") String eartags,
+                                 @RequestParam("quarantineImage") MultipartFile quarantineImage,
                                  @RequestParam(value = "image1", required = false) MultipartFile image1,
                                  @RequestParam(value ="image2", required = false) MultipartFile image2,
                                  @RequestParam(value ="image3", required = false) MultipartFile image3,
                                  @RequestParam(value ="image4", required = false) MultipartFile image4,
                                  @RequestParam(value ="image5", required = false) MultipartFile image5) throws IOException {
-        return iBillLandingInspectionService.addApplication(httpServletRequest,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,veter,eartags,image1,image2,image3,image4,image5);
+        return iBillLandingInspectionService.addApplication(httpServletRequest,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,veter,eartags,quarantineImage,image1,image2,image3,image4,image5);
     }
 
     @PostMapping("/cancelApplication")

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillBuyInfo.java

@@ -96,6 +96,11 @@ public class BillBuyInfo  extends BaseEntity implements Serializable {
     @JsonSerialize(using = LongJsonSerializer.class)
     private Long sellerId;
 
+    /**
+     * 检疫证图片
+     */
+    private String quarantineCertificatePic;
+
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillLandingInspection.java

@@ -133,6 +133,11 @@ public class BillLandingInspection extends BaseEntity implements Serializable {
      */
     private String observePicUrl;
 
+    /**
+     * 检疫证图片
+     */
+    private String quarantineCertificatePic;
+
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillLandingInspectionService.java

@@ -34,7 +34,7 @@ public interface IBillLandingInspectionService extends IService<BillLandingInspe
 
     Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException;
+    Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile quarantineImage, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException;
 
     Result listReadyApplication();
 }

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

@@ -158,8 +158,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException {
-
+    public Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile quarantineImage, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException {
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
         landingInspectionQueryWrapper.eq("inspection_num", inspectionNum).ne("inspection_sch",5);
         if (this.count(landingInspectionQueryWrapper) != 0) {
@@ -173,87 +172,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
        String content = "";
        int total = Integer.parseInt(animalNumberUp);
-         /* int sum = 0;
-        eartags = eartags.replace("，",",");
-        eartags = eartags.replace(", ",",");
-        eartags = eartags.replace("， ",",");
-        List eartagList = new ArrayList();
-        if (eartags.contains(",")){
-            String[] eartag = eartags.split(",");
-            for (String input : eartag) {
-                if (input.contains("-")){
-                    String start = input.substring(0, input.indexOf("-"));
-                    String base = eartags.substring(0, eartags.indexOf("-")-3);
-                    System.out.println("落地检耳标号:"+start);
-                    if (start.length() != 15){
-                        return new Result(10001,"耳标号格式错误需输入15位数字",false);
-                    }
-                    String end = input.substring(input.indexOf("-") + 1);
-                    if (end.length() != 3){
-                        return new Result(10001,"耳标号格式错误,-后需输入3位数字",false);
-                    }
-                    String substring1 = input.substring(start.length() - end.length(), start.length());
-                    if (Integer.parseInt(substring1) >=Integer.parseInt(end) ){
-                        return new Result(10001,"耳标号格式错误,包含-号耳标号需递增",false);
-                    }
-                    for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                        String s = String.valueOf(i);
-                        while (s.length() < 3) {
-                            s = "0".concat(s);
-                        }
-                        s = base.concat(s);
-                        eartagList.add(s);
-                        sum++;
-                    }
-                }else {
-                    if (input.length() != 15){
-                        return new Result(10001,"耳标号格式错误需输入15位数字",false);
-                    }
-                    eartagList.add(input);
-                    sum++;
-                }
-            }
-        }else {
-            if (eartags.contains("-")){
-                String start = eartags.substring(0, eartags.indexOf("-"));
-                String base = eartags.substring(0, eartags.indexOf("-")-3);
-                System.out.println("落地检耳标号:"+start);
-                if (start.length() != 15){
-                    return new Result(10001,"耳标号格式错误需输入15位数字",false);
-                }
-                String end = eartags.substring(eartags.indexOf("-") + 1);
-                if (end.length() != 3){
-                    return new Result(10001,"耳标号格式错误,-后需输入3位数字",false);
-                }
-                String substring1 = eartags.substring(start.length() - end.length(), start.length());
-                if (Integer.parseInt(substring1) >= Integer.parseInt(end)){
-                    return new Result(10001,"耳标号格式错误,包含-号耳标号需递增",false);
-                }
-                for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                    String s = String.valueOf(i);
-                    while (s.length() < 3) {
-                        s = "0".concat(s);
-                    }
-                    s = base.concat(s);
-                    eartagList.add(s);
-                    sum++;
-                }
-            }else {
-                System.out.println("落地检耳标号:"+eartags);
-                if (eartags.length() != 15){
-                    return new Result(10001,"耳标号格式错误需输入15位数字",false);
-                }
-                eartagList.add(eartags);
-                sum++;
-            }
-        }
-        HashSet set = new HashSet(eartagList);
-        if (set.size() != eartagList.size()){
-            return new Result(10001,"存在重复耳标号!",false);
-        }
-        if (sum != total){
-            return new Result(10001,"实际耳标数量和填写数量不符!",false);
-        }*/
+
         EartagResult eartagResult = EartagUtil.getEartagCollection(eartags);
         if (!eartagResult.getSuccess()){
             return new Result(10001,eartagResult.getMsg(),false);
@@ -270,7 +189,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         content = getUrl(content,image3);
         content = getUrl(content,image4);
         content = getUrl(content,image5);
-
+        String imageCom = uploadImage.getImageCom(quarantineImage);
         BillLandingInspection billLandingInspection = new BillLandingInspection();
         billLandingInspection.setInspectionNum(inspectionNum);
         billLandingInspection.setCargoOwner(cargoOwner);
@@ -281,6 +200,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         billLandingInspection.setStartTran(startTran);
         billLandingInspection.setReachTran(reachTran);
         billLandingInspection.setVeterId(Integer.parseInt(veter));
+        billLandingInspection.setQuarantineCertificatePic(imageCom);
         billLandingInspection.setEartags(eartags);
         billLandingInspection.setJcbgImgUrl(content);
         billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest) + "的落地检疫申请");