diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index dd8cc81c..d485d783 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/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.yxgh.base.enums.CheckingStatus; 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.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfRecordDetailDto; import com.kms.yxgh.df.dto.DfRecordDetailDto.DfRecordItemDto; import com.kms.yxgh.df.dto.DfRecordSearchDto; 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.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; @@ -71,7 +71,7 @@ public class DfRecordService extends BaseService { DfRecordSearchDto dto = BeanCopyUtils.copy(r, DfRecordSearchDto .class); if (dto != null) { - dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) + dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList()) .stream().map(item -> { List parts = Arrays.stream(item.getParts().split(PART_SEPARATOR)) .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index a7850080..e2e68e26 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -71,7 +71,7 @@ public class SzRecordService extends BaseService { SzRecordSearchDto dto = BeanCopyUtils.copy(r, SzRecordSearchDto .class); if (dto != null) { - dto.setParts(items.getOrDefault(r.getPlanId(), Collections.emptyList()) + dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList()) .stream().map(item -> { List parts = Arrays.stream(item.getParts().split( SzCheckingService.PART_SEPARATOR))