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
078988866e
commit
86d04a3cbd
6 changed files with 44 additions and 21 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. 12
      shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
  2. 24
      shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
  3. 3
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
  4. 10
      shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
  5. 8
      shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml
  6. 8
      shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml

12
shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
View File

@ -9,7 +9,11 @@ import org.springframework.util.StringUtils;
@ApiModel("审批搜索")
@Data
public class ApprovalSearchDto<T> {
public class ApprovalSearchDto<T> implements IAdcdDeptRole{
@ApiModelProperty(value = "行政区划")
private String adcd;
@ApiModelProperty("审批状态")
private String status;
@ -26,6 +30,9 @@ public class ApprovalSearchDto<T> {
@ApiModelProperty(value = "堤防编码")
private String dikeCode;
@ApiModelProperty(value = "堤防编码")
private String wagaCode;
public String getDikeCode() {
if (StringUtils.isEmpty(this.dikeCode)) {
this.dikeCode =AuthorityDikeCodeService.getAuthorityDikeCode();
@ -33,8 +40,7 @@ public class ApprovalSearchDto<T> {
return this.dikeCode;
}
@ApiModelProperty(value = "水闸编码")
private String wagaCode;
public String getWagaCode() {
if (StringUtils.isEmpty(this.wagaCode)) {

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

@ -483,12 +483,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::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()));
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime()));
BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
int df = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime()));
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime()));
map.put("sum", String.valueOf(sz + df));
return map;
}, "个", "0", "0"),
@ -499,15 +499,15 @@ public enum StaticIndexEnum {
int sz = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
// 待鉴定
.ne(BsSgcSzSzrw::getStatus, 3)
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, 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::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime())
);
map.put("sum", String.valueOf(sz + df));
return map;
@ -518,14 +518,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::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, 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::getCreateTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())
.ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime())
.le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime())
);
map.put("sum", String.valueOf(count + dfCount));
return map;

3
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
View File

@ -55,8 +55,7 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M
private final DfYhV2Mapper dfYhV2Mapper;
public IPage<DfProblemV2Dto> list(SearchParam<DfRecordSearchV2Dto> sp) {
DfRecordSearchV2Dto data = sp.getData();
if (ObjectUtils.isEmpty(data)) {
if (ObjectUtils.isEmpty(sp.getData())) {
return new Page<>();
}
// 分页参数

10
shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
View File

@ -36,13 +36,14 @@
jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status
FROM bs_sgc_sp_task ts
LEFT JOIN bs_sgc_df_xcyj jl ON jl.id = ts.form_id
LEFT JOIN att_dike_base base on base.dike_code=jl.dike_code
WHERE
ts.business_type = #{dto.businessType}
and ts.status in ('1','2')
<if test="dto.status != null and dto.status != ''">
AND ts.status = #{dto.status}
</if>
<if test="dto.condition!= null and dto.condition.name != null">
<if test="dto.condition!= null and dto.condition.name != null and dto.condition.name != ''">
AND jl.name LIKE CONCAT('%',#{dto.condition.name},'%')
</if>
<if test="dto.condition!= null and dto.condition.type != null and dto.condition.type != ''">
@ -66,9 +67,12 @@
<if test="dto.condition!= null and dto.condition.dutyHolder != null and dto.condition.dutyHolder != ''">
AND jl.duty_holder_id = #{dto.condition.dutyHolder}
</if>
<if test="dto.dikeCode!= null and dto.dikeCode != ''">
<if test="dto.dikeCode != null and dto.dikeCode != ''">
AND jl.dike_code = #{dto.dikeCode}
</if>
<if test="dto.adcdQx != null and dto.adcdQx != ''">
and base.adcd like concat(#{dto.adcdQx}, '%')
</if>
ORDER BY jl.update_time DESC
</select>
@ -84,6 +88,7 @@
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="problemLevel" column="problem_level"/>
<result property="dutyHolderName" column="duty_holder_name"/>
<result property="recordId" column="record_id"/>
@ -100,6 +105,7 @@
yh.dike_code ,
yh.dike_name ,
yh.start_date ,
yh.end_date ,
yh.problem_level ,
yh.duty_holder_name ,
yh.record_id

8
shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml
View File

@ -34,6 +34,7 @@
jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status
FROM bs_sgc_sp_task ts
LEFT JOIN bs_sgc_dw_xcyj jl ON jl.id = ts.form_id
LEFT JOIN att_dike_base base on base.dike_code=jl.dike_code
WHERE
ts.business_type = #{dto.businessType}
and ts.status in ('1','2')
@ -64,9 +65,12 @@
<if test="dto.condition!= null and dto.condition.dutyHolder != null and dto.condition.dutyHolder != ''">
AND jl.duty_holder_id = #{dto.condition.dutyHolder}
</if>
<if test="dto.dikeCode!= null and dto.dikeCode != ''">
<if test="dto.dikeCode != null and dto.dikeCode != ''">
AND jl.dike_code = #{dto.dikeCode}
</if>
<if test="dto.adcdQx != null and dto.adcdQx != ''">
and base.adcd like concat(#{dto.adcdQx}, '%')
</if>
ORDER BY jl.update_time DESC
</select>
@ -84,6 +88,7 @@
<result property="dikeCode" column="dike_code"/>
<result property="dikeName" column="dike_name"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="problemLevel" column="problem_level"/>
<result property="dutyHolderName" column="duty_holder_name"/>
<result property="recordId" column="record_id"/>
@ -100,6 +105,7 @@
yh.dike_code ,
yh.dike_name ,
yh.start_date ,
yh.start_date ,
yh.problem_level ,
yh.duty_holder_name ,
yh.record_id

8
shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml
View File

@ -36,6 +36,7 @@
jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status
FROM bs_sgc_sp_task ts
LEFT JOIN bs_sgc_sz_xcyj jl ON jl.id = ts.form_id
LEFT JOIN att_waga_base base on base.waga_code=jl.waga_code
WHERE
ts.business_type = #{dto.businessType}
and ts.status in ('1','2')
@ -66,9 +67,12 @@
<if test="dto.condition!= null and dto.condition.dutyHolder != null and dto.condition.dutyHolder != ''">
AND jl.duty_holder_id = #{dto.condition.dutyHolder}
</if>
<if test="dto.wagaCode!= null and dto.wagaCode != ''">
<if test="dto.wagaCode != null and dto.wagaCode != ''">
AND jl.waga_code = #{dto.wagaCode}
</if>
<if test="dto.adcdQx != null and dto.adcdQx != ''">
and base.adcd like concat(#{dto.adcdQx}, '%')
</if>
ORDER BY jl.update_time DESC
</select>
@ -84,6 +88,7 @@
<result property="wagaCode" column="waga_code"/>
<result property="wagaName" column="waga_name"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="problemLevel" column="problem_level"/>
<result property="dutyHolderName" column="duty_holder_name"/>
<result property="recordId" column="record_id"/>
@ -100,6 +105,7 @@
yh.waga_code ,
yh.waga_name ,
yh.start_date ,
yh.end_date ,
yh.problem_level ,
yh.duty_holder_name ,
yh.record_id

Write Preview
Loading…
Cancel
Save