From b70d017947d0e4a656925a4a3b946ae5938f112d Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 16 九月 2025 14:23:01 +0800
Subject: [PATCH] 部分新功能
---
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopyRecord.java | 45 +++++++++-------------
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/DocumentBorrowCopyController.java | 1
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java | 26 ++++++------
3 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/DocumentBorrowCopyController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/DocumentBorrowCopyController.java
index 4cfe559..b817d98 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/DocumentBorrowCopyController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/DocumentBorrowCopyController.java
@@ -3,7 +3,6 @@
import com.gkhy.exam.common.annotation.RepeatSubmit;
import com.gkhy.exam.common.api.CommonResult;
-import com.gkhy.exam.system.domain.AnnualVerificationPlan;
import com.gkhy.exam.system.domain.DocumentBorrowCopy;
import com.gkhy.exam.system.service.DocumentBorrowCopyService;
import io.swagger.annotations.Api;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java
index a858bd8..0fca222 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java
@@ -45,19 +45,19 @@
@NotBlank(message = "记录名称不能为空")
private String name;
- @ApiModelProperty(value ="制表人id" ,required = true)
- @TableField("tabulation_id")
- @NotNull(message = "制表人id不能为空")
- private Long tabulationId;
-
- @ApiModelProperty("制表人")
- @TableField("tabulation_name")
- private String tabulationName;
-
- @ApiModelProperty(value ="制表日期",required = true)
- @TableField("tabulation_date")
- @NotNull(message = "制表日期不能为空")
- private LocalDateTime tabulationDate;
+// @ApiModelProperty(value ="制表人id" ,required = true)
+// @TableField("tabulation_id")
+// @NotNull(message = "制表人id不能为空")
+// private Long tabulationId;
+//
+// @ApiModelProperty("制表人")
+// @TableField("tabulation_name")
+// private String tabulationName;
+//
+// @ApiModelProperty(value ="制表日期",required = true)
+// @TableField("tabulation_date")
+// @NotNull(message = "制表日期不能为空")
+// private LocalDateTime tabulationDate;
@ApiModelProperty("删除标志(0为删除，1删除，默认0)")
@TableField("del_flag")
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopyRecord.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopyRecord.java
index 5e50963..b92197e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopyRecord.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopyRecord.java
@@ -1,11 +1,14 @@
package com.gkhy.exam.system.domain;
+import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -33,45 +36,33 @@
@TableField("document_borrow_id")
private Long documentBorrowId;
+ @ApiModelProperty("时间")
+ @TableField("borrow_date")
+ private Date borrowDate;
+
@ApiModelProperty("文件名称")
@TableField("file_name")
private String fileName;
- @ApiModelProperty("编号")
+ @ApiModelProperty("文件编号")
@TableField("number")
private String number;
- @ApiModelProperty("发放部门")
- @TableField("distribution_dept_name")
- private String distributionDeptName;
+ @ApiModelProperty("受控状态")
+ @TableField("controlled_state")
+ private String controlledState;
- @ApiModelProperty("发放签收")
- @TableField("distribution_sign")
- private String distributionSign;
+ @ApiModelProperty("签名")
+ @TableField("back_sign")
+ private String backSign;
- @ApiModelProperty("发放日期")
- @TableField("distribution_date")
- private LocalDateTime distributionDate;
+ @ApiModelProperty("归还日期")
+ @TableField("back_date")
+ private Date backDate;
- @ApiModelProperty("回收部门")
- @TableField("collection_dept_name")
- private String collectionDeptName;
-
- @ApiModelProperty("签回")
- @TableField("collection_sign")
- private String collectionSign;
-
- @ApiModelProperty("发放日期")
- @TableField("collection_date")
- private LocalDateTime collectionDate;
-
- @ApiModelProperty("发放份数")
+ @ApiModelProperty("借阅、复制份数")
@TableField("collection_num")
private Integer collectionNum;
-
- @ApiModelProperty("发放份数")
- @TableField("distribution_num")
- private Integer distributionNum;
@ApiModelProperty("排序")
@TableField("sort")
--
Gitblit v1.9.2