From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java
index 6d04814..e11ec92 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCheck.java
@@ -5,7 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -31,46 +35,44 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
+
+ @TableField("year")
+ private String year;
@ApiModelProperty("企业id")
@TableField("company_id")
- @NotNull(message = "企业id不能为空")
private Integer companyId;
@ApiModelProperty("受审部门")
@TableField("dept_id")
- @NotNull(message = "受审部门不能为空")
- private Long deptId;
+ private Integer deptId;
- @ApiModelProperty("内审人员")
- @TableField("audit_id")
- @NotNull(message = "内审人员不能为空")
- private Long auditId;
+ @TableField(exist = false)
+ private String deptName;
- @ApiModelProperty("内审日期")
- @NotNull(message = "内审日期不能为空")
- @TableField("audit_date")
- private LocalDateTime auditDate;
+ @ApiModelProperty("审核人员")
+ @TableField("person_id")
+ private Integer personId;
- @ApiModelProperty("条款编码")
- @TableField("caluse_num")
- private String caluseNum;
+ @TableField(exist = false)
+ private String personName;
- @ApiModelProperty("条款内容")
- @TableField("caluse_content")
- private String caluseContent;
+ @ApiModelProperty("审核时间")
+ @TableField("check_time")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate checkTime;
- @ApiModelProperty("检查记录")
- @TableField("check_record")
- @NotBlank(message = "检查记录不能为空")
- private String checkRecord;
+ @ApiModelProperty(value = "开始时间")
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startTime;
- @ApiModelProperty("不符合标记")
- @TableField("inconsistent")
- private String inconsistent;
+ @ApiModelProperty(value = "结束时间")
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endTime;
- @ApiModelProperty("0否1是")
@TableField("del_flag")
private Integer delFlag;
@@ -86,5 +88,7 @@
@TableField("update_time")
private LocalDateTime updateTime;
+ @TableField(exist = false)
+ private List<InternalAuditCheckCatalogue> checkCatalogues;
}
--
Gitblit v1.9.2