diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java new file mode 100644 index 00000000..c05ca288 --- /dev/null +++ b/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 list(DashboardEnterpriseCheckListBo bo, PageQuery pageQuery) { + return dashboardEnterpriseCheckService.queryEnterpriseCheckPageList(bo, pageQuery); + } + + /** + * 重点企业-导出Excel + */ + @PostMapping("/export") + public void export(DashboardEnterpriseCheckListBo bo, HttpServletResponse response) { + try { + List 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); + } + } + } + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardEnterpriseCheck.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardEnterpriseCheck.java index 70fc81af..0e3e262f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardEnterpriseCheck.java +++ b/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; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardEnterpriseCheckBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardEnterpriseCheckBo.java index 3e97c822..cf5ecaea 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardEnterpriseCheckBo.java +++ b/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-是 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/dashboard/DashboardEnterpriseCheckListBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/dashboard/DashboardEnterpriseCheckListBo.java new file mode 100644 index 00000000..f8bfc7bb --- /dev/null +++ b/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; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardEnterpriseCheckVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardEnterpriseCheckVo.java index 81802120..cc5f9b4b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardEnterpriseCheckVo.java +++ b/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-是 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/report/DashboardEnterpriseCheckListVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/report/DashboardEnterpriseCheckListVo.java new file mode 100644 index 00000000..a6661c2c --- /dev/null +++ b/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; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java index d284533d..9e9804af 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java +++ b/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 queryCheckRegisterAreaList(Long year, Long month, String cityCode); + Page selectAreaStatPageList(@Param("page") Page page, + @Param("bo") CheckRegistrationAreaStatBo bo); + + List selectAreaStatList(@Param("bo") CheckRegistrationAreaStatBo bo); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java index 6e75cff2..c25ee781 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java +++ b/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 queryHighWarnDomainByYear(Integer startYear, Integer startMonth, Integer endYear, Integer endMonth, String lyid, Page page); + Page selectDomainStatPageList(@Param("page") Page page, + @Param("bo") CheckRegistrationDomainStatBo bo); + + List selectDomainStatList(@Param("bo") CheckRegistrationDomainStatBo bo); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java index 0d0f98c2..16329cac 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java +++ b/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 selectEnterpriseCheckPageList(@Param("page") Page page, + @Param("bo") DashboardEnterpriseCheckListBo bo); + + List selectEnterpriseCheckList(@Param("bo") DashboardEnterpriseCheckListBo bo); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java index ed0e3efe..ef39c2f4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java +++ b/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 queryRecentSixMonths(String enterpriseNumber, Long statYear, Long statMonth); + TableDataInfo queryEnterpriseCheckPageList(DashboardEnterpriseCheckListBo bo, PageQuery pageQuery); + + /** + * 查询重点企业监测检查列表(导出用,不分页) + * + * @param bo 查询条件 + * @return 重点企业监测检查列表 + */ + List queryEnterpriseCheckList(DashboardEnterpriseCheckListBo bo); + /** * 新增大屏重点企业监测检查(按月统计) * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java index 6173db50..98138e97 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java +++ b/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 queryEnterpriseCheckPageList(DashboardEnterpriseCheckListBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectEnterpriseCheckPageList(pageQuery.build(), bo); + return TableDataInfo.build(result); + } + + @Override + public List queryEnterpriseCheckList(DashboardEnterpriseCheckListBo bo) { + return baseMapper.selectEnterpriseCheckList(bo); + } + private LambdaQueryWrapper buildQueryWrapper(DashboardEnterpriseCheckBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml index ebcc480a..12c1c6af 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml @@ -88,4 +88,36 @@ ORDER BY area_name + + + + 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 + + AND a.area_name LIKE CONCAT('%', #{bo.district}, '%') + + + AND a.year = #{bo.year} + + + AND a.month = #{bo.month} + + ORDER BY a.area_name + + + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml index f29d0b18..65bb4a9b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml @@ -168,4 +168,35 @@ GROUP BY lyid, lymc + + + + 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' + + AND d.lymc LIKE CONCAT('%', #{bo.domainName}, '%') + + + AND d.year = #{bo.year} + + + AND d.month = #{bo.month} + + ORDER BY d.lymc + + + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml index 7c7e829b..f5d4b74e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml @@ -18,4 +18,58 @@ a.stat_month desc + + + +