From b66dadc64bf7420946b3ff01fc0890b4d6e02b0d Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 5 Jan 2022 22:45:04 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?= =?UTF-8?q?ose=20#3474=20=E5=AE=9E=E7=8E=B0=E5=AF=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/daemon/quartz/entity/SysJob.java | 18 +++++++++++------ .../pigx/daemon/quartz/entity/SysJobLog.java | 3 +++ .../pig4cloud/pigx/act/entity/LeaveBill.java | 19 +++++++----------- .../pig4cloud/pigx/pay/entity/PayChannel.java | 20 +++++++++---------- .../pigx/pay/entity/PayGoodsOrder.java | 20 +++++++++---------- .../pigx/pay/entity/PayNotifyRecord.java | 20 +++++++++---------- .../pigx/pay/entity/PayRefundOrder.java | 20 +++++++++---------- .../pigx/pay/entity/PayTradeOrder.java | 10 +++++----- 8 files changed, 67 insertions(+), 63 deletions(-) diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java index a327594fb..960aaa085 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java @@ -17,7 +17,9 @@ package com.pig4cloud.pigx.daemon.quartz.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; @@ -116,21 +118,25 @@ public class SysJob extends Model { /** * 创建者 */ + @TableField(fill = FieldFill.INSERT) private String createBy; - /** - * 创建时间 - */ - private LocalDateTime createTime; - /** * 更新者 */ + @TableField(fill = FieldFill.UPDATE) private String updateBy; /** - * 更新时间 + * 创建时间 */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java index 7f93269a2..b1e0ce454 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java @@ -17,7 +17,9 @@ package com.pig4cloud.pigx.daemon.quartz.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; @@ -122,6 +124,7 @@ public class SysJobLog extends Model { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java index 234f455d0..04cfb601e 100755 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.act.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -68,24 +65,22 @@ public class LeaveBill extends Model { private String state; /** - * 提交时间 - */ - private LocalDateTime leaveTime; - - /** - * 提交时间 + * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** - * 修改时间 + * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; /** - * 删除标志 + * 是否删除 -1：已删除 0：正常 */ @TableLogic + @TableField(fill = FieldFill.INSERT) private String delFlag; /** diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java index e1522ae4b..737f6eae8 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.pay.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.pig4cloud.pigx.common.core.sensitive.Sensitive; import io.swagger.annotations.ApiModel; @@ -96,22 +93,25 @@ public class PayChannel extends Model { */ private String remark; - /** - * 删除标记 - */ - @TableLogic - private String delFlag; - /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + /** + * 是否删除 -1：已删除 0：正常 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private String delFlag; + /** * 租户ID */ diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java index e07fde08c..d4b5a9c10 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.pay.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -78,22 +75,25 @@ public class PayGoodsOrder extends Model { */ private String payOrderId; - /** - * 0-正常,1-删除 - */ - @TableLogic - private String delFlag; - /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + /** + * 是否删除 -1：已删除 0：正常 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private String delFlag; + /** * 租户ID */ diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java index 17418d3bd..3cc343e26 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.pay.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -73,22 +70,25 @@ public class PayNotifyRecord extends Model { */ private String httpStatus; - /** - * 删除标记 - */ - @TableLogic - private String delFlag; - /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + /** + * 是否删除 -1：已删除 0：正常 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private String delFlag; + /** * 租户ID */ diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java index f1f48853a..51293fa23 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.pay.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -173,22 +170,25 @@ public class PayRefundOrder extends Model { */ private LocalDateTime refundSuccTime; - /** - * 删除标记 - */ - @TableLogic - private String delFlag; - /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + /** + * 是否删除 -1：已删除 0：正常 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private String delFlag; + /** * 租户ID */ diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java index 5af0013c4..ff0df98c6 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java @@ -17,10 +17,7 @@ package com.pig4cloud.pigx.pay.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -151,17 +148,20 @@ public class PayTradeOrder extends Model { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; /** - * 删除标记 + * 是否删除 -1：已删除 0：正常 */ @TableLogic + @TableField(fill = FieldFill.INSERT) private String delFlag; /**