From 8f2feb017e56179f756c878cda5056db8286a53b Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 10:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 48b027a..7b95188 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;
/**
* 鎶曚繚鐢宠鎿嶄綔鍘嗗彶琛�
@@ -20,6 +21,33 @@
@ApiModel("鎶曚繚鐢宠鎿嶄綔鍘嗗彶琛�")
@TableName("`apply_log`")
public class ApplyLog {
+ public ApplyLog(){
+
+ }
+ public ApplyLog(InsuranceApply 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(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.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")
@@ -70,7 +98,7 @@
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
- private String objId;
+ private Integer objId;
@ApiModelProperty(value = "鎿嶄綔鍓嶅唴瀹�")
@ExcelColumn(name="鎿嶄綔鍓嶅唴瀹�")
@@ -88,6 +116,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