Browse Source

监督端-趋势行为,态势趋势报表

dev-V1.10.0
niujiyi 3 weeks ago
parent
commit
c37f98fa28
  1. 95
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/SituationController.java
  2. 32
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/TrendBehaviorController.java
  3. 4
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatDomainBo.java
  4. 4
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java
  5. 4
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java
  6. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendAreaMapper.java
  7. 5
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendDomainMapper.java
  8. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatAreaMapper.java
  9. 9
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatDomainMapper.java
  10. 9
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ITrendBehaviorService.java
  11. 19
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/TrendBehaviorServiceImpl.java
  12. 1
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendAreaService.java
  13. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendDomainService.java
  14. 7
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendAreaServiceImpl.java
  15. 7
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendDomainServiceImpl.java
  16. 20
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml
  17. 26
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml
  18. 26
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml
  19. 7
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatAreaMapper.xml
  20. 56
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatDomainMapper.xml

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

@ -0,0 +1,95 @@
package com.zdxt.enforcementcode.controller.web.supervision.report;
import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo;
import com.zdxt.enforcementcode.service.IDashboardSituationTrendAreaService;
import com.zdxt.enforcementcode.service.IDashboardSituationTrendDomainService;
import jakarta.servlet.http.HttpServletResponse;
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 java.util.List;
/**
* 态势趋势监测分析
*/
@SaIgnore
@Slf4j
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/web/supervision/report/situationTrend")
public class SituationController {
private final IDashboardSituationTrendAreaService situationTrendAreaService;
private final IDashboardSituationTrendDomainService situationTrendDomainService;
@GetMapping("/situationTrendAreaList")
public TableDataInfo<DashboardSituationAreaVo> querySituationTrendAreaPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) {
return situationTrendAreaService.selectSituationTrendAreaPageList( bo,pageQuery);
}
/**
* 重点企业-导出Excel
*/
@PostMapping("/exportSituationTrendArea")
public void export(DashboardTrendStatQueryBo bo, HttpServletResponse response) {
try {
List<DashboardSituationAreaVo> list = situationTrendAreaService.querySituationTrendAreaList(bo);
ExcelUtil.exportExcel(list, "重点企业", DashboardSituationAreaVo.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);
}
}
}
/**
* 领域
*/
@GetMapping("/situationTrendDomainList")
public TableDataInfo<DashboardSituationDomainVo> selectSituationTrendDomainPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) {
return situationTrendDomainService.selectSituationTrendDomainPageList(bo, pageQuery);
}
/**
* 重点企业-导出Excel
*/
@PostMapping("/exportSituationTrendDomain")
public void exportDomain(DashboardTrendStatQueryBo bo, HttpServletResponse response) {
try {
List<DashboardSituationDomainVo> list = situationTrendDomainService.querySituationTrendDomainList(bo);
ExcelUtil.exportExcel(list, "重点企业", DashboardSituationDomainVo.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);
}
}
}
}

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

@ -4,9 +4,11 @@ package com.zdxt.enforcementcode.controller.web.supervision.report;
import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo;
import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo;
import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo;
import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo;
import com.zdxt.enforcementcode.report.ITrendBehaviorService;
import jakarta.servlet.http.HttpServletResponse;
@ -48,7 +50,7 @@ public class TrendBehaviorController {
@PostMapping("/exportTrendBehaviorArea")
public void export(DashboardTrendStatAreaBo bo, HttpServletResponse response) {
try {
List<DashboardTrendStatAreaVo> list = trendBehaviorService.selectTrendBehaviorAreaAreaList(bo);
List<DashboardTrendStatAreaVo> list = trendBehaviorService.selectTrendBehaviorAreaList(bo);
ExcelUtil.exportExcel(list, "重点企业", DashboardTrendStatAreaVo.class, response);
} catch (Exception e) {
log.error("导出重点企业Excel异常", e);
@ -61,4 +63,32 @@ public class TrendBehaviorController {
}
}
}
/**
* 领域
*/
@GetMapping("/trendBehaviorDomainList")
public TableDataInfo<DashboardTrendStatDomainVo> queryTrendBehaviorDomainPageList(DashboardTrendStatDomainBo bo, PageQuery pageQuery) {
return trendBehaviorService.selectTrendBehaviorDomainPageList(bo, pageQuery);
}
/**
* 重点企业-导出Excel
*/
@PostMapping("/exportTrendBehavioDomain")
public void exportDomain(DashboardTrendStatDomainBo bo, HttpServletResponse response) {
try {
List<DashboardTrendStatDomainVo> list = trendBehaviorService.selectTrendBehaviorDomainList(bo);
ExcelUtil.exportExcel(list, "重点企业", DashboardTrendStatDomainVo.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);
}
}
}
}

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

@ -92,5 +92,9 @@ public class DashboardTrendStatDomainBo extends BaseEntity {
*/
private String organId;
/**
* 查询时间
*/
private String quarterTime;
}

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

@ -187,8 +187,4 @@ public class DashboardTrendStatAreaVo implements Serializable {
*/
private String quarterTime;
/**
* 行政执法次数
*/
private Long xzzfcs;
}

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

@ -113,4 +113,8 @@ public class DashboardTrendStatDomainVo implements Serializable {
private String organId;
/**
* 季度时间
*/
private String quarterTime;
}

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

@ -1,11 +1,14 @@
package com.zdxt.enforcementcode.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zdxt.enforcementcode.domain.bean.DashboardSituationTrendArea;
import com.zdxt.enforcementcode.domain.bo.BashboardSituationQueryBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationPerListVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationTrendAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
@ -23,8 +26,9 @@ public interface DashboardSituationTrendAreaMapper extends BaseMapperPlus<Dashbo
* @param bo 查询参数
* @return 态势趋势分析-区域统计列表
*/
List<DashboardSituationAreaVo> querySituationTrendAreaList(DashboardTrendStatQueryBo bo);
List<DashboardSituationAreaVo> querySituationTrendAreaList(@Param("bo") DashboardTrendStatQueryBo bo);
Page<DashboardSituationAreaVo> selectSituationTrendAreaPageList(@Param("bo") DashboardTrendStatQueryBo bo, @Param("page") Page<DashboardTrendStatAreaVo> page);
/**
* 根据年份和季度,按综合评价分组统计个数
*

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

@ -1,12 +1,14 @@
package com.zdxt.enforcementcode.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zdxt.enforcementcode.domain.bean.DashboardSituationTrendDomain;
import com.zdxt.enforcementcode.domain.bo.BashboardSituationQueryBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationPerListVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationTrendDomainVo;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
@ -25,8 +27,9 @@ public interface DashboardSituationTrendDomainMapper extends BaseMapperPlus<Dash
* @param bo 查询参数
* @return 态势趋势分析-领域统计列表
*/
List<DashboardSituationDomainVo> querySituationTrendDomainList(DashboardTrendStatQueryBo bo);
List<DashboardSituationDomainVo> querySituationTrendDomainList(@Param("bo") DashboardTrendStatQueryBo bo);
Page<DashboardSituationDomainVo> selectSituationTrendDomainPageList(@Param("bo") DashboardTrendStatQueryBo bo,@Param("page") Page<DashboardSituationDomainVo> page);
/**
* 根据年份和季度,按综合评价分组统计个数
*

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

@ -3,7 +3,9 @@ package com.zdxt.enforcementcode.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zdxt.enforcementcode.domain.DashboardTrendStatArea;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -20,5 +22,7 @@ public interface DashboardTrendStatAreaMapper extends BaseMapperPlus<DashboardTr
Page<DashboardTrendStatAreaVo> selectTrendBehaviorAreaPageList(@Param("page") Page<DashboardTrendStatAreaVo> page,
@Param("bo") DashboardTrendStatAreaBo bo);
List<DashboardTrendStatAreaVo> selectTrendBehaviorAreaAreaList(@Param("bo") DashboardTrendStatAreaBo bo);
List<DashboardTrendStatAreaVo> selectTrendBehaviorAreaList(@Param("bo") DashboardTrendStatAreaBo bo);
}

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

@ -1,9 +1,14 @@
package com.zdxt.enforcementcode.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zdxt.enforcementcode.domain.DashboardTrendStatDomain;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 趋势行为分析-领域-统计Mapper接口
*
@ -12,4 +17,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/
public interface DashboardTrendStatDomainMapper extends BaseMapperPlus<DashboardTrendStatDomain, DashboardTrendStatDomainVo> {
Page<DashboardTrendStatDomainVo> selectTrendBehaviorDomainPageList(@Param("page") Page<DashboardTrendStatDomainVo> page,
@Param("bo") DashboardTrendStatDomainBo bo);
List<DashboardTrendStatDomainVo> selectTrendBehaviorDomainList(@Param("bo") DashboardTrendStatDomainBo bo);
}

9
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ITrendBehaviorService.java

@ -1,9 +1,12 @@
package com.zdxt.enforcementcode.report;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo;
import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -14,5 +17,9 @@ public interface ITrendBehaviorService {
TableDataInfo<DashboardTrendStatAreaVo> queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery);
List<DashboardTrendStatAreaVo> selectTrendBehaviorAreaAreaList(DashboardTrendStatAreaBo bo);
List<DashboardTrendStatAreaVo> selectTrendBehaviorAreaList(DashboardTrendStatAreaBo bo);
TableDataInfo<DashboardTrendStatDomainVo> selectTrendBehaviorDomainPageList(DashboardTrendStatDomainBo bo, PageQuery pageQuery);
List<DashboardTrendStatDomainVo> selectTrendBehaviorDomainList(DashboardTrendStatDomainBo bo);
}

19
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/TrendBehaviorServiceImpl.java

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zdxt.enforcementcode.domain.DashboardTrendStatArea;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo;
import com.zdxt.enforcementcode.mapper.DashboardTrendStatAreaMapper;
import com.zdxt.enforcementcode.mapper.DashboardTrendStatDomainMapper;
import com.zdxt.enforcementcode.report.ITrendBehaviorService;
import lombok.RequiredArgsConstructor;
import org.dromara.common.mybatis.core.page.PageQuery;
@ -20,6 +23,7 @@ import java.util.List;
public class TrendBehaviorServiceImpl implements ITrendBehaviorService {
private final DashboardTrendStatAreaMapper dashboardTrendStatAreaMapper;
private final DashboardTrendStatDomainMapper dashboardTrendStatDomainMapper;
@Override
public TableDataInfo<DashboardTrendStatAreaVo> queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery) {
@ -28,8 +32,19 @@ public class TrendBehaviorServiceImpl implements ITrendBehaviorService {
}
@Override
public List<DashboardTrendStatAreaVo> selectTrendBehaviorAreaAreaList(DashboardTrendStatAreaBo bo) {
return dashboardTrendStatAreaMapper.selectTrendBehaviorAreaAreaList(bo);
public List<DashboardTrendStatAreaVo> selectTrendBehaviorAreaList(DashboardTrendStatAreaBo bo) {
return dashboardTrendStatAreaMapper.selectTrendBehaviorAreaList(bo);
}
@Override
public TableDataInfo<DashboardTrendStatDomainVo> selectTrendBehaviorDomainPageList(DashboardTrendStatDomainBo bo, PageQuery pageQuery) {
Page<DashboardTrendStatDomainVo> list=dashboardTrendStatDomainMapper.selectTrendBehaviorDomainPageList(pageQuery.build(),bo);
return TableDataInfo.build(list);
}
@Override
public List<DashboardTrendStatDomainVo> selectTrendBehaviorDomainList(DashboardTrendStatDomainBo bo) {
return dashboardTrendStatDomainMapper.selectTrendBehaviorDomainList(bo);
}

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

@ -78,6 +78,7 @@ public interface IDashboardSituationTrendAreaService {
*/
List<DashboardSituationAreaVo> querySituationTrendAreaList(DashboardTrendStatQueryBo bo);
TableDataInfo<DashboardSituationAreaVo> selectSituationTrendAreaPageList(DashboardTrendStatQueryBo bo,PageQuery pageQuery);
/**
* 根据年份和季度,按综合评价分组统计个数
*

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

@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.service;
import com.zdxt.enforcementcode.domain.bo.BashboardSituationQueryBo;
import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationPerVo;
import com.zdxt.enforcementcode.domain.vo.DashboardSituationTrendDomainVo;
@ -78,6 +79,7 @@ public interface IDashboardSituationTrendDomainService {
*/
List<DashboardSituationDomainVo> querySituationTrendDomainList(DashboardTrendStatQueryBo bo);
TableDataInfo<DashboardSituationDomainVo> selectSituationTrendDomainPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery);
/**
* 根据年份和季度,按综合评价分组统计个数
*

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

@ -158,6 +158,13 @@ public class DashboardSituationTrendAreaServiceImpl implements IDashboardSituati
return baseMapper.querySituationTrendAreaList(bo);
}
@Override
public TableDataInfo<DashboardSituationAreaVo> selectSituationTrendAreaPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) {
Page<DashboardSituationAreaVo> list= baseMapper.selectSituationTrendAreaPageList(bo,pageQuery.build());
return TableDataInfo.build(list);
}
/**
* 根据年份和季度,按综合评价分组统计个数
*

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

@ -160,6 +160,13 @@ public class DashboardSituationTrendDomainServiceImpl implements IDashboardSitua
return baseMapper.querySituationTrendDomainList(bo);
}
@Override
public TableDataInfo<DashboardSituationDomainVo> selectSituationTrendDomainPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) {
Page<DashboardSituationDomainVo> list=baseMapper.selectSituationTrendDomainPageList(bo,pageQuery.build());
return TableDataInfo.build(list);
}
/**
* 根据年份和季度,按综合评价分组统计个数
*

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

@ -25,9 +25,11 @@
<if test="monthTime !=null">
and DATE_FORMAT(t1.enforcement_time,'%Y-%m') &gt;= DATE_FORMAT(#{monthTime},'%Y-%m')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
</where>
</select>
@ -103,7 +105,7 @@
<if test="enterpriseNumber !=null and enterpriseNumber !=''">
and t1.enterprise_number = #{enterpriseNumber}
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
</where>
@ -248,7 +250,7 @@
<if test="monthTime !=null">
and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{monthTime},'%Y-%m')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
</where>
@ -273,7 +275,7 @@
<if test="dayTime !=null">
and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
</where>
@ -299,7 +301,7 @@
<if test="dayTime !=null">
and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
</where>
@ -329,7 +331,7 @@
<if test="dayTime !=null">
and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
<if test="monthTime !=null">
@ -548,7 +550,7 @@
<if test="dayTime !=null">
and DATE_FORMAT(t2.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t4.code = #{code}
</if>
</where>
@ -582,7 +584,7 @@
<if test="dayTime !=null">
and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t3.code = #{code}
</if>
</where>) as zs
@ -601,7 +603,7 @@
<if test="dayTime !=null">
and DATE_FORMAT(t2.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d')
</if>
<if test="code !=null and code!=''">
<if test="code !=null and code!='' and code!='20220210190102183-D7DD-E31F5E9C1'">
and t4.code = #{code}
</if>
</where>

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

@ -5,7 +5,7 @@
<mapper namespace="com.zdxt.enforcementcode.mapper.DashboardSituationTrendAreaMapper">
<!-- 查询态势趋势分析-区域统计列表 -->
<select id="querySituationTrendAreaList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo">
<sql id="selectSituationAreaSql">
SELECT
a.id,
a.year,
@ -27,20 +27,20 @@
FROM dashboard_situation_trend_area a left join dashboard_area_info b on a.district_code = b.code and b.level = 3
WHERE a.is_delete = '0'
<if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
<if test="bo.startYear != null and bo.startQuarter != null and bo.endYear != null and bo.endQuarter != null">
AND (
(a.year = #{startYear} AND a.quarter &gt;= #{startQuarter})
OR (a.year &gt; #{startYear} AND a.year &lt; #{endYear})
OR (a.year = #{endYear} AND a.quarter &lt;= #{endQuarter})
(a.year = #{bo.startYear} AND a.quarter &gt;= #{bo.startQuarter})
OR (a.year &gt; #{bo.startYear} AND a.year &lt; #{bo.endYear})
OR (a.year = #{bo.endYear} AND a.quarter &lt;= #{bo.endQuarter})
)
</if>
<if test="districtCode != null and districtCode != ''">
AND a.district_code = #{districtCode}
<if test="bo.districtCode != null and bo.districtCode != ''">
AND a.district_code = #{bo.districtCode}
</if>
<if test="districtName != null and districtName != ''">
AND a.district_name LIKE CONCAT('%', #{districtName}, '%')
<if test="bo.districtName != null and bo.districtName != ''">
AND a.district_name LIKE CONCAT('%', #{bo.districtName}, '%')
</if>
ORDER BY
@ -48,6 +48,14 @@
a.year,
a.quarter
</sql>
<select id="querySituationTrendAreaList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo">
<include refid="selectSituationAreaSql"/>
</select>
<select id="selectSituationTrendAreaPageList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo">
<include refid="selectSituationAreaSql"/>
</select>
<!-- 根据年份和季度,按综合评价分组统计个数 -->

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

@ -5,7 +5,7 @@
<mapper namespace="com.zdxt.enforcementcode.mapper.DashboardSituationTrendDomainMapper">
<!-- 查询态势趋势分析-领域统计列表 -->
<select id="querySituationTrendDomainList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo">
<sql id="selectSituationDomainSql">
SELECT
a.id,
a.year,
@ -29,20 +29,20 @@
FROM dashboard_situation_trend_domain a left join dashboard_domain_dept b ON a.lyid = b.domain_id
WHERE a.is_delete = '0'
<if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
<if test="bo.startYear != null and bo.startQuarter != null and bo.endYear != null and bo.endQuarter != null">
AND (
(a.year = #{startYear} AND a.quarter &gt;= #{startQuarter})
OR (a.year &gt; #{startYear} AND a.year &lt; #{endYear})
OR (a.year = #{endYear} AND a.quarter &lt;= #{endQuarter})
(a.year = #{bo.startYear} AND a.quarter &gt;= #{bo.startQuarter})
OR (a.year &gt; #{bo.startYear} AND a.year &lt; #{bo.endYear})
OR (a.year = #{bo.endYear} AND a.quarter &lt;= #{bo.endQuarter})
)
</if>
<if test="lyid != null and lyid != ''">
AND a.lyid = #{lyid}
<if test="bo.lyid != null and bo.lyid != ''">
AND a.lyid = #{bo.lyid}
</if>
<if test="lymc != null and lymc != ''">
AND a.lymc LIKE CONCAT('%', #{lymc}, '%')
<if test="bo.lymc != null and bo.lymc != ''">
AND a.lymc LIKE CONCAT('%', #{bo.lymc}, '%')
</if>
ORDER BY
@ -50,6 +50,14 @@
a.year,
a.quarter
</sql>
<select id="querySituationTrendDomainList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo">
<include refid="selectSituationDomainSql"/>
</select>
<select id="selectSituationTrendDomainPageList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo">
<include refid="selectSituationDomainSql"/>
</select>
<!-- 根据年份和季度,按综合评价分组统计个数 -->

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

@ -8,7 +8,7 @@
select
t1.district_name as districtName,
t1.quarter_time as quarterTime,
t1.quarter_value as xzzfcs
t1.quarter_value as jccs
from
(
select
@ -56,7 +56,10 @@
<include refid="selectTrendBehaviorAreaSql"/>
</select>
<select id="selectTrendBehaviorAreaAreaList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo">
<select id="selectTrendBehaviorAreaList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo">
<include refid="selectTrendBehaviorAreaSql"/>
</select>
</mapper>

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

@ -3,4 +3,60 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zdxt.enforcementcode.mapper.DashboardTrendStatDomainMapper">
<sql id="selectTrendBehaviorDomainSql">
select
t1.domain_name as domainName,
t1.quarter_time as quarterTime,
t1.quarter_value as jccs
from
(
select
domain_name,
firstQuarter as quarter_value,
firstTime as quarter_time
from
dashboard_trend_stat_domain
where is_delete =0
union all
select
domain_name,
secondQuarter as quarter_value,
secondTime as quarter_time
from
dashboard_trend_stat_domain
where is_delete =0
union all
select
domain_name,
thirdQuarter as quarter_value,
thirdTime as quarter_time
from
dashboard_trend_stat_domain
where is_delete =0
union all
select
domain_name,
fourthQuarter as quarter_value,
fourthTime as quarter_time
from
dashboard_trend_stat_domain
where is_delete =0) t1
<where>
<if test="bo.domainName!=null and bo.domainName!=''">
t1.domain_name = #{bo.domainName}
</if>
<if test="bo.quarterTime!=null and bo.quarterTime!=''">
and t1.quarter_time = #{bo.quarterTime}
</if>
</where>
</sql>
<select id="selectTrendBehaviorDomainPageList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo">
<include refid="selectTrendBehaviorDomainSql"/>
</select>
<select id="selectTrendBehaviorDomainList" resultType="com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo">
<include refid="selectTrendBehaviorDomainSql"/>
</select>
</mapper>

Loading…
Cancel
Save