上传图片

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

@@ -102,7 +102,7 @@ public class BaseFarmerTypeInfoController {
         if (ObjectUtil.isEmpty(baseFarmerTypeInfo)){
             return new Result(10001,"奖补类型不存在",false);
         }
-        return new Result(ResultCode.SUCCESS,baseFarmerTypeInfo.getRewardMoney().multiply(BigDecimal.valueOf(Long.parseLong(rewardNum))));
+        return new Result(ResultCode.SUCCESS,baseFarmerTypeInfo.getRewardMoney().multiply(BigDecimal.valueOf(Double.parseDouble(rewardNum))));
     }
 
 }

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

@@ -19,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.HashMap;
@@ -40,8 +41,18 @@ public class BillLandingInspectionController {
     private IBillLandingInspectionService iBillLandingInspectionService;
 
     @PostMapping("/addApplication")
-    public Result addApplication(HttpServletRequest httpServletRequest, @RequestBody BillLandingInspection billLandingInspection){
-        return iBillLandingInspectionService.addApplication(httpServletRequest,billLandingInspection);
+    public Result addApplication(HttpServletRequest httpServletRequest, @RequestParam("inspectionNum") String inspectionNum,
+                                 @RequestParam("cargoOwner") String cargoOwner,
+                                 @RequestParam("ownerPhone") String ownerPhone,
+                                 @RequestParam("animalType") String animalType,
+                                 @RequestParam("animalNumberUp") String animalNumberUp,
+                                 @RequestParam("useTo") String useTo,
+                                 @RequestParam("startTran") String startTran,
+                                 @RequestParam("reachTran") String reachTran,
+                                 @RequestParam("veter") String veter,
+                                 @RequestParam("eartags") String eartags,
+                                 @RequestParam("image") MultipartFile image) throws IOException {
+        return iBillLandingInspectionService.addApplication(httpServletRequest,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,veter,eartags,image);
     }
 
     @PostMapping("/cancelApplication")
@@ -51,7 +62,7 @@ public class BillLandingInspectionController {
 
     //根据检疫证号返回全部耳标
     @PostMapping("/getEartagNoBy")
-    public Result getEartagNoBy(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+    public Result getEartagNoBy(HttpServletRequest httpServletRequest, @RequestParam Map<String, String> paramsMap){
         return iBillLandingInspectionService.getEartagNoBy(httpServletRequest,paramsMap);
     }
 

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

@@ -3,8 +3,10 @@ package com.huimv.farm.damsubsidy.service;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 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;
 
 /**
@@ -22,8 +24,6 @@ public interface IBillLandingInspectionService extends IService<BillLandingInspe
 
     Result addPay(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
-    Result addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection);
-
     Result cancelApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
@@ -33,4 +33,6 @@ public interface IBillLandingInspectionService extends IService<BillLandingInspe
     Result agreeApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     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 image) throws IOException;
 }

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

@@ -8,15 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.*;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -148,18 +151,17 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
+    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 image) throws IOException {
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
-        landingInspectionQueryWrapper.eq("inspection_num", billLandingInspection.getInspectionNum());
+        landingInspectionQueryWrapper.eq("inspection_num", inspectionNum);
         if (this.count(landingInspectionQueryWrapper) != 0) {
             return new Result(10001, "存在相同检疫证号！", false);
         }
-        if (billLandingInspection.getInspectionNum().length() != 10) {
+        if (inspectionNum.length() != 10) {
             return new Result(10001, "检疫证号应该为10位！", false);
         }
-        int total = Integer.parseInt(billLandingInspection.getAnimalNumberUp());
+        int total = Integer.parseInt(animalNumberUp);
         int sum = 0;
-        String eartags = billLandingInspection.getEartags();
         eartags = eartags.replace("，",",");
         eartags = eartags.replace(", ",",");
         eartags = eartags.replace("， ",",");
@@ -219,9 +221,22 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (sum != total){
             return new Result(10001,"实际耳标数量和填写数量不符!",false);
         }
+        String content = UploadImage.getImageCom(image);
+        BillLandingInspection billLandingInspection = new BillLandingInspection();
+        billLandingInspection.setInspectionNum(inspectionNum);
+        billLandingInspection.setCargoOwner(cargoOwner);
+        billLandingInspection.setOwnerPhone(ownerPhone);
+        billLandingInspection.setAnimalType(Integer.parseInt(animalType));
+        billLandingInspection.setAnimalNumberUp(animalNumberUp);
+        billLandingInspection.setUseTo(useTo);
+        billLandingInspection.setStartTran(startTran);
+        billLandingInspection.setReachTran(reachTran);
+        billLandingInspection.setVeterId(Integer.parseInt(veter));
+        billLandingInspection.setEartags(eartags);
+        billLandingInspection.setJcbgImgUrl(content);
         billLandingInspection.setCargoOwner(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setOwnerPhone(TokenSign.getPhone(httpServletRequest));
-        billLandingInspection.setInspectionName(billLandingInspection.getCargoOwner() + "的落地检疫申请");
+        billLandingInspection.setInspectionName(cargoOwner + "的落地检疫申请");
         billLandingInspection.setCreateTime(DateTime.now());
         billLandingInspection.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billLandingInspection.setInspectionType(0);