diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java index c2e2621a..25071733 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java @@ -7,21 +7,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; +import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardReviewMeetingRecordMapper; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardReviewMeetingRecordMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -57,7 +56,11 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp @Override public Map> evaluateDetail(String rmrId) { List scoreList = esReviewMeetingMapper.getScoreList(rmrId); - Map> scoreMap = scoreList.stream().collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName)); + Map> scoreMap = scoreList.stream() + .collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName)); + scoreMap.replaceAll((k, v) -> scoreMap.get(k).stream() + .sorted(Comparator.comparing(EnterpriseStandardRmrEvaluateDetail::getEvaluateItem)) + .collect(Collectors.toList())); String avgScore = esReviewMeetingMapper.getAvgScore(rmrId); Map> resultMap = new LinkedHashMap<>();