From 6c9e1795402df2a12e0387c5caf85317c7d81ac2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 22 Dec 2023 18:34:30 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsAssessResultsController.java | 24 +--- .../service/ILawsAssessResultsService.java | 5 +- .../impl/LawsAssessResultsServiceImpl.java | 122 +++++++++++------- .../projectLibrary/vo/MetNotMetVO.java | 27 ++++ 4 files changed, 107 insertions(+), 71 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/MetNotMetVO.java diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java index f559bdd7..7b36b6cc 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java @@ -1,25 +1,14 @@ package com.jero.modules.projectLibrary.controller; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import cn.hutool.core.collection.CollStreamUtil; import com.jero.common.api.vo.Result; -import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; -import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; -import com.jero.modules.projectLibrary.entity.LawsAssess; import com.jero.modules.projectLibrary.entity.LawsAssessResults; import com.jero.modules.projectLibrary.service.ILawsAssessResultsService; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.projectLibrary.service.ILawsAssessService; +import com.jero.modules.projectLibrary.vo.MetNotMetVO; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.lang3.StringUtils; @@ -29,9 +18,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; -import java.util.List; -import java.util.Map; - /** * @Description: 标准评估结果 @@ -71,11 +57,11 @@ public class LawsAssessResultsController extends JeroController> queryByAssessId(@RequestParam(name="assessId",required=true) String assessId) { - List lawsAssessResultsList = lawsAssessResultsService.queryByAssessId(assessId); + @GetMapping(value = "/getMetNotMetVOById") + public Result getMetNotMetVOById(@RequestParam(name="id",required=true) String id) { + MetNotMetVO metNotMetVO = lawsAssessResultsService.getMetNotMetVOById(id); - return Result.OK(lawsAssessResultsList); + return Result.OK(metNotMetVO); } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessResultsService.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessResultsService.java index 52abd2fa..fbb8c8bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessResultsService.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessResultsService.java @@ -4,6 +4,8 @@ import com.jero.modules.projectLibrary.entity.LawsAssessResults; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.projectLibrary.vo.MetNotMetVO; + import java.util.List; /** @@ -72,7 +74,6 @@ public interface ILawsAssessResultsService extends IService { * @param id * @return */ - LawsAssessResults queryById(String id); + MetNotMetVO getMetNotMetVOById(String id); - List queryByAssessId(String assessId); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java index 5aabf846..d9bf3f94 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java @@ -1,6 +1,8 @@ package com.jero.modules.projectLibrary.service.impl; +import com.google.common.collect.Lists; import cn.hutool.core.collection.CollStreamUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.CommonConstant; @@ -10,11 +12,13 @@ import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; +import com.jero.modules.projectLibrary.common.AssessCommon; import com.jero.modules.projectLibrary.entity.LawsAssess; import com.jero.modules.projectLibrary.entity.LawsAssessResults; import com.jero.modules.projectLibrary.mapper.LawsAssessResultsMapper; import com.jero.modules.projectLibrary.service.ILawsAssessResultsService; import com.jero.modules.projectLibrary.service.ILawsAssessService; +import com.jero.modules.projectLibrary.vo.MetNotMetVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,9 +66,60 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl queryPage(LawsAssessResults lawsAssessResults, Integer pageNo, Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsAssessResults, req.getParameterMap()); + String assessId = lawsAssessResults.getAssessId(); + + LawsAssess lawsAssess = lawsAssessService.queryById(assessId); + if(lawsAssess==null) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } + String projectId = lawsAssess.getProjectId(); + String standardId = lawsAssess.getStandardId(); + String source = lawsAssess.getSource(); + String processStatus = lawsAssess.getProcessStatus(); + String standardNumber = null; + String standardName = null; + String standardEnglishName = null; + String standardState = null; + List dictModels = sysBaseAPI.queryDictItemsByCode("standard_state"); + Map standardStateMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); + if (CommonConstant.STANDARD_SOURCE_1.equals(source)){ + //查询国内标准数据，赋值给collection + LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); + if (standard != null){ + standardNumber = standard.getStandardNumber(); + standardName = standard.getStandardName(); + standardEnglishName = standard.getStandardEnglishName(); + standardState = standardStateMap.get(standard.getStandardState()); + } + } + if (CommonConstant.STANDARD_SOURCE_2.equals(source)){ + //查询海外标准数据，赋值给collection + LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); + if (standard != null){ + standardNumber = standard.getStandardNumber(); + standardName = standard.getStandardName(); + standardEnglishName = standard.getStandardEnglishName(); + standardState = standardStateMap.get(standard.getStandardState()); + } + } + Map parameterMap = req.getParameterMap(); + parameterMap.remove("assessId"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsAssessResults, parameterMap); + queryWrapper.lambda() + .eq(LawsAssessResults::getProjectId,projectId) + .eq(LawsAssessResults::getStandardId,standardId) + .groupBy(LawsAssessResults::getTermNumber) + .groupBy(LawsAssessResults::getAssessorId); Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); + Page pageList = page(page, queryWrapper); + for (LawsAssessResults assessResults : pageList.getRecords()) { + assessResults.setStandardName(standardName); + assessResults.setStandardNumber(standardNumber); + assessResults.setStandardEnglishName(standardEnglishName); + assessResults.setStandardState(standardState); + assessResults.setSource(source); + } + return pageList; } /** @@ -135,54 +190,21 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(LawsAssessResults::getProjectId,assessResults.getProjectId()) + .eq(LawsAssessResults::getStandardId,assessResults.getStandardId()) + .eq(LawsAssessResults::getTermNumber,assessResults.getTermNumber()); + List assessResultsList = this.list(queryWrapper); + Map> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults); + MetNotMetVO metNotMetVO = new MetNotMetVO(); + metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH)); + metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT)); + metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED)); + metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED)); + return metNotMetVO; } - @Override - public List queryByAssessId(String assessId) { - LawsAssess lawsAssess = lawsAssessService.queryById(assessId); - if(lawsAssess==null) { - throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - String projectId = lawsAssess.getProjectId(); - String standardId = lawsAssess.getStandardId(); - String source = lawsAssess.getSource(); - String processStatus = lawsAssess.getProcessStatus(); - String standardNumber = null; - String standardName = null; - String standardEnglishName = null; - String standardState = null; - List dictModels = sysBaseAPI.queryDictItemsByCode("standard_state"); - Map standardStateMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); - if (CommonConstant.STANDARD_SOURCE_1.equals(source)){ - //查询国内标准数据，赋值给collection - LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); - if (standard != null){ - standardNumber = standard.getStandardNumber(); - standardName = standard.getStandardName(); - standardEnglishName = standard.getStandardEnglishName(); - standardState = standardStateMap.get(standard.getStandardState()); - } - } - if (CommonConstant.STANDARD_SOURCE_2.equals(source)){ - //查询海外标准数据，赋值给collection - LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); - if (standard != null){ - standardNumber = standard.getStandardNumber(); - standardName = standard.getStandardName(); - standardEnglishName = standard.getStandardEnglishName(); - standardState = standardStateMap.get(standard.getStandardState()); - } - } - List lawsAssessResultsList = baseMapper.selectListByProjectIdAndStandardId(projectId,standardId); - for (LawsAssessResults lawsAssessResults : lawsAssessResultsList) { - lawsAssessResults.setStandardName(standardName); - lawsAssessResults.setStandardNumber(standardNumber); - lawsAssessResults.setStandardEnglishName(standardEnglishName); - lawsAssessResults.setStandardState(standardState); - lawsAssessResults.setSource(source); - } - return lawsAssessResultsList; - } } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/MetNotMetVO.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/MetNotMetVO.java new file mode 100644 index 00000000..cde2f21c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/MetNotMetVO.java @@ -0,0 +1,27 @@ +package com.jero.modules.projectLibrary.vo; + +import com.jero.modules.projectLibrary.entity.LawsAssessResults; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 符合、不符合页 + * @author liJiaRao + * @date 2023-12-22 18:29 + */ +@Data +public class MetNotMetVO { + /** + * 符合 + */ + @ApiModelProperty(value = "主键") + private List accordWithList; + @ApiModelProperty(value = "不符合") + private List notCompliantList; + @ApiModelProperty(value = "待验证") + private List toBeVerifiedList; + @ApiModelProperty(value = "不涉及") + private List notInvolvedList; +}