Merge remote-tracking branch 'origin/master'

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -69,14 +68,12 @@ public class DgApplyAmountInfo implements Serializable {
      */
     private String businessType;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 
     /**

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAssetsAssessmentAssetsList.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,8 +26,12 @@ public class DgAssetsAssessmentAssetsList implements Serializable {
 
     private String name;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAssetsAssignUser.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -69,14 +68,12 @@ public class DgAssetsAssignUser implements Serializable {
      */
     private String applyContent;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAssetsInvestigation.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -99,14 +98,12 @@ public class DgAssetsInvestigation implements Serializable {
      */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessType.java

@@ -1,5 +1,8 @@
 package com.daqing.framework.domain.guarantee;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
@@ -29,7 +32,11 @@ public class DgBusinessType implements Serializable {
      */
     private Integer companyId;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceAssignUser.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -69,14 +68,12 @@ public class DgComplianceAssignUser implements Serializable {
      */
     private String applyContent;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceInvestigation.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -53,14 +52,12 @@ public class DgComplianceInvestigation implements Serializable {
      */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeApply.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -58,7 +57,11 @@ public class DgGuaranteeApply implements Serializable {
      */
     private Integer status;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeApplyLast.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -58,7 +57,11 @@ public class DgGuaranteeApplyLast implements Serializable {
      */
     private Integer status;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeAssignUser.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -69,13 +68,11 @@ public class DgGuaranteeAssignUser implements Serializable {
      */
     private String applyContent;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeInvestigation.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -78,13 +77,11 @@ public class DgGuaranteeInvestigation implements Serializable {
      */
     private String conversation;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeLetterAssignUser.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,14 +47,12 @@ public class DgGuaranteeLetterAssignUser implements Serializable {
      */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -78,13 +77,11 @@ public class DgLoanCommitteeConsider implements Serializable {
      */
     private String file;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanNotice.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,13 +47,11 @@ public class DgLoanNotice implements Serializable {
      */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgMessageAssignUser.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -69,13 +68,11 @@ public class DgMessageAssignUser implements Serializable {
      */
     private String applyContent;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgMessageInvestigation.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -53,13 +52,11 @@ public class DgMessageInvestigation implements Serializable {
      */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgPaymentConfirmationConsider.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -53,13 +52,11 @@ public class DgPaymentConfirmationConsider implements Serializable {
      */
     private String imgFile;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgProcess.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -50,7 +49,11 @@ public class DgProcess implements Serializable {
      */
     private String remark;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgWorkConferenceConsider.java

@@ -1,8 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,13 +47,11 @@ public class DgWorkConferenceConsider implements Serializable {
      */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
+    @TableField(fill = FieldFill.INSERT)
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "更新时间")
-     * 修改时间
+    @TableField(fill = FieldFill.INSERT_UPDATE)
-     */
     private Date updateTime;
 }

dq-framework-utils/src/main/java/com/daqing/framework/utils/handler/MyMetaObjectHandler.java

@@ -0,0 +1,28 @@
+package com.daqing.framework.utils.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @Author chen
+ * @DATE 2020/10/30 11:13
+ * @Version 1.0
+ * 自动处理添加和修改时间
+ */
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createTime", new Date(), metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+}