Browse Source

fix:需求调整

release-sy-v1.0.0
“lyd” 4 days ago
parent
commit
2539d1c9fa
  1. 1
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
  2. 3
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
  3. 1
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java

1
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java

@ -242,7 +242,6 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
.map(BsSgcDfManateam::getDikeCode)
.collect(Collectors.toList()))
);
manageList = StreamUtils.distinctByKeyFast(manageList, DfCheckingV2ProjectManage::getDikeCode);
Map<String, String> personNameList = list.stream()
.collect(Collectors.toMap(BsSgcDfManateam::getDikeCode, BsSgcDfManateam::getPersonName));
receiveV2Dto.setDropDownList(manageList.stream().map(e -> {

3
shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java

@ -236,7 +236,7 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
return receiveV2Dto;
}
List<BsSgcDfManateam> list = bsSgcDfManateamService.list(new LambdaQueryWrapper<BsSgcDfManateam>()
.eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber())
.eq(StringUtils.isNotBlank(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber())
);
if (CollectionUtils.isEmpty(list)) {
return receiveV2Dto;
@ -248,7 +248,6 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
.in(DwCheckingV2ProjectManage::getDikeCode, list.stream()
.map(BsSgcDfManateam::getDikeCode)
.collect(Collectors.toList())));
manageList = StreamUtils.distinctByKeyFast(manageList, DwCheckingV2ProjectManage::getDikeCode);
Map<String, String> personNameList = list.stream()
.collect(Collectors.toMap(BsSgcDfManateam::getDikeCode, BsSgcDfManateam::getPersonName));
receiveV2Dto.setDropDownList(manageList.stream().map(e -> {

1
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java

@ -243,7 +243,6 @@ public class SzCheckingV2Service extends BaseService<SzCheckingV2Mapper, SzCheck
.in(SzCheckingV2ProjectManage::getWagaCode, list.stream()
.map(BsSgcSzManateam::getWagaCode)
.collect(Collectors.toList())));
manageList = StreamUtils.distinctByKeyFast(manageList, SzCheckingV2ProjectManage::getWagaCode);
Map<String, String> personNameList = list.stream()
.collect(Collectors.toMap(BsSgcSzManateam::getWagaCode, BsSgcSzManateam::getPersonName));
receiveV2Dto.setDropDownList(manageList.stream().map(e -> {

Loading…
Cancel
Save