From 5996fd93b17f2d5783875b2118024dcd74e50bb4 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Tue, 26 May 2026 15:25:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pNonEnforcementRegistrationController.java | 13 +- .../NonEnforcementRegistrationMapper.java | 4 +- .../INonEnforcementRegistrationService.java | 11 ++ ...NonEnforcementRegistrationServiceImpl.java | 135 +++++++++++++----- 4 files changed, 117 insertions(+), 46 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java index 01ed79a2..636387a7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java @@ -5,13 +5,12 @@ import com.zdxt.enforcementcode.domain.bo.NonEnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.NonEnforcementRegistrationVo; import com.zdxt.enforcementcode.service.INonEnforcementRegistrationService; import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 执法端-非行政执法登记Controller * @@ -35,17 +34,13 @@ public class AppNonEnforcementRegistrationController extends BaseController { } /** - * 执法端-非行政查询执法登记列表(历史活动) + * 执法端-非行政查询执法登记列表(历史活动) - 分页 */ @SaIgnore @GetMapping("/queryList") - public TableDataInfo queryList(NonEnforcementRegistrationBo bo) + public TableDataInfo queryList(NonEnforcementRegistrationBo bo, PageQuery pageQuery) { - int total = enforcementRegistrationService.getListTotal(bo); - List list = enforcementRegistrationService.selectNonEnforcementRegistrationList(bo); - TableDataInfo rspData = new TableDataInfo<>(list, total); - rspData.setCode(0); - return rspData; + return enforcementRegistrationService.queryPageList(bo, pageQuery); } /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/NonEnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/NonEnforcementRegistrationMapper.java index 61d88a2f..0fa024f6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/NonEnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/NonEnforcementRegistrationMapper.java @@ -1,7 +1,9 @@ package com.zdxt.enforcementcode.mapper; +import com.zdxt.enforcementcode.domain.NonEnforcementRegistration; import com.zdxt.enforcementcode.domain.bo.NonEnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.NonEnforcementRegistrationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.springframework.stereotype.Repository; import java.util.List; @@ -13,7 +15,7 @@ import java.util.List; * @date 2025-06-19 */ @Repository -public interface NonEnforcementRegistrationMapper +public interface NonEnforcementRegistrationMapper extends BaseMapperPlus { /** * 查询非行政执法登记 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/INonEnforcementRegistrationService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/INonEnforcementRegistrationService.java index 3f90a00d..08b816fc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/INonEnforcementRegistrationService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/INonEnforcementRegistrationService.java @@ -3,6 +3,8 @@ package com.zdxt.enforcementcode.service; import com.zdxt.enforcementcode.domain.bo.NonEnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.NonEnforcementRegistrationVo; import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import java.util.List; @@ -22,6 +24,15 @@ public interface INonEnforcementRegistrationService */ public NonEnforcementRegistrationVo selectNonEnforcementRegistrationById(String id); + /** + * 分页查询非行政执法登记列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 非行政执法登记分页列表 + */ + TableDataInfo queryPageList(NonEnforcementRegistrationBo bo, PageQuery pageQuery); + /** * 查询非行政执法登记列表 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java index 643ae1b4..c23e4670 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java @@ -3,8 +3,10 @@ package com.zdxt.enforcementcode.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.common.annotation.DataScope; import com.zdxt.enforcementcode.common.util.CommonUtil; +import com.zdxt.enforcementcode.domain.NonEnforcementRegistration; import com.zdxt.enforcementcode.domain.ZdxtFile; import com.zdxt.enforcementcode.domain.bo.NonEnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.NonEnforcementRegistrationVo; @@ -19,6 +21,8 @@ import org.dromara.common.core.enums.FormatsType; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysUserVo; @@ -57,8 +61,8 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg @Override public NonEnforcementRegistrationVo selectNonEnforcementRegistrationById(String id) { - NonEnforcementRegistrationVo nonReg = nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationById(id); - if (nonReg.getId() != null) { + NonEnforcementRegistrationVo nonReg = nonEnforcementRegistrationMapper.selectVoById(id); + if (nonReg != null && nonReg.getId() != null) { SysUserVo user = sysUserMapper.selectUserById(Long.valueOf(nonReg.getLawEnforcerId())); String temp=user.getLawCertificateNum(); if(StringUtils.isEmpty(temp)){ @@ -95,6 +99,95 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg return nonReg; } + /** + * 分页查询非行政执法登记列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 非行政执法登记分页列表 + */ + @Override + public TableDataInfo queryPageList(NonEnforcementRegistrationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = nonEnforcementRegistrationMapper.selectVoPage(pageQuery.build(), lqw); + + // 处理执法人员信息等附加数据 + if (result.getRecords() != null && !result.getRecords().isEmpty()) { + enrichLawEnforcerInfo(result.getRecords()); + } + + return TableDataInfo.build(result); + } + + /** + * 构建查询条件 + * + * @param bo 查询条件 + * @return LambdaQueryWrapper + */ + private LambdaQueryWrapper buildQueryWrapper(NonEnforcementRegistrationBo bo) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + + // 根据实际业务需要添加查询条件 + if (bo != null) { + lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), NonEnforcementRegistration::getEnterpriseName, bo.getEnterpriseName()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), NonEnforcementRegistration::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(bo.getReslut() != null, NonEnforcementRegistration::getReslut, bo.getReslut()); + lqw.eq(bo.getStatus() != null, NonEnforcementRegistration::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), NonEnforcementRegistration::getBureauDeptId, bo.getBureauDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerId()), NonEnforcementRegistration::getLawEnforcerId, bo.getLawEnforcerId()); + lqw.orderByDesc(NonEnforcementRegistration::getEnforcementTime); + } + + return lqw; + } + + /** + * 补充执法人员信息 + * + * @param list 记录列表 + */ + private void enrichLawEnforcerInfo(List list) { + if (list == null || list.isEmpty()) { + return; + } + + // 执法人员 没有执法证件号展示加密手机号 + list.forEach(li -> { + // 处理主执法人员信息 + if (StringUtils.isNotEmpty(li.getLawEnforcerId())) { + SysUserVo sysUserVo = sysUserMapper.selectUserById(Long.valueOf(li.getLawEnforcerId())); + if (sysUserVo != null) { + String lawCN = sysUserVo.getLawCertificateNum(); + if (StringUtils.isEmpty(lawCN)) { + lawCN = CommonUtil.encryptPhone(sysUserVo.getPhonenumber()); + } + li.setLawEnforcer(sysUserVo.getUserName() + " " + lawCN); + } else { + li.setLawEnforcer(li.getLawEnforcer()); + } + } + + // 处理其他执法人员信息 + List lawTwoList = new ArrayList<>(); + if (StringUtils.isNotEmpty(li.getLawEnforcerOther()) && StringUtils.isNotEmpty(li.getLawEnforcerIdOther())) { + List userBeans = sysUserMapper.selectUserByIds(Convert.toStrArray(li.getLawEnforcerIdOther())); + if (userBeans != null && !userBeans.isEmpty()) { + userBeans.forEach(u -> { + if (u != null) { + String temp = u.getLawCertificateNum(); + if (StringUtils.isEmpty(temp)) { + temp = CommonUtil.encryptPhone(u.getPhonenumber()); + } + lawTwoList.add(u.getUserName() + " " + temp); + } + }); + li.setLawEnforcerOtherList(lawTwoList); + } + } + }); + } + /** * 查询非行政执法登记列表 * @@ -104,41 +197,11 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg @Override public List selectNonEnforcementRegistrationList(NonEnforcementRegistrationBo bo) { - List list=nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationList(bo); - if(list.size()!=0){ - // 执法人员 没有执法证件号展示加密手机号 - list.forEach(li->{ - if (StringUtils.isNotEmpty(li.getLawEnforcerId())) { - SysUserVo sysUserVo = sysUserMapper.selectUserById(Long.valueOf(li.getLawEnforcerId())); - if (sysUserVo != null) { - String lawCN = sysUserVo.getLawCertificateNum(); - if(StringUtils.isEmpty(lawCN)){ - lawCN = CommonUtil.encryptPhone(sysUserVo.getPhonenumber()); - } - li.setLawEnforcer(sysUserVo.getUserName() + " " + lawCN); - } else { - li.setLawEnforcer(li.getLawEnforcer()); - } - } + List list = nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationList(bo); + + // 使用公共方法处理执法人员信息 + enrichLawEnforcerInfo(list); - List lawTwoList = new ArrayList<>(); - if (StringUtils.isNotEmpty(li.getLawEnforcerOther()) && StringUtils.isNotEmpty(li.getLawEnforcerIdOther())) { - List userBeans = sysUserMapper.selectUserByIds(Convert.toStrArray(li.getLawEnforcerIdOther())); - if (userBeans != null && !userBeans.isEmpty()) { - userBeans.forEach(u->{ - if (u != null) { - String temp = u.getLawCertificateNum(); - if(StringUtils.isEmpty(temp)){ - temp = CommonUtil.encryptPhone(u.getPhonenumber()); - } - lawTwoList.add(u.getUserName() + " " + temp); - } - }); - li.setLawEnforcerOtherList(lawTwoList); - } - } - }); - } return list; }