From ed06a0046bc1d186ad0ba1d06924b10a7af42a2f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 10 Sep 2023 14:45:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=84=E5=AE=A1=E4=BC=9A=E8=AF=84?= =?UTF-8?q?=E5=88=86=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rpriseStandardReviewMeetingController.java | 24 +++++++--- .../EnterpriseStandardRmrEvaluateDetail.java | 6 +++ ...riseStandardReviewMeetingRecordMapper.java | 8 ++++ ...priseStandardReviewMeetingRecordMapper.xml | 44 +++++++++++++++++++ ...iseStandardReviewMeetingRecordService.java | 11 +++++ ...tandardReviewMeetingRecordServiceImpl.java | 15 +++++++ 6 files changed, 101 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java index 1a818a67..27270d66 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java @@ -4,22 +4,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; 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.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; /** @@ -51,4 +48,17 @@ public class EnterpriseStandardReviewMeetingController extends JeroController pageList= esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); return Result.OK(pageList); } + + /** + * 分页列表查询 + * + * @return + */ + @AutoLog(value = "企标评审会-评分详情") + @ApiOperation(value="企标评审会-评分详情", notes="企标评审会-评分详情") + @GetMapping(value = "/evaluateDetail/{id}") + public Result evaluateDetail(@PathVariable("id") String id) { + Map> resultMap = esReviewMeetingService.evaluateDetail(id); + return Result.OK(resultMap); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java index 330e01a3..794105ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.enterprise.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -74,6 +75,11 @@ public class EnterpriseStandardRmrEvaluateDetail implements Serializable { @ApiModelProperty(value = "评分人id") private String adjudicatorId; + /**评分人名称*/ + @TableField(exist = false) + @ApiModelProperty(value = "评分人名称") + private String adjudicatorName;; + /**扣分理由*/ @ApiModelProperty(value = "扣分理由") private String deductionScoreReason; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java index e959a29f..0a8aef6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java @@ -3,10 +3,14 @@ package com.jero.modules.laws.enterprise.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_review_meeting_record】的数据库操作Mapper @@ -16,6 +20,10 @@ import org.apache.ibatis.annotations.Param; public interface EnterpriseStandardReviewMeetingRecordMapper extends BaseMapper { IPage page(IPage page, @Param("param") ESQueryCommonDTO esReviewMeeting); + + String getAvgScore(@Param("id") String id); + + List getScoreList(@Param("id") String rmrId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml index eb6dfe5b..945842d3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml @@ -11,6 +11,7 @@ + @@ -82,4 +83,47 @@ score.avg_score_item2 DESC, score.avg_score_item4 DESC; + + + + + + 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 975393f6..da3b9a92 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 @@ -3,9 +3,13 @@ package com.jero.modules.laws.enterprise.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; import com.baomidou.mybatisplus.extension.service.IService; +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 java.util.List; +import java.util.Map; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_review_meeting_record】的数据库操作Service @@ -21,4 +25,11 @@ public interface EnterpriseStandardReviewMeetingRecordService extends IService queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize); + + /** + * 评分详情接口 + * @param id + * @return + */ + Map> evaluateDetail(String id); } 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 f2174a33..d8def3f7 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.DictModel; 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.service.EnterpriseStandardReviewMeetingRecordService; @@ -14,7 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -40,6 +44,17 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp return page; } + @Override + public Map> evaluateDetail(String rmrId) { + List scoreList = esReviewMeetingMapper.getScoreList(rmrId); + Map> scoreMap = scoreList.stream().collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName)); + String avgScore = esReviewMeetingMapper.getAvgScore(rmrId); + Map> resultMap = new LinkedHashMap<>(); + resultMap.put(avgScore, null); + resultMap.putAll(scoreMap); + return resultMap; + } + // 转换列表中的状态值为中文 private void transReviewMeetingVo(List list) { if (list.isEmpty()) {