feat: 不符合项库增加关闭人关闭时间字段

2024-09-13 15:42:22 +08:00
parent a51971fcb0
commit baba223d4f
3 changed files with 23 additions and 1 deletions
@@ -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`;
+    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`;
@@ -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
     */
@@ -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);
    }