diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java index 46c35b72..d93adf06 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java @@ -46,4 +46,11 @@ public interface EnterpriseStandardReviewMeetingRecordService extends IService standardNos); + + /** + * 评分详情接口 + * @param standardId + * @return + */ + Map> evaluateDetailForESInfo(String standardId); } 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 a1092e55..334a66e8 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 @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -43,6 +44,9 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp @Resource private EnterpriseStandardPlanService esPlanService; + @Resource + private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; + @Override public IPage queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); @@ -51,11 +55,11 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp } @Override - public Map> evaluateDetail(String standardNumber) { - List scoreList = esReviewMeetingMapper.getScoreList(standardNumber); + public Map> evaluateDetail(String rmrId) { + List scoreList = esReviewMeetingMapper.getScoreList(rmrId); Map> scoreMap = scoreList.stream().collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName)); - String avgScore = esReviewMeetingMapper.getAvgScore(standardNumber); + String avgScore = esReviewMeetingMapper.getAvgScore(rmrId); Map> resultMap = new LinkedHashMap<>(); resultMap.put(avgScore, null); resultMap.putAll(scoreMap); @@ -81,6 +85,14 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp // 设置为优质标准 esPlanService.update(espWrapper); } + + @Override + public Map> evaluateDetailForESInfo(String standardId) { + LambdaQueryWrapper reviewMeetingRecordLambdaQueryWrapper = new LambdaQueryWrapper<>(); + reviewMeetingRecordLambdaQueryWrapper.eq(EnterpriseStandardReviewMeetingRecord::getStandardId, standardId); + EnterpriseStandardReviewMeetingRecord one = esReviewMeetingService.getOne(reviewMeetingRecordLambdaQueryWrapper); + return this.evaluateDetail(one.getId()); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 21958a79..cf0465f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -22,13 +22,11 @@ import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -223,4 +221,17 @@ public class LawsEnterpriseController { public Result importExcelWithData(@RequestParam("file") MultipartFile file) { return Result.OK(lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue())); } + + /** + * 企标详情-评分详情 + * + * @return + */ + @AutoLog(value = "企业法规标准-评分详情") + @ApiOperation(value = "企业法规标准-评分详情", notes = "企业法规标准-评分详情") + @GetMapping(value = "/evaluateDetailForESInfo/{standardId}") + public Result evaluateDetailForESInfo(@PathVariable("standardId") String standardId) { + Map> resultMap = esReviewMeetingService.evaluateDetailForESInfo(standardId); + return Result.OK(resultMap); + } }