refactor(pms-business): 重构考核详情相关代码
- 将 ExamineDetailVo 重命名为 ExamineConfigDetailVo,以更准确地反映其用途 - 移除了未使用的导入和注解,简化了代码结构 - 优化了 formatData 方法的实现,提高了代码可读性和性能dev_1.1.0
parent
1c2fc2bcc0
commit
fade049c9d
|
@ -3,10 +3,8 @@ package tech.unissense.pms.business.examine.detail.service;
|
||||||
import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
|
import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
|
||||||
import tech.unissense.pms.business.examine.config.enums.ReviewTypeEnum;
|
import tech.unissense.pms.business.examine.config.enums.ReviewTypeEnum;
|
||||||
import tech.unissense.pms.business.examine.detail.domain.ExamineDetail;
|
import tech.unissense.pms.business.examine.detail.domain.ExamineDetail;
|
||||||
import org.springframework.data.domain.Page;
|
|
||||||
import org.springframework.data.domain.PageRequest;
|
|
||||||
import tech.unissense.pms.business.examine.detail.dto.ExamineDetailRequestDto;
|
import tech.unissense.pms.business.examine.detail.dto.ExamineDetailRequestDto;
|
||||||
import tech.unissense.pms.business.examine.detail.vo.ExamineDetailVo;
|
import tech.unissense.pms.business.examine.detail.vo.ExamineConfigDetailVo;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -55,7 +53,7 @@ public interface ExamineDetailService {
|
||||||
|
|
||||||
void insertBatch(List<ExamineDetail> list);
|
void insertBatch(List<ExamineDetail> list);
|
||||||
|
|
||||||
List<ExamineDetailVo> formatData(List<ExamineConfig> configList, ExamineDetailRequestDto dto);
|
List<ExamineConfigDetailVo> formatData(List<ExamineConfig> configList, ExamineDetailRequestDto dto);
|
||||||
/**
|
/**
|
||||||
* 计算分数
|
* 计算分数
|
||||||
* @param taskId 任务id
|
* @param taskId 任务id
|
||||||
|
|
|
@ -9,8 +9,7 @@ import tech.unissense.pms.business.examine.detail.dto.ExamineDetailRequestDto;
|
||||||
import tech.unissense.pms.business.examine.detail.mapper.ExamineDetailMapper;
|
import tech.unissense.pms.business.examine.detail.mapper.ExamineDetailMapper;
|
||||||
import tech.unissense.pms.business.examine.detail.service.ExamineDetailService;
|
import tech.unissense.pms.business.examine.detail.service.ExamineDetailService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import tech.unissense.pms.business.examine.detail.vo.ExamineDetailVo;
|
import tech.unissense.pms.business.examine.detail.vo.ExamineConfigDetailVo;
|
||||||
import tech.unissense.pms.common.exception.ServiceException;
|
|
||||||
import tech.unissense.pms.common.utils.bean.BeanUtils;
|
import tech.unissense.pms.common.utils.bean.BeanUtils;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
@ -88,23 +87,24 @@ public class ExamineDetailServiceImpl implements ExamineDetailService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ExamineDetailVo> formatData(List<ExamineConfig> configList, ExamineDetailRequestDto dto) {
|
public List<ExamineConfigDetailVo> formatData(List<ExamineConfig> configList, ExamineDetailRequestDto dto) {
|
||||||
List<ExamineDetailVo> examineDetailVoList = new ArrayList<>();
|
List<ExamineConfigDetailVo> examineConfigDetailVoList = new ArrayList<>();
|
||||||
ExamineDetail examineDetail = new ExamineDetail();
|
ExamineDetail examineDetail = new ExamineDetail();
|
||||||
examineDetail.setExamineId(dto.getExamineId());
|
examineDetail.setExamineId(dto.getExamineId());
|
||||||
List<ExamineDetail> list = examineDetailMapper.list(examineDetail);
|
List<ExamineDetail> list = examineDetailMapper.list(examineDetail);
|
||||||
Map<Integer, ExamineDetail> scoreMap = list.stream().collect(Collectors.toMap(ExamineDetail::getConfigId
|
Map<Integer, ExamineDetail> scoreMap = list.stream().collect(Collectors.toMap(ExamineDetail::getConfigId
|
||||||
, Function.identity(), (v1, v2) -> v1));
|
, Function.identity(), (v1, v2) -> v1));
|
||||||
for (ExamineConfig examineConfig : configList) {
|
for (ExamineConfig examineConfig : configList) {
|
||||||
ExamineDetailVo examineDetailVo = new ExamineDetailVo();
|
ExamineConfigDetailVo examineConfigDetailVo = new ExamineConfigDetailVo();
|
||||||
BeanUtils.copyProperties(examineConfig, examineDetailVo);
|
BeanUtils.copyProperties(examineConfig, examineConfigDetailVo);
|
||||||
ExamineDetail detail = scoreMap.get(examineConfig.getId());
|
ExamineDetail detail = scoreMap.get(examineConfig.getId());
|
||||||
examineDetailVo.setScore(detail == null ? 0 : detail.getScore());
|
examineConfigDetailVo.setExamineId(dto.getExamineId());
|
||||||
examineDetailVo.setRemark(detail == null ? "" : detail.getRemark());
|
examineConfigDetailVo.setScore(detail == null ? 0 : detail.getScore());
|
||||||
examineDetailVoList.add(examineDetailVo);
|
examineConfigDetailVo.setRemark(detail == null ? "" : detail.getRemark());
|
||||||
|
examineConfigDetailVoList.add(examineConfigDetailVo);
|
||||||
}
|
}
|
||||||
// examineDetailVoList.sort(Comparator.comparing(ExamineDetailVo::getSortNum));
|
examineConfigDetailVoList.sort(Comparator.comparing(ExamineConfigDetailVo::getSortNum));
|
||||||
return examineDetailVoList;
|
return examineConfigDetailVoList;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
package tech.unissense.pms.business.examine.detail.vo;
|
package tech.unissense.pms.business.examine.detail.vo;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
|
import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author : ch
|
* @author : ch
|
||||||
* @version : 1.0
|
* @version : 1.0
|
||||||
* @ClassName : ExamineDetailVo
|
* @ClassName : ExamineConfigDetailVo
|
||||||
* @Description :
|
* @Description :
|
||||||
* @DATE : Created in 14:59 2025/1/2
|
* @DATE : Created in 14:59 2025/1/2
|
||||||
* <pre> Copyright: Copyright(c) 2025 </pre>
|
* <pre> Copyright: Copyright(c) 2025 </pre>
|
||||||
|
@ -22,9 +19,10 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@Data
|
@Data
|
||||||
public class ExamineDetailVo extends ExamineConfig {
|
public class ExamineConfigDetailVo extends ExamineConfig {
|
||||||
|
|
||||||
private Integer score;
|
private Integer score;
|
||||||
|
private Integer examineId;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue