修改落地检疫接口

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

@@ -1,9 +1,13 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +19,15 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-buy-info")
+@CrossOrigin
 public class BillBuyInfoController {
+    @Autowired
+    private IBillBuyInfoService billBuyInfoService;
+
+
+    @PostMapping("/listTransaction")
+    public Result listTransaction(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billBuyInfoService.listTransaction(httpServletRequest,paramsMap);
+    }
 
 }

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

@@ -35,6 +35,11 @@ public class BaseAnimal extends BaseEntity implements Serializable {
     private String earatgNo;
 
     /**
+     * 所属人
+     */
+    private String belongToUser;
+
+    /**
      * 0肉牛，1羊，2猪
      */
     private Integer animalType;

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

@@ -66,7 +66,7 @@ public class BaseEntity implements Serializable {
      * 更新人
      */
     @TableField(fill = FieldFill.UPDATE)
-    private Long updateUser;
+    private String updateUser;
 
     private  Integer isDelete;
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
@@ -49,7 +51,7 @@ public class BillIsolated extends BaseEntity implements Serializable {
     /**
      * 隔离开始时间
      */
-    private LocalDate strIsolated;
+    private LocalDateTime strIsolated;
 
     /**
      * 隔离天数
@@ -59,7 +61,7 @@ public class BillIsolated extends BaseEntity implements Serializable {
     /**
      * 隔离结束时间
      */
-    private LocalDate endIsolated;
+    private LocalDateTime endIsolated;
 
     /**
      * 延期天数

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
@@ -66,12 +68,12 @@ public class BillLandingInspection extends BaseEntity implements Serializable {
     /**
      * 数量及单位
      */
-    private String animalUmberUp;
+    private String animalNumberUp;
 
-    /**
-     * 数量
-     */
-    private Integer animalUmber;
+//    /**
+//     * 数量
+//     */
+//    private Integer animalNumber;
 
     /**
      * 用途
@@ -101,7 +103,7 @@ public class BillLandingInspection extends BaseEntity implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDate reviewedTime;
+    private Date reviewedTime;
 
     /**
      * 驳回理由

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

@@ -1,8 +1,12 @@
 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 javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 交易信息 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillBuyInfoService extends IService<BillBuyInfo> {
 
+    Result listTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,11 +1,15 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 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 javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 交易信息 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillBuyInfo> implements IBillBuyInfoService {
 
+    @Override
+    public Result listTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        return null;
+    }
 }

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

@@ -1,5 +1,6 @@
 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,19 +16,18 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 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.text.DateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -59,36 +59,88 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         String endIsolated = paramsMap.get("endIsolated");
 
         BillIsolated billIsolated = new BillIsolated();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         billIsolated.setInspectionName(TokenSign.getUserName(httpServletRequest)+"的隔离信息");
         billIsolated.setInspectionNum(inspectionNum);
-        billIsolated.setStrIsolated(LocalDate.parse(strIsolated));
+        billIsolated.setStrIsolated(LocalDateTime.parse(strIsolated,formatter));
         billIsolated.setDayIsolated(Integer.parseInt(dayIsolated));
-        billIsolated.setEndIsolated(LocalDate.parse(endIsolated));
-
-        BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspectionNum", inspectionNum).ne("inspection_sch", 5));
-        String input = billLandingInspection.getEartags();
-
-        String start = input.substring(0, input.indexOf("-"));
-        String end = input.substring(input.indexOf("-") + 1);
-        String substring = start.substring(0, start.length() - end.length());
-        String begin = start.substring(end.length()+1);
-        List<Integer> numbers = new ArrayList<>();
-        for (int i = Integer.parseInt(begin); i <= Integer.parseInt(end); i++) {
-            numbers.add(i);
-        }
-        for (Integer number : numbers) {
-            String earatgNo = substring + number.toString();
-            BaseAnimal baseAnimal = new BaseAnimal();
-            baseAnimal.setEaratgNo(earatgNo);
-            baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
-            baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-            baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
-            baseAnimal.setCreateTime(new Date());
-            baseAnimalMapper.insert(baseAnimal);
+        billIsolated.setEndIsolated(LocalDateTime.parse(endIsolated,formatter));
+        billIsolated.setCreateTime(DateTime.now());
+        billIsolated.setCreateUser(TokenSign.getUserName(httpServletRequest));
+
+        BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
+        String eartags = billLandingInspection.getEartags();
+
+        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 = new BaseAnimal();
+                        baseAnimal.setEaratgNo(earatgNo);
+                        baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
+                        baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
+                        baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                        baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                        baseAnimal.setCreateTime(new Date());
+                        baseAnimalMapper.insert(baseAnimal);
+                    }
+                }else {
+                    BaseAnimal baseAnimal = new BaseAnimal();
+                    baseAnimal.setEaratgNo(input);
+                    baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
+                    baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
+                    baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setCreateTime(new Date());
+                    baseAnimalMapper.insert(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 = new BaseAnimal();
+                    baseAnimal.setEaratgNo(earatgNo);
+                    baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
+                    baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
+                    baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setCreateTime(new Date());
+                    baseAnimalMapper.insert(baseAnimal);
+                }
+            }else {
+                BaseAnimal baseAnimal = new BaseAnimal();
+                baseAnimal.setEaratgNo(eartags);
+                baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
+                baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
+                baseAnimal.setBelongToUser(TokenSign.getUserName(httpServletRequest));
+                baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                baseAnimal.setCreateTime(new Date());
+                baseAnimalMapper.insert(baseAnimal);
+            }
         }
+
         billLandingInspection.setInspectionSch(2);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
-        billLandingInspection.setReviewedTime(LocalDate.now());
+        billLandingInspection.setReviewedTime(DateTime.now());
         landingInspectionMapper.updateById(billLandingInspection);
         this.save(billIsolated);
 
@@ -114,7 +166,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         BillIsolated billIsolated = this.getById(id);
         billIsolated.setDayIsolated(billIsolated.getDayIsolated()+Integer.parseInt(day));
         billIsolated.setEndIsolated(billIsolated.getEndIsolated().plusDays(Integer.parseInt(day)));
-        this.save(billIsolated);
+        this.updateById(billIsolated);
         return Result.SUCCESS();
     }
 
@@ -155,7 +207,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             }
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);
-            String[] eartag = deaths.split(",");
+            String[] eartag = deaths.split(";");
             for (String s : eartag) {
                 if (!s.contains("-")){
                     BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", s));

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

@@ -19,6 +19,7 @@ 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.List;
 import java.util.Map;
 
@@ -217,7 +218,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
 
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
         if (userType == 2 || userType == 3){
-            landingInspectionQueryWrapper.eq("creat_user",userName);
+            landingInspectionQueryWrapper.eq("create_user",userName);
         }
 
         if (startTime != null) {
@@ -244,7 +245,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         billLandingInspection.setInspectionSch(3);
         billLandingInspection.setRejectReason(rejectReason);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
-        billLandingInspection.setReviewedTime(LocalDate.now());
+        billLandingInspection.setReviewedTime(DateTime.now());
         this.updateById(billLandingInspection);
         return Result.SUCCESS();
     }
@@ -254,7 +255,9 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         String id = paramsMap.get("id");
         BillLandingInspection landingInspection = this.getById(id);
         landingInspection.setInspectionSch(1);
-        if (this.save(landingInspection)){
+        landingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
+        landingInspection.setReviewedTime(DateTime.now());
+        if (this.updateById(landingInspection)){
             return Result.SUCCESS();
         }else {
             return Result.ERROR();