修改补贴接口

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

@@ -83,6 +83,11 @@ public class BillSubsidyController {
         return subsidyService.listPcSub(httpServletRequest,parasMap);
     }
 
+    @PostMapping("/listFlow")
+    public Result listFlow(@RequestBody Map<String, String> parasMap){
+        return iBillSubsidyService.listFlow(parasMap);
+    }
+
     //打印
     @PostMapping("/print")
     public Result print(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> parasMap) throws Exception {

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

@@ -38,4 +38,6 @@ public interface IBillSubsidyService extends IService<BillSubsidy> {
     Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result getLast(HttpServletRequest httpServletRequest, Map<String, String> parasMap);
+
+    Result listFlow(Map<String, String> parasMap);
 }

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

@@ -177,6 +177,10 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     public Result addApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
         String eartagNo = billSubsidy.getEartagNo();
         String[] eartags = eartagNo.split(",");
+        String bankCardId = billSubsidy.getBankCardId();
+        if(!(BankUtil.checkBankCard(bankCardId))){
+            return new Result(10001,"补贴账号不符合标准!",false);
+        }
         for (String eartag : eartags) {
             if (!eartag.contains("-")){
                 BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartag));
@@ -199,10 +203,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 }
             }
         }
-        String bankCardId = billSubsidy.getBankCardId();
-        if(!(BankUtil.checkBankCard(bankCardId))){
-            return new Result(10001,"补贴账号不符合标准!",false);
-        }
         billSubsidy.setBankName(BankUtil.getname(bankCardId));
         billSubsidy.setSubsidyName(TokenSign.getUserName(httpServletRequest)+"的补贴申请");
         billSubsidy.setCreateTime(DateTime.now());
@@ -285,7 +285,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             billSubsidy.setAppeal(appeal);
             billSubsidy.setSubsidySch(5);
             billSubsidy.setAppealTime(new Date());
-            if (this.save(billSubsidy)) {
+            if (this.updateById(billSubsidy)) {
                 return Result.SUCCESS();
             } else {
                 return Result.ERROR();
@@ -341,4 +341,25 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             return new Result(ResultCode.SUCCESS,billSubsidy);
         }
     }
+
+    @Override
+    public Result listFlow(Map<String, String> parasMap) {
+        String id = parasMap.get("id");
+        BillSubsidy billSubsidy = this.getById(id);
+        List result = new ArrayList();
+        if (billSubsidy.getSubsidySch() == 0){
+            result.add("提交申请");
+            result.add(billSubsidy.getCreateTime());
+            result.add("待受理");
+        }else if (billSubsidy.getSubsidySch() == 1){
+            result.add("提交申请");
+            result.add(billSubsidy.getCreateTime());
+            result.add("已受理");
+            result.add(billSubsidy.getAcceptTime());
+            result.add("审核中");
+        }else if (billSubsidy.getSubsidySch() == 2){
+
+        }
+        return null;
+    }
 }