接口1

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

@@ -283,7 +283,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(5);
         billLandingInspection.setRejectReason(rejectReason);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());

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

@@ -158,7 +158,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 return new Result(10001, "工作验收表不能为空！",false);
             }
             billSubsidy.setSubsidySch(4);
-            billSubsidy.setIsShensu(1);
             billSubsidy.setRejectReason(rejectReason);
             billSubsidy.setWorkAccptUrl(workAccptUrl);
             billSubsidy.setAcceptTime(new Date());
@@ -339,6 +338,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             String appeal = paramsMap.get("appeal");
             billSubsidy.setAppeal(appeal);
             billSubsidy.setSubsidySch(5);
+            billSubsidy.setIsShensu(1);
             billSubsidy.setAppealTime(new Date());
             if (this.updateById(billSubsidy)) {
                 return Result.SUCCESS();
@@ -463,6 +463,14 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             rejectApplication.setTime(billSubsidy.getAcceptTime());
             rejectApplication.setReason("拒绝理由:"+billSubsidy.getRefuseReason());
             result.add(rejectApplication);
+            if (billSubsidy.getAppeal() != null) {
+                RejectApplication shensuApplication = new RejectApplication();
+                shensuApplication.setTitle("已申诉");
+                shensuApplication.setStatus(true);
+                shensuApplication.setTime(billSubsidy.getAcceptTime());
+                shensuApplication.setReason("");
+                result.add(shensuApplication);
+            }
         }else if (billSubsidy.getSubsidySch() == 3){
             RejectApplication addApplication = new RejectApplication();
             addApplication.setTitle("提交申请");
@@ -478,6 +486,15 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
+            if (billSubsidy.getAppeal() != null) {
+                RejectApplication shensuApplication = new RejectApplication();
+                shensuApplication.setTitle("申诉中");
+                shensuApplication.setStatus(true);
+                shensuApplication.setTime(billSubsidy.getAcceptTime());
+                shensuApplication.setReason("");
+                result.add(shensuApplication);
+            }
+
             RejectApplication acceptApplication = new RejectApplication();
             acceptApplication.setTitle("审核通过");
             acceptApplication.setReason("");
@@ -524,14 +541,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             rejectApplication.setTime(billSubsidy.getReviewedTime());
             rejectApplication.setReason("驳回理由: "+billSubsidy.getRejectReason());
             result.add(rejectApplication);
-            if (billSubsidy.getIsShensu() == 0) {
-                RejectApplication shensuApplication = new RejectApplication();
-                shensuApplication.setTitle("申诉中");
-                shensuApplication.setStatus(true);
-                shensuApplication.setTime(billSubsidy.getAcceptTime());
-                shensuApplication.setReason("");
-                result.add(shensuApplication);
-            }
 
         }else if (billSubsidy.getSubsidySch() == 5){
             RejectApplication addApplication = new RejectApplication();
@@ -548,6 +557,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             receiveApplication.setTime(billSubsidy.getAcceptTime());
             result.add(receiveApplication);
 
+
             RejectApplication rejectApplication = new RejectApplication();
             rejectApplication.setTitle("审核不通过");
             rejectApplication.setStatus(false);