diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java index b3178764..aa02d4e8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java @@ -20,7 +20,8 @@ public class DwRecordSearchV2Dto implements IAdcdDeptRole { @ApiModelProperty("工程损坏单位id") private String damageUnitId; - + @ApiModelProperty(value = "任务名称") + private String taskName; @ApiModelProperty("工程名称") private String dikeName; @ApiModelProperty("工程类型") diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java index c780a026..443a2577 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java @@ -247,7 +247,6 @@ public class DwCheckingV2Service extends BaseService manageList = this.baseMapper.selectList(new LambdaQueryWrapper() - .apply(" distinct dike_code ") .in(DwCheckingV2ProjectManage::getDikeCode, list.stream() .map(BsSgcDfManateam::getDikeCode) .collect(Collectors.toList()))); @@ -258,7 +257,7 @@ public class DwCheckingV2Service extends BaseService - - - - - select - xmgl.id, - xmgl.waga_code , - xmgl.waga_name , - xmgl.type , - xmgl.name , - xmgl.create_time , - xmgl.category , - xmgl.create_uid , - xmgl.cycle, - xmgl.responsible_unit, - xmgl.responsible_unit_id, - xmgl.task_name, - xmgl.create_name + xmgl.id, + xmgl.waga_code , + xmgl.waga_name , + xmgl.type, + xmgl.name, + xmgl.create_time, + xmgl.category , + xmgl.create_uid, + xmgl.create_name from bs_sgc_sz_xmgl xmgl left join att_waga_base base on base.waga_code=xmgl.waga_code