From 7b56cd5adb14446ea28ff6171d596d02e1ff0ec3 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Sun, 15 Sep 2024 06:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=86=99=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseLawEnforcementController.java | 17 +++++++++++++---- .../mapper/EnterpriseLawEnforcementMapper.java | 2 +- .../IEnterpriseLawEnforcementService.java | 2 +- .../EnterpriseLawEnforcementServiceImpl.java | 2 +- .../mapper/EnterpriseLawEnforcementMapper.xml | 5 ++++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index 8ad50e70..d64e905d 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; @@ -76,12 +77,19 @@ public class AppEnterpriseLawEnforcementController extends BaseController * 查询企业端-执法部门预约记录列表 */ // @RequiresPermissions("code:enforcement:queryList") - @GetMapping("/queryList") + @PostMapping("/queryList") @ResponseBody - public TableDataInfo queryList(EnterpriseLawEnforcement enterpriseLawEnforcement) + public TableDataInfo queryList(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { - startPage(); +// startPage(); + int total = enterpriseLawEnforcementService.selectTotal(enterpriseLawEnforcement); List list = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement); + + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(0); + rspData.setRows(list); + rspData.setTotal(total); + // for (EnterpriseLawEnforcement ee : list) { // EnterpriseComplaint params = new EnterpriseComplaint(); // params.setRelId(ee.getId()); @@ -115,7 +123,8 @@ public class AppEnterpriseLawEnforcementController extends BaseController ee.setStatus(3); } } - return getDataTable(list); +// return getDataTable(list); + return rspData; } @GetMapping("/queryTotal") @ResponseBody diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java index 4f8e9b05..8eb3e8bf 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java @@ -28,7 +28,7 @@ public interface EnterpriseLawEnforcementMapper * @return 企业端-执法部门预约记录集合 */ public List selectEnterpriseLawEnforcementList(EnterpriseLawEnforcement enterpriseLawEnforcement); - long selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement); + int selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement); /** * 新增企业端-执法部门预约记录 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java index 79b1449f..cb1e6708 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java @@ -29,7 +29,7 @@ public interface IEnterpriseLawEnforcementService * @return 企业端-执法部门预约记录集合 */ public List selectEnterpriseLawEnforcementList(EnterpriseLawEnforcement enterpriseLawEnforcement); - public long selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement); + public int selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement); /** * 新增企业端-执法部门预约记录 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 6dc5db09..e13f8600 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -140,7 +140,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc } @Override - public long selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement) { + public int selectTotal(EnterpriseLawEnforcement enterpriseLawEnforcement) { return enterpriseLawEnforcementMapper.selectTotal(enterpriseLawEnforcement); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml index fc35ea3a..ef4c3288 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml @@ -109,9 +109,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by check_time desc + + LIMIT #{params.pageNum}, #{params.pageSize} + - select count(1) from enterprise_law_enforcement and law_enforcement = #{lawEnforcement}