评估结果历史实体类更正

laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardCollection.java

@@ -6,6 +6,7 @@ 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.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -109,6 +110,8 @@ public class LawsStandardCollection implements Serializable {
     private String onTheProductionDate;
 
     /**标准状态*/
+    @Dict(dicCode = "es_status")
+//    @Dict(dicCode = "standard_state")
     @TableField(exist = false)
     @ApiModelProperty(value = "标准状态")
     private String standardState;

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

@@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.projectLibrary.entity.LawsAssessResults;
+
 import com.jero.modules.projectLibrary.service.ILawsAssessResultsService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
@@ -41,13 +42,9 @@ public class LawsAssessResultsController extends JeroController<LawsAssessResult
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		String standardId = lawsAssessResults.getStandardId();
+		String assessId = lawsAssessResults.getAssessId();
-		String projectId = lawsAssessResults.getProjectId();
+		if (StringUtils.isBlank(assessId)){
-		if (StringUtils.isBlank(standardId)){
+			throw new JeroBootException("标准评估ID不能为空");
-			throw new JeroBootException("标准ID不能为空");
-		}
-		if (StringUtils.isBlank(projectId)){
-			throw new JeroBootException("项目ID不能为空");
 		}
 		IPage<LawsAssessResults> pageList = lawsAssessResultsService.queryPage(lawsAssessResults, pageNo, pageSize, req);
 		return Result.OK(pageList);

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

@@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
 import org.apache.poi.ss.formula.functions.T;
 
+
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

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

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
@@ -17,10 +18,14 @@ 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.LawsAssessResults;
 import com.jero.modules.projectLibrary.entity.LawsProjectLibrary;
+import com.jero.modules.projectLibrary.service.ILawsAssessResultsService;
 import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.projectLibrary.vo.RiskOverviewVo;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.sun.deploy.net.URLEncoder;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +57,10 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
 	private ILawsProjectLibraryService lawsProjectLibraryService;
 	@Autowired
 	private ISysUserService sysUserService;
+	 @Autowired
+	 private ISysDictService sysDictService;
+	 @Autowired
+	 private ILawsAssessResultsService lawsAssessResultsService;
 
 	/**
 	 * 分页列表查询
@@ -138,6 +147,24 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
 		return Result.OK(lawsProjectLibrary);
 	}
 
+	 /**
+	  * 项目风险性总览
+	  */
+	 @AutoLog(value = "项目库详情-项目风险性总览")
+	 @ApiOperation(value="项目库详情-项目风险性总览", notes="项目库详情-项目风险性总览")
+	 @GetMapping(value = "/riskOverview")
+	 public Result<RiskOverviewVo> riskOverview(@RequestParam(name="id",required=true) String id) {
+		 LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.queryById(id);
+		 if(lawsProjectLibrary==null) {
+			 throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+		 }
+		 RiskOverviewVo riskOverviewVo = new RiskOverviewVo();
+
+
+
+		 return Result.OK(riskOverviewVo);
+	 }
+
     /**
     * 导出excel
     */
@@ -201,30 +228,11 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
 			 String projectHealth = aDo.getProjectHealth();
 			 String projectLeader = aDo.getProjectLeader();
 
-			 switch (projectSource) {
+			 String project_source = sysDictService.queryDictTextByKey("project_source", projectSource);
-				 case "1":
+			 aDo.setProjectSource(project_source);
-					 aDo.setProjectSource("本地新增");
-					 break;
-				 case "2":
-					 aDo.setProjectSource("PMS");
-					 break;
-				 default:
-					 aDo.setProjectSource("");
-			 }
 
-			 switch (projectHealth) {
+			 String project_health = sysDictService.queryDictTextByKey("project_health", projectHealth);
-				 case "1":
+			 aDo.setProjectHealth(project_health);
-					 aDo.setProjectHealth("预警");
-					 break;
-				 case "2":
-					 aDo.setProjectHealth("风险");
-					 break;
-				 case "3":
-					 aDo.setProjectHealth("正常");
-					 break;
-				 default:
-					 aDo.setProjectHealth("");
-			 }
 
 			 if (StringUtils.isNotBlank(projectLeader)) {
 				 SysUser sysUser = sysUserService.getById(projectLeader);

laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java

@@ -35,66 +35,81 @@ public class LawsAssessResults implements Serializable {
     @ApiModelProperty(value = "主键")
     private String id;
 
-	/**标准ID*/
+	/**标准评估ID*/
+    @ApiModelProperty(value = "标准评估ID")
+    private String assessId;
+
+	/**流程状态(1-未评估、2-评估中、3-已评估)*/
+    @ApiModelProperty(value = "流程状态(1-未评估、2-评估中、3-已评估)")
+    private String processStatus;
+
+    /**评估人ID*/
+    @ApiModelProperty(value = "评估人ID")
+    private String assessorId;
+
+	/**评估人名字*/
+    @ApiModelProperty(value = "评估人名字")
+    private String assessorName;
+
+	/**责任部门ID*/
+    @ApiModelProperty(value = "责任部门ID")
+    private String departmentId;
+
+	/**评估日期*/
+    @ApiModelProperty(value = "评估日期")
+    private Date assessTime;
+
+	/**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/
+    @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)")
+    private String assessResults;
+
+	/**条款ID*/
+    @ApiModelProperty(value = "条款ID")
+    private String termId;
+
+    /**标准ID*/
     @ApiModelProperty(value = "标准ID")
     private String standardId;
 
-	/**标准编号*/
+	/**标准号*/
-    @ApiModelProperty(value = "标准编号")
+    @ApiModelProperty(value = "标准号")
     private String standardNumber;
 
     /**标准名称*/
     @ApiModelProperty(value = "标准名称")
     private String standardName;
 
-	/**项目ID*/
-    @ApiModelProperty(value = "项目ID")
-    private String projectId;
-
-	/**项目名称*/
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-	/**条款ID*/
-    @ApiModelProperty(value = "条款ID")
-    private String termId;
-
 	/**条款号*/
     @ApiModelProperty(value = "条款号")
-    private String termNum;
+    private String termNumber;
 
-	/**条款名称*/
+	/**项目编号*/
-    @ApiModelProperty(value = "条款名称")
+    @ApiModelProperty(value = "项目编号")
-    private String termName;
+    private String projectNo;
 
-	/**责任部门ID*/
+    /**应对措施*/
-    @ApiModelProperty(value = "责任部门ID")
+    @ApiModelProperty(value = "应对措施")
-    private String departmentId;
+    private String countermeasures;
 
-	/**设计工程师ID*/
+    /**风险点*/
-    @ApiModelProperty(value = "设计工程师ID")
+    @ApiModelProperty(value = "风险点")
-    private String engineerId;
+    private String riskPoints;
 
-	/**设计工程师名字*/
+    /**设计工程师名字*/
-    @ApiModelProperty(value = "设计工程师名字")
+    @ApiModelProperty(value = "验证方案")
-    private String engineerName;
+    private String validateSolution;
 
-	/**预计整改完成日期*/
+    /**预估更改周期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "预估更改周期")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private String cycle;
-    @ApiModelProperty(value = "预计整改完成日期")
-    private Date expectedTime;
 
-	/**实际整改完成日期*/
+    /**不涉及理由*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "不涉及理由")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private String reason;
-    @ApiModelProperty(value = "实际整改完成日期")
-    private Date realityTime;
 
-	/**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/
+    /**不符合项*/
-    @Dict(dicCode = "assess_rectification")
+    @ApiModelProperty(value = "不符合项")
-    @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)")
+    private String nonconformance;
-    private String state;
 
 
     /**创建人*/

laws-modules/src/main/java/com/jero/modules/projectLibrary/vo/RiskOverviewVo.java

@@ -0,0 +1,34 @@
+package com.jero.modules.projectLibrary.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 项目库详情-项目风险性总览
+ */
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="项目库详情-项目风险性总览", description="项目库详情-项目风险性总览")
+public class RiskOverviewVo {
+    /**符合*/
+    @ApiModelProperty(value = "符合")
+    private int conform;
+
+    /**不符合*/
+    @ApiModelProperty(value = "不符合")
+    private int nonConformance;
+
+    /**待验证*/
+    @ApiModelProperty(value = "待验证")
+    private int toBeVerified;
+
+    /**不涉及*/
+    @ApiModelProperty(value = "不涉及")
+    private int notInvolved;
+
+}