From fade049c9d4366e8b82a564df6c49408584ca860 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Fri, 3 Jan 2025 11:13:26 +0800 Subject: [PATCH] =?UTF-8?q?refactor(pms-business):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E8=AF=A6=E6=83=85=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 ExamineDetailVo 重命名为 ExamineConfigDetailVo，以更准确地反映其用途 - 移除了未使用的导入和注解，简化了代码结构 - 优化了 formatData 方法的实现，提高了代码可读性和性能 --- .../detail/service/ExamineDetailService.java | 6 ++--- .../impl/ExamineDetailServiceImpl.java | 22 +++++++++---------- ...tailVo.java => ExamineConfigDetailVo.java} | 8 +++---- 3 files changed, 16 insertions(+), 20 deletions(-) rename pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/{ExamineDetailVo.java => ExamineConfigDetailVo.java} (82%) diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/ExamineDetailService.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/ExamineDetailService.java index c2cf60b..b9bf08a 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/ExamineDetailService.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/ExamineDetailService.java @@ -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.enums.ReviewTypeEnum; 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.vo.ExamineDetailVo; +import tech.unissense.pms.business.examine.detail.vo.ExamineConfigDetailVo; import java.math.BigDecimal; import java.util.List; @@ -55,7 +53,7 @@ public interface ExamineDetailService { void insertBatch(List list); - List formatData(List configList, ExamineDetailRequestDto dto); + List formatData(List configList, ExamineDetailRequestDto dto); /** * 计算分数 * @param taskId 任务id diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java index da566ad..215b014 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java @@ -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.service.ExamineDetailService; import org.springframework.stereotype.Service; -import tech.unissense.pms.business.examine.detail.vo.ExamineDetailVo; -import tech.unissense.pms.common.exception.ServiceException; +import tech.unissense.pms.business.examine.detail.vo.ExamineConfigDetailVo; import tech.unissense.pms.common.utils.bean.BeanUtils; import javax.annotation.Resource; @@ -88,23 +87,24 @@ public class ExamineDetailServiceImpl implements ExamineDetailService { } @Override - public List formatData(List configList, ExamineDetailRequestDto dto) { - List examineDetailVoList = new ArrayList<>(); + public List formatData(List configList, ExamineDetailRequestDto dto) { + List examineConfigDetailVoList = new ArrayList<>(); ExamineDetail examineDetail = new ExamineDetail(); examineDetail.setExamineId(dto.getExamineId()); List list = examineDetailMapper.list(examineDetail); Map scoreMap = list.stream().collect(Collectors.toMap(ExamineDetail::getConfigId , Function.identity(), (v1, v2) -> v1)); for (ExamineConfig examineConfig : configList) { - ExamineDetailVo examineDetailVo = new ExamineDetailVo(); - BeanUtils.copyProperties(examineConfig, examineDetailVo); + ExamineConfigDetailVo examineConfigDetailVo = new ExamineConfigDetailVo(); + BeanUtils.copyProperties(examineConfig, examineConfigDetailVo); ExamineDetail detail = scoreMap.get(examineConfig.getId()); - examineDetailVo.setScore(detail == null ? 0 : detail.getScore()); - examineDetailVo.setRemark(detail == null ? "" : detail.getRemark()); - examineDetailVoList.add(examineDetailVo); + examineConfigDetailVo.setExamineId(dto.getExamineId()); + examineConfigDetailVo.setScore(detail == null ? 0 : detail.getScore()); + examineConfigDetailVo.setRemark(detail == null ? "" : detail.getRemark()); + examineConfigDetailVoList.add(examineConfigDetailVo); } -// examineDetailVoList.sort(Comparator.comparing(ExamineDetailVo::getSortNum)); - return examineDetailVoList; + examineConfigDetailVoList.sort(Comparator.comparing(ExamineConfigDetailVo::getSortNum)); + return examineConfigDetailVoList; } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/ExamineDetailVo.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/ExamineConfigDetailVo.java similarity index 82% rename from pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/ExamineDetailVo.java rename to pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/ExamineConfigDetailVo.java index 2bc8438..95383bb 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/ExamineDetailVo.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/vo/ExamineConfigDetailVo.java @@ -1,16 +1,13 @@ package tech.unissense.pms.business.examine.detail.vo; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; import tech.unissense.pms.business.examine.config.domain.ExamineConfig; -import java.util.List; - /** * @author : ch * @version : 1.0 - * @ClassName : ExamineDetailVo + * @ClassName : ExamineConfigDetailVo * @Description : * @DATE : Created in 14:59 2025/1/2 * 
       Copyright: Copyright(c) 2025
@@ -22,9 +19,10 @@ import java.util.List; */ @NoArgsConstructor @Data -public class ExamineDetailVo extends ExamineConfig { +public class ExamineConfigDetailVo extends ExamineConfig { private Integer score; + private Integer examineId; private String remark; }