代码整理

common/src/main/java/com/winsun/bean/Order.java

@@ -175,7 +175,7 @@ public class Order implements Serializable{
 	private String userType;
 
 	/**
-	 * 受理结果（通过/不通过）
+	 * 受理结果（通过/不通过）  0：待审核 1：已通过  2：未通过
 	 */
 	private String acceptResult;
 

service-manager/src/main/java/com/winsun/controller/ManagerKpiController.java

@@ -195,18 +195,8 @@ public class ManagerKpiController extends BaseController {
                 managerKpiWrapper.le(StringUtils.isNotBlank(month2),"month",month2);
             }
         }
-        List<ManagerKpi> managerKpiList = managerKpiMapper.selectList(managerKpiWrapper);
-
-        List<ManagerKpi> dataList = new ArrayList<>();
-        //redisTemplate.opsForValue().set(hcmap, hcmap, 60, TimeUnit.MINUTES);
-
-        if(managerKpiList.size() < pageSize) {
-            dataList = managerKpiList;
-        }else {
-            dataList = managerKpiList.subList((pageNo-1)*pageSize, pageNo*pageSize);
-        }
-        page.setRecords(dataList);
-        page.setTotal(managerKpiList.size());
+        List<ManagerKpi> aPackage = managerKpiMapper.selectPage(page, managerKpiWrapper);
+        page.setRecords(aPackage);
         return ResponseData.success(page, "查询成功！");
     }
 

service-manager/src/main/java/com/winsun/controller/RegularController.java

@@ -108,9 +108,11 @@ public class RegularController extends BaseController {
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
             return ResponseData.error("无数据权限");
         }
+        Page<Regular> page = new Page<>(pageNo, pageSize);
+
         Wrapper<Regular> wrapper = new EntityWrapper();
         wrapper.like(StringUtils.isNotBlank(regularName), "regular_name", regularName, SqlLike.DEFAULT);
-        Page<Regular> page = new Page<>(pageNo, pageSize);
+
         List<Regular> regulars = regularMapper.selectPage(page, wrapper);
         page.setRecords(regulars);
         return ResponseData.success(page, "查询成功！");

service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java

@@ -203,18 +203,8 @@ public class StudentCardVerifyController extends BaseController {
                 studentCardWrapper.between("audit_date",dates[0],dates[1]);
             }
         }
-        List<StudentCard> studentCardList = studentCardMapper.selectList(studentCardWrapper);
-
-        List<StudentCard> dataList = new ArrayList<>();
-        //redisTemplate.opsForValue().set(hcmap, hcmap, 60, TimeUnit.MINUTES);
-
-        if(studentCardList.size() < pageSize) {
-            dataList = studentCardList;
-        }else {
-            dataList = studentCardList.subList((pageNo-1)*pageSize, pageNo*pageSize);
-        }
-        page.setRecords(dataList);
-        page.setTotal(studentCardList.size());
+        List<StudentCard> aPackage = studentCardMapper.selectPage(page, studentCardWrapper);
+        page.setRecords(aPackage);
         return ResponseData.success(page, "查询成功！");
     }
 

service-manager/src/main/java/com/winsun/controller/StudentDwkVerifyController.java

@@ -179,18 +179,8 @@ public class StudentDwkVerifyController extends BaseController {
                 studentCardWrapper.between("audit_date",dates[0],dates[1]);
             }
         }
-        List<StudentCertUpload> studentCardList = studentCertUploadMapper.selectList(studentCardWrapper);
-
-        List<StudentCertUpload> dataList = new ArrayList<>();
-        //redisTemplate.opsForValue().set(hcmap, hcmap, 60, TimeUnit.MINUTES);
-
-        if(studentCardList.size() < pageSize) {
-            dataList = studentCardList;
-        }else {
-            dataList = studentCardList.subList((pageNo-1)*pageSize, pageNo*pageSize);
-        }
-        page.setRecords(dataList);
-        page.setTotal(studentCardList.size());
+        List<StudentCertUpload> aPackage = studentCertUploadMapper.selectPage(page, studentCardWrapper);
+        page.setRecords(aPackage);
         return ResponseData.success(page, "查询成功！");
     }
 

service-manager/src/main/java/com/winsun/controller/YxtCouponController.java

@@ -154,22 +154,14 @@ public class YxtCouponController extends BaseController {
         }
 
         Page<YxtCoupon> page = new Page<>(pageNo, pageSize);
-        List<YxtCoupon> dataList = new LinkedList<>();
 
         Wrapper<YxtCoupon> yxtCouponWrapper = new EntityWrapper<>();
         yxtCouponWrapper.like(StringUtils.isNotBlank(card), "card_number", card, SqlLike.DEFAULT);
         yxtCouponWrapper.eq(StringUtils.isNotBlank(state), "state", state);
         yxtCouponWrapper.eq(StringUtils.isNotBlank(shelfState), "shelf_state", shelfState);
-        List<YxtCoupon> yxtCouponList = yxtCouponMapper.selectList(yxtCouponWrapper);
-
-        if (yxtCouponList.size() < pageSize) {
-            dataList = yxtCouponList;
-        } else {
-            dataList = yxtCouponList.subList((pageNo - 1) * pageSize, pageNo * pageSize);
-        }
 
-        page.setRecords(dataList);
-        page.setTotal(yxtCouponList.size());
+        List<YxtCoupon> aPackage = yxtCouponMapper.selectPage(page, yxtCouponWrapper);
+        page.setRecords(aPackage);
         return ResponseData.success(page, "查询成功！");
     }
 

service-manager/src/main/java/com/winsun/controller/zjlSalaryController.java

@@ -195,20 +195,8 @@ public class zjlSalaryController extends BaseController {
                 wrapper.le(StringUtils.isNotBlank(month2),"month",month2);
             }
         }
-        List<ZjlWage> zjlWages = zjlWageMapper.selectList(wrapper);
-        if(zjlWages.size()==0){
-            page.setRecords(null);
-            page.setTotal(0);
-            return ResponseData.success(page, "没有数据！");
-        }
-        if(zjlWages.size() < pageSize) {
-            dataList = zjlWages;
-        }else {
-            dataList = zjlWages.subList((pageNo-1)*pageSize, pageNo*pageSize);
-        }
-
-        page.setRecords(dataList);
-        page.setTotal(zjlWages.size());
+        List<ZjlWage> aPackage = zjlWageMapper.selectPage(page, wrapper);
+        page.setRecords(aPackage);
         return ResponseData.success(page, "查询成功！");
     }