修改补贴接口

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

@@ -1,10 +1,14 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.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.util.Map;
@@ -24,10 +28,22 @@ public class BillBuyInfoController {
     @Autowired
     private IBillBuyInfoService billBuyInfoService;
 
-
     @PostMapping("/listTransaction")
-    public Result listTransaction(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billBuyInfoService.listTransaction(httpServletRequest,paramsMap);
+    public Result listTransaction(){
+        return new Result(ResultCode.SUCCESS,billBuyInfoService.list(new QueryWrapper<BillBuyInfo>().orderByDesc("create_time")));
+    }
+
+    @PostMapping("/addTransaction")
+    public Result addTransaction(HttpServletRequest httpServletRequest,
+                                 @RequestParam("image1") MultipartFile image1,
+                                 @RequestParam("image2") MultipartFile image2,
+                                 @RequestParam("image3") MultipartFile image3,
+                                 @RequestParam("inspectionNum") String inspectionNum,
+                                 @RequestParam("seller") String seller,
+                                 @RequestParam("buyer") String buyer,
+                                 @RequestParam("num") String num,
+                                 @RequestParam("eartags") String eartags){
+        return billBuyInfoService.addTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags);
     }
 
 }

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

@@ -4,6 +4,7 @@ package com.huimv.farm.damsubsidy.controller;
 import cn.hutool.core.date.DateTime;
 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.service.IBillLandingInspectionService;
 import com.huimv.farm.damsubsidy.service.impl.BillLandingInspectionServiceImpl;
@@ -51,6 +52,12 @@ public class BillLandingInspectionController {
         return iBillLandingInspectionService.listApplication(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/listDetail")
+    public Result listDetail(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        String id = paramsMap.get("id");
+        return new Result(ResultCode.SUCCESS,iBillLandingInspectionService.getById(id));
+    }
+
     @PostMapping("/rejectApplication")
     public Result rejectApplication(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
         return iBillLandingInspectionService.rejectApplication(httpServletRequest,paramsMap);

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

@@ -84,6 +84,11 @@ public class BaseAnimal extends BaseEntity implements Serializable {
      */
     private Date buyTime;
 
+    /**
+     * 0正常 1,死亡
+     */
+    private Integer isDie;
+
 
 
 }

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

@@ -47,6 +47,7 @@ public class BaseEntity implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**

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

@@ -36,17 +36,7 @@ public class BillBuyInfo  extends BaseEntity implements Serializable {
     private String inspectionNum;
 
     /**
-     * 买方id
-     */
-    private Long buyerId;
-
-    /**
-     * 卖方id
-     */
-    private Long sellerId;
-
-    /**
-     * 卖方id
+     * 买方名字
      */
     private String buyerName;
 

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -103,6 +105,7 @@ public class BillLandingInspection extends BaseEntity implements Serializable {
     /**
      * 审核时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reviewedTime;
 
     /**

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDate;
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -138,11 +140,13 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /**
      * 提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date subTime;
 
     /**
      * 受理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date acceptTime;
 
     /**
@@ -153,6 +157,7 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /**
      * 审核时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reviewedTime;
 
     /**
@@ -168,11 +173,13 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /**
      * 申诉时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date appealTime;
 
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date payTime;
 
     /**
@@ -188,6 +195,7 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /**
      * 撤销时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate revokeTime;
 
 

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

@@ -3,6 +3,7 @@ package com.huimv.farm.damsubsidy.service;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -17,5 +18,5 @@ import java.util.Map;
  */
 public interface IBillBuyInfoService extends IService<BillBuyInfo> {
 
-    Result listTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags);
 }

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

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

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

@@ -1,13 +1,33 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import cn.hutool.core.date.DateTime;
+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.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.BaseAnimal;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
+import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+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.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,9 +40,168 @@ import java.util.Map;
  */
 @Service
 public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillBuyInfo> implements IBillBuyInfoService {
+    @Resource
+    private BaseAnimalMapper baseAnimalMapper;
 
     @Override
-    public Result listTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        return null;
+    @Transactional
+    public Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags) {
+        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 = "http://139.9.167.178/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 = "http://139.9.167.178/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 = "http://139.9.167.178/images"+path3 +"/"+imgname3;
+
+        BillBuyInfo billBuyInfo = new BillBuyInfo();
+        billBuyInfo.setInspectionNum(inspectionNum);
+        billBuyInfo.setBuyerName(buyer);
+        billBuyInfo.setSellerName(seller);
+        billBuyInfo.setCreateUser(TokenSign.getUserName(httpServletRequest));
+        billBuyInfo.setCreateTime(DateTime.now());
+        billBuyInfo.setRealNumUp(num);
+        billBuyInfo.setBuyPicUrl(content);
+        billBuyInfo.setPayPicUrl(content2);
+        billBuyInfo.setBuyPayGoodsPicUrl(content3);
+        billBuyInfo.setRealEartag(eartags);
+        this.save(billBuyInfo);
+
+        if (eartags.contains(";")){
+            String[] eartag = eartags.split(";");
+            for (String input : eartag) {
+                if (input.contains("-")){
+                    String start = input.substring(0, input.indexOf("-"));
+                    String end = input.substring(input.indexOf("-") + 1);
+                    String substring = start.substring(0, start.length() - end.length());
+                    String finish = substring+end;
+                    List<Integer> numbers = new ArrayList<>();
+                    for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
+                        numbers.add(i);
+                    }
+                    for (Integer number : numbers) {
+                        String earatgNo = number.toString();
+                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                        if (ObjectUtil.isEmpty(baseAnimal)){
+                            return new Result(10001,"耳标号不存在",false);
+                        }
+                        baseAnimal.setBelongToUser(buyer);
+                        baseAnimal.setBuyerName(buyer);
+                        baseAnimal.setSellerName(seller);
+                        baseAnimal.setAnimalStatus(2);
+                        baseAnimal.setBuyTime(DateTime.now());
+                        baseAnimalMapper.updateById(baseAnimal);
+                    }
+                }else {
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
+                    if (ObjectUtil.isEmpty(baseAnimal)){
+                        return new Result(10001,"耳标号不存在",false);
+                    }
+                    baseAnimal.setBelongToUser(buyer);
+                    baseAnimal.setBuyerName(buyer);
+                    baseAnimal.setSellerName(seller);
+                    baseAnimal.setAnimalStatus(2);
+                    baseAnimal.setBuyTime(DateTime.now());
+                    baseAnimalMapper.updateById(baseAnimal);
+                }
+            }
+        }else {
+            if (eartags.contains("-")){
+                String start = eartags.substring(0, eartags.indexOf("-"));
+                String end = eartags.substring(eartags.indexOf("-") + 1);
+                String substring = start.substring(0, start.length() - end.length());
+                String finish = substring+end;
+                List<Integer> numbers = new ArrayList<>();
+                for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
+                    numbers.add(i);
+                }
+                for (Integer number : numbers) {
+                    String earatgNo = number.toString();
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                    if (ObjectUtil.isEmpty(baseAnimal)){
+                        return new Result(10001,"耳标号不存在",false);
+                    }
+                    baseAnimal.setBelongToUser(buyer);
+                    baseAnimal.setBuyerName(buyer);
+                    baseAnimal.setSellerName(seller);
+                    baseAnimal.setAnimalStatus(2);
+                    baseAnimal.setBuyTime(DateTime.now());
+                    baseAnimalMapper.updateById(baseAnimal);
+                }
+            }else {
+                BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags));
+                if (ObjectUtil.isEmpty(baseAnimal)){
+                    return new Result(10001,"耳标号不存在",false);
+                }
+                baseAnimal.setBelongToUser(buyer);
+                baseAnimal.setBuyerName(buyer);
+                baseAnimal.setSellerName(seller);
+                baseAnimal.setAnimalStatus(2);
+                baseAnimal.setBuyTime(DateTime.now());
+                baseAnimalMapper.updateById(baseAnimal);
+            }
+        }
+        return Result.SUCCESS();
     }
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -54,6 +55,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
     @Transactional
     public Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String inspectionNum = paramsMap.get("inspectionNum");
+        String isolatedPosition = paramsMap.get("isolatedPosition");
         String strIsolated = paramsMap.get("strIsolated");
         String dayIsolated = paramsMap.get("dayIsolated");
         String endIsolated = paramsMap.get("endIsolated");
@@ -62,11 +64,13 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         billIsolated.setInspectionName(TokenSign.getUserName(httpServletRequest)+"的隔离信息");
         billIsolated.setInspectionNum(inspectionNum);
+        billIsolated.setIsolatedPosition(isolatedPosition);
         billIsolated.setStrIsolated(LocalDateTime.parse(strIsolated,formatter));
         billIsolated.setDayIsolated(Integer.parseInt(dayIsolated));
         billIsolated.setEndIsolated(LocalDateTime.parse(endIsolated,formatter));
         billIsolated.setCreateTime(DateTime.now());
         billIsolated.setCreateUser(TokenSign.getUserName(httpServletRequest));
+        this.save(billIsolated);
 
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
         String eartags = billLandingInspection.getEartags();
@@ -85,6 +89,10 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     }
                     for (Integer number : numbers) {
                         String earatgNo = number.toString();
+                        Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                        if (num != 0){
+                            return new Result(10001,"耳标号重复",false);
+                        }
                         BaseAnimal baseAnimal = new BaseAnimal();
                         baseAnimal.setEaratgNo(earatgNo);
                         baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
@@ -95,6 +103,10 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         baseAnimalMapper.insert(baseAnimal);
                     }
                 }else {
+                    Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
+                    if (num != 0){
+                        return new Result(10001,"耳标号重复",false);
+                    }
                     BaseAnimal baseAnimal = new BaseAnimal();
                     baseAnimal.setEaratgNo(input);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
@@ -117,6 +129,10 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 }
                 for (Integer number : numbers) {
                     String earatgNo = number.toString();
+                    Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                    if (num != 0){
+                        return new Result(10001,"耳标号重复",false);
+                    }
                     BaseAnimal baseAnimal = new BaseAnimal();
                     baseAnimal.setEaratgNo(earatgNo);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
@@ -127,6 +143,10 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimalMapper.insert(baseAnimal);
                 }
             }else {
+                Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags));
+                if (num != 0){
+                    return new Result(10001,"耳标号重复",false);
+                }
                 BaseAnimal baseAnimal = new BaseAnimal();
                 baseAnimal.setEaratgNo(eartags);
                 baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
@@ -138,11 +158,11 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             }
         }
 
-        billLandingInspection.setInspectionSch(2);
+        billLandingInspection.setInspectionSch(3);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());
         landingInspectionMapper.updateById(billLandingInspection);
-        this.save(billIsolated);
+
 
         return Result.SUCCESS();
 
@@ -151,11 +171,14 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     @Override
     public Result listIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
         String type = paramsMap.get("type");
+        Page<BillIsolated> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         if (type.equals("1")){
-            return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<BillIsolated>().ge("str_isolated",LocalDate.now()).le("end_isolated",LocalDate.now())));
+            return new Result(ResultCode.SUCCESS,this.page(page,new QueryWrapper<BillIsolated>().ge("str_isolated",LocalDate.now()).le("end_isolated",LocalDate.now())));
         }else {
-            return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<BillIsolated>().lt("end_isolated",LocalDate.now())));
+            return new Result(ResultCode.SUCCESS,this.page(page,new QueryWrapper<BillIsolated>().lt("end_isolated",LocalDate.now())));
         }
     }
 
@@ -198,6 +221,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         BillIsolated isolation = this.getById(id);
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);
+
         if ("1".equals(isDead)){
             BillIsolated billIsolated = this.getById(id);
             List<BaseAnimal> baseAnimals = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().eq("inspection_num", billIsolated.getInspectionNum()));
@@ -207,25 +231,48 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             }
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);
-            String[] eartag = deaths.split(";");
-            for (String s : eartag) {
-                if (!s.contains("-")){
-                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", s));
-                    baseAnimal.setAnimalStatus(4);
+            if (deaths.contains(";")){
+                String[] eartag = deaths.split(";");
+                for (String s : eartag) {
+                    if (!s.contains("-")){
+                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", s));
+                        baseAnimal.setIsDie(1);
+                        baseAnimalMapper.updateById(baseAnimal);
+                    }else {
+                        String start = s.substring(0, s.indexOf("-"));
+                        String end = s.substring(s.indexOf("-") + 1);
+                        String substring = start.substring(0, start.length() - end.length());
+                        String finish = substring+end;
+                        List<Integer> numbers = new ArrayList<>();
+                        for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
+                            numbers.add(i);
+                        }
+                        for (Integer number : numbers) {
+                            String earatgNo = number.toString();
+                            BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                            animal.setIsDie(1);
+                            baseAnimalMapper.updateById(animal);
+                        }
+                    }
+                }
+            }else {
+                if (!deaths.contains("-")){
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", deaths));
+                    baseAnimal.setIsDie(1);
                     baseAnimalMapper.updateById(baseAnimal);
                 }else {
-                    String start = s.substring(0, s.indexOf("-"));
-                    String end = s.substring(s.indexOf("-") + 1);
+                    String start = deaths.substring(0, deaths.indexOf("-"));
+                    String end = deaths.substring(deaths.indexOf("-") + 1);
                     String substring = start.substring(0, start.length() - end.length());
-                    String begin = start.substring(end.length()+1);
+                    String finish = substring+end;
                     List<Integer> numbers = new ArrayList<>();
-                    for (int i = Integer.parseInt(begin); i <= Integer.parseInt(end); i++) {
+                    for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
                         numbers.add(i);
                     }
                     for (Integer number : numbers) {
-                        String earatgNo = substring + number.toString();
+                        String earatgNo = number.toString();
                         BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
-                        animal.setIsLoated(4);
+                        animal.setIsDie(1);
                         baseAnimalMapper.updateById(animal);
                     }
                 }
@@ -234,7 +281,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             isolation.setIsDead(0);
         }
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", isolation.getInspectionNum()));
-        billLandingInspection.setInspectionSch(3);
+        billLandingInspection.setInspectionSch(4);
         landingInspectionMapper.updateById(billLandingInspection);
         this.save(isolation);
         return Result.SUCCESS();

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

@@ -5,6 +5,7 @@ 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.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;
@@ -209,6 +210,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
 
     @Override
     public Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
         String inspectionSch = paramsMap.get("inspectionSch");
@@ -230,10 +233,15 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
             landingInspectionQueryWrapper.le("create_time",endTime);
         }
         if (ObjectUtil.isNotEmpty(inspectionSch)){
-            landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);
+            if (inspectionSch.equals("4")){
+                landingInspectionQueryWrapper.eq("inspection_sch",4).or().eq("inspection_sch",5);
+            }else {
+                landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);
+            }
         }
         landingInspectionQueryWrapper.orderByDesc("create_time");
-        return new Result(ResultCode.SUCCESS,billLandingInspectionMapper.selectList(landingInspectionQueryWrapper));
+        Page<BillLandingInspection> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,billLandingInspectionMapper.selectPage(page,landingInspectionQueryWrapper));
     }
 
     @Override
@@ -241,8 +249,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         String id = paramsMap.get("id");
         String rejectReason = paramsMap.get("rejectReason");
         BillLandingInspection billLandingInspection = this.getById(id);
-//        billLandingInspection.setInspectionSch(4);
-        billLandingInspection.setInspectionSch(3);
+        billLandingInspection.setInspectionSch(5);
         billLandingInspection.setRejectReason(rejectReason);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());
@@ -254,7 +261,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     public Result agreeApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         BillLandingInspection landingInspection = this.getById(id);
-        landingInspection.setInspectionSch(1);
+        landingInspection.setInspectionSch(2);
         landingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         landingInspection.setReviewedTime(DateTime.now());
         if (this.updateById(landingInspection)){

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

@@ -3,6 +3,8 @@ package com.huimv.farm.damsubsidy.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.BankUtil;
 import com.huimv.farm.damsubsidy.common.utils.Result;
@@ -12,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.BillIsolated;
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.huimv.farm.damsubsidy.entity.SysUser;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
@@ -174,7 +177,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     @Transactional
     public Result addApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
         String eartagNo = billSubsidy.getEartagNo();
-        String[] eartags = eartagNo.split(",");
+        String[] eartags = eartagNo.split(";");
         for (String eartag : eartags) {
             if (!eartag.contains("-")){
                 BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartag));
@@ -184,13 +187,13 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 String start = eartag.substring(0, eartag.indexOf("-"));
                 String end = eartag.substring(eartag.indexOf("-") + 1);
                 String substring = start.substring(0, start.length() - end.length());
-                String begin = start.substring(end.length()+1);
+                String finish = substring+end;
                 List<Integer> numbers = new ArrayList<>();
-                for (int i = Integer.parseInt(begin); i <= Integer.parseInt(end); i++) {
+                for (int i = Integer.parseInt(start); i <= Integer.parseInt(finish); i++) {
                     numbers.add(i);
                 }
                 for (Integer number : numbers) {
-                    String earatgNo = substring + number.toString();
+                    String earatgNo = number.toString();
                     BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
                     animal.setIsLoated(1);
                     baseAnimalMapper.updateById(animal);
@@ -213,7 +216,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
     @Override
     public Result saveApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
-        billSubsidy.setSubsidySch(4);
+        billSubsidy.setSubsidySch(7);
         billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
         if (this.saveOrUpdate(billSubsidy)) {
             return Result.SUCCESS();
@@ -256,7 +259,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 //          养殖户申诉不通过补贴申请
             String appeal = paramsMap.get("appeal");
             billSubsidy.setAppeal(appeal);
-            billSubsidy.setSubsidySch(0);
+            billSubsidy.setSubsidySch(5);
             billSubsidy.setAppealTime(new Date());
             if (this.save(billSubsidy)){
                 return Result.SUCCESS();
@@ -268,6 +271,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
     @Override
     public Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
         String subsidySch = paramsMap.get("subsidySch");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
@@ -288,17 +293,26 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             subsidyQueryWrapper.le("create_time",endTime);
         }
         if (ObjectUtil.isNotEmpty(subsidySch)){
-            subsidyQueryWrapper.eq("subsidy_sch",subsidySch);
+            if (subsidySch.equals("1")){
+                subsidyQueryWrapper.eq("subsidy_sch",0);
+            }else if (subsidySch.equals("2")){
+                subsidyQueryWrapper.eq("subsidy_sch",1).or().eq("subsidy_sch",5);
+            }else if (subsidySch.equals("3")){
+                subsidyQueryWrapper.eq("subsidy_sch",2).or().eq("subsidy_sch",3).or().eq("subsidy_sch",4);
+            }else if (subsidySch.equals("4")){
+                subsidyQueryWrapper.eq("subsidy_sch",8);
+            }
         }else {
-            subsidyQueryWrapper.ne("subsidy_sch",4);
+            subsidyQueryWrapper.ne("subsidy_sch",7);
         }
         subsidyQueryWrapper.orderByDesc("create_time");
-        return new Result(ResultCode.SUCCESS,subsidyMapper.selectList(subsidyQueryWrapper));
+        Page<BillSubsidy> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,subsidyMapper.selectPage(page,subsidyQueryWrapper));
     }
 
     @Override
     public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> parasMap) {
-        BillSubsidy billSubsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("creat_user", TokenSign.getUserName(httpServletRequest)).eq("subsidy_sch", 4));
+        BillSubsidy billSubsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("creat_user", TokenSign.getUserName(httpServletRequest)).eq("subsidy_sch", 7));
         return new Result(ResultCode.SUCCESS,billSubsidy);
     }
 }