Merge remote-tracking branch 'origin/dev-V1.0.8' into dev-V1.0.8

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java

@@ -0,0 +1,62 @@
+package com.zdxt.enforcementcode.controller.web.supervision.report;
+
+import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo;
+import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo;
+import com.zdxt.enforcementcode.service.IDashboardEnterpriseCheckService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 重点企业检测分析
+ *
+ * @author zdxt
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/web/supervision/report/keyEnterprises")
+public class KeyEnterprisesController {
+
+    private final IDashboardEnterpriseCheckService dashboardEnterpriseCheckService;
+
+    /**
+     * 重点企业-分页列表查询
+     */
+    @GetMapping("/list")
+    public TableDataInfo<DashboardEnterpriseCheckListVo> list(DashboardEnterpriseCheckListBo bo, PageQuery pageQuery) {
+        return dashboardEnterpriseCheckService.queryEnterpriseCheckPageList(bo, pageQuery);
+    }
+
+    /**
+     * 重点企业-导出Excel
+     */
+    @PostMapping("/export")
+    public void export(DashboardEnterpriseCheckListBo bo, HttpServletResponse response) {
+        try {
+            List<DashboardEnterpriseCheckListVo> list = dashboardEnterpriseCheckService.queryEnterpriseCheckList(bo);
+            ExcelUtil.exportExcel(list, "重点企业", DashboardEnterpriseCheckListVo.class, response);
+        } catch (Exception e) {
+            log.error("导出重点企业Excel异常", e);
+            response.reset();
+            response.setContentType("application/json; charset=utf-8");
+            try {
+                response.getWriter().write("{\"code\":500,\"msg\":\"导出失败: " + e.getMessage() + "\"}");
+            } catch (Exception ignored) {
+                log.error("响应重置异常", ignored);
+            }
+        }
+    }
+
+}

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardEnterpriseCheck.java

@@ -127,5 +127,18 @@ public class DashboardEnterpriseCheck extends BaseEntity {
      */
     private Long xzzfzs;
 
+    /**
+     * 非行政执法总数
+     */
+    private Long noXzzfzs;
 
+    /**
+     * 区
+     */
+    private String district;
+
+    /**
+     * 街道
+     */
+    private String street;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardEnterpriseCheckBo.java

@@ -116,6 +116,21 @@ public class DashboardEnterpriseCheckBo extends BaseEntity {
      */
     private String organId;
 
+    /**
+     * 非行政执法总数
+     */
+    private Long noXzzfzs;
+
+    /**
+     * 区
+     */
+    private String district;
+
+    /**
+     * 街道
+     */
+    private String street;
+
     /**
      * 逻辑删除：0-否 1-是
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/dashboard/DashboardEnterpriseCheckListBo.java

@@ -0,0 +1,37 @@
+package com.zdxt.enforcementcode.domain.bo.dashboard;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大屏重点企业监测检查列表查询参数
+ */
+@Data
+public class DashboardEnterpriseCheckListBo implements Serializable {
+
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 所属区
+     */
+    private String districtName;
+
+    /**
+     * 所属街道
+     */
+    private String streetName;
+
+    /**
+     * 统计年份
+     */
+    private Integer statYear;
+
+    /**
+     * 统计月份
+     */
+    private Integer statMonth;
+}

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardEnterpriseCheckVo.java

@@ -136,6 +136,24 @@ public class DashboardEnterpriseCheckVo implements Serializable {
     @ExcelProperty(value = "组织单位ID")
     private String organId;
 
+    /**
+     * 非行政执法总数
+     */
+    @ExcelProperty(value = "非行政执法总数")
+    private Long noXzzfzs;
+
+    /**
+     * 区
+     */
+    @ExcelProperty(value = "区")
+    private String district;
+
+    /**
+     * 街道
+     */
+    @ExcelProperty(value = "街道")
+    private String street;
+
     /**
      * 逻辑删除：0-否 1-是
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/report/DashboardEnterpriseCheckListVo.java

@@ -0,0 +1,48 @@
+package com.zdxt.enforcementcode.domain.vo.report;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 大屏重点企业监测检查列表视图对象
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class DashboardEnterpriseCheckListVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 企业名称
+     */
+    @ExcelProperty(value = "企业名称")
+    private String enterpriseName;
+
+    /**
+     * 所属区
+     */
+    @ExcelProperty(value = "所属区")
+    private String districtName;
+
+    /**
+     * 所属街道
+     */
+    @ExcelProperty(value = "所属街道")
+    private String streetName;
+
+    /**
+     * 行政执法总数
+     */
+    @ExcelProperty(value = "行政执法总数")
+    private Long xzzfzs;
+}

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java

@@ -2,9 +2,15 @@ package com.zdxt.enforcementcode.mapper;
 
 
 import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea;
+import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationAreaStatBo;
 import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaVo;
+import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 大屏-检查登记-区域统计Mapper接口
  *
@@ -33,4 +39,9 @@ public interface DashboardCheckRegisterAreaMapper extends BaseMapperPlus<Dashboa
      */
     java.util.List<DashboardCheckRegisterAreaVo> queryCheckRegisterAreaList(Long year, Long month, String cityCode);
 
+    Page<CheckRegistrationAreaStatVo> selectAreaStatPageList(@Param("page") Page<CheckRegistrationAreaStatVo> page,
+                                                              @Param("bo") CheckRegistrationAreaStatBo bo);
+
+    List<CheckRegistrationAreaStatVo> selectAreaStatList(@Param("bo") CheckRegistrationAreaStatBo bo);
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java

@@ -2,10 +2,12 @@ package com.zdxt.enforcementcode.mapper;
 
 
 import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterDomain;
+import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationDomainStatBo;
 import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 import java.util.List;
 
@@ -63,4 +65,9 @@ public interface DashboardCheckRegisterDomainMapper extends BaseMapperPlus<Dashb
      */
     List<DashboardCheckRegisterDomainVo> queryHighWarnDomainByYear(Integer startYear, Integer startMonth, Integer endYear, Integer endMonth, String lyid, Page<DashboardCheckRegisterDomainVo> page);
 
+    Page<CheckRegistrationDomainStatVo> selectDomainStatPageList(@Param("page") Page<CheckRegistrationDomainStatVo> page,
+                                                                  @Param("bo") CheckRegistrationDomainStatBo bo);
+
+    List<CheckRegistrationDomainStatVo> selectDomainStatList(@Param("bo") CheckRegistrationDomainStatBo bo);
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java

@@ -2,7 +2,10 @@ package com.zdxt.enforcementcode.mapper;
 
 
 import com.zdxt.enforcementcode.domain.bean.DashboardEnterpriseCheck;
+import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo;
 import com.zdxt.enforcementcode.domain.vo.DashboardEnterpriseCheckVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
@@ -32,4 +35,9 @@ public interface DashboardEnterpriseCheckMapper extends BaseMapperPlus<Dashboard
                                                            @Param("endYear") long endYear,
                                                            @Param("endMonth") long endMonth);
 
+    Page<DashboardEnterpriseCheckListVo> selectEnterpriseCheckPageList(@Param("page") Page<DashboardEnterpriseCheckListVo> page,
+                                                                       @Param("bo") DashboardEnterpriseCheckListBo bo);
+
+    List<DashboardEnterpriseCheckListVo> selectEnterpriseCheckList(@Param("bo") DashboardEnterpriseCheckListBo bo);
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java

@@ -1,7 +1,9 @@
 package com.zdxt.enforcementcode.service;
 
 import com.zdxt.enforcementcode.domain.bo.DashboardEnterpriseCheckBo;
+import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo;
 import com.zdxt.enforcementcode.domain.vo.DashboardEnterpriseCheckVo;
+import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
@@ -51,6 +53,16 @@ public interface IDashboardEnterpriseCheckService {
      */
     List<DashboardEnterpriseCheckVo> queryRecentSixMonths(String enterpriseNumber, Long statYear, Long statMonth);
 
+    TableDataInfo<DashboardEnterpriseCheckListVo> queryEnterpriseCheckPageList(DashboardEnterpriseCheckListBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询重点企业监测检查列表（导出用，不分页）
+     *
+     * @param bo 查询条件
+     * @return 重点企业监测检查列表
+     */
+    List<DashboardEnterpriseCheckListVo> queryEnterpriseCheckList(DashboardEnterpriseCheckListBo bo);
+
     /**
      * 新增大屏重点企业监测检查（按月统计）
      *

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java

@@ -2,6 +2,8 @@ package com.zdxt.enforcementcode.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zdxt.enforcementcode.domain.bean.DashboardEnterpriseCheck;
+import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo;
+import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -103,6 +105,17 @@ public class DashboardEnterpriseCheckServiceImpl implements IDashboardEnterprise
             (long) end.getYear(), (long) end.getMonthValue());
     }
 
+    @Override
+    public TableDataInfo<DashboardEnterpriseCheckListVo> queryEnterpriseCheckPageList(DashboardEnterpriseCheckListBo bo, PageQuery pageQuery) {
+        Page<DashboardEnterpriseCheckListVo> result = baseMapper.selectEnterpriseCheckPageList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    @Override
+    public List<DashboardEnterpriseCheckListVo> queryEnterpriseCheckList(DashboardEnterpriseCheckListBo bo) {
+        return baseMapper.selectEnterpriseCheckList(bo);
+    }
+
     private LambdaQueryWrapper<DashboardEnterpriseCheck> buildQueryWrapper(DashboardEnterpriseCheckBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<DashboardEnterpriseCheck> lqw = Wrappers.lambdaQuery();
@@ -124,6 +137,9 @@ public class DashboardEnterpriseCheckServiceImpl implements IDashboardEnterprise
         lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), DashboardEnterpriseCheck::getBureauDeptId, bo.getBureauDeptId());
         lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), DashboardEnterpriseCheck::getDeptId, bo.getDeptId());
         lqw.eq(StringUtils.isNotBlank(bo.getOrganId()), DashboardEnterpriseCheck::getOrganId, bo.getOrganId());
+        lqw.eq(bo.getNoXzzfzs() != null, DashboardEnterpriseCheck::getNoXzzfzs, bo.getNoXzzfzs());
+        lqw.like(StringUtils.isNotBlank(bo.getDistrict()), DashboardEnterpriseCheck::getDistrict, bo.getDistrict());
+        lqw.like(StringUtils.isNotBlank(bo.getStreet()), DashboardEnterpriseCheck::getStreet, bo.getStreet());
         lqw.eq(StringUtils.isNotBlank(bo.getIsDelete()), DashboardEnterpriseCheck::getIsDelete, bo.getIsDelete());
         return lqw;
     }

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml

@@ -88,4 +88,36 @@
         ORDER BY area_name
     </select>
 
+    <!-- ======================== 检查登记-按区域统计（报表） ======================== -->
+
+    <sql id="selectAreaStatSql">
+        SELECT
+            a.area_name AS district,
+            a.xzzfs,
+            a.xzjczs,
+            a.xzcfzs,
+            a.xzzqzs
+        FROM dashboard_check_register_area a
+        WHERE IFNULL(a.is_delete, '0') = '0'
+          AND a.level = 2
+        <if test="bo.district != null and bo.district != ''">
+            AND a.area_name LIKE CONCAT('%', #{bo.district}, '%')
+        </if>
+        <if test="bo.year != null">
+            AND a.year = #{bo.year}
+        </if>
+        <if test="bo.month != null">
+            AND a.month = #{bo.month}
+        </if>
+        ORDER BY a.area_name
+    </sql>
+
+    <select id="selectAreaStatPageList" resultType="com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo">
+        <include refid="selectAreaStatSql"/>
+    </select>
+
+    <select id="selectAreaStatList" resultType="com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo">
+        <include refid="selectAreaStatSql"/>
+    </select>
+
 </mapper>

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml

@@ -168,4 +168,35 @@
         GROUP BY lyid, lymc
     </select>
 
+    <!-- ======================== 检查登记-按领域统计（报表） ======================== -->
+
+    <sql id="selectDomainStatSql">
+        SELECT
+            d.lymc AS domainName,
+            d.xzzfs,
+            d.xzjczs,
+            d.xzcfzs,
+            d.xzqzzs
+        FROM dashboard_check_register_domain d
+        WHERE IFNULL(d.is_delete, '0') = '0'
+        <if test="bo.domainName != null and bo.domainName != ''">
+            AND d.lymc LIKE CONCAT('%', #{bo.domainName}, '%')
+        </if>
+        <if test="bo.year != null">
+            AND d.year = #{bo.year}
+        </if>
+        <if test="bo.month != null">
+            AND d.month = #{bo.month}
+        </if>
+        ORDER BY d.lymc
+    </sql>
+
+    <select id="selectDomainStatPageList" resultType="com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo">
+        <include refid="selectDomainStatSql"/>
+    </select>
+
+    <select id="selectDomainStatList" resultType="com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo">
+        <include refid="selectDomainStatSql"/>
+    </select>
+
 </mapper>

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml

@@ -18,4 +18,58 @@
             a.stat_month desc
     </select>
 
+    <select id="selectEnterpriseCheckPageList" resultType="com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo">
+        SELECT
+            dec.enterprise_id,
+            dec.enterprise_name,
+            dec.district AS districtName,
+            dec.street AS streetName,
+            dec.xzzfzs
+        FROM dashboard_enterprise_check dec
+        WHERE IFNULL(dec.is_delete, '0') = '0'
+        <if test="bo.enterpriseName != null and bo.enterpriseName != ''">
+            AND dec.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')
+        </if>
+        <if test="bo.districtName != null and bo.districtName != ''">
+            AND dec.district = #{bo.districtName}
+        </if>
+        <if test="bo.streetName != null and bo.streetName != ''">
+            AND dec.street = #{bo.streetName}
+        </if>
+        <if test="bo.statYear != null">
+            AND dec.stat_year = #{bo.statYear}
+        </if>
+        <if test="bo.statMonth != null">
+            AND dec.stat_month = #{bo.statMonth}
+        </if>
+        ORDER BY dec.xzzfzs desc
+    </select>
+
+    <select id="selectEnterpriseCheckList" resultType="com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo">
+        SELECT
+            dec.enterprise_id,
+            dec.enterprise_name,
+            dec.district AS districtName,
+            dec.street AS streetName,
+            dec.xzzfzs
+        FROM dashboard_enterprise_check dec
+        WHERE IFNULL(dec.is_delete, '0') = '0'
+        <if test="bo.enterpriseName != null and bo.enterpriseName != ''">
+            AND dec.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')
+        </if>
+        <if test="bo.districtName != null and bo.districtName != ''">
+            AND dec.district = #{bo.districtName}
+        </if>
+        <if test="bo.streetName != null and bo.streetName != ''">
+            AND dec.street = #{bo.streetName}
+        </if>
+        <if test="bo.statYear != null">
+            AND dec.stat_year = #{bo.statYear}
+        </if>
+        <if test="bo.statMonth != null">
+            AND dec.stat_month = #{bo.statMonth}
+        </if>
+        ORDER BY dec.xzzfzs desc
+    </select>
+
 </mapper>