diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java index bd4d898a..48a0aef1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java @@ -1,7 +1,9 @@ package com.zdxt.enforcementcode.controller.app.enterprise; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import com.zdxt.enforcementcode.service.IEnforcementRegistrationService; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; @@ -43,4 +45,12 @@ public class AppEntEnforcementRegistrationController extends BaseController { return enforcementRegistrationService.queryEnterprisePageList(bo, pageQuery); } + /** + * 企业端-执法登记列表(历史执法信息) + */ + @GetMapping("/queryEnforcementRegistrationPageList") + public TableDataInfo list(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { + return enforcementRegistrationService.queryEnforcementRegistrationPageList(dto, pageQuery); + } + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/DeleteStatusEnum.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/DeleteStatusEnum.java new file mode 100755 index 00000000..19e2a114 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/commonenum/DeleteStatusEnum.java @@ -0,0 +1,53 @@ +package com.zdxt.enforcementcode.domain.commonenum; + +/** + * 更新状态类型枚举定义 + * @author liaoz + */ +public enum DeleteStatusEnum { + + /** + * 已删除 + */ + DELETED(0, "未删除"), + + /** + * 未删除 + */ + UNDELETED(1, "已删除"); + + private Integer key; + private String value; + + DeleteStatusEnum(Integer key, String value) { + this.value = value; + this.key = key; + } + + public String getValue() { + return value; + } + + public Integer getKey() { + return key; + } + + + /** + * 根据value获取description + * @description + * + * @createDate 2017年11月28日 + * @param key + * @return + */ + public static String getValueByKey(String key) { + DeleteStatusEnum[] enums = DeleteStatusEnum.values(); + for (int i = 0; i < enums.length; i++) { + if (enums[i].getKey().equals(key)) { + return enums[i].getValue(); + } + } + return ""; + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/EnforcementRegistrationQueryDTO.java similarity index 66% rename from ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java rename to zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/EnforcementRegistrationQueryDTO.java index 24ae9a7e..738ec560 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/EnforcementRegistrationQueryDTO.java @@ -1,14 +1,9 @@ -package com.zdxt.enforcementcode.domain.dto; +package com.zdxt.enforcementcode.domain.dto.enterprise; + -import cn.idev.excel.annotation.ExcelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import java.util.Date; /** * 企业端-查询企业执法登记列表 diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java similarity index 88% rename from ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java rename to zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java index 11a595ca..6c7bd82e 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java @@ -1,17 +1,12 @@ -package com.zdxt.enforcementcode.domain.vo; +package com.zdxt.enforcementcode.domain.vo.enterprise; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import cn.idev.excel.annotation.ExcelProperty; import com.zdxt.enforcementcode.domain.EnforcementRegistration; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import java.io.Serial; import java.io.Serializable; import java.util.Date; -import java.util.List; /** 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 fc3f54d9..e997cfe5 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 @@ -1,7 +1,12 @@ 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.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** @@ -12,4 +17,13 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface EnforcementRegistrationMapper extends BaseMapperPlus { + /** + * 分页查询执法登记列表 + * + * @param page 分页参数 + * @param dto 查询条件 + * @return 执法登记列表 + */ + IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); + } 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 f6898362..eff0fc22 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,7 +1,9 @@ package com.zdxt.enforcementcode.service; +import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -74,4 +76,13 @@ public interface IEnforcementRegistrationService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + /** + * 企业端-执法登记列表(历史执法信息) + * @param dto + * @param pageQuery + * @return + */ + TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery); } 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 db261f75..b0f54d80 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 @@ -2,6 +2,9 @@ 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.vo.enterprise.EnforcementRegistrationListVo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -365,4 +368,11 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { + Page page = pageQuery.build(); + IPage result = baseMapper.selectEnforcementRegistrationPage(page, dto); + return TableDataInfo.build(result); + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index 490074b7..4fa23a03 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -3,4 +3,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + +