Browse Source

fix: 修复巡查记录检索接口

master_tdsql
hxh 1 year ago
parent
commit
501c74bd5e
  1. 6
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
  2. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

6
shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.system.service.SysUserService; import com.kms.system.service.SysUserService;
import com.kms.yxgh.base.enums.CheckingStatus; import com.kms.yxgh.base.enums.CheckingStatus;
import com.kms.yxgh.base.enums.RecordStatus; import com.kms.yxgh.base.enums.RecordStatus;
import com.kms.yxgh.df.domain.DfRecord;
import com.kms.yxgh.df.domain.DfRecordItem;
import com.kms.yxgh.df.dto.DfCheckingDetailDto; import com.kms.yxgh.df.dto.DfCheckingDetailDto;
import com.kms.yxgh.df.dto.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfPlanDetailDto;
import com.kms.yxgh.df.dto.DfRecordDetailDto; import com.kms.yxgh.df.dto.DfRecordDetailDto;
import com.kms.yxgh.df.dto.DfRecordDetailDto.DfRecordItemDto; import com.kms.yxgh.df.dto.DfRecordDetailDto.DfRecordItemDto;
import com.kms.yxgh.df.dto.DfRecordSearchDto; import com.kms.yxgh.df.dto.DfRecordSearchDto;
import com.kms.yxgh.df.dto.StartPlan; import com.kms.yxgh.df.dto.StartPlan;
import com.kms.yxgh.df.domain.DfRecord;
import com.kms.yxgh.df.domain.DfRecordItem;
import com.kms.yxgh.df.mapper.DfRecordItemMapper; import com.kms.yxgh.df.mapper.DfRecordItemMapper;
import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.df.mapper.DfRecordMapper;
import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.BeanCopyUtils;
@ -71,7 +71,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
DfRecordSearchDto dto = BeanCopyUtils.copy(r, DfRecordSearchDto DfRecordSearchDto dto = BeanCopyUtils.copy(r, DfRecordSearchDto
.class); .class);
if (dto != null) { if (dto != null) {
dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList())
.stream().map(item -> { .stream().map(item -> {
List<String> parts = Arrays.stream(item.getParts().split(PART_SEPARATOR)) List<String> parts = Arrays.stream(item.getParts().split(PART_SEPARATOR))
.sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList());

2
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

@ -71,7 +71,7 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
SzRecordSearchDto dto = BeanCopyUtils.copy(r, SzRecordSearchDto SzRecordSearchDto dto = BeanCopyUtils.copy(r, SzRecordSearchDto
.class); .class);
if (dto != null) { if (dto != null) {
dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList())
.stream().map(item -> { .stream().map(item -> {
List<String> parts = Arrays.stream(item.getParts().split( List<String> parts = Arrays.stream(item.getParts().split(
SzCheckingService.PART_SEPARATOR)) SzCheckingService.PART_SEPARATOR))

Loading…
Cancel
Save