新增企业端历史执法信息列表查询接口

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<EnforcementRegistrationListVo> list(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) {
+        return enforcementRegistrationService.queryEnforcementRegistrationPageList(dto, pageQuery);
+    }
+
 }

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 "";
+    }
+}

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/EnforcementRegistrationQueryDTO.java → 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;
 
 /**
  * 企业端-查询企业执法登记列表

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationListVo.java → 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;
 
 
 /**

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<EnforcementRegistration, EnforcementRegistrationVo> {
 
+    /**
+     * 分页查询执法登记列表
+     *
+     * @param page 分页参数
+     * @param dto 查询条件
+     * @return 执法登记列表
+     */
+    IPage<EnforcementRegistrationListVo> selectEnforcementRegistrationPage(@Param("page") Page<EnforcementRegistrationListVo> page, @Param("dto") EnforcementRegistrationQueryDTO dto);
+
 }

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<String> ids, Boolean isValid);
+
+
+    /**
+     *  企业端-执法登记列表（历史执法信息）
+     * @param dto
+     * @param pageQuery
+     * @return
+     */
+    TableDataInfo<EnforcementRegistrationListVo> queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery);
 }

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<EnforcementRegistrationListVo> queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) {
+        Page<EnforcementRegistrationListVo> page = pageQuery.build();
+        IPage<EnforcementRegistrationListVo> result = baseMapper.selectEnforcementRegistrationPage(page, dto);
+        return TableDataInfo.build(result);
+    }
 }

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">
 <mapper namespace="com.zdxt.enforcementcode.mapper.EnforcementRegistrationMapper">
+
+    <select id="selectEnforcementRegistrationPage" resultType="com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo">
+        SELECT
+            id,
+            law_enforcement,
+            law_enforcement_id,
+            enterprise_id,
+            enterprise_name,
+            enterprise_number,
+            enforcement_time,
+            law_enforcer,
+            law_enforcer_id,
+            law_enforcer_tel,
+            law_enforcer_two,
+            law_enforcer_id_two,
+            law_enforcer_tel_two,
+            subsidiaryer,
+            subsidiaryer_id,
+            subsidiaryer_tel,
+            law_enforcement_item,
+            law_enforcement_basis
+        FROM enforcement_registration
+        <where>
+
+            <!-- 执法部门过滤 -->
+            <if test="dto.lawEnforcement != null and dto.lawEnforcement != ''">
+                AND law_enforcement = #{dto.lawEnforcement}
+            </if>
+            <!-- 执法事项过滤 -->
+            <if test="dto.lawEnforcementItem != null and dto.lawEnforcementItem != ''">
+                AND law_enforcement_item LIKE CONCAT('%', #{dto.lawEnforcementItem}, '%')
+            </if>
+            <!-- 是否真联合执法过滤 -->
+            <if test="dto.isRealUnion != null">
+                AND is_real_union = #{dto.isRealUnion}
+            </if>
+            <!-- 日期类型筛选 -->
+            <if test="dto.dateType != null">
+                <choose>
+                    <when test="dto.dateType == 1">
+                        <!-- 本月 -->
+                        AND enforcement_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+                    </when>
+                    <when test="dto.dateType == 2">
+                        <!-- 本季 -->
+                        AND enforcement_time &gt;= DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL (QUARTER(CURDATE()) - 1) * 3 MONTH), '%Y-%m-01')
+                    </when>
+                    <when test="dto.dateType == 3">
+                        <!-- 本年 -->
+                        AND enforcement_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+                    </when>
+                </choose>
+            </if>
+            <!-- 指定月份筛选 -->
+            <if test="dto.dateSearch != null and dto.dateSearch != ''">
+                AND DATE_FORMAT(enforcement_time, '%Y-%m') = #{dto.dateSearch}
+            </if>
+            AND is_delete = 0
+        </where>
+        ORDER BY id DESC
+    </select>
+
 </mapper>