补贴流程

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

@@ -10,4 +10,5 @@ public class BaseApplication {
     private String title;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date time;
+    private Boolean status;
 }

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

@@ -6,5 +6,5 @@ import java.math.BigDecimal;
 
 @Data
 public class PayApplication extends BaseApplication {
-    private BigDecimal payMoney;
+    private String payMoney;
 }

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

@@ -186,8 +186,6 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     public Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageSize = paramsMap.get("pageSize");
         String pageNum = paramsMap.get("pageNum");
-        String startTime = paramsMap.get("startTime");
-        String endTime = paramsMap.get("endTime");
         String inspectionSch = paramsMap.get("inspectionSch");
         String userName = TokenSign.getUserName(httpServletRequest);
         SysUser user = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("user_name", userName));
@@ -201,14 +199,6 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
             landingInspectionQueryWrapper.eq("veter_id",user.getVeterId());
         }
 
-        if (startTime != null) {
-            startTime = startTime + " 00:00:00";
-            landingInspectionQueryWrapper.ge("create_time",startTime);
-        }
-        if (endTime != null) {
-            endTime = endTime + " 23:59:59";
-            landingInspectionQueryWrapper.le("create_time",endTime);
-        }
         if (ObjectUtil.isNotEmpty(inspectionSch)){
             landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);
         }

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

@@ -355,8 +355,10 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         BillSubsidy billSubsidy = this.getById(id);
         List result = new ArrayList();
         if (billSubsidy.getSubsidySch() == 0){
-            BaseApplication addApplication = new BaseApplication();
+            RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
+            addApplication.setStatus(true);
+            addApplication.setReason("");
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
@@ -364,13 +366,17 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             lastApplication.setTitle("待受理");
             result.add(lastApplication);
         }else if (billSubsidy.getSubsidySch() == 1){
-            BaseApplication addApplication = new BaseApplication();
+            RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
+            addApplication.setStatus(true);
+            addApplication.setReason("");
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
-            BaseApplication receiveApplication = new BaseApplication();
+            RejectApplication receiveApplication = new RejectApplication();
             receiveApplication.setTitle("已受理");
+            receiveApplication.setStatus(true);
+            receiveApplication.setReason("");
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
@@ -378,80 +384,105 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             lastApplication.setTitle("审核中");
             result.add(lastApplication);
         }else if (billSubsidy.getSubsidySch() == 2){
-            BaseApplication addApplication = new BaseApplication();
+            RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
+            addApplication.setReason("");
+            addApplication.setStatus(true);
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
             RejectApplication rejectApplication = new RejectApplication();
             rejectApplication.setTitle("已拒绝");
+            rejectApplication.setStatus(false);
             rejectApplication.setTime(billSubsidy.getAcceptTime());
-            rejectApplication.setReason(billSubsidy.getRefuseReason());
+            rejectApplication.setReason("拒绝理由:"+billSubsidy.getRefuseReason());
             result.add(rejectApplication);
         }else if (billSubsidy.getSubsidySch() == 3){
-            BaseApplication addApplication = new BaseApplication();
+            RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
+            addApplication.setReason("");
+            addApplication.setStatus(true);
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
-            BaseApplication receiveApplication = new BaseApplication();
+            RejectApplication receiveApplication = new RejectApplication();
             receiveApplication.setTitle("已受理");
+            receiveApplication.setReason("");
+            receiveApplication.setStatus(true);
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
-            BaseApplication acceptApplication = new BaseApplication();
+            RejectApplication acceptApplication = new RejectApplication();
             acceptApplication.setTitle("审核通过");
+            acceptApplication.setReason("");
+            acceptApplication.setStatus(true);
             acceptApplication.setTime(billSubsidy.getAcceptTime());
             result.add(acceptApplication);
 
             if (billSubsidy.getIsPay() == 2){
                 PayApplication payApplication = new PayApplication();
                 payApplication.setTitle("已支付");
+                payApplication.setStatus(true);
                 payApplication.setTime(billSubsidy.getPayTime());
-                payApplication.setPayMoney(billSubsidy.getPayMoney());
+                if (ObjectUtil.isEmpty(billSubsidy.getPayMoney())){
+                    payApplication.setPayMoney("支付金额: ¥"+"");
+                }else {
+                    payApplication.setPayMoney("支付金额: ¥"+billSubsidy.getPayMoney().toString());
+                }
                 result.add(payApplication);
             }else {
-                BaseApplication lastApplication = new BaseApplication();
+                RejectApplication lastApplication = new RejectApplication();
                 lastApplication.setTitle("待支付");
                 result.add(lastApplication);
             }
         }else if (billSubsidy.getSubsidySch() == 4){
-            BaseApplication addApplication = new BaseApplication();
+            RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
+            addApplication.setReason("");
+            addApplication.setStatus(true);
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
-            BaseApplication receiveApplication = new BaseApplication();
+            RejectApplication receiveApplication = new RejectApplication();
             receiveApplication.setTitle("已受理");
+            receiveApplication.setReason("");
+            receiveApplication.setStatus(true);
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
             RejectApplication rejectApplication = new RejectApplication();
             rejectApplication.setTitle("审核不通过");
+            rejectApplication.setStatus(false);
             rejectApplication.setTime(billSubsidy.getReviewedTime());
-            rejectApplication.setReason(billSubsidy.getRejectReason());
+            rejectApplication.setReason("驳回理由: "+billSubsidy.getRejectReason());
             result.add(rejectApplication);
         }else if (billSubsidy.getSubsidySch() == 5){
-            BaseApplication addApplication = new BaseApplication();
+            RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
+            addApplication.setReason("");
+            addApplication.setStatus(true);
             addApplication.setTime(billSubsidy.getCreateTime());
             result.add(addApplication);
 
-            BaseApplication receiveApplication = new BaseApplication();
+            RejectApplication receiveApplication = new RejectApplication();
+            receiveApplication.setReason("");
             receiveApplication.setTitle("已受理");
+            receiveApplication.setStatus(true);
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
             RejectApplication rejectApplication = new RejectApplication();
             rejectApplication.setTitle("审核不通过");
+            rejectApplication.setStatus(false);
             rejectApplication.setTime(billSubsidy.getReviewedTime());
-            rejectApplication.setReason(billSubsidy.getRejectReason());
+            rejectApplication.setReason("驳回理由: "+billSubsidy.getRejectReason());
             result.add(rejectApplication);
 
             RejectApplication appealApplication = new RejectApplication();
             appealApplication.setTitle("已申诉");
+            appealApplication.setStatus(true);
             appealApplication.setTime(billSubsidy.getAppealTime());
-            appealApplication.setReason(billSubsidy.getAppeal());
+            appealApplication.setReason("申诉内容描述: "+billSubsidy.getAppeal());
             result.add(appealApplication);
 
             BaseApplication lastApplication = new BaseApplication();