From ec1fbaa715047d8336dc1c97b02b7d8614ea5ce5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 16:11:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=BA=93=20=E8=AF=84=E4=BC=B0=E5=BA=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AF=B4=E6=98=8E=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update/测试阶段.sql | 6 ++++++ .../entity/ProcessStandardComplianceCheckDetail.java | 1 + .../entity/LawsConformityAssessmentLibraryDetail.java | 7 +++++++ .../entity/LawsEvaluationNotMetLibrary.java | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index fa0e30f0..4f8ad290 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -356,6 +356,12 @@ ALTER TABLE `process_market_standard_release` -- 2024-09-13 增加辅助说明材料字段 ALTER TABLE `process_standard_compliance_check_detail` ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`; +-- 2024-09-13 增加辅助说明材料字段 +ALTER TABLE `laws_evaluation_not_met_library` + ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料'; +-- 2024-09-13 增加辅助说明材料字段 +ALTER TABLE `laws_conformity_assessment_library_detail` + ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料'; -- 2024-09-13 增加评估发起人 ALTER TABLE `laws_conformity_assessment_library_detail` diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index e37c0a5f..44f502c1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -226,6 +226,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa * 辅助说明材料 */ @ApiModelProperty(value = "辅助说明材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String unsatisfiedRequireAttach; @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java index 5c0ea10e..6068cb2a 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java @@ -165,6 +165,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable { @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String material; + /** + * 辅助说明材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") + private String unsatisfiedRequireAttach; + /** * 关联主表Id */ diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index 6dd17cfa..8906c897 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -276,6 +276,13 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "关闭用主键ids") private String selections; + /** + * 辅助说明材料 + */ + @ApiModelProperty(value = "辅助说明材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") + private String unsatisfiedRequireAttach; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file