修改交易接口

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

@@ -212,7 +212,7 @@ public class SysUserController {
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req) {
-        String token = TokenSign.sign("企业合作社测试", "13112341238",3L);
+        String token = TokenSign.sign("superadmin", "123456789",1L);
         return token;
     }
 

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

@@ -311,8 +311,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             isolation.setIsDead(0);
         }
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", isolation.getInspectionNum()));
-        billLandingInspection.setUpdateTime(DateTime.now());
-        billLandingInspection.setUpdateUser(TokenSign.getUserName(httpServletRequest));
+        billLandingInspection.setReviewedTime(DateTime.now());
+        billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setInspectionSch(4);
         landingInspectionMapper.updateById(billLandingInspection);
         isolation.setUpdateTime(DateTime.now());

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

@@ -35,13 +35,13 @@ import java.util.Map;
 @Service
 public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingInspectionMapper, BillLandingInspection> implements IBillLandingInspectionService {
 
-    @Autowired
+    @Resource
     private BillLandingInspectionMapper billLandingInspectionMapper;
-    @Autowired
+    @Resource
     private BillIsolatedMapper isolatedMapper;
-    @Autowired
+    @Resource
     private BillBuyInfoMapper buyInfoMapper;
-    @Autowired
+    @Resource
     private BillSubsidyMapper subsidyMapper;
     @Resource
     private SysUserMapper sysUserMapper;
@@ -184,6 +184,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
 
     @Override
     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");
@@ -208,7 +210,8 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
             landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);
         }
         landingInspectionQueryWrapper.orderByDesc("create_time");
-        return new Result(ResultCode.SUCCESS,billLandingInspectionMapper.selectList(landingInspectionQueryWrapper));
+        Page<BillLandingInspection> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,billLandingInspectionMapper.selectPage(page,landingInspectionQueryWrapper));
     }
 
     @Override
@@ -216,8 +219,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(3);
+        billLandingInspection.setInspectionSch(5);
         billLandingInspection.setRejectReason(rejectReason);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());
@@ -229,7 +231,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     public Result agreeApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         BillLandingInspection landingInspection = this.getById(id);
-        landingInspection.setInspectionSch(1);
+        landingInspection.setInspectionSch(2);
         landingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         landingInspection.setReviewedTime(DateTime.now());
         if (this.updateById(landingInspection)){