From a5de0257374f3dfc7d1cf27d15b029ea42462282 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 22 Dec 2023 13:37:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectAssessController.java | 2 + .../entity/ProcessProjectAssessTerm.java | 32 +++++++++ .../entity/ProcessProjectAssessTermUser.java | 16 +++++ .../xml/ProcessProjectAssessTermMapper.xml | 24 +++++-- .../service/ProcessProjectAssessService.java | 68 +++++++++++++++---- .../entity/LawsAssessResults.java | 39 ++++++++--- 6 files changed, 156 insertions(+), 25 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java index 59579ec8..e4053011 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java @@ -128,10 +128,12 @@ public class ProcessProjectAssessController extends JeroController processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId); + processProjectAssessTermList.forEach(item -> item.setStandardId(lawsAssess.getStandardId())); allList.addAll(processProjectAssessTermList); continue; } ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm(); + processProjectAssessTerm.setStandardId(lawsAssess.getStandardId()); processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber()); processProjectAssessTerm.setTermName(lawsAssess.getStandardName()); processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.YES.getInteger()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java index c756ea36..d615fa34 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.List; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; /** @@ -76,6 +77,10 @@ public class ProcessProjectAssessTerm { @ApiModelProperty(value = "评估流程id") private String assessmentId; + /**标准id*/ + @ApiModelProperty(value = "标准id") + private String standardId; + /** * 条款号 */ @@ -226,5 +231,32 @@ public class ProcessProjectAssessTerm { @DateTimeFormat(pattern="yyyy-MM-dd") private Date expectedTime; + /**评估日期*/ + @TableField(exist = false) + @ApiModelProperty(value = "评估日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date assessTime; + + /**风险点*/ + @TableField(exist = false) + @ApiModelProperty(value = "风险点") + private String riskPoints; + + /**验证方案*/ + @TableField(exist = false) + @ApiModelProperty(value = "验证方案") + private String validateSolution; + + /**不符合项*/ + @TableField(exist = false) + @ApiModelProperty(value = "不符合项") + private String nonConformance; + + /**应对措施*/ + @TableField(exist = false) + @ApiModelProperty(value = "应对措施") + private String countermeasures; + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java index c988869d..21ef4e4a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java @@ -140,6 +140,14 @@ public class ProcessProjectAssessTermUser { @ApiModelProperty(value = "佐证材料") private String fileId; + /**不符合项*/ + @ApiModelProperty(value = "不符合项") + private String nonConformance; + + /**应对措施*/ + @ApiModelProperty(value = "应对措施") + private String countermeasures; + /** * 预计整改完成日期 */ @@ -148,6 +156,14 @@ public class ProcessProjectAssessTermUser { @DateTimeFormat(pattern="yyyy-MM-dd") private Date expectedTime; + /**风险点*/ + @ApiModelProperty(value = "风险点") + private String riskPoints; + + /**验证方案*/ + @ApiModelProperty(value = "验证方案") + private String validateSolution; + /**评估日期*/ @ApiModelProperty(value = "评估日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml index 607519c3..ce4e19d2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml @@ -26,13 +26,18 @@ - + + + + + + ${alias}.id, ${alias}.create_by, ${alias}.create_time, ${alias}.update_by, ${alias}.update_time, ${alias}.org_code, ${alias}.del_flag, ${alias}.assessment_id, - ${alias}.term_number, ${alias}.term_name, ${alias}.term_text, ${alias}.split_info_id, ${alias}.can_assign_flag + ${alias}.standard_id, ${alias}.term_number, ${alias}.term_name, ${alias}.term_text, ${alias}.split_info_id, ${alias}.can_assign_flag