From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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 56e152e..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
@@ -36,6 +36,7 @@
         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;
@@ -48,6 +49,33 @@
         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")
@@ -116,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