补贴流程

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

@@ -0,0 +1,13 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseApplication {
+    private String title;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date time;
+}

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

@@ -0,0 +1,10 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayApplication extends BaseApplication {
+    private BigDecimal payMoney;
+}

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

@@ -0,0 +1,8 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import lombok.Data;
+
+@Data
+public class RejectApplication extends BaseApplication {
+    private String reason;
+}

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

@@ -2,6 +2,7 @@ package com.huimv.farm.damsubsidy.service.impl;
 
 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.BaseAnimal;
@@ -30,7 +31,7 @@ public class BaseAnimalServiceImpl extends ServiceImpl<BaseAnimalMapper, BaseAni
         String inspectionNum = paramsMap.get("inspectionNum");
         List<BaseAnimal> baseAnimals = this.list(new QueryWrapper<BaseAnimal>()
                 .eq("inspection_num", inspectionNum).eq("is_die",0)
-                .eq("animal_status",2).eq("is_loated",0));
+                .eq("animal_status",2).eq("is_loated",0).eq("belong_to_user", TokenSign.getUserName(httpServletRequest)));
         if (ObjectUtil.isEmpty(baseAnimals)) {
             return new Result(10001,"该检疫批次中无符合要求的畜种！",false);
         }else {

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

@@ -8,15 +8,12 @@ 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;
-import com.huimv.farm.damsubsidy.entity.BaseAnimal;
+import com.huimv.farm.damsubsidy.entity.*;
 import com.alibaba.fastjson.JSONArray;
 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;
 import com.huimv.farm.damsubsidy.mapper.BillSubsidyMapper;
 import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
@@ -30,6 +27,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -348,18 +346,109 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         BillSubsidy billSubsidy = this.getById(id);
         List result = new ArrayList();
         if (billSubsidy.getSubsidySch() == 0){
-            result.add("提交申请");
-            result.add(billSubsidy.getCreateTime());
-            result.add("待受理");
+            BaseApplication addApplication = new BaseApplication();
+            addApplication.setTitle("提交申请");
+            addApplication.setTime(billSubsidy.getCreateTime());
+            result.add(addApplication);
+
+            BaseApplication lastApplication = new BaseApplication();
+            lastApplication.setTitle("待受理");
+            result.add(lastApplication);
         }else if (billSubsidy.getSubsidySch() == 1){
-            result.add("提交申请");
-            result.add(billSubsidy.getCreateTime());
-            result.add("已受理");
-            result.add(billSubsidy.getAcceptTime());
-            result.add("审核中");
+            BaseApplication addApplication = new BaseApplication();
+            addApplication.setTitle("提交申请");
+            addApplication.setTime(billSubsidy.getCreateTime());
+            result.add(addApplication);
+
+            BaseApplication receiveApplication = new BaseApplication();
+            receiveApplication.setTitle("已受理");
+            receiveApplication.setTime(billSubsidy.getAcceptTime());
+            result.add(receiveApplication);
+
+            BaseApplication lastApplication = new BaseApplication();
+            lastApplication.setTitle("审核中");
+            result.add(lastApplication);
         }else if (billSubsidy.getSubsidySch() == 2){
+            BaseApplication addApplication = new BaseApplication();
+            addApplication.setTitle("提交申请");
+            addApplication.setTime(billSubsidy.getCreateTime());
+            result.add(addApplication);
+
+            RejectApplication rejectApplication = new RejectApplication();
+            rejectApplication.setTitle("已拒绝");
+            rejectApplication.setTime(billSubsidy.getAcceptTime());
+            rejectApplication.setReason(billSubsidy.getRefuseReason());
+            result.add(rejectApplication);
+        }else if (billSubsidy.getSubsidySch() == 3){
+            BaseApplication addApplication = new BaseApplication();
+            addApplication.setTitle("提交申请");
+            addApplication.setTime(billSubsidy.getCreateTime());
+            result.add(addApplication);
+
+            BaseApplication receiveApplication = new BaseApplication();
+            receiveApplication.setTitle("已受理");
+            receiveApplication.setTime(billSubsidy.getAcceptTime());
+            result.add(receiveApplication);
+
+            BaseApplication acceptApplication = new BaseApplication();
+            acceptApplication.setTitle("审核通过");
+            acceptApplication.setTime(billSubsidy.getAcceptTime());
+            result.add(acceptApplication);
+
+            if (billSubsidy.getIsPay() == 2){
+                PayApplication payApplication = new PayApplication();
+                payApplication.setTitle("已支付");
+                payApplication.setTime(billSubsidy.getPayTime());
+                payApplication.setPayMoney(billSubsidy.getPayMoney());
+                result.add(payApplication);
+            }else {
+                BaseApplication lastApplication = new BaseApplication();
+                lastApplication.setTitle("待支付");
+                result.add(lastApplication);
+            }
+        }else if (billSubsidy.getSubsidySch() == 4){
+            BaseApplication addApplication = new BaseApplication();
+            addApplication.setTitle("提交申请");
+            addApplication.setTime(billSubsidy.getCreateTime());
+            result.add(addApplication);
+
+            BaseApplication receiveApplication = new BaseApplication();
+            receiveApplication.setTitle("已受理");
+            receiveApplication.setTime(billSubsidy.getAcceptTime());
+            result.add(receiveApplication);
+
+            RejectApplication rejectApplication = new RejectApplication();
+            rejectApplication.setTitle("审核不通过");
+            rejectApplication.setTime(billSubsidy.getReviewedTime());
+            rejectApplication.setReason(billSubsidy.getRejectReason());
+            result.add(rejectApplication);
+        }else if (billSubsidy.getSubsidySch() == 5){
+            BaseApplication addApplication = new BaseApplication();
+            addApplication.setTitle("提交申请");
+            addApplication.setTime(billSubsidy.getCreateTime());
+            result.add(addApplication);
+
+            BaseApplication receiveApplication = new BaseApplication();
+            receiveApplication.setTitle("已受理");
+            receiveApplication.setTime(billSubsidy.getAcceptTime());
+            result.add(receiveApplication);
+
+            RejectApplication rejectApplication = new RejectApplication();
+            rejectApplication.setTitle("审核不通过");
+            rejectApplication.setTime(billSubsidy.getReviewedTime());
+            rejectApplication.setReason(billSubsidy.getRejectReason());
+            result.add(rejectApplication);
+
+            RejectApplication appealApplication = new RejectApplication();
+            appealApplication.setTitle("已申诉");
+            appealApplication.setTime(billSubsidy.getAppealTime());
+            appealApplication.setReason(billSubsidy.getAppeal());
+            result.add(appealApplication);
 
+            BaseApplication lastApplication = new BaseApplication();
+            lastApplication.setTitle("待受理");
+            result.add(lastApplication);
         }
-        return null;
+        return new Result(ResultCode.SUCCESS,result);
     }
 }