交易数量判断、移动Vo位置、补贴申请判断

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

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
-import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -48,7 +48,7 @@ public class BillBuyInfoController {
                                  @RequestParam("buyer") String buyer,
                                  @RequestParam("num") String num,
                                  @RequestParam("eartags") String eartags,
-                                 @RequestParam("buyerPhone")String buyerPhone){
+                                 @RequestParam("buyerPhone")String buyerPhone) throws IOException {
         return billBuyInfoService.addTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags,buyerPhone);
     }
 

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

@@ -1,7 +1,6 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import cn.hutool.core.date.DateUtil;
@@ -10,20 +9,17 @@ 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.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
-import com.huimv.farm.damsubsidy.service.impl.BillLandingInspectionServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -80,13 +76,22 @@ public class BillLandingInspectionController {
         return iBillLandingInspectionService.rejectApplication(httpServletRequest,paramsMap);
     }
 
-    @PostMapping("listReadyApplication")
+    @PostMapping("/listReadyApplication")
     public Result listReadyApplication(){
         return new Result(ResultCode.SUCCESS,iBillLandingInspectionService.list(new QueryWrapper<BillLandingInspection>()
                 .eq("inspection_sch",4)
                 .eq("is_delete",0)));
     }
 
+    @PostMapping("/listPersonal")
+    public Result listPersonal(HttpServletRequest httpServletRequest){
+        return new Result(ResultCode.SUCCESS,iBillLandingInspectionService.list(new QueryWrapper<BillLandingInspection>()
+                .eq("inspection_sch",4)
+                .eq("create_user",TokenSign.getMemberIdByJwtToken(httpServletRequest))
+                .isNull("reject_reason")
+                .eq("is_delete",0)));
+    }
+
 
     @Autowired
     private IBillLandingInspectionService billLandingInspectionService;

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

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
-import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
 import com.huimv.farm.damsubsidy.common.utils.PdfUtil;
@@ -22,9 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 
 /**

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

@@ -1,93 +0,0 @@
-package com.huimv.farm.damsubsidy.controller;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.entity.BillLandingInspection;
-import com.huimv.farm.damsubsidy.entity.BillSubsidy;
-import com.huimv.farm.damsubsidy.entity.SysUser;
-import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
-import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
-import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
-import com.huimv.farm.damsubsidy.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 企业合作社 前端控制器
- * </p>
- *
- * @author Newspaper
- * @since 2023-04-27
- */
-@CrossOrigin
-@RestController
-@RequestMapping("/Enterprise-Cooperative")
-public class EnterpriseCooperativeController {
-    @Autowired
-    private IBillSubsidyService iBillSubsidyService;
-
-    @Autowired
-    private IBillLandingInspectionService iBillLandingInspectionService;
-
-
-    @PostMapping("/listApplication")
-    public Result listApplication(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap){
-        String startTime = paramsMap.get("startTime");
-        String endTime = paramsMap.get("endTime");
-        String applicationType = paramsMap.get("applicationType");
-        String applicationStatus = paramsMap.get("applicationStatus");
-        QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
-        QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
-        if (startTime != null) {
-            startTime = startTime + " 00:00:00";
-            subsidyQueryWrapper.ge("create_time",startTime);
-            landingInspectionQueryWrapper.ge("create_time",startTime);
-        }
-        if (endTime != null) {
-            endTime = endTime + " 23:59:59";
-            subsidyQueryWrapper.le("create_time",endTime);
-            landingInspectionQueryWrapper.le("create_time",endTime);
-        }
-
-
-        subsidyQueryWrapper.eq("creat_user",TokenSign.getUserName(httpServletRequest))
-                .orderByDesc("create_time");
-        landingInspectionQueryWrapper.eq("creat_user",TokenSign.getUserName(httpServletRequest))
-                .orderByDesc("create_time");
-
-        Map<String,Object> resultMap = new HashMap<String,Object>();
-        if (ObjectUtil.isNotEmpty(applicationStatus)){
-            landingInspectionQueryWrapper.eq("inspection_sch",applicationStatus);
-            subsidyQueryWrapper.eq("subsidy_sch",applicationStatus);
-        }
-        if (ObjectUtil.isNotEmpty(applicationStatus)){
-            landingInspectionQueryWrapper.eq("inspection_sch",applicationStatus);
-            subsidyQueryWrapper.eq("subsidy_sch",applicationStatus);
-        }
-        if ("0".equals(applicationType)){
-            List<BillSubsidy> subsidyList = iBillSubsidyService.list(subsidyQueryWrapper);
-            List<BillLandingInspection> landingInspectionList = iBillLandingInspectionService.list(landingInspectionQueryWrapper);
-            resultMap.put("subsidyList",subsidyList);
-            resultMap.put("LandingInspectionList",landingInspectionList);
-        }else if ("1".equals(applicationType)){
-            List<BillLandingInspection> subsidyList = iBillLandingInspectionService.list(landingInspectionQueryWrapper);
-            resultMap.put("subsidyList",subsidyList);
-        }else {
-            List<BillLandingInspection> landingInspectionList = iBillLandingInspectionService.list(landingInspectionQueryWrapper);
-            resultMap.put("LandingInspectionList",landingInspectionList);
-        }
-        return new Result(ResultCode.SUCCESS,resultMap);
-    }
-
-
-}

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

@@ -1,9 +1,10 @@
-package com.huimv.farm.damsubsidy.entity;
+package com.huimv.farm.damsubsidy.entity.Vo;
 
+import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import lombok.Data;
 
 @Data
-public class BillBuyInfoVo extends BillBuyInfo{
+public class BillBuyInfoVo extends BillBuyInfo {
     private String cargoOwner;
     private String ownerPhone;
     private Integer animalType;

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

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.entity;
+package com.huimv.farm.damsubsidy.entity.Vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,6 +10,7 @@ import java.util.Date;
 import java.io.Serializable;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.farm.damsubsidy.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

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

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.entity;
+package com.huimv.farm.damsubsidy.entity.Vo;
 
 import lombok.Data;
 

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -2,7 +2,7 @@ package com.huimv.farm.damsubsidy.mapper;
 
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.farm.damsubsidy.entity.BillBuyInfoVo;
+import com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.java

@@ -1,6 +1,6 @@
 package com.huimv.farm.damsubsidy.mapper;
 
-import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -6,6 +6,7 @@ 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;
 
 /**
@@ -18,7 +19,7 @@ import java.util.Map;
  */
 public interface IBillBuyInfoService extends IService<BillBuyInfo> {
 
-    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone);
+    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException;
 
     Result saveTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -1,7 +1,7 @@
 package com.huimv.farm.damsubsidy.service;
 
 import com.huimv.farm.damsubsidy.common.utils.Result;
-import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -29,8 +29,9 @@ public class BaseAnimalServiceImpl extends ServiceImpl<BaseAnimalMapper, BaseAni
     @Override
     public Result noSubsidyAnimal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String inspectionNum = paramsMap.get("inspectionNum");
+        String[] inspectionNums = inspectionNum.split(",");
         List<BaseAnimal> baseAnimals = this.list(new QueryWrapper<BaseAnimal>()
-                .eq("inspection_num", inspectionNum).eq("is_die",0)
+                .in("inspection_num", inspectionNums).eq("is_die",0)
                 .in("animal_status",1,2).eq("is_loated",0).eq("belong_to_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)));
         if (ObjectUtil.isEmpty(baseAnimals)) {
             return new Result(10001,"该检疫批次中无符合要求的畜种！",false);

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

@@ -5,21 +5,24 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.huimv.farm.damsubsidy.common.exception.ExceptionEnum;
+import com.huimv.farm.damsubsidy.common.exception.MiException;
 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.Vo.BillBuyInfoVo;
+import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jdk.nashorn.internal.parser.Token;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -27,6 +30,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
@@ -53,81 +57,13 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
     private BillLandingInspectionMapper billLandingInspectionMapper;
 
     @Override
-    @Transactional
-    public Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) {
-        String imgname = "成功";
-        String originalFilename = image1.getOriginalFilename();
-        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-        String path = DateUtil.format(new Date(),"yyyy-MM");
-        try {
-            InputStream inputStream = image1.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content = out.toByteArray();
-            imgname = UUID.randomUUID()+"."+filenameExtension;
-            UploadImage.sshSftp(content,path, imgname);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content = "https://img.ifarmcloud.com/images/"+path +"/"+imgname;
-
-        String imgname2 = "成功";
-        String originalFilename2 = image2.getOriginalFilename();
-        String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
-        String path2 = DateUtil.format(new Date(),"yyyy-MM");
-        try {
-            InputStream inputStream = image2.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content2 = out.toByteArray();
-            imgname2 = UUID.randomUUID()+"."+filenameExtension2;
-            UploadImage.sshSftp(content2,path2, imgname2);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content2 = "https://img.ifarmcloud.com/images/"+path2 +"/"+imgname2;
-
-        String imgname3 = "成功";
-        String originalFilename3 = image3.getOriginalFilename();
-        String filenameExtension3 = StringUtils.getFilenameExtension(originalFilename3);
-        String path3 = DateUtil.format(new Date(),"yyyy-MM");
-        try {
-            InputStream inputStream = image3.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content3 = out.toByteArray();
-            imgname3 = UUID.randomUUID()+"."+filenameExtension3;
-            UploadImage.sshSftp(content3,path3, imgname3);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content3 = "https://img.ifarmcloud.com/images/"+path3 +"/"+imgname3;
-
+    @Transactional(rollbackFor = RuntimeException.class)
+    public Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException {
         BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("bill_buy_status",1));
         SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", buyerPhone));
         BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum));
 
+        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
         int sum = 0;
         int total = Integer.parseInt(num);
 
@@ -137,9 +73,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             }
         }
         if (eartags.contains(",")){
-            eartags.replace("，",",");
-            eartags.replace(", ",",");
-            eartags.replace("， ",",");
+            eartags = eartags.replace("，",",");
+            eartags = eartags.replace(", ",",");
+            eartags = eartags.replace("， ",",");
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
@@ -329,9 +265,16 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 sum++;
             }
         }
+
         if (total != sum){
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new Result(10001,"实际耳标数量和填写数量不符!",false);
         }
+        String content = UploadImage.getImageCom(image1);
+        String content2 = UploadImage.getImageCom(image2);
+        String content3 = UploadImage.getImageCom(image3);
+
+
         if (ObjectUtil.isEmpty(billBuyInfo1)){
             BillBuyInfo billBuyInfo = new BillBuyInfo();
             billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");

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

@@ -12,13 +12,12 @@ import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.huimv.farm.damsubsidy.entity.BillIsolated;
-import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.service.IBillIsolatedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jdk.nashorn.internal.parser.Token;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -31,8 +30,6 @@ import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**

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

@@ -1,30 +1,22 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
-import com.huimv.farm.damsubsidy.common.utils.PovertyUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
-import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.*;
+import com.huimv.farm.damsubsidy.entity.Vo.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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -156,8 +148,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result
-    addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
+    public Result addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection) {
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
         landingInspectionQueryWrapper.eq("inspection_num", billLandingInspection.getInspectionNum());
         if (this.count(landingInspectionQueryWrapper) != 0) {

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

@@ -219,6 +219,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (billSubsidy.getExistNum() < billSubsidy.getImportNum()){
             return new Result(10001,"引进数应小于或等于存栏数!",false);
         }
+        if (billSubsidy.getImportNum() < billSubsidy.getRewardNum()){
+            return new Result(10001,"奖补数应小于或等于引进数!",false);
+        }
         if(!(BankUtil.checkBankCard(bankCardId))){
             return new Result(10001,"银行卡号不符合标准!",false);
         }

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.xml

@@ -21,12 +21,12 @@
         <result column="is_delete" property="isDelete" />
     </resultMap>
 
-    <select id="listDetail" resultType="com.huimv.farm.damsubsidy.entity.BillBuyInfoVo">
+    <select id="listDetail" resultType="com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo">
         SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
  FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.id = #{id}
     </select>
 
-    <select id="getLast" resultType="com.huimv.farm.damsubsidy.entity.BillBuyInfoVo">
+    <select id="getLast" resultType="com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo">
         SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
  FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.create_user = #{userName} and b.bill_buy_status = 1
     </select>

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.BillLandingInspection">
+    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection">
         <id column="id" property="id" />
         <result column="inspection_name" property="inspectionName" />
         <result column="inspection_sch" property="inspectionSch" />