diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index 2d80af26..b35ce308 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -154,6 +154,7 @@ public class LawsAssessController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, request.getParameterMap()); dos = lawsAssessService.list(queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java index c0af9638..e39433f5 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java @@ -4,6 +4,7 @@ import java.io.OutputStream; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -18,9 +19,11 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; +import com.jero.modules.projectLibrary.entity.LawsAssess; import com.jero.modules.projectLibrary.entity.LawsAssessResults; import com.jero.modules.projectLibrary.entity.LawsProjectLibrary; import com.jero.modules.projectLibrary.service.ILawsAssessResultsService; +import com.jero.modules.projectLibrary.service.ILawsAssessService; import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.projectLibrary.vo.RiskOverviewVo; @@ -60,6 +63,8 @@ public class LawsProjectLibraryController extends JeroController wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LawsAssess::getProjectId, id); + wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); + List list = lawsAssessService.list(wrapper); + List collect = list.stream().map(LawsAssess::getId).collect(Collectors.toList()); + if (collect.isEmpty()){ + return Result.OK(new RiskOverviewVo(0,0,0,0)); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(LawsAssessResults::getAssessId, collect); + List assessResults = lawsAssessResultsService.list(queryWrapper); + int a = Math.toIntExact(assessResults.stream().filter(LawsAssessResults -> "1".equals(LawsAssessResults.getAssessResults())).count()); + int b = Math.toIntExact(assessResults.stream().filter(LawsAssessResults -> "2".equals(LawsAssessResults.getAssessResults())).count()); + int c = Math.toIntExact(assessResults.stream().filter(LawsAssessResults -> "3".equals(LawsAssessResults.getAssessResults())).count()); + int d = Math.toIntExact(assessResults.stream().filter(LawsAssessResults -> "4".equals(LawsAssessResults.getAssessResults())).count()); + return Result.OK(new RiskOverviewVo(a,b,c,d)); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java index 5e46cea9..7bb7bc07 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java @@ -52,7 +52,6 @@ public class LawsAssess implements Serializable { private String standardId; /**标准来源*/ - @NotBlank(message = "source not null") @Excel(name = "标准来源(1国内、2海外、3企标)", width = 15) @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)") private String source; diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java index 3b2434d7..fc7d6661 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java @@ -60,6 +60,7 @@ public class LawsAssessResults implements Serializable { private Date assessTime; /**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/ + @Dict(dicCode = "assess_results") @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)") private String assessResults; diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/RiskOverviewVo.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/RiskOverviewVo.java index c4203776..02d18cf4 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/RiskOverviewVo.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/RiskOverviewVo.java @@ -2,8 +2,10 @@ package com.jero.modules.projectLibrary.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; /** @@ -14,6 +16,8 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="项目库详情-项目风险性总览", description="项目库详情-项目风险性总览") +@AllArgsConstructor +@NoArgsConstructor public class RiskOverviewVo { /**符合*/ @ApiModelProperty(value = "符合")