From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
index 8b8f1fe..087b3ae 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
@@ -10,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鎶曚繚鐢宠鎿嶄綔鍘嗗彶琛�
@@ -28,25 +29,53 @@
this.content=content;
this.applyId = apply.getId();
this.createDate =apply.getEditDate();
- this.editor =apply.getEditor();
+ this.creator =apply.getEditor();
this.status = apply.getStatus();
this.objId=objId;
this.objType = objType;
this.beforeContent=before;
this.afterContent=after;
}
+
public ApplyLog(ApplyChange apply,String title,String content,Integer objId,Integer objType, String before,String after){
this.title =title;
this.content=content;
this.applyId = apply.getId();
this.createDate =apply.getEditDate();
- this.editor =apply.getEditor();
+ this.creator =apply.getEditor();
this.status = apply.getStatus();
this.objId=objId;
this.objType = objType;
this.beforeContent=before;
this.afterContent=after;
}
+
+ public ApplyLog(UnionApply apply,String title,String content,Integer objId,Integer objType, String before,String after){
+ this.title =title;
+ this.content=content;
+ this.applyId = apply.getId();
+ this.createDate =apply.getEditDate();
+ this.creator =apply.getEditor();
+ this.status = apply.getStatus();
+ this.objId=objId;
+ this.objType = objType;
+ this.beforeContent=before;
+ this.afterContent=after;
+ }
+
+ public ApplyLog(UnionChange apply,String title,String content,Integer objId,Integer objType, String before,String after){
+ this.title =title;
+ this.content=content;
+ this.applyId = apply.getId();
+ this.createDate =apply.getEditDate();
+ this.creator =apply.getEditor();
+ this.status = apply.getStatus();
+ this.objId=objId;
+ this.objType = objType;
+ this.beforeContent=before;
+ this.afterContent=after;
+ }
+
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -115,6 +144,9 @@
@ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
@TableField(exist = false)
private String creatorName;
+ @ApiModelProperty(value = "鍒涘缓浜洪鍨� 0骞冲彴 1浼佷笟", example = "1")
+ @TableField(exist = false)
+ private Integer creatorType;
@ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
@TableField(exist = false)
--
Gitblit v1.9.3