From baba223d4fe800045ef76533e2f7c312e65bc7c0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 13 Sep 2024 15:42:08 +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=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E4=BA=BA?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql                            |  7 ++++++-
 .../entity/LawsEvaluationNotMetLibrary.java       | 15 +++++++++++++++
 .../LawsEvaluationNotMetLibraryServiceImpl.java   |  2 ++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index 4c46ec19..9d3091df 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -359,4 +359,9 @@ ALTER TABLE `process_standard_compliance_check_detail`
 
 -- 2024-09-13 增加评估发起人
 ALTER TABLE `laws_conformity_assessment_library_detail`
-    ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`;
\ No newline at end of file
+    ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`;
+
+-- 2024-09-13 不符合项增加关闭人、关闭时间
+ALTER TABLE `laws_evaluation_not_met_library`
+    ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`,
+    ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;
\ No newline at end of file
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 eec9c6f4..6dd17cfa 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
@@ -254,6 +254,21 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
     @ApiModelProperty(value = "这条数据的所有审批人员")
     private String allApprovalUser;
 
+    /**
+     * 关闭人
+     */
+    @ApiModelProperty(value = "关闭人")
+    private String closeUser;
+
+    /**
+     * 关闭时间
+     */
+    @ApiModelProperty(value = "关闭时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Excel(name = "关闭时间", width = 15, orderNum = "12", format = "yyyy-MM-dd")
+    private Date closeTime;
+
     /**
      * 关闭用主键ids
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index 9c1d49c5..3d16bea5 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -101,6 +101,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
                 LawsEvaluationNotMetLibrary::getFile, lawsEvaluationNotMet.getFile());
         wrapper.set(LawsEvaluationNotMetLibrary::getUpdateTime, new Date());
         wrapper.set(LawsEvaluationNotMetLibrary::getUpdateBy, UserUtils.getCurrentUser().getUsername());
+        wrapper.set(LawsEvaluationNotMetLibrary::getCloseUser, UserUtils.getCurrentUser().getId());
+        wrapper.set(LawsEvaluationNotMetLibrary::getCloseTime, new Date());
         wrapper.in(LawsEvaluationNotMetLibrary::getId, ids);
         update(wrapper);
     }