接口13

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

@@ -96,7 +96,7 @@ public class BillLandingInspectionController {
 
     @RequestMapping("/addPay")
     public Result addPay(HttpServletRequest httpServletRequest,
-                         @RequestParam("idCordBackUrl") MultipartFile idCordBackUrl,
+                         @RequestParam(name = "idCordBackUrl",required = false) MultipartFile idCordBackUrl,
                          @RequestParam("id") String id) {
         String imgname = "成功";
         String originalFilename = idCordBackUrl.getOriginalFilename();

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

@@ -147,6 +147,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         billSubsidy.setPayImgUrl(url);
         billSubsidy.setSubsidySch(3);
         billSubsidy.setIsPay(2);
+        billSubsidy.setPayMoney(billSubsidy.getApplyMoney());
         subsidyMapper.updateById(billSubsidy);
         return new Result(ResultCode.SUCCESS,subsidyMapper.selectById(id));
     }

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

@@ -67,9 +67,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         } else if (Integer.parseInt(type) == 1) {
             queryWrapper.eq("subsidy_sch", 0).orderByDesc("create_time");
         } else if (Integer.parseInt(type) == 2) {
-            queryWrapper.eq("subsidy_sch", 1).orderByDesc("create_time");
+            queryWrapper.in("subsidy_sch", 1,5).orderByDesc("create_time");
         } else {
-            queryWrapper.ge("subsidy_sch", 2).orderByDesc("create_time");
+            queryWrapper.in("subsidy_sch", 2,3).orderByDesc("create_time");
         }
         Page<BillSubsidy> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 //        List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);