|
|
@ -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<DfRecordMapper, DfRecord> { |
|
|
|
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<String> parts = Arrays.stream(item.getParts().split(PART_SEPARATOR)) |
|
|
|
.sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); |
|
|
|