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 | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 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 955280d..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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,16 +10,72 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鎶曚繚鐢宠鎿嶄綔鍘嗗彶琛�
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Data
@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;
+ }
+
+ 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")
@@ -31,7 +88,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +97,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,7 +126,7 @@
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
- private String objId;
+ private Integer objId;
@ApiModelProperty(value = "鎿嶄綔鍓嶅唴瀹�")
@ExcelColumn(name="鎿嶄綔鍓嶅唴瀹�")
@@ -83,4 +140,17 @@
@ExcelColumn(name="鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級 3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴 锛堝凡鍏抽棴锛�")
private Integer status;
+
+ @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)
+ private String companyName;
+
+
}
--
Gitblit v1.9.3