From 2b81da40f7607f3a0e345dfc9743736124c842c9 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 6 May 2026 11:16:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E6=8A=95=E8=AF=89=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/NonEnforcementRegistration.java | 150 ++++++++++++++++++ .../AppEnterpriseComplaintEnums.java | 14 +- .../AppEnterpriseComplatintInsertDTO.java | 4 +- .../AppEnterpriseComplatintQueryDTO.java | 4 +- .../enterprise/AppEnterpriseComplaintVo.java | 2 +- .../mapper/EnforcementRegistrationMapper.java | 4 +- .../AppEnterpriseComplaintMapper.java | 4 +- .../AppNonEnforcementRegistrationMapper.java | 4 +- .../IEnforcementRegistrationService.java | 4 +- .../AppEnterpriseComplaintServiceImpl.java | 42 +++-- .../EnforcementRegistrationServiceImpl.java | 4 +- 11 files changed, 192 insertions(+), 44 deletions(-) create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java new file mode 100644 index 00000000..47c4358c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java @@ -0,0 +1,150 @@ +package com.zdxt.enforcementcode.domain; + + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +@Data +@EqualsAndHashCode() +@TableName("non_enforcement_registration") +public class NonEnforcementRegistration { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 关联执法记录ID + */ + private String relId; + + /** + * 执法类型 + */ + private Long enforceType; + + /** + * 问题描述 + */ + private String problemDescription; + + /** + * 联系人 + */ + private String linkman; + + /** + * 联系方式 + */ + private String linkmanTel; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 投诉对接12345案件类型 + */ + private String caseType; + + /** + * + */ + private Long authorization; + + /** + * + */ + private Long comOrOpi; + + /** + * + */ + private String enterpriseAddress; + + /** + * + */ + private String proWoCode; + + /** + * + */ + private Long status; + + /** + * + */ + private Date evaluateTime; + + /** + * + */ + private String enterpriseNumber; + + /** + * + */ + private String enterpriseName; + + /** + * 执法部门多个-逗号隔开 + */ + private String complaintDepartments; + + /** + * 执法部门id多个-逗号隔开 + */ + private String complaintDepartmentIds; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 投诉类型 0 系默认 1 联合检查 + */ + private Long complaintType; + + /** + * 投诉事项编码，多个逗号隔开 + */ + private String complaintItemCodes; + + /** + * 投诉事项名称，多个逗号隔开 + */ + private String complaintItemNames; + + /** + * 同步过来的处理时间 + */ + private String handleTime; + + /** + * 投诉事项（对应记录表执法/入企事项） + */ + private String complaintRecordItem; + + /** + * 数据类型 0行政 1 非行政 + */ + private Long recordType; + + /** + * 是否有投诉 0 否 1 是 + */ + private Long HasComplaint; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/AppEnterpriseComplaintEnums.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/AppEnterpriseComplaintEnums.java index d09f64a1..c1be8e1e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/AppEnterpriseComplaintEnums.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/AppEnterpriseComplaintEnums.java @@ -4,18 +4,18 @@ public enum AppEnterpriseComplaintEnums { // 行政：0 - ADMINISTRATION(0,"行政"), + ADMINISTRATION(0L,"行政"), //非行政：1 - NON_ADMINISTRATIVE(1,"非行政"), + NON_ADMINISTRATIVE(1L,"非行政"), - IS_COMPLAINT(1,"已投诉"), + IS_COMPLAINT(1L,"已投诉"), - JPG(0,"JPG"); + JPG(0L,"JPG"); - private Integer key; + private Long key; private String value; - AppEnterpriseComplaintEnums(Integer key, String value) { + AppEnterpriseComplaintEnums(Long key, String value) { this.value = value; this.key = key; } @@ -24,7 +24,7 @@ public enum AppEnterpriseComplaintEnums { return value; } - public Integer getKey() { + public Long getKey() { return key; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java index 08d3f3ad..af8c5388 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java @@ -1,7 +1,7 @@ package com.zdxt.enforcementcode.domain.dto.enterprise; import com.baomidou.mybatisplus.annotation.TableField; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppEnterpriseComplaint; +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.Date; import java.util.List; @Data -@AutoMapper(target = AppEnterpriseComplaint.class) +@AutoMapper(target = EnterpriseComplaint.class) public class AppEnterpriseComplatintInsertDTO { /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java index ec3da830..72b117c7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java @@ -1,7 +1,7 @@ package com.zdxt.enforcementcode.domain.dto.enterprise; import com.baomidou.mybatisplus.annotation.TableField; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppEnterpriseComplaint; +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -14,7 +14,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = AppEnterpriseComplaint.class) +@AutoMapper(target = EnterpriseComplaint.class) public class AppEnterpriseComplatintQueryDTO extends BaseEntity { /** * 主键ID diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/AppEnterpriseComplaintVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/AppEnterpriseComplaintVo.java index 75ce6831..e2bcdb08 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/AppEnterpriseComplaintVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/AppEnterpriseComplaintVo.java @@ -13,7 +13,7 @@ import java.util.Date; import java.util.List; @Data -@AutoMapper(target = com.zdxt.enforcementcode.domain.entity.enterprise.AppEnterpriseComplaint.class) +@AutoMapper(target = com.zdxt.enforcementcode.domain.EnterpriseComplaint.class) public class AppEnterpriseComplaintVo implements Serializable { @Serial diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java index e997cfe5..93c24cc2 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java @@ -3,7 +3,7 @@ package com.zdxt.enforcementcode.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.EnforcementRegistration; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.apache.ibatis.annotations.Param; @@ -24,6 +24,6 @@ public interface EnforcementRegistrationMapper extends BaseMapperPlus selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); + IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") AppEnforcementRegistrationQueryDTO dto); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnterpriseComplaintMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnterpriseComplaintMapper.java index a3c126ba..bd682e37 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnterpriseComplaintMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnterpriseComplaintMapper.java @@ -1,8 +1,8 @@ package com.zdxt.enforcementcode.mapper.enterprise; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppEnterpriseComplaint; +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -public interface AppEnterpriseComplaintMapper extends BaseMapperPlus { +public interface AppEnterpriseComplaintMapper extends BaseMapperPlus { } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppNonEnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppNonEnforcementRegistrationMapper.java index 64708f64..61ea31ec 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppNonEnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppNonEnforcementRegistrationMapper.java @@ -1,11 +1,11 @@ package com.zdxt.enforcementcode.mapper.enterprise; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppNonEnforcementRegistration; +import com.zdxt.enforcementcode.domain.NonEnforcementRegistration; import com.zdxt.enforcementcode.domain.vo.enterprise.AppNonEnforcementRegistrationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 企业端-非执法记录Mapper接口 */ -public interface AppNonEnforcementRegistrationMapper extends BaseMapperPlus { +public interface AppNonEnforcementRegistrationMapper extends BaseMapperPlus { } 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 eff0fc22..e101c269 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 @@ -1,6 +1,6 @@ package com.zdxt.enforcementcode.service; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; @@ -84,5 +84,5 @@ public interface IEnforcementRegistrationService { * @param pageQuery * @return */ - TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery); + TableDataInfo queryEnforcementRegistrationPageList(AppEnforcementRegistrationQueryDTO dto, PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java index 49a8dca2..2b6cd898 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java @@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.EnforcementRegistration; +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; +import com.zdxt.enforcementcode.domain.NonEnforcementRegistration; import com.zdxt.enforcementcode.domain.ZdxtFile; import com.zdxt.enforcementcode.domain.bo.EnterpriseComplaintBo; import com.zdxt.enforcementcode.domain.commonenum.AppEnterpriseComplaintEnums; import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintInsertDTO; import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintQueryDTO; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppEnforcementRegistration; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppEnterpriseComplaint; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppNonEnforcementRegistration; import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; import com.zdxt.enforcementcode.mapper.ZdxtFileMapper; @@ -32,8 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; /** * 企业执法-在线投诉Service业务层处理 @@ -82,8 +80,8 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain */ @Override public TableDataInfo queryPageList(AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(dto.getRelId()), AppEnterpriseComplaint::getRelId, dto.getRelId()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(dto.getRelId()), EnterpriseComplaint::getRelId, dto.getRelId()); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -100,20 +98,20 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain dto.setCreateTime(DateUtils.getNowDate()); dto.setId(IdUtil.simpleUUID()); - AppEnterpriseComplaint add = MapstructUtils.convert(dto, AppEnterpriseComplaint.class); + EnterpriseComplaint add = MapstructUtils.convert(dto, EnterpriseComplaint.class); // 保存投诉信息 boolean flag = baseMapper.insert(add) > 0; if (flag) { //更新记录表状态 0：行政 1非行政 if(AppEnterpriseComplaintEnums.ADMINISTRATION.getKey().equals(dto.getRecordType())){ - AppEnforcementRegistration param =new AppEnforcementRegistration(); + EnforcementRegistration param =new EnforcementRegistration(); param.setId(dto.getRelId()); param.setIsComplaint(AppEnterpriseComplaintEnums.IS_COMPLAINT.getKey()); // 更新执法登记记录 enforcementRegistrationMapper.updateById(param); }else{ - AppNonEnforcementRegistration param =new AppNonEnforcementRegistration(); + NonEnforcementRegistration param =new NonEnforcementRegistration(); param.setId(dto.getRelId()); param.setHasComplaint(AppEnterpriseComplaintEnums.IS_COMPLAINT.getKey()); // 更新非执法登记记录 @@ -148,7 +146,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain */ @Override public Boolean updateByBo(EnterpriseComplaintBo bo) { - AppEnterpriseComplaint update = MapstructUtils.convert(bo, AppEnterpriseComplaint.class); + EnterpriseComplaint update = MapstructUtils.convert(bo, EnterpriseComplaint.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -156,7 +154,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain /** * 保存前的数据校验 */ - private void validEntityBeforeSave(AppEnterpriseComplaint entity){ + private void validEntityBeforeSave(EnterpriseComplaint entity){ //TODO 做一些数据校验,如唯一约束 } @@ -185,36 +183,36 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain @Override public TableDataInfo getAllCheckList(AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery) { // 构建查询条件 - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); // 根据 relId 过滤 - lqw.eq(StringUtils.isNotBlank(dto.getRelId()), AppEnterpriseComplaint::getRelId, dto.getRelId()); + lqw.eq(StringUtils.isNotBlank(dto.getRelId()), EnterpriseComplaint::getRelId, dto.getRelId()); // 根据搜索值模糊查询（问题描述、联系人、企业名称等） if (StringUtils.isNotBlank(dto.getSearchValue())) { lqw.and(wrapper -> wrapper - .like(AppEnterpriseComplaint::getProblemDescription, dto.getSearchValue()) + .like(EnterpriseComplaint::getProblemDescription, dto.getSearchValue()) .or() - .like(AppEnterpriseComplaint::getLinkman, dto.getSearchValue()) + .like(EnterpriseComplaint::getLinkman, dto.getSearchValue()) .or() - .like(AppEnterpriseComplaint::getEnterpriseName, dto.getSearchValue()) + .like(EnterpriseComplaint::getEnterpriseName, dto.getSearchValue()) ); } // 根据执法类型过滤 - lqw.eq(dto.getEnforceType() != null, AppEnterpriseComplaint::getEnforceType, dto.getEnforceType()); + lqw.eq(dto.getEnforceType() != null, EnterpriseComplaint::getEnforceType, dto.getEnforceType()); // 根据投诉类型过滤 - lqw.eq(dto.getComplaintType() != null, AppEnterpriseComplaint::getComplaintType, dto.getComplaintType()); + lqw.eq(dto.getComplaintType() != null, EnterpriseComplaint::getComplaintType, dto.getComplaintType()); // 根据数据类型过滤（0行政 1非行政） - lqw.eq(dto.getRecordType() != null, AppEnterpriseComplaint::getRecordType, dto.getRecordType()); + lqw.eq(dto.getRecordType() != null, EnterpriseComplaint::getRecordType, dto.getRecordType()); // 根据状态过滤 - lqw.eq(dto.getStatus() != null, AppEnterpriseComplaint::getStatus, dto.getStatus()); + lqw.eq(dto.getStatus() != null, EnterpriseComplaint::getStatus, dto.getStatus()); // 按创建时间降序排列 - lqw.orderByDesc(AppEnterpriseComplaint::getCreateTime); + lqw.orderByDesc(EnterpriseComplaint::getCreateTime); // 执行分页查询 Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); 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 b0f54d80..3ff22657 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 @@ -3,7 +3,7 @@ package com.zdxt.enforcementcode.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -370,7 +370,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } @Override - public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { + public TableDataInfo queryEnforcementRegistrationPageList(AppEnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { Page page = pageQuery.build(); IPage result = baseMapper.selectEnforcementRegistrationPage(page, dto); return TableDataInfo.build(result);