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

fix:大屏需求调整

release-sy-v1.0.0
“lyd” 3 weeks ago
parent
86d04a3cbd
commit
979db519fd
2 changed files with 45 additions and 23 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. 41
      shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
  2. 27
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java

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

@ -45,6 +45,7 @@ import com.kms.yxgh.sz.mapper.SzYhV2Mapper;
import com.kms.yxgh.sz.service.SzCheckingProblemV2Service;
import com.kms.yxgh.sz.service.SzYhV2Service;
import com.shuili.common.utils.SpringUtils;
import lombok.Data;
import lombok.Getter;
import java.math.BigDecimal;
@ -483,12 +484,12 @@ public enum StaticIndexEnum {
Map<String,String> map =new HashMap<>();
BsSgcSzSzrwService szService = SpringUtils.getBean(BsSgcSzSzrwService.class);
int sz = szService.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime()));
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()));
BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
int df = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime()));
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime()));
map.put("sum", String.valueOf(sz + df));
return map;
}, "个", "0", "0"),
@ -499,15 +500,15 @@ public enum StaticIndexEnum {
int sz = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
// 待鉴定
.ne(BsSgcSzSzrw::getStatus, 3)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
);
BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
int df = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
// 待鉴定
.ne(BsSgcDfDfrw::getStatus, 3)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())
);
map.put("sum", String.valueOf(sz + df));
return map;
@ -518,14 +519,14 @@ public enum StaticIndexEnum {
BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
int count = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
.eq(BsSgcSzSzrw::getStatus, 3)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
);
BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
int dfCount = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
.eq(BsSgcDfDfrw::getStatus, 3)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())
);
map.put("sum", String.valueOf(count + dfCount));
return map;
@ -535,22 +536,16 @@ public enum StaticIndexEnum {
YZT_DISEASE_RISK_WT_NUMBER_SUM("数量", sp -> {
DfDangerousTaskItemRelMapper mapper = SpringUtils.getBean(DfDangerousTaskItemRelMapper.class);
Map<String,String> map =new HashMap<>();
Integer count = mapper.selectCount(new QueryWrapper<DfDangerousTaskItemRel>()
.select(" DISTINCT TASK_ID ").lambda()
.ge(!Objects.isNull(sp.getStartTime()), DfDangerousTaskItemRel::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), DfDangerousTaskItemRel::getCreateTime, sp.getEndTime())
);
map.put("sum",String.valueOf(null == count ? 0:count));
int count = mapper.countTask(sp);
map.put("sum",String.valueOf(count));
return map;
}, "个", "0", "0"),
YZT_DISEASE_RISK_WT_problem_SUM("问题数", sp -> {
DfDangerousTaskItemRelMapper mapper = SpringUtils.getBean(DfDangerousTaskItemRelMapper.class);
Map<String,String> map =new HashMap<>();
DfDangerousTaskItemRelService service = SpringUtils.getBean(DfDangerousTaskItemRelService.class);
map.put("sum",String.valueOf(service.count(new LambdaQueryWrapper<DfDangerousTaskItemRel>()
.ge(!Objects.isNull(sp.getStartTime()), DfDangerousTaskItemRel::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), DfDangerousTaskItemRel::getCreateTime, sp.getEndTime())
)));
int count = mapper.countQuestion(sp);
map.put("sum",String.valueOf(count));
return map;
}, "个", "0", "0"),

27
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java
View File

@ -1,6 +1,7 @@
package com.kms.yxgh.df.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
import com.kms.yxgh.df.domain.DfDangerousTaskItemRel;
import com.kms.yxgh.df.dto.DfDangerousTaskItemRelDto;
import com.kms.yxgh.df.dto.DfDangerousTaskSearchDto;
@ -15,6 +16,32 @@ import java.util.List;
@Repository
public interface DfDangerousTaskItemRelMapper extends BaseMapper<DfDangerousTaskItemRel> {
@Select("<script>" +
"select sum(DISTINCT gl.TASK_ID) from bs_sgc_df_bxgcnrgl gl " +
"left join bs_sgc_df_bxgcrw rw on gl.TASK_ID=rw.ID " +
"WHERE 1=1 " +
"<if test='dto.startTime != null '>" +
"AND rw.create_time &gt;= #{dto.startTime} " +
"</if>" +
"<if test='dto.endTime != null'>" +
"AND rw.create_time &lt;= #{dto.endTime} " +
"</if>" +
"</script>")
int countTask(@Param("dto") ObjectStatisticQueDto dto);
@Select("<script>" +
"select count(1) from bs_sgc_df_bxgcnrgl gl " +
"left join bs_sgc_df_bxgcrw rw on gl.TASK_ID=rw.ID " +
"WHERE 1=1 " +
"<if test='dto.startTime != null '>" +
"AND rw.create_time &gt;= #{dto.startTime} " +
"</if>" +
"<if test='dto.endTime != null'>" +
"AND rw.create_time &lt;= #{dto.endTime} " +
"</if>" +
"</script>")
int countQuestion(@Param("dto") ObjectStatisticQueDto dto);
@Insert({
"<script>",
"insert into bs_sgc_df_bxgcnrgl(task_id, project_id, project_item_id, level, PROBLEM_DESCRIBE, SITE_SITUATION_RECORDS) values ",

Write Preview
Loading…
Cancel
Save