zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

执法端-历史活动查询分页修改

dev-V1.0.1
niujiyi 5 months ago
parent
21fb6a9d87
commit
5996fd93b1
4 changed files with 117 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java
  2. 4
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/NonEnforcementRegistrationMapper.java
  3. 11
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/INonEnforcementRegistrationService.java
  4. 81
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java

13
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java
View File

@ -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<NonEnforcementRegistrationVo> queryList(NonEnforcementRegistrationBo bo, PageQuery pageQuery)
{
int total = enforcementRegistrationService.getListTotal(bo);
List<NonEnforcementRegistrationVo> list = enforcementRegistrationService.selectNonEnforcementRegistrationList(bo);
TableDataInfo<NonEnforcementRegistrationVo> rspData = new TableDataInfo<>(list, total);
rspData.setCode(0);
return rspData;
return enforcementRegistrationService.queryPageList(bo, pageQuery);
}
/**

4
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/NonEnforcementRegistrationMapper.java
View File

@ -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<NonEnforcementRegistration, NonEnforcementRegistrationVo>
{
/**
* 查询非行政执法登记

11
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/INonEnforcementRegistrationService.java
View File

@ -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<NonEnforcementRegistrationVo> queryPageList(NonEnforcementRegistrationBo bo, PageQuery pageQuery);
/**
* 查询非行政执法登记列表
*

81
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java
View File

@ -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)){
@ -96,18 +100,61 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
}
/**
* 查询非行政执法登记列表
* 分页查询非行政执法登记列表
*
* @param bo 非行政执法登记
* @return 非行政执法登记
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 非行政执法登记分页列表
*/
@Override
public List<NonEnforcementRegistrationVo> selectNonEnforcementRegistrationList(NonEnforcementRegistrationBo bo)
{
List<NonEnforcementRegistrationVo> list=nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationList(bo);
if(list.size()!=0){
public TableDataInfo<NonEnforcementRegistrationVo> queryPageList(NonEnforcementRegistrationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<NonEnforcementRegistration> lqw = buildQueryWrapper(bo);
Page<NonEnforcementRegistrationVo> 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<NonEnforcementRegistration> buildQueryWrapper(NonEnforcementRegistrationBo bo) {
LambdaQueryWrapper<NonEnforcementRegistration> 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<NonEnforcementRegistrationVo> 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) {
@ -121,6 +168,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
}
}
// 处理其他执法人员信息
List<String> lawTwoList = new ArrayList<>();
if (StringUtils.isNotEmpty(li.getLawEnforcerOther()) && StringUtils.isNotEmpty(li.getLawEnforcerIdOther())) {
List<SysUserVo> userBeans = sysUserMapper.selectUserByIds(Convert.toStrArray(li.getLawEnforcerIdOther()));
@ -139,6 +187,21 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
}
});
}
/**
* 查询非行政执法登记列表
*
* @param bo 非行政执法登记
* @return 非行政执法登记
*/
@Override
public List<NonEnforcementRegistrationVo> selectNonEnforcementRegistrationList(NonEnforcementRegistrationBo bo)
{
List<NonEnforcementRegistrationVo> list = nonEnforcementRegistrationMapper.selectNonEnforcementRegistrationList(bo);
// 使用公共方法处理执法人员信息
enrichLawEnforcerInfo(list);
return list;
}

Write Preview
Loading…
Cancel
Save