接口1

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

@@ -142,6 +142,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         String url = paramsMap.get("url");
         BillSubsidy billSubsidy = subsidyMapper.selectById(id);
         billSubsidy.setPayImgUrl(url);
+        billSubsidy.setSubsidySch(3);
         billSubsidy.setIsPay(2);
         subsidyMapper.updateById(billSubsidy);
         return new Result(ResultCode.SUCCESS);

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

@@ -63,13 +63,13 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
         QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
         if (type == null || type == "") {
-            queryWrapper.orderByDesc("sub_time");
+            queryWrapper.orderByAsc("accept_time");
         } else if (Integer.parseInt(type) == 1) {
-            queryWrapper.eq("subsidy_sch", 0).orderByDesc("sub_time");
+            queryWrapper.eq("subsidy_sch", 0).orderByAsc("accept_time");
         } else if (Integer.parseInt(type) == 2) {
-            queryWrapper.eq("subsidy_sch", 1).orderByDesc("sub_time");
+            queryWrapper.eq("subsidy_sch", 1).orderByAsc("accept_time");
         } else {
-            queryWrapper.ge("subsidy_sch", 2).orderByDesc("sub_time");
+            queryWrapper.ge("subsidy_sch", 2).orderByAsc("accept_time");
         }
         Page<BillSubsidy> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 //        List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);
@@ -109,6 +109,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
             billSubsidy.setRefuseReason(refuseReason);
             billSubsidy.setSubsidySch(2);
+            billSubsidy.setReviewedDepart("乡镇专干");
             billSubsidy.setAcceptTime(new Date());
             subsidyMapper.updateById(billSubsidy);
             return new Result(ResultCode.SUCCESS, billSubsidy);
@@ -118,6 +119,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
             billSubsidy.setSubsidySch(1);
             billSubsidy.setAcceptTime(new Date());
+            billSubsidy.setReviewedDepart("乡镇专干");
             subsidyMapper.updateById(billSubsidy);
             return new Result(ResultCode.SUCCESS, billSubsidy);
         }

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

@@ -148,7 +148,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             user.setAddress(paramsMap.get("address"));
         }
 //        if (Integer.parseInt(paramsMap.get("type")) == 1) {
-//
+//            user.setVeterId(Integer.parseInt(paramsMap.get("veterId")));
 //        }
         if (Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();