h5 动态表单

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormDictDTO.java

@@ -2,9 +2,9 @@ package com.pcloud.booksflow.form.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -30,4 +30,4 @@ public class FormDictDTO implements Serializable {
     @ApiModelProperty(value = "备注", required = false)
     private String remarks;
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormFieldDictDTO.java

@@ -5,10 +5,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -174,4 +174,4 @@ public class FormFieldDictDTO {
         private String address;
     }
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormPrintConfigDTO.java

@@ -7,8 +7,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -123,4 +123,4 @@ public class FormPrintConfigDTO implements Serializable {
         private Boolean print;
     }
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormPrintConfigModeDTO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -17,7 +17,7 @@ import java.io.Serializable;
 public class FormPrintConfigModeDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      *   主键ID
      */
@@ -29,4 +29,4 @@ public class FormPrintConfigModeDTO implements Serializable {
     @NotNull
     private Integer mode;
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormPrintConfigUploadDTO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -37,4 +37,4 @@ public class FormPrintConfigUploadDTO implements Serializable {
     @NotNull(message = "fileType不能为空")
     private String fileType;
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormPrintDTO.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Map;
 
@@ -29,4 +29,4 @@ public class FormPrintDTO implements Serializable {
     @NotEmpty(message = "数据")
     private Map<String, Object> data;
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/FormTemplateDTO.java

@@ -6,9 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

ruoyi-modules/ruoyi-form/booksflow-form-api/src/main/java/com/pcloud/booksflow/form/api/dto/ModifyLogRecordDTO.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -104,4 +104,4 @@ public class ModifyLogRecordDTO implements Serializable {
     @ApiModelProperty(value = "服务名称")
     private String serviceName;
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/pom.xml

@@ -15,6 +15,11 @@
             <artifactId>booksflow-form-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/Form.java

@@ -1,24 +1,13 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table form
+
- */
+@Data
-@Getter
+@TableName("form_print_config_tpl")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class Form implements Serializable {
     /**
      * Database Column Remarks:
@@ -60,4 +49,4 @@ public class Form implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormDict.java

@@ -2,24 +2,13 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table form_dict
+
- */
+@Data
-@Getter
+@TableName("form_print_config_tpl")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class FormDict implements Serializable {
     /**
      * Database Column Remarks:
@@ -127,4 +116,4 @@ public class FormDict implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormDictExample.java

@@ -1,872 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class FormDictExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public FormDictExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Long value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Long value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Long value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Long> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNull() {
-            addCriterion("`name` is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNotNull() {
-            addCriterion("`name` is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameEqualTo(String value) {
-            addCriterion("`name` =", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotEqualTo(String value) {
-            addCriterion("`name` <>", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThan(String value) {
-            addCriterion("`name` >", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("`name` >=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThan(String value) {
-            addCriterion("`name` <", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("`name` <=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLike(String value) {
-            addCriterion("`name` like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotLike(String value) {
-            addCriterion("`name` not like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIn(List<String> values) {
-            addCriterion("`name` in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> values) {
-            addCriterion("`name` not in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("`name` between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("`name` not between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIsNull() {
-            addCriterion("code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIsNotNull() {
-            addCriterion("code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeEqualTo(String value) {
-            addCriterion("code =", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotEqualTo(String value) {
-            addCriterion("code <>", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeGreaterThan(String value) {
-            addCriterion("code >", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("code >=", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLessThan(String value) {
-            addCriterion("code <", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLessThanOrEqualTo(String value) {
-            addCriterion("code <=", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLike(String value) {
-            addCriterion("code like", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotLike(String value) {
-            addCriterion("code not like", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIn(List<String> values) {
-            addCriterion("code in", values, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotIn(List<String> values) {
-            addCriterion("code not in", values, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeBetween(String value1, String value2) {
-            addCriterion("code between", value1, value2, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotBetween(String value1, String value2) {
-            addCriterion("code not between", value1, value2, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksIsNull() {
-            addCriterion("remarks is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksIsNotNull() {
-            addCriterion("remarks is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksEqualTo(String value) {
-            addCriterion("remarks =", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksNotEqualTo(String value) {
-            addCriterion("remarks <>", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksGreaterThan(String value) {
-            addCriterion("remarks >", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksGreaterThanOrEqualTo(String value) {
-            addCriterion("remarks >=", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksLessThan(String value) {
-            addCriterion("remarks <", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksLessThanOrEqualTo(String value) {
-            addCriterion("remarks <=", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksLike(String value) {
-            addCriterion("remarks like", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksNotLike(String value) {
-            addCriterion("remarks not like", value, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksIn(List<String> values) {
-            addCriterion("remarks in", values, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksNotIn(List<String> values) {
-            addCriterion("remarks not in", values, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksBetween(String value1, String value2) {
-            addCriterion("remarks between", value1, value2, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andRemarksNotBetween(String value1, String value2) {
-            addCriterion("remarks not between", value1, value2, "remarks");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNull() {
-            addCriterion("created_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNotNull() {
-            addCriterion("created_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByEqualTo(Long value) {
-            addCriterion("created_by =", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotEqualTo(Long value) {
-            addCriterion("created_by <>", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThan(Long value) {
-            addCriterion("created_by >", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThanOrEqualTo(Long value) {
-            addCriterion("created_by >=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThan(Long value) {
-            addCriterion("created_by <", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThanOrEqualTo(Long value) {
-            addCriterion("created_by <=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIn(List<Long> values) {
-            addCriterion("created_by in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotIn(List<Long> values) {
-            addCriterion("created_by not in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByBetween(Long value1, Long value2) {
-            addCriterion("created_by between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotBetween(Long value1, Long value2) {
-            addCriterion("created_by not between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNull() {
-            addCriterion("updated_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNotNull() {
-            addCriterion("updated_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByEqualTo(Long value) {
-            addCriterion("updated_by =", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotEqualTo(Long value) {
-            addCriterion("updated_by <>", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThan(Long value) {
-            addCriterion("updated_by >", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThanOrEqualTo(Long value) {
-            addCriterion("updated_by >=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThan(Long value) {
-            addCriterion("updated_by <", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThanOrEqualTo(Long value) {
-            addCriterion("updated_by <=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIn(List<Long> values) {
-            addCriterion("updated_by in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotIn(List<Long> values) {
-            addCriterion("updated_by not in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByBetween(Long value1, Long value2) {
-            addCriterion("updated_by between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotBetween(Long value1, Long value2) {
-            addCriterion("updated_by not between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedIsNull() {
-            addCriterion("deleted is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedIsNotNull() {
-            addCriterion("deleted is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedEqualTo(Integer value) {
-            addCriterion("deleted =", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedNotEqualTo(Integer value) {
-            addCriterion("deleted <>", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedGreaterThan(Integer value) {
-            addCriterion("deleted >", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedGreaterThanOrEqualTo(Integer value) {
-            addCriterion("deleted >=", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedLessThan(Integer value) {
-            addCriterion("deleted <", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedLessThanOrEqualTo(Integer value) {
-            addCriterion("deleted <=", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedIn(List<Integer> values) {
-            addCriterion("deleted in", values, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedNotIn(List<Integer> values) {
-            addCriterion("deleted not in", values, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedBetween(Integer value1, Integer value2) {
-            addCriterion("deleted between", value1, value2, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedNotBetween(Integer value1, Integer value2) {
-            addCriterion("deleted not between", value1, value2, "deleted");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_dict
-     *
-     * @mbg.generated do_not_delete_during_merge
-     */
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormExample.java

@@ -1,501 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FormExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public FormExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Long value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Long value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Long value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Long> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNull() {
-            addCriterion("`name` is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNotNull() {
-            addCriterion("`name` is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameEqualTo(String value) {
-            addCriterion("`name` =", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotEqualTo(String value) {
-            addCriterion("`name` <>", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThan(String value) {
-            addCriterion("`name` >", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("`name` >=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThan(String value) {
-            addCriterion("`name` <", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("`name` <=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLike(String value) {
-            addCriterion("`name` like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotLike(String value) {
-            addCriterion("`name` not like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIn(List<String> values) {
-            addCriterion("`name` in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> values) {
-            addCriterion("`name` not in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("`name` between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("`name` not between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIsNull() {
-            addCriterion("code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIsNotNull() {
-            addCriterion("code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeEqualTo(String value) {
-            addCriterion("code =", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotEqualTo(String value) {
-            addCriterion("code <>", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeGreaterThan(String value) {
-            addCriterion("code >", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("code >=", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLessThan(String value) {
-            addCriterion("code <", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLessThanOrEqualTo(String value) {
-            addCriterion("code <=", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLike(String value) {
-            addCriterion("code like", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotLike(String value) {
-            addCriterion("code not like", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIn(List<String> values) {
-            addCriterion("code in", values, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotIn(List<String> values) {
-            addCriterion("code not in", values, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeBetween(String value1, String value2) {
-            addCriterion("code between", value1, value2, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotBetween(String value1, String value2) {
-            addCriterion("code not between", value1, value2, "code");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form
-     *
-     * @mbg.generated do_not_delete_during_merge
-     */
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormFieldDict.java

@@ -2,24 +2,13 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table form_field_dict
+
- */
+@Data
-@Getter
+@TableName("form_print_config_tpl")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class FormFieldDict implements Serializable {
     /**
      * Database Column Remarks:
@@ -182,4 +171,4 @@ public class FormFieldDict implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfig.java

@@ -2,24 +2,13 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table form_print_config
+
- */
+@Data
-@Getter
+@TableName("form_print_config_tpl")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class FormPrintConfig implements Serializable {
     /**
      * Database Column Remarks:
@@ -292,4 +281,4 @@ public class FormPrintConfig implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigTpl.java

@@ -1,141 +1,71 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+
- *
+@Data
- * This class was generated by MyBatis Generator.
+@TableName("form_print_config_tpl")
- * This class corresponds to the database table form_print_config_tpl
- */
-@Getter
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class FormPrintConfigTpl implements Serializable {
-    /**
-     * Database Column Remarks:
-     *   主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.id
-     *
-     * @mbg.generated
-     */
-    private Long id;
 
+    private Long id;
     /**
-     * Database Column Remarks:
+     * 表单打印配置 ID
-     *   表单打印配置 ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.form_print_config_id
-     *
-     * @mbg.generated
      */
     private Long formPrintConfigId;
 
     /**
-     * Database Column Remarks:
+     * 模板文件url
-     *   模板文件url
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.file_url
-     *
-     * @mbg.generated
      */
     private String fileUrl;
 
     /**
-     * Database Column Remarks:
+     * 文件类型：doc、excel
-     *   文件类型：doc、excel
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.file_type
-     *
-     * @mbg.generated
      */
     private String fileType;
 
     /**
-     * Database Column Remarks:
+     * file_wps_id
-     *   file_wps_id
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.file_wps_id
-     *
-     * @mbg.generated
      */
     private String fileWpsId;
 
     /**
-     * Database Column Remarks:
+     * 创建人
-     *   创建人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.created_by
-     *
-     * @mbg.generated
      */
     private Long createdBy;
 
     /**
-     * Database Column Remarks:
+     * 更新人
-     *   更新人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.updated_by
-     *
-     * @mbg.generated
      */
     private Long updatedBy;
 
     /**
-     * Database Column Remarks:
+     * 创建时间
-     *   创建时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.create_time
-     *
-     * @mbg.generated
      */
     private Date createTime;
 
     /**
-     * Database Column Remarks:
+     * 更新时间
-     *   更新时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config_tpl.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
     /**
-     * Database Column Remarks:
+     * 打印字段
-     *   是否删除(0:否,1:是)
+     */
-     *
+    private String printFields;
-     * This field was generated by MyBatis Generator.
+
-     * This field corresponds to the database column form_print_config_tpl.deleted
+    /**
-     *
+     * 扩展属性(JSON格式)
-     * @mbg.generated
+     */
+    private String ext;
+
+    /**
+     * 是否删除(0:否,1:是)
      */
     private Integer deleted;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigTplExample.java

@@ -1,932 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class FormPrintConfigTplExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public FormPrintConfigTplExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Long value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Long value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Long value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Long> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdIsNull() {
-            addCriterion("form_print_config_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdIsNotNull() {
-            addCriterion("form_print_config_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdEqualTo(Long value) {
-            addCriterion("form_print_config_id =", value, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdNotEqualTo(Long value) {
-            addCriterion("form_print_config_id <>", value, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdGreaterThan(Long value) {
-            addCriterion("form_print_config_id >", value, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("form_print_config_id >=", value, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdLessThan(Long value) {
-            addCriterion("form_print_config_id <", value, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdLessThanOrEqualTo(Long value) {
-            addCriterion("form_print_config_id <=", value, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdIn(List<Long> values) {
-            addCriterion("form_print_config_id in", values, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdNotIn(List<Long> values) {
-            addCriterion("form_print_config_id not in", values, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdBetween(Long value1, Long value2) {
-            addCriterion("form_print_config_id between", value1, value2, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormPrintConfigIdNotBetween(Long value1, Long value2) {
-            addCriterion("form_print_config_id not between", value1, value2, "formPrintConfigId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlIsNull() {
-            addCriterion("file_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlIsNotNull() {
-            addCriterion("file_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlEqualTo(String value) {
-            addCriterion("file_url =", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotEqualTo(String value) {
-            addCriterion("file_url <>", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlGreaterThan(String value) {
-            addCriterion("file_url >", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("file_url >=", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlLessThan(String value) {
-            addCriterion("file_url <", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlLessThanOrEqualTo(String value) {
-            addCriterion("file_url <=", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlLike(String value) {
-            addCriterion("file_url like", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotLike(String value) {
-            addCriterion("file_url not like", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlIn(List<String> values) {
-            addCriterion("file_url in", values, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotIn(List<String> values) {
-            addCriterion("file_url not in", values, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlBetween(String value1, String value2) {
-            addCriterion("file_url between", value1, value2, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotBetween(String value1, String value2) {
-            addCriterion("file_url not between", value1, value2, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeIsNull() {
-            addCriterion("file_type is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeIsNotNull() {
-            addCriterion("file_type is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeEqualTo(String value) {
-            addCriterion("file_type =", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeNotEqualTo(String value) {
-            addCriterion("file_type <>", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeGreaterThan(String value) {
-            addCriterion("file_type >", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeGreaterThanOrEqualTo(String value) {
-            addCriterion("file_type >=", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeLessThan(String value) {
-            addCriterion("file_type <", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeLessThanOrEqualTo(String value) {
-            addCriterion("file_type <=", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeLike(String value) {
-            addCriterion("file_type like", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeNotLike(String value) {
-            addCriterion("file_type not like", value, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeIn(List<String> values) {
-            addCriterion("file_type in", values, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeNotIn(List<String> values) {
-            addCriterion("file_type not in", values, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeBetween(String value1, String value2) {
-            addCriterion("file_type between", value1, value2, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileTypeNotBetween(String value1, String value2) {
-            addCriterion("file_type not between", value1, value2, "fileType");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdIsNull() {
-            addCriterion("file_wps_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdIsNotNull() {
-            addCriterion("file_wps_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdEqualTo(String value) {
-            addCriterion("file_wps_id =", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdNotEqualTo(String value) {
-            addCriterion("file_wps_id <>", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdGreaterThan(String value) {
-            addCriterion("file_wps_id >", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdGreaterThanOrEqualTo(String value) {
-            addCriterion("file_wps_id >=", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdLessThan(String value) {
-            addCriterion("file_wps_id <", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdLessThanOrEqualTo(String value) {
-            addCriterion("file_wps_id <=", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdLike(String value) {
-            addCriterion("file_wps_id like", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdNotLike(String value) {
-            addCriterion("file_wps_id not like", value, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdIn(List<String> values) {
-            addCriterion("file_wps_id in", values, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdNotIn(List<String> values) {
-            addCriterion("file_wps_id not in", values, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdBetween(String value1, String value2) {
-            addCriterion("file_wps_id between", value1, value2, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileWpsIdNotBetween(String value1, String value2) {
-            addCriterion("file_wps_id not between", value1, value2, "fileWpsId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNull() {
-            addCriterion("created_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNotNull() {
-            addCriterion("created_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByEqualTo(Long value) {
-            addCriterion("created_by =", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotEqualTo(Long value) {
-            addCriterion("created_by <>", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThan(Long value) {
-            addCriterion("created_by >", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThanOrEqualTo(Long value) {
-            addCriterion("created_by >=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThan(Long value) {
-            addCriterion("created_by <", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThanOrEqualTo(Long value) {
-            addCriterion("created_by <=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIn(List<Long> values) {
-            addCriterion("created_by in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotIn(List<Long> values) {
-            addCriterion("created_by not in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByBetween(Long value1, Long value2) {
-            addCriterion("created_by between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotBetween(Long value1, Long value2) {
-            addCriterion("created_by not between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNull() {
-            addCriterion("updated_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNotNull() {
-            addCriterion("updated_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByEqualTo(Long value) {
-            addCriterion("updated_by =", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotEqualTo(Long value) {
-            addCriterion("updated_by <>", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThan(Long value) {
-            addCriterion("updated_by >", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThanOrEqualTo(Long value) {
-            addCriterion("updated_by >=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThan(Long value) {
-            addCriterion("updated_by <", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThanOrEqualTo(Long value) {
-            addCriterion("updated_by <=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIn(List<Long> values) {
-            addCriterion("updated_by in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotIn(List<Long> values) {
-            addCriterion("updated_by not in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByBetween(Long value1, Long value2) {
-            addCriterion("updated_by between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotBetween(Long value1, Long value2) {
-            addCriterion("updated_by not between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedIsNull() {
-            addCriterion("deleted is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedIsNotNull() {
-            addCriterion("deleted is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedEqualTo(Integer value) {
-            addCriterion("deleted =", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedNotEqualTo(Integer value) {
-            addCriterion("deleted <>", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedGreaterThan(Integer value) {
-            addCriterion("deleted >", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedGreaterThanOrEqualTo(Integer value) {
-            addCriterion("deleted >=", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedLessThan(Integer value) {
-            addCriterion("deleted <", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedLessThanOrEqualTo(Integer value) {
-            addCriterion("deleted <=", value, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedIn(List<Integer> values) {
-            addCriterion("deleted in", values, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedNotIn(List<Integer> values) {
-            addCriterion("deleted not in", values, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedBetween(Integer value1, Integer value2) {
-            addCriterion("deleted between", value1, value2, "deleted");
-            return (Criteria) this;
-        }
-
-        public Criteria andDeletedNotBetween(Integer value1, Integer value2) {
-            addCriterion("deleted not between", value1, value2, "deleted");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated do_not_delete_during_merge
-     */
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigWithBLOBs.java

@@ -1,47 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- *
- * This class was generated by MyBatis Generator.
- * This class corresponds to the database table form_print_config
- */
-@Getter
-@Setter
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class FormPrintConfigWithBLOBs extends FormPrintConfig implements Serializable {
-    /**
-     * Database Column Remarks:
-     *   打印字段
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.print_fields
-     *
-     * @mbg.generated
-     */
-    private String printFields;
-
-    /**
-     * Database Column Remarks:
-     *   扩展属性(JSON格式)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.ext
-     *
-     * @mbg.generated
-     */
-    private String ext;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    private static final long serialVersionUID = 1L;
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplate.java

@@ -2,24 +2,15 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
+
-import lombok.Builder;
+import lombok.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
 /**
  *
  * This class was generated by MyBatis Generator.
  * This class corresponds to the database table form_template
  */
-@Getter
+@Data
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class FormTemplate implements Serializable {
     /**
      * Database Column Remarks:
@@ -116,4 +107,4 @@ public class FormTemplate implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplateExample.java

@@ -1,792 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class FormTemplateExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public FormTemplateExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Long value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Long value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Long value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Long> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdIsNull() {
-            addCriterion("form_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdIsNotNull() {
-            addCriterion("form_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdEqualTo(Long value) {
-            addCriterion("form_id =", value, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdNotEqualTo(Long value) {
-            addCriterion("form_id <>", value, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdGreaterThan(Long value) {
-            addCriterion("form_id >", value, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("form_id >=", value, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdLessThan(Long value) {
-            addCriterion("form_id <", value, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdLessThanOrEqualTo(Long value) {
-            addCriterion("form_id <=", value, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdIn(List<Long> values) {
-            addCriterion("form_id in", values, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdNotIn(List<Long> values) {
-            addCriterion("form_id not in", values, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdBetween(Long value1, Long value2) {
-            addCriterion("form_id between", value1, value2, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andFormIdNotBetween(Long value1, Long value2) {
-            addCriterion("form_id not between", value1, value2, "formId");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIsNull() {
-            addCriterion("version is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIsNotNull() {
-            addCriterion("version is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionEqualTo(Integer value) {
-            addCriterion("version =", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotEqualTo(Integer value) {
-            addCriterion("version <>", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionGreaterThan(Integer value) {
-            addCriterion("version >", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionGreaterThanOrEqualTo(Integer value) {
-            addCriterion("version >=", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLessThan(Integer value) {
-            addCriterion("version <", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLessThanOrEqualTo(Integer value) {
-            addCriterion("version <=", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIn(List<Integer> values) {
-            addCriterion("version in", values, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotIn(List<Integer> values) {
-            addCriterion("version not in", values, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionBetween(Integer value1, Integer value2) {
-            addCriterion("version between", value1, value2, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotBetween(Integer value1, Integer value2) {
-            addCriterion("version not between", value1, value2, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingIsNull() {
-            addCriterion("content_encoding is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingIsNotNull() {
-            addCriterion("content_encoding is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingEqualTo(String value) {
-            addCriterion("content_encoding =", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingNotEqualTo(String value) {
-            addCriterion("content_encoding <>", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingGreaterThan(String value) {
-            addCriterion("content_encoding >", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingGreaterThanOrEqualTo(String value) {
-            addCriterion("content_encoding >=", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingLessThan(String value) {
-            addCriterion("content_encoding <", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingLessThanOrEqualTo(String value) {
-            addCriterion("content_encoding <=", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingLike(String value) {
-            addCriterion("content_encoding like", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingNotLike(String value) {
-            addCriterion("content_encoding not like", value, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingIn(List<String> values) {
-            addCriterion("content_encoding in", values, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingNotIn(List<String> values) {
-            addCriterion("content_encoding not in", values, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingBetween(String value1, String value2) {
-            addCriterion("content_encoding between", value1, value2, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andContentEncodingNotBetween(String value1, String value2) {
-            addCriterion("content_encoding not between", value1, value2, "contentEncoding");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNull() {
-            addCriterion("created_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIsNotNull() {
-            addCriterion("created_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByEqualTo(Long value) {
-            addCriterion("created_by =", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotEqualTo(Long value) {
-            addCriterion("created_by <>", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThan(Long value) {
-            addCriterion("created_by >", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByGreaterThanOrEqualTo(Long value) {
-            addCriterion("created_by >=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThan(Long value) {
-            addCriterion("created_by <", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByLessThanOrEqualTo(Long value) {
-            addCriterion("created_by <=", value, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByIn(List<Long> values) {
-            addCriterion("created_by in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotIn(List<Long> values) {
-            addCriterion("created_by not in", values, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByBetween(Long value1, Long value2) {
-            addCriterion("created_by between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedByNotBetween(Long value1, Long value2) {
-            addCriterion("created_by not between", value1, value2, "createdBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNull() {
-            addCriterion("updated_by is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIsNotNull() {
-            addCriterion("updated_by is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByEqualTo(Long value) {
-            addCriterion("updated_by =", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotEqualTo(Long value) {
-            addCriterion("updated_by <>", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThan(Long value) {
-            addCriterion("updated_by >", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByGreaterThanOrEqualTo(Long value) {
-            addCriterion("updated_by >=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThan(Long value) {
-            addCriterion("updated_by <", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByLessThanOrEqualTo(Long value) {
-            addCriterion("updated_by <=", value, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByIn(List<Long> values) {
-            addCriterion("updated_by in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotIn(List<Long> values) {
-            addCriterion("updated_by not in", values, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByBetween(Long value1, Long value2) {
-            addCriterion("updated_by between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatedByNotBetween(Long value1, Long value2) {
-            addCriterion("updated_by not between", value1, value2, "updatedBy");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_template
-     *
-     * @mbg.generated do_not_delete_during_merge
-     */
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplateField.java

@@ -2,24 +2,13 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table form_template_field
+
- */
+@Data
-@Getter
+@TableName("form_print_config_tpl")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class FormTemplateField implements Serializable {
     /**
      * Database Column Remarks:
@@ -314,4 +303,4 @@ public class FormTemplateField implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/ModifyLogRecord.java

@@ -2,24 +2,13 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table modify_log_record
+
- */
+@Data
-@Getter
+@TableName("")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class ModifyLogRecord implements Serializable {
     /**
      * Database Column Remarks:
@@ -204,4 +193,4 @@ public class ModifyLogRecord implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/TenantInitStatus.java

@@ -2,24 +2,13 @@ package com.pcloud.booksflow.form.mybatis.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
-/**
+import com.baomidou.mybatisplus.annotation.TableName;
- *
+import lombok.*;
- * This class was generated by MyBatis Generator.
+
- * This class corresponds to the database table tenant_init_status
+
- */
+@Data
-@Getter
+@TableName("")
-@Setter
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
 public class TenantInitStatus implements Serializable {
     /**
      * Database Column Remarks:
@@ -83,4 +72,4 @@ public class TenantInitStatus implements Serializable {
      * @mbg.generated
      */
     private static final long serialVersionUID = 1L;
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/TenantInitStatusExample.java

@@ -1,602 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class TenantInitStatusExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public TenantInitStatusExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Long value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Long value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Long value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Long> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedIsNull() {
-            addCriterion("initialized is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedIsNotNull() {
-            addCriterion("initialized is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedEqualTo(Integer value) {
-            addCriterion("initialized =", value, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedNotEqualTo(Integer value) {
-            addCriterion("initialized <>", value, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedGreaterThan(Integer value) {
-            addCriterion("initialized >", value, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedGreaterThanOrEqualTo(Integer value) {
-            addCriterion("initialized >=", value, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedLessThan(Integer value) {
-            addCriterion("initialized <", value, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedLessThanOrEqualTo(Integer value) {
-            addCriterion("initialized <=", value, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedIn(List<Integer> values) {
-            addCriterion("initialized in", values, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedNotIn(List<Integer> values) {
-            addCriterion("initialized not in", values, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedBetween(Integer value1, Integer value2) {
-            addCriterion("initialized between", value1, value2, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andInitializedNotBetween(Integer value1, Integer value2) {
-            addCriterion("initialized not between", value1, value2, "initialized");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdIsNull() {
-            addCriterion("agent_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdIsNotNull() {
-            addCriterion("agent_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdEqualTo(Long value) {
-            addCriterion("agent_id =", value, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdNotEqualTo(Long value) {
-            addCriterion("agent_id <>", value, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdGreaterThan(Long value) {
-            addCriterion("agent_id >", value, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("agent_id >=", value, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdLessThan(Long value) {
-            addCriterion("agent_id <", value, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdLessThanOrEqualTo(Long value) {
-            addCriterion("agent_id <=", value, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdIn(List<Long> values) {
-            addCriterion("agent_id in", values, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdNotIn(List<Long> values) {
-            addCriterion("agent_id not in", values, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdBetween(Long value1, Long value2) {
-            addCriterion("agent_id between", value1, value2, "agentId");
-            return (Criteria) this;
-        }
-
-        public Criteria andAgentIdNotBetween(Long value1, Long value2) {
-            addCriterion("agent_id not between", value1, value2, "agentId");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated do_not_delete_during_merge
-     */
-    public static class Criteria extends GeneratedCriteria {
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormDictMapper.java

@@ -1,121 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormDict;
-import com.pcloud.booksflow.form.mybatis.entity.FormDictExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface FormDictMapper extends PaginationMapper<FormDict, FormDictExample> {
+public interface FormDictMapper extends BaseMapper<FormDict> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormDictExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(FormDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int insert(FormDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int insertSelective(FormDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    List<FormDict> selectByExample(FormDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    FormDict selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") FormDict record, @Param("example") FormDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") FormDict record, @Param("example") FormDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(FormDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(FormDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    List<FormDict> selectByExampleWithPaging(@Param("example") FormDictExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    FormDict selectOneByExample(FormDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<FormDict> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormDictMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface FormDictMapperExt extends FormDictMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormFieldDictMapper.java

@@ -1,145 +1,22 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pcloud.booksflow.form.api.dto.DictCodesDTO;
 import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
 import com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
+import com.pcloud.universe.commons.paging.BaseMapper;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface FormFieldDictMapper extends PaginationMapper<FormFieldDict, FormFieldDictExample> {
+import java.util.List;
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormFieldDictExample example);
 
-    /**
+public interface FormFieldDictMapper extends BaseMapper<FormFieldDict> {
-     * This method was generated by MyBatis Generator.
+    List<FormFieldDict> selectByExampleWithPagingBLOBs(@Param("example") FormFieldDictExample example,
-     * This method corresponds to the database table form_field_dict
+                                                       @Param("offset") int offset,
-     *
+                                                       @Param("limit") int limit,
-     * @mbg.generated
+                                                       @Param("queryStr") String queryStr);
-     */
-    int deleteByExample(FormFieldDictExample example);
 
-    /**
+    long countByExampleExt(@Param("example") FormFieldDictExample example, @Param("queryStr") String queryStr);
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
 
-    /**
+    List<FormFieldDict> getByCodes(@Param("list") List<DictCodesDTO> dtos);
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int insert(FormFieldDict record);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int insertSelective(FormFieldDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    List<FormFieldDict> selectByExampleWithBLOBs(FormFieldDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    List<FormFieldDict> selectByExample(FormFieldDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    FormFieldDict selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") FormFieldDict record, @Param("example") FormFieldDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int updateByExampleWithBLOBs(@Param("record") FormFieldDict record, @Param("example") FormFieldDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") FormFieldDict record, @Param("example") FormFieldDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(FormFieldDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeyWithBLOBs(FormFieldDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(FormFieldDict record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    List<FormFieldDict> selectByExampleWithPaging(@Param("example") FormFieldDictExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    FormFieldDict selectOneByExample(FormFieldDictExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_field_dict
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<FormFieldDict> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormFieldDictMapperExt.java

@@ -1,21 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-import com.pcloud.booksflow.form.api.dto.DictCodesDTO;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface FormFieldDictMapperExt extends FormFieldDictMapper {
-
-    List<FormFieldDict> selectByExampleWithPagingBLOBs(@Param("example") FormFieldDictExample example,
-                                                       @Param("offset") int offset,
-                                                       @Param("limit") int limit,
-                                                       @Param("queryStr") String queryStr);
-
-    long countByExampleExt(@Param("example") FormFieldDictExample example, @Param("queryStr") String queryStr);
-
-    List<FormFieldDict> getByCodes(@Param("list") List<DictCodesDTO> dtos);
-
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormMapper.java

@@ -1,121 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.Form;
-import com.pcloud.booksflow.form.mybatis.entity.FormExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface FormMapper extends PaginationMapper<Form, FormExample> {
+public interface FormMapper extends BaseMapper<Form> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(FormExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int insert(Form record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int insertSelective(Form record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    List<Form> selectByExample(FormExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    Form selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") Form record, @Param("example") FormExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") Form record, @Param("example") FormExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(Form record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(Form record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    List<Form> selectByExampleWithPaging(@Param("example") FormExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    Form selectOneByExample(FormExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<Form> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface FormMapperExt extends FormMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigMapper.java

@@ -1,146 +1,10 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample;
+import org.apache.ibatis.annotations.Mapper;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface FormPrintConfigMapper extends PaginationMapper<FormPrintConfig, FormPrintConfigExample> {
+@Mapper
-    /**
+public interface FormPrintConfigMapper extends BaseMapper<FormPrintConfig> {
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormPrintConfigExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int insert(FormPrintConfigWithBLOBs record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int insertSelective(FormPrintConfigWithBLOBs record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    List<FormPrintConfigWithBLOBs> selectByExampleWithBLOBs(FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    List<FormPrintConfig> selectByExample(FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    FormPrintConfigWithBLOBs selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") FormPrintConfigWithBLOBs record, @Param("example") FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int updateByExampleWithBLOBs(@Param("record") FormPrintConfigWithBLOBs record, @Param("example") FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") FormPrintConfig record, @Param("example") FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(FormPrintConfigWithBLOBs record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeyWithBLOBs(FormPrintConfigWithBLOBs record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(FormPrintConfig record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    List<FormPrintConfig> selectByExampleWithPaging(@Param("example") FormPrintConfigExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    FormPrintConfig selectOneByExample(FormPrintConfigExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<FormPrintConfig> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface FormPrintConfigMapperExt extends FormPrintConfigMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigTplMapper.java

@@ -1,121 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTplExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface FormPrintConfigTplMapper extends PaginationMapper<FormPrintConfigTpl, FormPrintConfigTplExample> {
+public interface FormPrintConfigTplMapper extends BaseMapper<FormPrintConfigTpl> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormPrintConfigTplExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(FormPrintConfigTplExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int insert(FormPrintConfigTpl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int insertSelective(FormPrintConfigTpl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    List<FormPrintConfigTpl> selectByExample(FormPrintConfigTplExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    FormPrintConfigTpl selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") FormPrintConfigTpl record, @Param("example") FormPrintConfigTplExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") FormPrintConfigTpl record, @Param("example") FormPrintConfigTplExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(FormPrintConfigTpl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(FormPrintConfigTpl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    List<FormPrintConfigTpl> selectByExampleWithPaging(@Param("example") FormPrintConfigTplExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    FormPrintConfigTpl selectOneByExample(FormPrintConfigTplExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_print_config_tpl
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<FormPrintConfigTpl> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigTplMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface FormPrintConfigTplMapperExt extends FormPrintConfigTplMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateFieldMapper.java

@@ -1,145 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface FormTemplateFieldMapper extends PaginationMapper<FormTemplateField, FormTemplateFieldExample> {
+public interface FormTemplateFieldMapper extends BaseMapper<FormTemplateField> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormTemplateFieldExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int insert(FormTemplateField record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int insertSelective(FormTemplateField record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    List<FormTemplateField> selectByExampleWithBLOBs(FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    List<FormTemplateField> selectByExample(FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    FormTemplateField selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") FormTemplateField record, @Param("example") FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int updateByExampleWithBLOBs(@Param("record") FormTemplateField record, @Param("example") FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") FormTemplateField record, @Param("example") FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(FormTemplateField record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeyWithBLOBs(FormTemplateField record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(FormTemplateField record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    List<FormTemplateField> selectByExampleWithPaging(@Param("example") FormTemplateFieldExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    FormTemplateField selectOneByExample(FormTemplateFieldExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template_field
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<FormTemplateField> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateFieldMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface FormTemplateFieldMapperExt extends FormTemplateFieldMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateMapper.java

@@ -1,121 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormTemplate;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplateExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface FormTemplateMapper extends PaginationMapper<FormTemplate, FormTemplateExample> {
+public interface FormTemplateMapper extends BaseMapper<FormTemplate> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    long countByExample(FormTemplateExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(FormTemplateExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int insert(FormTemplate record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int insertSelective(FormTemplate record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    List<FormTemplate> selectByExample(FormTemplateExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    FormTemplate selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") FormTemplate record, @Param("example") FormTemplateExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") FormTemplate record, @Param("example") FormTemplateExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(FormTemplate record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(FormTemplate record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    List<FormTemplate> selectByExampleWithPaging(@Param("example") FormTemplateExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    FormTemplate selectOneByExample(FormTemplateExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<FormTemplate> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface FormTemplateMapperExt extends FormTemplateMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/ModifyLogRecordMapper.java

@@ -1,121 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord;
-import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecordExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface ModifyLogRecordMapper extends PaginationMapper<ModifyLogRecord, ModifyLogRecordExample> {
+public interface ModifyLogRecordMapper extends BaseMapper<ModifyLogRecord> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    long countByExample(ModifyLogRecordExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(ModifyLogRecordExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int insert(ModifyLogRecord record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int insertSelective(ModifyLogRecord record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    List<ModifyLogRecord> selectByExample(ModifyLogRecordExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    ModifyLogRecord selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") ModifyLogRecord record, @Param("example") ModifyLogRecordExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") ModifyLogRecord record, @Param("example") ModifyLogRecordExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(ModifyLogRecord record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(ModifyLogRecord record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    List<ModifyLogRecord> selectByExampleWithPaging(@Param("example") ModifyLogRecordExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    ModifyLogRecord selectOneByExample(ModifyLogRecordExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table modify_log_record
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<ModifyLogRecord> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/ModifyLogRecordMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface ModifyLogRecordMapperExt extends ModifyLogRecordMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/TenantInitStatusMapper.java

@@ -1,121 +1,8 @@
 package com.pcloud.booksflow.form.mybatis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus;
-import com.pcloud.booksflow.form.mybatis.entity.TenantInitStatusExample;
-import com.pcloud.universe.commons.paging.PaginationMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-public interface TenantInitStatusMapper extends PaginationMapper<TenantInitStatus, TenantInitStatusExample> {
+public interface TenantInitStatusMapper extends BaseMapper<TenantInitStatus> {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    long countByExample(TenantInitStatusExample example);
 
-    /**
+}
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(TenantInitStatusExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int insert(TenantInitStatus record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int insertSelective(TenantInitStatus record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    List<TenantInitStatus> selectByExample(TenantInitStatusExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    TenantInitStatus selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") TenantInitStatus record, @Param("example") TenantInitStatusExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") TenantInitStatus record, @Param("example") TenantInitStatusExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(TenantInitStatus record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(TenantInitStatus record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    List<TenantInitStatus> selectByExampleWithPaging(@Param("example") TenantInitStatusExample example, @Param("offset") int offset, @Param("limit") int limit);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    TenantInitStatus selectOneByExample(TenantInitStatusExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
-    int batchInsert(@Param("list") List<TenantInitStatus> list);
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/TenantInitStatusMapperExt.java

@@ -1,4 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-public interface TenantInitStatusMapperExt extends TenantInitStatusMapper {
-}

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapper.xml

@@ -31,7 +31,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -110,9 +110,9 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, form_id, main_title, sub_title, display_format, document_no_prefix, show_document_no, 
+    id, form_id, main_title, sub_title, display_format, document_no_prefix, show_document_no,
-    print_date_format, show_print_date, show_page_number, column_width_mode, table_style, 
+    print_date_format, show_print_date, show_page_number, column_width_mode, table_style,
-    row_height, file_size, file_name, file_type, file_wps_id, file_url_ai, file_url, 
+    row_height, file_size, file_name, file_type, file_wps_id, file_url_ai, file_url,
     `mode`, created_by, updated_by, create_time, update_time
   </sql>
   <sql id="Blob_Column_List">
@@ -165,7 +165,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -190,7 +190,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs">
+  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -198,26 +198,26 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into form_print_config (form_id, main_title, sub_title, 
+    insert into form_print_config (form_id, main_title, sub_title,
-      display_format, document_no_prefix, show_document_no, 
+      display_format, document_no_prefix, show_document_no,
-      print_date_format, show_print_date, show_page_number, 
+      print_date_format, show_print_date, show_page_number,
-      column_width_mode, table_style, row_height, 
+      column_width_mode, table_style, row_height,
-      file_size, file_name, file_type, 
+      file_size, file_name, file_type,
-      file_wps_id, file_url_ai, file_url, 
+      file_wps_id, file_url_ai, file_url,
-      `mode`, created_by, updated_by, 
+      `mode`, created_by, updated_by,
-      create_time, update_time, print_fields, 
+      create_time, update_time, print_fields,
       ext)
-    values (#{formId,jdbcType=BIGINT}, #{mainTitle,jdbcType=VARCHAR}, #{subTitle,jdbcType=VARCHAR}, 
+    values (#{formId,jdbcType=BIGINT}, #{mainTitle,jdbcType=VARCHAR}, #{subTitle,jdbcType=VARCHAR},
-      #{displayFormat,jdbcType=VARCHAR}, #{documentNoPrefix,jdbcType=VARCHAR}, #{showDocumentNo,jdbcType=BIT}, 
+      #{displayFormat,jdbcType=VARCHAR}, #{documentNoPrefix,jdbcType=VARCHAR}, #{showDocumentNo,jdbcType=BIT},
-      #{printDateFormat,jdbcType=VARCHAR}, #{showPrintDate,jdbcType=BIT}, #{showPageNumber,jdbcType=BIT}, 
+      #{printDateFormat,jdbcType=VARCHAR}, #{showPrintDate,jdbcType=BIT}, #{showPageNumber,jdbcType=BIT},
-      #{columnWidthMode,jdbcType=VARCHAR}, #{tableStyle,jdbcType=VARCHAR}, #{rowHeight,jdbcType=VARCHAR}, 
+      #{columnWidthMode,jdbcType=VARCHAR}, #{tableStyle,jdbcType=VARCHAR}, #{rowHeight,jdbcType=VARCHAR},
-      #{fileSize,jdbcType=INTEGER}, #{fileName,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
+      #{fileSize,jdbcType=INTEGER}, #{fileName,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
-      #{fileWpsId,jdbcType=VARCHAR}, #{fileUrlAi,jdbcType=VARCHAR}, #{fileUrl,jdbcType=VARCHAR}, 
+      #{fileWpsId,jdbcType=VARCHAR}, #{fileUrlAi,jdbcType=VARCHAR}, #{fileUrl,jdbcType=VARCHAR},
-      #{mode,jdbcType=INTEGER}, #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, 
+      #{mode,jdbcType=INTEGER}, #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{printFields,jdbcType=LONGVARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{printFields,jdbcType=LONGVARCHAR},
       #{ext,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs">
+  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -551,7 +551,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs">
+  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -636,7 +636,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -743,25 +743,25 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into form_print_config (form_id, 
+    insert into form_print_config (form_id,
-      main_title, sub_title, display_format, 
+      main_title, sub_title, display_format,
-      document_no_prefix, show_document_no, 
+      document_no_prefix, show_document_no,
-      print_date_format, show_print_date, show_page_number, 
+      print_date_format, show_print_date, show_page_number,
-      column_width_mode, table_style, 
+      column_width_mode, table_style,
-      row_height, file_size, file_name, 
+      row_height, file_size, file_name,
-      file_type, file_wps_id, file_url_ai, 
+      file_type, file_wps_id, file_url_ai,
-      file_url, `mode`, created_by, 
+      file_url, `mode`, created_by,
-      updated_by, create_time, update_time, 
+      updated_by, create_time, update_time,
       print_fields, ext)
-    values <foreach collection="list" item="item" separator=","> (#{item.formId,jdbcType=BIGINT}, 
+    values <foreach collection="list" item="item" separator=","> (#{item.formId,jdbcType=BIGINT},
-      #{item.mainTitle,jdbcType=VARCHAR}, #{item.subTitle,jdbcType=VARCHAR}, #{item.displayFormat,jdbcType=VARCHAR}, 
+      #{item.mainTitle,jdbcType=VARCHAR}, #{item.subTitle,jdbcType=VARCHAR}, #{item.displayFormat,jdbcType=VARCHAR},
-      #{item.documentNoPrefix,jdbcType=VARCHAR}, #{item.showDocumentNo,jdbcType=BIT}, 
+      #{item.documentNoPrefix,jdbcType=VARCHAR}, #{item.showDocumentNo,jdbcType=BIT},
-      #{item.printDateFormat,jdbcType=VARCHAR}, #{item.showPrintDate,jdbcType=BIT}, #{item.showPageNumber,jdbcType=BIT}, 
+      #{item.printDateFormat,jdbcType=VARCHAR}, #{item.showPrintDate,jdbcType=BIT}, #{item.showPageNumber,jdbcType=BIT},
-      #{item.columnWidthMode,jdbcType=VARCHAR}, #{item.tableStyle,jdbcType=VARCHAR}, 
+      #{item.columnWidthMode,jdbcType=VARCHAR}, #{item.tableStyle,jdbcType=VARCHAR},
-      #{item.rowHeight,jdbcType=VARCHAR}, #{item.fileSize,jdbcType=INTEGER}, #{item.fileName,jdbcType=VARCHAR}, 
+      #{item.rowHeight,jdbcType=VARCHAR}, #{item.fileSize,jdbcType=INTEGER}, #{item.fileName,jdbcType=VARCHAR},
-      #{item.fileType,jdbcType=VARCHAR}, #{item.fileWpsId,jdbcType=VARCHAR}, #{item.fileUrlAi,jdbcType=VARCHAR}, 
+      #{item.fileType,jdbcType=VARCHAR}, #{item.fileWpsId,jdbcType=VARCHAR}, #{item.fileUrlAi,jdbcType=VARCHAR},
-      #{item.fileUrl,jdbcType=VARCHAR}, #{item.mode,jdbcType=INTEGER}, #{item.createdBy,jdbcType=BIGINT}, 
+      #{item.fileUrl,jdbcType=VARCHAR}, #{item.mode,jdbcType=INTEGER}, #{item.createdBy,jdbcType=BIGINT},
-      #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP},
       #{item.printFields,jdbcType=LONGVARCHAR}, #{item.ext,jdbcType=LONGVARCHAR})</foreach>
   </insert>
-</mapper>
+</mapper>

ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/controller/FormPrintConfigController.java

@@ -6,7 +6,7 @@ import com.pcloud.booksflow.form.api.dto.FormPrintConfigModeDTO;
 import com.pcloud.booksflow.form.api.dto.FormPrintConfigUploadDTO;
 import com.pcloud.booksflow.form.api.dto.FormPrintDTO;
 import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs;
+import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl;
 import com.pcloud.booksflow.form.service.FormPrintConfigService;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.entity.UploadResultInfo;
@@ -39,7 +39,7 @@ public class FormPrintConfigController {
      */
     @ApiOperation("创建或更新表单打印配置")
     @PostMapping("/createOrUpdate")
-    public ResponseDto<FormPrintConfigWithBLOBs> createOrUpdate(@Validated @RequestBody FormPrintConfigDTO dto) {
+    public ResponseDto<FormPrintConfigTpl> createOrUpdate(@Validated @RequestBody FormPrintConfigDTO dto) {
         return new ResponseDto<>(formPrintConfigService.createOrUpdate(dto));
     }
 
@@ -89,4 +89,4 @@ public class FormPrintConfigController {
     }
 
 
-}
+}

ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormPrintConfigService.java

@@ -14,7 +14,7 @@ import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO;
 import com.pcloud.booksflow.form.mybatis.entity.Form;
 import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig;
 import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigWithBLOBs;
+import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl;
 import com.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigMapperExt;
 import com.pcloud.booksflow.form.utils.UserUtils;
 import com.pcloud.booksflow.form.utils.poi.WordTemplateProcessor;
@@ -62,10 +62,10 @@ public class FormPrintConfigService {
      * @param dto 表单打印配置对象
      * @return 创建或更新后的表单打印配置对象
      */
-    public FormPrintConfigWithBLOBs createOrUpdate(FormPrintConfigDTO dto) {
+    public FormPrintConfigTpl createOrUpdate(FormPrintConfigDTO dto) {
         // 创建操作
         FormPrintConfig config = getEntityByFormId(dto.getFormId());
-        FormPrintConfigWithBLOBs entity = new FormPrintConfigWithBLOBs();
+        FormPrintConfigTpl entity = new FormPrintConfigTpl();
         if (config != null) {
             // 更新操作
             BeanUtil.copyProperties(dto, entity, "printFields");
@@ -102,7 +102,7 @@ public class FormPrintConfigService {
         example.createCriteria()
                 .andFormIdEqualTo(formId);
         example.setOrderByClause("id desc");
-        List<FormPrintConfigWithBLOBs> formPrintConfigs = formPrintConfigMapperExt.selectByExampleWithBLOBs(example);
+        List<FormPrintConfigTpl> formPrintConfigs = formPrintConfigMapperExt.selectByExampleWithBLOBs(example);
         if (!formPrintConfigs.isEmpty()) {
             return BeanUtil.copyProperties(formPrintConfigs.get(0), FormPrintConfigVO.class);
         } else {
@@ -110,12 +110,12 @@ public class FormPrintConfigService {
         }
     }
 
-    public FormPrintConfigWithBLOBs getEntityByFormId(Long formId) {
+    public FormPrintConfigTpl getEntityByFormId(Long formId) {
         FormPrintConfigExample example = new FormPrintConfigExample();
         example.createCriteria()
                 .andFormIdEqualTo(formId);
         example.setOrderByClause("id desc");
-        List<FormPrintConfigWithBLOBs> formPrintConfigs = formPrintConfigMapperExt.selectByExampleWithBLOBs(example);
+        List<FormPrintConfigTpl> formPrintConfigs = formPrintConfigMapperExt.selectByExampleWithBLOBs(example);
         if (!formPrintConfigs.isEmpty()) {
             return formPrintConfigs.get(0);
         } else {
@@ -137,7 +137,7 @@ public class FormPrintConfigService {
         return getByFormId(form.getId());
     }
 
-    public FormPrintConfigWithBLOBs getEntityByFormCode(String formCode) {
+    public FormPrintConfigTpl getEntityByFormCode(String formCode) {
         Form form = formService.getByCode(formCode);
         if (form == null) {
             return null;
@@ -146,8 +146,8 @@ public class FormPrintConfigService {
     }
 
     public int updateMode(FormPrintConfigModeDTO dto) {
-        FormPrintConfigWithBLOBs entity = new FormPrintConfigWithBLOBs();
+        FormPrintConfigTpl entity = new FormPrintConfigTpl();
-        FormPrintConfigWithBLOBs config = getEntityByFormId(dto.getFormId());
+        FormPrintConfigTpl config = getEntityByFormId(dto.getFormId());
         if (config != null) {
             entity.setId(config.getId());
             entity.setMode(dto.getMode());
@@ -163,8 +163,8 @@ public class FormPrintConfigService {
     public void createOrUpdate(FormPrintConfigUploadDTO dto) {
         // 创建操作
         Long userId = UserUtils.getUserId();
-        FormPrintConfigWithBLOBs upEntity = new FormPrintConfigWithBLOBs();
+        FormPrintConfigTpl upEntity = new FormPrintConfigTpl();
-        FormPrintConfigWithBLOBs _config = getEntityByFormId(dto.getFormId());
+        FormPrintConfigTpl _config = getEntityByFormId(dto.getFormId());
         if (_config != null) {
             // 更新操作
             BeanUtil.copyProperties(dto, upEntity);
@@ -209,7 +209,7 @@ public class FormPrintConfigService {
         log.info("dify response: {}", response);
 
         //更新
-        FormPrintConfigWithBLOBs upEntity = new FormPrintConfigWithBLOBs();
+        FormPrintConfigTpl upEntity = new FormPrintConfigTpl();
         upEntity.setId(entity.getId());
         upEntity.setFileWpsId(fileId);
         return formPrintConfigMapperExt.updateByPrimaryKeySelective(upEntity);
@@ -227,7 +227,7 @@ public class FormPrintConfigService {
         String fileId = fileRecord.getFileId();
 
         //更新
-        FormPrintConfigWithBLOBs upEntity = new FormPrintConfigWithBLOBs();
+        FormPrintConfigTpl upEntity = new FormPrintConfigTpl();
         upEntity.setId(_entity.getId());
         upEntity.setFileWpsId(fileId);
         return formPrintConfigMapperExt.updateByPrimaryKeySelective(upEntity);
@@ -285,4 +285,4 @@ public class FormPrintConfigService {
             }
         }
     }
-}
+}