From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
index b5d4c3c..dbf18a2 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -13,13 +15,27 @@
/**
* 鐞嗚碃鎿嶄綔鍘嗗彶琛�
* @author 姹熻箘韫�
- * @date 2024/01/15 11:15
+ * @date 2024/01/16 10:03
*/
@Data
@ApiModel("鐞嗚碃鎿嶄綔鍘嗗彶琛�")
@TableName("`settle_claims_log`")
public class SettleClaimsLog {
+ public SettleClaimsLog(){
+ }
+ public SettleClaimsLog(SettleClaims apply,String title,String content,Integer objId,Integer objType, String before,String after){
+ this.title =title;
+ this.content=content;
+ this.createDate =apply.getEditDate();
+ this.creator =apply.getEditor();
+ this.objId=objId;
+ this.isdeleted = Constants.ZERO;
+ this.objType = objType;
+ this.beforeContent=before;
+ this.settleClainmsId=apply.getId();
+ this.afterContent=after;
+ }
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
@@ -31,7 +47,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +56,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,7 +85,7 @@
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
- private String objId;
+ private Integer objId;
@ApiModelProperty(value = "鎿嶄綔鍓嶅唴瀹�")
@ExcelColumn(name="鎿嶄綔鍓嶅唴瀹�")
@@ -79,4 +95,21 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
+ @ApiModelProperty(value = "澶х被绫诲瀷锛�1=鎶ユ 2=绔嬫 3=鍙楃悊 4=鐞嗙畻 5=鏍歌禂 6=缁撴 7=绔嬫閫�鍥� 8鍟嗚閫�鍥� 9宸叉挙妗�")
+ private Integer parentStatus;
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷")
+ 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