diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java index 96a835a3..a3cb3b69 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java @@ -109,7 +109,7 @@ public class AppEnforcementRegistrationController extends BaseController { @SaIgnore @GetMapping("/queryList") @ResponseBody - public R queryList(EnforcementRegistrationBo bo, PageQuery pageQuery) { + public R queryList(EnforcementRegistrationBo bo) { // dateType本单位 0 全市 1 if (Objects.nonNull( LoginHelper.getUserId()) && bo.getWarnType()==0) { bo.setDeptId(LoginHelper.getDeptId() == null ? null : LoginHelper.getDeptId()); @@ -119,17 +119,17 @@ public class AppEnforcementRegistrationController extends BaseController { bo.setBureauDeptId(bureauDept.getDeptId()); } } - //查询检查总次数 - List listCount = enforcementRegistrationService.selectEnforcementRegistrationList(bo,pageQuery); + + List list = enforcementRegistrationService.selectEnforcementRegistrationList(bo); + int count = 0; - if (listCount.size() > 0) { - count = listCount.stream() + if (list.size() > 0) { + count = list.stream() .map(item -> item.getNum()) .filter(num -> num != null) .mapToInt(Integer::intValue) .sum(); } - List list = enforcementRegistrationService.selectEnforcementRegistrationList(bo, pageQuery); EnforcementRegistrationVo result = new EnforcementRegistrationVo(); result.setListCount(count); @@ -317,7 +317,7 @@ public class AppEnforcementRegistrationController extends BaseController { // 已登记联合检查 EnforcementRegistrationBo bo = new EnforcementRegistrationBo(); bo.setUnionNo((vo.getUnionNo())); - regResults = enforcementRegistrationService.selectEnforcementRegistrationList(bo, null); + regResults = enforcementRegistrationService.selectEnforcementRegistrationList(bo); // 预约未登记的 (预约没要联合检查了) EnterpriseLawEnforcementBo lawRarams = new EnterpriseLawEnforcementBo(); lawRarams.setUniteCheck(vo.getUniteCheck()); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java index 0671d783..68f9afaf 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java @@ -106,10 +106,10 @@ public interface IEnforcementRegistrationService { /** * 执法端-查询执法登记列表 * @param bo - * @param pageQuery + * @param bo * @return */ - List selectEnforcementRegistrationList(EnforcementRegistrationBo bo,PageQuery pageQuery); + List selectEnforcementRegistrationList(EnforcementRegistrationBo bo); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 3b638204..05ef7f0c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -751,12 +751,11 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Override // @DataScope @DataScope(deptField = "bureau_dept_id", extraDeptField = "entrust_dept_id") - public List selectEnforcementRegistrationList(EnforcementRegistrationBo bo, PageQuery pageQuery) + public List selectEnforcementRegistrationList(EnforcementRegistrationBo bo) { - // 使用MyBatis-Plus标准分页查询,避免复杂SQL导致分页失效 + // 使用MyBatis-Plus标准查询,返回全部数据 LambdaQueryWrapper lqw = buildAppListQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return result.getRecords(); + return baseMapper.selectVoList(lqw); } /**