ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fixbug:一张图-需求调整

release-sy-v1.0.0
“lyd” 1 month ago
parent
6322dd81cf
commit
9bbaa708b5
11 changed files with 291 additions and 142 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java
  2. 18
      shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java
  3. 44
      shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java
  4. 327
      shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
  5. 2
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java
  6. 2
      shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingProblemV2Controller.java
  7. 10
      shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingRecordV2Controller.java
  8. 10
      shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingV2Controller.java
  9. 10
      shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwYhV2Controller.java
  10. 4
      shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java
  11. 3
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java

3
shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java
View File

@ -54,6 +54,9 @@ public class CharInfoDto {
@ApiModelProperty(value = "单位")
private String unit;
@ApiModelProperty(value = "排序")
private String sort;
@ApiModelProperty(value = "数据")
private List<String> data;
}

18
shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java
View File

@ -7,6 +7,24 @@ public enum PatrolMaintenanceCategory {
PROJECT_PATROL("工程巡查", "1"),
JD_PATROL("机电巡查", "2"),
DW_CATEGORY_MOUSE_EVIL("鼠害", "1"),
DW_CATEGORY_ANT_EVIL("蚁害", "2"),
YZT_SZ_FXHZ_SUM("分泄洪闸", "1"),
YZT_SZ_JZZ_SUM("节制闸", "2"),
YZT_SZ_PTSZ_SUM("排退水闸", "3"),
YZT_SZ_YJSZ_SUM("引进水闸", "4"),
YZT_SZ_DCZ_SUM("挡潮闸", "5"),
YZT_SZ_CZ_SUM("船闸", "6"),
YZT_("多类型混合闸", "7"),
YZT_SZ_QT_SUM("其他", "9"),
YZT_DF_HJD_SUM("河江堤", "1"),
YZT_HD_SUM("湖堤", "2"),
YZT_HAID_SUM("海堤", "3"),
YZT_WYD_SUM("围圩堤", "4"),
DJ_LX("零星", "1"),
DJ_YB("一般", "2"),

44
shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java
View File

@ -5,7 +5,13 @@ import com.kms.yg.cz.dto.CharInfoDto;
import com.shuili.common.utils.StringUtils;
import lombok.Getter;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -39,30 +45,35 @@ public enum ProjectCharEnum {
C_DW_14("巡查记录分析", Arrays.asList(StaticIndexEnum.DW_JL_ONE_DATE_SUM, StaticIndexEnum.DW_JL_TWO_DATE_SUM), "数量", Collections.emptyList()),
C_DW_15("巡查缺陷分析", Arrays.asList(StaticIndexEnum.DW_QX_ONE_DATE_SUM, StaticIndexEnum.DW_QX_TWO_DATE_SUM), "数量", Collections.emptyList()),
C_DW_16("缺陷问题等级分析", Arrays.asList(StaticIndexEnum.DW_QX_DJ_LX_SUM, StaticIndexEnum.DW_QX_DJ_JD_SUM, StaticIndexEnum.DW_QX_DJ_ZD_SUM, StaticIndexEnum.DW_QX_DJ_YB_SUM), "数量", Collections.emptyList()),
C_DW_17("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DW_BD_YH_SUM, StaticIndexEnum.DW_BD_QX_SUM), "数量", Collections.emptyList()),
C_DW_18("巡查项目总数", Collections.singletonList(StaticIndexEnum.DW_XM_SUM), "数量", Collections.emptyList()),
C_DW_15("有害动物防治问题分析", Arrays.asList(StaticIndexEnum.DW_QX_ONE_DATE_SUM, StaticIndexEnum.DW_QX_TWO_DATE_SUM), "数量", Collections.emptyList()),
C_DW_16("有害动物问题等级分析", Arrays.asList(StaticIndexEnum.DW_QX_DJ_LX_SUM, StaticIndexEnum.DW_QX_DJ_JD_SUM, StaticIndexEnum.DW_QX_DJ_ZD_SUM, StaticIndexEnum.DW_QX_DJ_YB_SUM), "数量", Collections.emptyList()),
C_DW_17("问题和处置对比分析", Arrays.asList(StaticIndexEnum.DW_BD_QX_SUM, StaticIndexEnum.DW_BD_YH_SUM), "数量", Collections.emptyList()),
C_DW_18("检查项目总数", Collections.singletonList(StaticIndexEnum.DW_XM_SUM), "数量", Collections.emptyList()),
C_DW_1("工程分布", Collections.singletonList(StaticIndexEnum.DW_PROJECT_ADCD_SUM), "数量", Collections.emptyList()),
C_DW_2("巡查分析", Arrays.asList(StaticIndexEnum.DW_CHECKING_ADCD_SUM, StaticIndexEnum.DW_JD_ADCD_SUM), "数量", Collections.emptyList()),
C_DW_3("缺陷和养护对比", Arrays.asList(StaticIndexEnum.DW_QX_ADCD_SUM, StaticIndexEnum.DW_YH_ADCD_SUM), "数量", Collections.emptyList()),
C_DW_2("检查分析", Arrays.asList(StaticIndexEnum.DW_CHECKING_ADCD_SUM, StaticIndexEnum.DW_JD_ADCD_SUM), "数量", Collections.emptyList()),
C_DW_3("问题和处置对比分析", Arrays.asList(StaticIndexEnum.DW_QX_ADCD_SUM, StaticIndexEnum.DW_YH_ADCD_SUM), "数量", Collections.emptyList()),
K1("工程数量", Arrays.asList(
StaticIndexEnum.YZT_SK_SUM
,StaticIndexEnum.YZT_SZ_SUM
,StaticIndexEnum.YZT_DF_SUM), "数量", Collections.emptyList()),
K2("测报设施建设", Arrays.asList(
StaticIndexEnum.YZT_SSYX_SUM
,StaticIndexEnum.YZT_SWGCJCCZ_SUM
,StaticIndexEnum.YZT_SWGCJCCD_SUM
K2("水闸分类统计", Arrays.asList(
StaticIndexEnum.YZT_SZ_FXHZ_SUM
, StaticIndexEnum.YZT_SZ_JZZ_SUM
, StaticIndexEnum.YZT_SZ_PTSZ_SUM
, StaticIndexEnum.YZT_SZ_YJSZ_SUM
, StaticIndexEnum.YZT_SZ_DCZ_SUM
, StaticIndexEnum.YZT_SZ_CZ_SUM
, StaticIndexEnum.YZT_SZ_DLXHHZ_SUM
, StaticIndexEnum.YZT_SZ_QT_SUM
), "数量", Collections.emptyList()),
K3("监督检查总览", Arrays.asList(
StaticIndexEnum.YZT_SUPERVISE_JRGJ_YCL_SUM
,StaticIndexEnum.YZT_SUPERVISE_JRGJ_DCL_SUM
,StaticIndexEnum.YZT_SUPERVISE_BYGJ_YCL_SUM
,StaticIndexEnum.YZT_SUPERVISE_BYGJ_DCL_SUM
K3("堤防分类统计", Arrays.asList(
StaticIndexEnum.YZT_DF_HJD_SUM
, StaticIndexEnum.YZT_HD_SUM
, StaticIndexEnum.YZT_HAID_SUM
, StaticIndexEnum.YZT_WYD_SUM
), "数量", Collections.emptyList()),
K4("安全巡查概况", Arrays.asList(
StaticIndexEnum.YZT_TOUR_CHECK_RWS_SUM
@ -183,6 +194,7 @@ public enum ProjectCharEnum {
series.setName(type.getZhName());
series.setCode(type.name());
series.setUnit(type.getUnit());
series.setSort(type.getSort());
Map<String, String> values = dataMap.getOrDefault(type, new HashMap<>());
series.setData(charInfoDto.getXAxis().stream()
.map(time -> {

327
shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
View File

@ -1,3 +1,5 @@
package com.kms.yxgh.common.enums;
import cn.hutool.core.collection.CollectionUtil;
@ -11,9 +13,12 @@ import com.kms.yg.res.service.AttResBaseService;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
import com.kms.yg.sz.service.BsSgcSzSzrwService;
import com.kms.yxgh.common.dto.*;
import com.kms.yxgh.common.dto.CountDateDto;
import com.kms.yxgh.common.dto.CountDto;
import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
import com.kms.yxgh.common.service.Statistic;
import com.kms.yxgh.df.domain.DfCheckingProblemV2;
import com.kms.yxgh.df.domain.DfYhV2;
import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper;
import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper;
import com.kms.yxgh.df.mapper.DfCheckingV2Mapper;
@ -25,6 +30,7 @@ import com.kms.yxgh.dw.mapper.DwCheckingRecordV2Mapper;
import com.kms.yxgh.dw.mapper.DwCheckingV2Mapper;
import com.kms.yxgh.dw.mapper.DwYhV2Mapper;
import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
import com.kms.yxgh.sz.domain.SzYhV2;
import com.kms.yxgh.sz.mapper.SzCheckingProblemV2Mapper;
import com.kms.yxgh.sz.mapper.SzCheckingRecordV2Mapper;
import com.kms.yxgh.sz.mapper.SzCheckingV2Mapper;
@ -35,7 +41,11 @@ import com.shuili.common.utils.SpringUtils;
import lombok.Getter;
import java.math.BigDecimal;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Getter
@ -45,59 +55,59 @@ public enum StaticIndexEnum {
DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.JD_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_JL_TWO_DATE_SUM("工程巡查", sp -> {
DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_ONE_DATE_SUM("机电巡查", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countDate(sp, PatrolMaintenanceCategory.JD_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_TWO_DATE_SUM("工程巡查", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countDate(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_DJ_LX_SUM("零星", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_DJ_YB_SUM("一般", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_YB);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_DJ_JD_SUM("较大", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_JD);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_DJ_ZD_SUM("重大", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_ZD);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_BD_YH_SUM("养护次数", sp -> {
DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class);
List<CountDateDto> list = mapper.countYhDto(sp);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_BD_QX_SUM("缺陷次数", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countQx(sp);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DF_XM_SUM("巡查项目数", sp -> {
DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class);
@ -105,34 +115,34 @@ public enum StaticIndexEnum {
Map<String, String> map = new HashMap<>();
map.put("sum", String.valueOf(list));
return map;
}, "个", "0"),
}, "个", "0", "0"),
DF_QX_ADCD_SUM("缺陷数量", sp -> {
DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
DF_YH_ADCD_SUM("养护次数", sp -> {
DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
DF_PROJECT_ADCD_SUM("工程数量", sp -> {
DfCheckingV2Mapper mapper = SpringUtils.getBean(DfCheckingV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
DF_CHECKING_ADCD_SUM("工程巡查", sp -> {
DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
DF_JD_ADCD_SUM("机电巡查", sp -> {
DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.JD_PATROL);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
@ -140,59 +150,59 @@ public enum StaticIndexEnum {
SzCheckingRecordV2Mapper mapper = SpringUtils.getBean(SzCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.JD_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_JL_TWO_DATE_SUM("工程巡查", sp -> {
SzCheckingRecordV2Mapper mapper = SpringUtils.getBean(SzCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_ONE_DATE_SUM("机电巡查", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countDate(sp, PatrolMaintenanceCategory.JD_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_TWO_DATE_SUM("工程巡查", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countDate(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_DJ_LX_SUM("零星", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_DJ_YB_SUM("一般", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_YB);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_DJ_JD_SUM("较大", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_JD);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_DJ_ZD_SUM("重大", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_ZD);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_BD_YH_SUM("养护次数", sp -> {
SzYhV2Mapper mapper = SpringUtils.getBean(SzYhV2Mapper.class);
List<CountDateDto> list = mapper.countYhDto(sp);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_BD_QX_SUM("缺陷次数", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countQx(sp);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
SZ_XM_SUM("巡查项目数", sp -> {
SzCheckingRecordV2Mapper mapper = SpringUtils.getBean(SzCheckingRecordV2Mapper.class);
@ -200,269 +210,343 @@ public enum StaticIndexEnum {
Map<String, String> map = new HashMap<>();
map.put("sum", String.valueOf(list));
return map;
}, "个", "0"),
}, "个", "0", "0"),
SZ_QX_ADCD_SUM("缺陷数量", sp -> {
SzCheckingProblemV2Mapper mapper = SpringUtils.getBean(SzCheckingProblemV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
SZ_YH_ADCD_SUM("养护次数", sp -> {
SzYhV2Mapper mapper = SpringUtils.getBean(SzYhV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
SZ_PROJECT_ADCD_SUM("工程数量", sp -> {
SzCheckingV2Mapper mapper = SpringUtils.getBean(SzCheckingV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
SZ_CHECKING_ADCD_SUM("工程巡查", sp -> {
SzCheckingRecordV2Mapper mapper = SpringUtils.getBean(SzCheckingRecordV2Mapper.class);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
SZ_JD_ADCD_SUM("机电巡查", sp -> {
SzCheckingRecordV2Mapper mapper = SpringUtils.getBean(SzCheckingRecordV2Mapper.class);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.JD_PATROL);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
DW_JL_ONE_DATE_SUM("机电巡查", sp -> {
DW_JL_ONE_DATE_SUM("鼠害检查", sp -> {
DwCheckingRecordV2Mapper mapper = SpringUtils.getBean(DwCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.JD_PATROL);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.DW_CATEGORY_MOUSE_EVIL);
return dataGroup(list);
}, "个", "0"),
DW_JL_TWO_DATE_SUM("工程巡查", sp -> {
}, "个", "0", "0"),
DW_JL_TWO_DATE_SUM("蚁害检查", sp -> {
DwCheckingRecordV2Mapper mapper = SpringUtils.getBean(DwCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.DW_CATEGORY_ANT_EVIL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_QX_ONE_DATE_SUM("机电巡查", sp -> {
DW_QX_ONE_DATE_SUM("鼠害检查", sp -> {
DwCheckingRecordV2Mapper mapper = SpringUtils.getBean(DwCheckingRecordV2Mapper.class);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.JD_PATROL);
List<CountDateDto> list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.DW_CATEGORY_MOUSE_EVIL);
return dataGroup(list);
}, "个", "0"),
DW_QX_TWO_DATE_SUM("工程巡查", sp -> {
}, "个", "0", "0"),
DW_QX_TWO_DATE_SUM("蚁害检查", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countDate(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
List<CountDateDto> list = mapper.countDate(sp, PatrolMaintenanceCategory.DW_CATEGORY_ANT_EVIL);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_QX_DJ_LX_SUM("零星", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_QX_DJ_YB_SUM("一般", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_YB);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_QX_DJ_JD_SUM("较大", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_JD);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_QX_DJ_ZD_SUM("重大", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_ZD);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_BD_YH_SUM("养护次数", sp -> {
DW_BD_YH_SUM("问题次数", sp -> {
DwYhV2Mapper mapper = SpringUtils.getBean(DwYhV2Mapper.class);
List<CountDateDto> list = mapper.countYhDto(sp);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_BD_QX_SUM("缺陷次数", sp -> {
DW_BD_QX_SUM("处置次数", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDateDto> list = mapper.countQx(sp);
return dataGroup(list);
}, "个", "0"),
}, "个", "0", "0"),
DW_XM_SUM("巡查项目数", sp -> {
DW_XM_SUM("检查项目数", sp -> {
DwCheckingRecordV2Mapper mapper = SpringUtils.getBean(DwCheckingRecordV2Mapper.class);
int list = mapper.countXm(sp);
Map<String, String> map = new HashMap<>();
map.put("sum", String.valueOf(list));
return map;
}, "个", "0"),
}, "个", "0", "0"),
DW_QX_ADCD_SUM("缺陷数量", sp -> {
DW_QX_ADCD_SUM("问题数量", sp -> {
DwCheckingProblemV2Mapper mapper = SpringUtils.getBean(DwCheckingProblemV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
DW_YH_ADCD_SUM("养护次数", sp -> {
}, "个", "0", "0"),
DW_YH_ADCD_SUM("处置次数", sp -> {
DwYhV2Mapper mapper = SpringUtils.getBean(DwYhV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
DW_PROJECT_ADCD_SUM("工程数量", sp -> {
DwCheckingV2Mapper mapper = SpringUtils.getBean(DwCheckingV2Mapper.class);
List<CountDto> list = mapper.count(sp);
return adcdGroup(list, sp);
}, "个", "0"),
DW_CHECKING_ADCD_SUM("工程巡查", sp -> {
}, "个", "0", "0"),
DW_CHECKING_ADCD_SUM("鼠害检查", sp -> {
DwCheckingRecordV2Mapper mapper = SpringUtils.getBean(DwCheckingRecordV2Mapper.class);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.PROJECT_PATROL);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.DW_CATEGORY_MOUSE_EVIL);
return adcdGroup(list, sp);
}, "个", "0"),
DW_JD_ADCD_SUM("机电巡查", sp -> {
}, "个", "0", "0"),
DW_JD_ADCD_SUM("蚁害检查", sp -> {
DwCheckingRecordV2Mapper mapper = SpringUtils.getBean(DwCheckingRecordV2Mapper.class);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.JD_PATROL);
List<CountDto> list = mapper.count(sp, PatrolMaintenanceCategory.DW_CATEGORY_ANT_EVIL);
return adcdGroup(list, sp);
}, "个", "0"),
}, "个", "0", "0"),
YZT_SK_SUM("水库", sp -> {
Map<String,String> map =new HashMap<>();
AttResBaseService service = SpringUtils.getBean(AttResBaseService.class);
map.put("sum",String.valueOf(service.count()));
return map;
}, "座", "0"),
}, "座", "0", "0"),
YZT_SZ_SUM("水闸", sp -> {
Map<String,String> map =new HashMap<>();
BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
map.put("sum",String.valueOf(service.count()));
return map;
}, "座", "0"),
}, "座", "0", "0"),
YZT_DF_SUM("堤防", sp -> {
Map<String,String> map =new HashMap<>();
BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class);
map.put("sum",String.valueOf(service.count()));
return map;
}, "段", "0"),
}, "段", "0", "0"),
YZT_SSYX_SUM("水事影像监测监视点", sp -> {
Map<String,String> map =new HashMap<>();
return map;
}, "个", "125"),
}, "个", "125", "0"),
YZT_SWGCJCCZ_SUM("水文工程检测测站数量", sp -> {
Map<String,String> map =new HashMap<>();
AttStBaseService service = SpringUtils.getBean(AttStBaseService.class);
map.put("sum",String.valueOf(service.count()));
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_SWGCJCCD_SUM("水文工程检测测点数量", sp -> {
Map<String,String> map =new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_SZ_FXHZ_SUM("分泄洪闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "1"),
YZT_SZ_JZZ_SUM("节制闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "2"),
YZT_SZ_PTSZ_SUM("排退水闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "3"),
YZT_SZ_YJSZ_SUM("引进水闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "4"),
YZT_SZ_DCZ_SUM("挡潮闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "5"),
YZT_SZ_CZ_SUM("船闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "6"),
YZT_SZ_DLXHHZ_SUM("多类型混合闸", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "7"),
YZT_SUPERVISE_JRGJ_YCL_SUM("已处理", sp -> {
YZT_SZ_QT_SUM("其他", sp -> {
Map<String, String> map = new HashMap<>();
AttStMpService service = SpringUtils.getBean(AttStMpService.class);
map.put("sum", String.valueOf(service.count()));
return map;
}, "个", "0", "9"),
YZT_DF_HJD_SUM("河江堤", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","15");
return map;
}, "个", "0"),
}, "个", "0", "1"),
YZT_SUPERVISE_JRGJ_DCL_SUM("待处理", sp -> {
YZT_HD_SUM("湖堤", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","47");
return map;
}, "个", "0"),
}, "个", "0", "2"),
YZT_SUPERVISE_BYGJ_YCL_SUM("已处理", sp -> {
YZT_HAID_SUM("海堤", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","156");
return map;
}, "个", "0"),
}, "个", "0", "3"),
YZT_SUPERVISE_BYGJ_DCL_SUM("待处理", sp -> {
YZT_WYD_SUM("围圩堤", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","975");
return map;
}, "个", "0"),
}, "个", "0", "4"),
YZT_TOUR_CHECK_RWS_SUM("任务数", sp -> {
Map<String,String> map =new HashMap<>();
BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
map.put("sum",String.valueOf(service.count()));
map.put("sum", String.valueOf(service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime()))));
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_TOUR_CHECK_DJD_SUM("待鉴定", sp -> {
Map<String,String> map =new HashMap<>();
BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
int countDtb = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>().eq(BsSgcSzSzrw::getStatus, 1));
int countDsh = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>().eq(BsSgcSzSzrw::getStatus, 0));
int countDtb = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
// 待审核
.eq(BsSgcSzSzrw::getStatus, 1)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
);
// 待填报
int countDsh = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
.eq(BsSgcSzSzrw::getStatus, 0)
.eq(BsSgcSzSzrw::getStatus, 1)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
);
map.put("sum",String.valueOf(countDtb+countDsh));
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_TOUR_CHECK_YJD_SUM("已鉴定", sp -> {
Map<String,String> map =new HashMap<>();
BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
int count = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>().eq(BsSgcSzSzrw::getStatus, 2));
int count = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
.eq(BsSgcSzSzrw::getStatus, 2)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
);
map.put("sum",String.valueOf(count));
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_DISEASE_RISK_WT_NUMBER_SUM("数量", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","98");
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_DISEASE_RISK_WT_problem_SUM("问题数", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","56");
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_DISEASE_RISK_RW_NUMBER_SUM("任务数", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","98");
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_DISEASE_RISK_RW_YWC_SUM("已完成", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum","30");
return map;
}, "个", "0"),
}, "个", "0", "0"),
YZT_DAILY_YB_NUMBER_SUM("一般", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue())));
map.put("sum", String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue(), sp)));
return map;
}, "个", "0"),
}, "个", "0", "2"),
YZT_DAILY_JD_NUMBER_SUM("较大", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue())));
map.put("sum", String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue(), sp)));
return map;
}, "个", "0"),
}, "个", "0", "3"),
YZT_DAILY_ZD_NUMBER_SUM("重大", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue())));
map.put("sum", String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue(), sp)));
return map;
}, "个", "0"),
}, "个", "0", "4"),
YZT_DAILY_JJ_NUMBER_SUM("零星", sp -> {
Map<String,String> map =new HashMap<>();
map.put("sum",String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue())));
map.put("sum", String.valueOf(getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue(), sp)));
return map;
}, "个", "0"),
}, "个", "0", "1"),
YZT_DAILY_BL_NUMBER_SUM("比例", sp -> {
Map<String,String> map =new HashMap<>();
map.put("bl",getYhSum());
map.put("bl", getYhSum(sp));
return map;
}, "个", "0"),
}, "个", "0", "0"),
@ -472,32 +556,47 @@ public enum StaticIndexEnum {
private final Statistic source;
private final String unit;
private final String defaultValue;
private final String sort;
StaticIndexEnum(String zhName, Statistic source, String unit, String defaultValue) {
StaticIndexEnum(String zhName, Statistic source, String unit, String defaultValue, String sort) {
this.zhName = zhName;
this.source = source;
this.unit = unit;
this.defaultValue = defaultValue;
this.sort = sort;
}
public static int getProblemGrade(String dj) {
public static int getProblemGrade(String dj, ObjectStatisticQueDto sp) {
DfCheckingProblemV2Service dfQxService = SpringUtils.getBean(DfCheckingProblemV2Service.class);
SzCheckingProblemV2Service szQxService = SpringUtils.getBean(SzCheckingProblemV2Service.class);
int dfCount = dfQxService.count(new LambdaQueryWrapper<DfCheckingProblemV2>().eq(DfCheckingProblemV2::getProblemLevel, dj));
int szCount = szQxService.count(new LambdaQueryWrapper<SzCheckingProblemV2>().eq(SzCheckingProblemV2::getProblemLevel, dj));
int dfCount = dfQxService.count(new LambdaQueryWrapper<DfCheckingProblemV2>()
.eq(DfCheckingProblemV2::getProblemLevel, dj)
.ge(!Objects.isNull(sp.getStartTime()), DfCheckingProblemV2::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), DfCheckingProblemV2::getCreateTime, sp.getStartTime())
);
int szCount = szQxService.count(new LambdaQueryWrapper<SzCheckingProblemV2>()
.eq(SzCheckingProblemV2::getProblemLevel, dj)
.ge(!Objects.isNull(sp.getStartTime()), SzCheckingProblemV2::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), SzCheckingProblemV2::getCreateTime, sp.getStartTime())
);
return dfCount+szCount;
}
public static String getYhSum() {
public static String getYhSum(ObjectStatisticQueDto sp) {
DfYhV2Service dfYhV2Service = SpringUtils.getBean(DfYhV2Service.class);
SzYhV2Service szYhV2Service = SpringUtils.getBean(SzYhV2Service.class);
int dfCount = dfYhV2Service.count();
int szCount = szYhV2Service.count();
int yb = getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue());
int jd = getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue());
int zd = getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue());
int lx = getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue());
int dfCount = dfYhV2Service.count(new LambdaQueryWrapper<DfYhV2>()
.ge(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getStartTime()));
int szCount = szYhV2Service.count(new LambdaQueryWrapper<SzYhV2>()
.ge(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getStartTime()));
int yb = getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue(), sp);
int jd = getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue(), sp);
int zd = getProblemGrade(PatrolMaintenanceCategory.DJ_ZD.getValue(), sp);
int lx = getProblemGrade(PatrolMaintenanceCategory.DJ_LX.getValue(), sp);
BigDecimal bl= BigDecimal.valueOf(0);
BigDecimal qxCount = BigDecimal.valueOf(dfCount + szCount);

2
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java
View File

@ -69,7 +69,7 @@ public interface DfCheckingRecordV2Mapper extends BaseMapper<DfCheckingRecord> {
List<CountDateDto> countDateGroup(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category);
@Select("<script> " +
"select count(distinct dike_code) from bs_sgc_df_xsxcjl " +
"select count(1) from bs_sgc_df_xmgl where 1=1 " +
"<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" +

2
shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingProblemV2Controller.java → shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingProblemV2Controller.java
View File

@ -1,4 +1,4 @@
package com.kms.yxgh.dw.ontroller;
package com.kms.yxgh.dw.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.yxgh.dw.dto.DwProblemV2Dto;

10
shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingRecordV2Controller.java → shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingRecordV2Controller.java
View File

@ -1,4 +1,4 @@
package com.kms.yxgh.dw.ontroller;
package com.kms.yxgh.dw.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.yxgh.base.Response;
@ -13,7 +13,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController

10
shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwCheckingV2Controller.java → shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwCheckingV2Controller.java
View File

@ -1,4 +1,4 @@
package com.kms.yxgh.dw.ontroller;
package com.kms.yxgh.dw.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.yxgh.base.Response;
@ -11,7 +11,13 @@ import com.shuili.common.enums.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**

10
shuili-system/src/main/java/com/kms/yxgh/dw/ontroller/DwYhV2Controller.java → shuili-system/src/main/java/com/kms/yxgh/dw/controller/DwYhV2Controller.java
View File

@ -1,4 +1,4 @@
package com.kms.yxgh.dw.ontroller;
package com.kms.yxgh.dw.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kms.yxgh.base.Response;
@ -17,7 +17,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import static com.kms.yxgh.common.ApprovalTypeEnum.DW_V2_YH_RECORD;

4
shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java
View File

@ -24,7 +24,7 @@ public interface DwCheckingRecordV2Mapper extends BaseMapper<DwCheckingRecord> {
@Select("<script> " +
"select base.adcd code ,count(1) sum " +
"from bs_sgc_dw_xsxcjl xm " +
"left join att_project_base base on base.dike_code=xm.dike_code " +
"left join att_dike_base base on base.dike_code=xm.dike_code " +
"where 1=1 " +
"<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
@ -54,7 +54,7 @@ public interface DwCheckingRecordV2Mapper extends BaseMapper<DwCheckingRecord> {
List<CountDateDto> countDateGroup(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category);
@Select("<script> " +
"select count(distinct project_code) from bs_sgc_dw_xsxcjl " +
"select count(1) from bs_sgc_dw_xmgl where 1=1 " +
"<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" +

3
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java
View File

@ -5,7 +5,6 @@ import com.kms.yxgh.common.dto.CountDateDto;
import com.kms.yxgh.common.dto.CountDto;
import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
import com.kms.yxgh.df.domain.DfCheckingRecord;
import com.kms.yxgh.sz.domain.SzCheckingRecord;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -55,7 +54,7 @@ public interface SzCheckingRecordV2Mapper extends BaseMapper<SzCheckingRecord> {
List<CountDateDto> countDateGroup(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category);
@Select("<script> " +
"select count(distinct waga_code) from bs_sgc_sz_xsxcjl " +
"select count(1) from bs_sgc_sz_xmgl where 1=1 " +
"<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" +

Write Preview
Loading…
Cancel
Save