feat: 企标详情-评价详情
This commit is contained in:
+7
@@ -46,4 +46,11 @@ public interface EnterpriseStandardReviewMeetingRecordService extends IService<E
|
||||
* @param standardNos
|
||||
*/
|
||||
void setQualityStandards(List<String> standardNos);
|
||||
|
||||
/**
|
||||
* 评分详情接口
|
||||
* @param standardId
|
||||
* @return
|
||||
*/
|
||||
Map<String, List<EnterpriseStandardRmrEvaluateDetail>> evaluateDetailForESInfo(String standardId);
|
||||
}
|
||||
|
||||
+15
-3
@@ -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<EnterpriseStandardReviewMeetingVo> queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) {
|
||||
IPage<EnterpriseStandardReviewMeetingVo> page = new Page<>(pageNo, pageSize);
|
||||
@@ -51,11 +55,11 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, List<EnterpriseStandardRmrEvaluateDetail>> evaluateDetail(String standardNumber) {
|
||||
List<EnterpriseStandardRmrEvaluateDetail> scoreList = esReviewMeetingMapper.getScoreList(standardNumber);
|
||||
public Map<String, List<EnterpriseStandardRmrEvaluateDetail>> evaluateDetail(String rmrId) {
|
||||
List<EnterpriseStandardRmrEvaluateDetail> scoreList = esReviewMeetingMapper.getScoreList(rmrId);
|
||||
Map<String, List<EnterpriseStandardRmrEvaluateDetail>> scoreMap = scoreList.stream().collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName));
|
||||
|
||||
String avgScore = esReviewMeetingMapper.getAvgScore(standardNumber);
|
||||
String avgScore = esReviewMeetingMapper.getAvgScore(rmrId);
|
||||
Map<String, List<EnterpriseStandardRmrEvaluateDetail>> 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<String, List<EnterpriseStandardRmrEvaluateDetail>> evaluateDetailForESInfo(String standardId) {
|
||||
LambdaQueryWrapper<EnterpriseStandardReviewMeetingRecord> reviewMeetingRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
reviewMeetingRecordLambdaQueryWrapper.eq(EnterpriseStandardReviewMeetingRecord::getStandardId, standardId);
|
||||
EnterpriseStandardReviewMeetingRecord one = esReviewMeetingService.getOne(reviewMeetingRecordLambdaQueryWrapper);
|
||||
return this.evaluateDetail(one.getId());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
+13
-2
@@ -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<String, List<EnterpriseStandardRmrEvaluateDetail>> resultMap = esReviewMeetingService.evaluateDetailForESInfo(standardId);
|
||||
return Result.OK(resultMap);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user