项目库详情页项目风险性总览接口

laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java

@@ -154,6 +154,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 				lawsAssess.setProcessStatus("1");
 				lawsAssess.setCreateTime(now);
 				lawsAssess.setUpdateTime(now);
+				lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 				lawsAssesses.add(lawsAssess);
 			}
 		}
@@ -183,6 +184,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 				lawsAssess.setProcessStatus("1");
 				lawsAssess.setCreateTime(now);
 				lawsAssess.setUpdateTime(now);
+				lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 				lawsAssesses.add(lawsAssess);
 			}
 		}
@@ -233,6 +235,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 			 assess.setProcessStatus("1");
 			 assess.setCreateTime(now);
 			 assess.setUpdateTime(now);
+			 lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 			 lawsAssesses.add(assess);
 		 }
 		 lawsAssessService.saveBatch(lawsAssesses);
@@ -276,6 +279,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 		 if (StringUtils.isNotBlank(selections)){
 			 dos = lawsAssessService.listByIds(Arrays.asList(selections.split(",")));
 		 }else {
+			 lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 			 QueryWrapper<LawsAssess> queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, request.getParameterMap());
 			 dos = lawsAssessService.list(queryWrapper);
 		 }

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<LawsProjectLibr
 	 @Autowired
 	 private ISysDictService sysDictService;
 	 @Autowired
+	 private ILawsAssessService lawsAssessService;
+	 @Autowired
 	 private ILawsAssessResultsService lawsAssessResultsService;
 
 	/**
@@ -158,11 +163,22 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
 		 if(lawsProjectLibrary==null) {
 			 throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
 		 }
-		 RiskOverviewVo riskOverviewVo = new RiskOverviewVo();
+		 LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
-
+		 wrapper.eq(LawsAssess::getProjectId, id);
-
+		 wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
-
+		 List<LawsAssess> list = lawsAssessService.list(wrapper);
-		 return Result.OK(riskOverviewVo);
+		 List<String> collect = list.stream().map(LawsAssess::getId).collect(Collectors.toList());
+		 if (collect.isEmpty()){
+		 	return Result.OK(new RiskOverviewVo(0,0,0,0));
+		 }
+		 LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
+		 queryWrapper.in(LawsAssessResults::getAssessId, collect);
+		 List<LawsAssessResults> 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));
 	 }
 
     /**

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;

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;
 

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 = "符合")