优化表单设计模块

src/main/java/com/gxwebsoft/cms/entity/Design.java

@@ -2,8 +2,8 @@ package com.gxwebsoft.cms.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.fasterxml.jackson.annotation.JsonSubTypes;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -68,6 +68,10 @@ public class Design implements Serializable {
     @ApiModelProperty(value = "状态, 0正常, 1冻结")
     private Integer status;
 
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 

src/main/java/com/gxwebsoft/cms/entity/Form.java

@@ -2,6 +2,7 @@ package com.gxwebsoft.cms.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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -55,6 +57,19 @@ public class Form implements Serializable {
     @ApiModelProperty(value = "状态, 0正常, 1冻结")
     private Integer status;
 
+    @ApiModelProperty(value = "是否隐藏顶部图片")
+    private Integer hidePhoto;
+
+    @ApiModelProperty(value = "是否隐藏背景图片")
+    private Integer hideBackground;
+
+    @ApiModelProperty(value = "背景图片透明度")
+    private BigDecimal opacity;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 

src/main/java/com/gxwebsoft/cms/entity/FormRecord.java

@@ -1,9 +1,6 @@
 package com.gxwebsoft.cms.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -47,6 +44,10 @@ public class FormRecord implements Serializable {
     @ApiModelProperty(value = "状态, 0正常, 1冻结")
     private Integer status;
 
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 

src/main/java/com/gxwebsoft/cms/mapper/xml/DesignMapper.xml

@@ -40,6 +40,12 @@
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
+            <if test="param.deleted != null">
+              AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+              AND a.deleted = 0
+            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>

src/main/java/com/gxwebsoft/cms/mapper/xml/DesignRecordMapper.xml

@@ -40,6 +40,12 @@
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
+            <if test="param.deleted != null">
+              AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+              AND a.deleted = 0
+            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>

src/main/java/com/gxwebsoft/cms/mapper/xml/FormMapper.xml

@@ -37,6 +37,12 @@
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
+            <if test="param.deleted != null">
+              AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+              AND a.deleted = 0
+            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>

src/main/java/com/gxwebsoft/cms/mapper/xml/FormRecordMapper.xml

@@ -29,6 +29,12 @@
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
+            <if test="param.deleted != null">
+              AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+              AND a.deleted = 0
+            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>

src/main/java/com/gxwebsoft/cms/param/DesignParam.java

@@ -60,4 +60,8 @@ public class DesignParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
 }

src/main/java/com/gxwebsoft/cms/param/DesignRecordParam.java

@@ -60,4 +60,8 @@ public class DesignRecordParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
 }

src/main/java/com/gxwebsoft/cms/param/FormParam.java

@@ -57,4 +57,8 @@ public class FormParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
 }

src/main/java/com/gxwebsoft/cms/param/FormRecordParam.java

@@ -48,4 +48,8 @@ public class FormRecordParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
 }

src/test/java/com/gxwebsoft/generator/CmsGenerator.java

@@ -54,8 +54,8 @@ public class CmsGenerator {
 //            "cms_design_record",
 //            "cms_website",
 //            "cms_website_field",
-              "cms_form",
+//              "cms_form",
-              "cms_form_record"
+//              "cms_form_record"
     };
     // 需要去除的表前缀
     private static final String[] TABLE_PREFIX = new String[]{