h5 动态表单

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

@@ -1,52 +1,36 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("form_print_config_tpl")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("form")
 public class Form implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
      * 表单名称
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form.name
-     *
-     * @mbg.generated
      */
     private String name;
 
     /**
-     * Database Column Remarks:
+     * 表单编码
-     *   code
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form.code
-     *
-     * @mbg.generated
      */
     private String code;
 
-    /**
+
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form
-     *
-     * @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

@@ -1,119 +1,66 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("form_print_config_tpl")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("form_dict")
 public class FormDict implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_dict.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
      * 名称
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_dict.name
-     *
-     * @mbg.generated
      */
     private String name;
 
     /**
-     * Database Column Remarks:
+     * 编码
-     *   值
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_dict.code
-     *
-     * @mbg.generated
      */
     private String code;
 
     /**
-     * Database Column Remarks:
      * 备注
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_dict.remarks
-     *
-     * @mbg.generated
      */
     private String remarks;
 
     /**
-     * Database Column Remarks:
      * 创建人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_dict.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_dict.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_dict.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_dict.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
     /**
-     * Database Column Remarks:
      * 是否删除(0:否,1:是)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_dict.deleted
-     *
-     * @mbg.generated
      */
     private Integer deleted;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_dict
-     *
-     * @mbg.generated
-     */
     private static final long serialVersionUID = 1L;
 }

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

@@ -1,174 +1,86 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("form_print_config_tpl")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("form_field_dict")
 public class FormFieldDict implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
      * 类型：单位类型、往来单位、税率、费用分类、费用科目、仓库管理
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.config_type
-     *
-     * @mbg.generated
      */
     private String configType;
 
     /**
-     * Database Column Remarks:
      * 名称
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.name
-     *
-     * @mbg.generated
      */
     private String name;
 
     /**
-     * Database Column Remarks:
+     * 编码
-     *   值
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.code
-     *
-     * @mbg.generated
      */
     private String code;
 
     /**
-     * Database Column Remarks:
+     * 父级ID
-     *   父级ID，也可以是关联的id
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.parent_id
-     *
-     * @mbg.generated
      */
     private Long parentId;
 
     /**
-     * Database Column Remarks:
-     *   检查ids：当删除里面的id时，进行校验是否有相关联
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.check_ids
-     *
-     * @mbg.generated
-     */
-    private String checkIds;
-
-    /**
-     * Database Column Remarks:
      * 排序
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.sort_order
-     *
-     * @mbg.generated
      */
     private Integer sortOrder;
 
     /**
-     * Database Column Remarks:
      * 状态(1:启用,0:禁用)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.status
-     *
-     * @mbg.generated
      */
     private Integer status;
 
     /**
-     * Database Column Remarks:
      * 创建人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.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_field_dict.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_field_dict.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_field_dict.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
     /**
-     * Database Column Remarks:
      * 是否删除(0:否,1:是)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.deleted
-     *
-     * @mbg.generated
      */
     private Integer deleted;
 
     /**
-     * Database Column Remarks:
      * 其他字段(JSON格式)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_field_dict.other_fields
-     *
-     * @mbg.generated
      */
     private String otherFields;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_field_dict
-     *
-     * @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

@@ -1,284 +1,142 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("form_print_config_tpl")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("form_print_config")
 public class FormPrintConfig implements Serializable {
+
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
      * 关联的表单ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.form_id
-     *
-     * @mbg.generated
      */
     private Long formId;
 
     /**
-     * Database Column Remarks:
      * 主标题
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.main_title
-     *
-     * @mbg.generated
      */
     private String mainTitle;
 
     /**
-     * Database Column Remarks:
      * 副标题
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.sub_title
-     *
-     * @mbg.generated
      */
     private String subTitle;
 
     /**
-     * Database Column Remarks:
      * 显示格式：简洁、标准、完整
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.display_format
-     *
-     * @mbg.generated
      */
     private String displayFormat;
 
     /**
-     * Database Column Remarks:
+     * 单据编号前缀
-     *   单据编号前缀（如CG-）
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.document_no_prefix
-     *
-     * @mbg.generated
      */
     private String documentNoPrefix;
 
     /**
-     * Database Column Remarks:
      * 是否显示单据编号
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.show_document_no
-     *
-     * @mbg.generated
      */
     private Boolean showDocumentNo;
 
     /**
-     * Database Column Remarks:
      * 打印日期格式
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.print_date_format
-     *
-     * @mbg.generated
      */
     private String printDateFormat;
 
     /**
-     * Database Column Remarks:
      * 是否显示打印日期
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.show_print_date
-     *
-     * @mbg.generated
      */
     private Boolean showPrintDate;
 
     /**
-     * Database Column Remarks:
      * 是否显示页码
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.show_page_number
-     *
-     * @mbg.generated
      */
     private Boolean showPageNumber;
 
     /**
-     * Database Column Remarks:
      * 列宽模式：固定宽度或自适应
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.column_width_mode
-     *
-     * @mbg.generated
      */
     private String columnWidthMode;
 
     /**
-     * Database Column Remarks:
      * 表格样式：有边框或无边框
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.table_style
-     *
-     * @mbg.generated
      */
     private String tableStyle;
 
     /**
-     * Database Column Remarks:
      * 数据行高
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.row_height
-     *
-     * @mbg.generated
      */
     private String rowHeight;
 
     /**
-     * Database Column Remarks:
      * 模板文件大小
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.file_size
-     *
-     * @mbg.generated
      */
     private Integer fileSize;
 
     /**
-     * Database Column Remarks:
+     * 模板文件名
-     *   模板文件name
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.file_name
-     *
-     * @mbg.generated
      */
     private String fileName;
 
     /**
-     * Database Column Remarks:
      * 文件类型：doc、excel
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.file_type
-     *
-     * @mbg.generated
      */
     private String fileType;
 
     /**
-     * Database Column Remarks:
      * file_wps_id
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.file_wps_id
-     *
-     * @mbg.generated
      */
     private String fileWpsId;
 
     /**
-     * Database Column Remarks:
+     * AI模板文件url
-     *   ai模板文件url
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.file_url_ai
-     *
-     * @mbg.generated
      */
     private String fileUrlAi;
 
     /**
-     * Database Column Remarks:
      * 模板文件url
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.file_url
-     *
-     * @mbg.generated
      */
     private String fileUrl;
 
     /**
-     * Database Column Remarks:
      * 打印配置模式（1、默认模式；2、模板打印模式）
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.mode
-     *
-     * @mbg.generated
      */
     private Integer mode;
 
     /**
-     * Database Column Remarks:
      * 创建人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_print_config.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.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.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.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
-    /**
-     * 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/FormPrintConfigTpl.java

@@ -1,71 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-@Data
-@TableName("form_print_config_tpl")
-public class FormPrintConfigTpl implements Serializable {
-
-    private Long id;
-    /**
-     * 表单打印配置 ID
-     */
-    private Long formPrintConfigId;
-
-    /**
-     * 模板文件url
-     */
-    private String fileUrl;
-
-    /**
-     * 文件类型：doc、excel
-     */
-    private String fileType;
-
-    /**
-     * file_wps_id
-     */
-    private String fileWpsId;
-
-    /**
-     * 创建人
-     */
-    private Long createdBy;
-
-    /**
-     * 更新人
-     */
-    private Long updatedBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 打印字段
-     */
-    private String printFields;
-
-    /**
-     * 扩展属性(JSON格式)
-     */
-    private String ext;
-
-    /**
-     * 是否删除(0:否,1:是)
-     */
-    private Integer deleted;
-
-    private static final long serialVersionUID = 1L;
-}

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

@@ -1,110 +1,61 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.*;
-
-/**
- *
- * This class was generated by MyBatis Generator.
- * This class corresponds to the database table form_template
- */
 @Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("form_template")
 public class FormTemplate implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
+     * 表单ID
-     *   form id
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template.form_id
-     *
-     * @mbg.generated
      */
     private Long formId;
 
     /**
-     * Database Column Remarks:
      * 版本
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template.version
-     *
-     * @mbg.generated
      */
     private Integer version;
 
     /**
-     * Database Column Remarks:
+     * 内容编码
-     *   内容编码，保存时和上次的编码是否一致，一致时则不进行更新
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template.content_encoding
-     *
-     * @mbg.generated
      */
     private String contentEncoding;
 
     /**
-     * Database Column Remarks:
      * 创建人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template.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_template.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_template.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_template.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_template
-     *
-     * @mbg.generated
-     */
     private static final long serialVersionUID = 1L;
 }

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

@@ -1,306 +1,151 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("form_print_config_tpl")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("form_template_field")
 public class FormTemplateField implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
+     * 模板ID
-     *   form_template 的id
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.template_id
-     *
-     * @mbg.generated
      */
     private Long templateId;
 
     /**
-     * Database Column Remarks:
      * 编码
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.code
-     *
-     * @mbg.generated
      */
     private String code;
 
     /**
-     * Database Column Remarks:
+     * 父ID
-     *   父id
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.parent_id
-     *
-     * @mbg.generated
      */
     private Long parentId;
 
     /**
-     * Database Column Remarks:
      * 标题
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.title
-     *
-     * @mbg.generated
      */
     private String title;
 
     /**
-     * Database Column Remarks:
+     * 显示标题
-     *   show标题
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.show_title
-     *
-     * @mbg.generated
      */
     private String showTitle;
 
     /**
-     * Database Column Remarks:
+     * 数据库字段
-     *   数据库中关联字段（目前用作流程流转时数据判断）
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.db_field
-     *
-     * @mbg.generated
      */
     private String dbField;
 
     /**
-     * Database Column Remarks:
      * 是否必填
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.required
-     *
-     * @mbg.generated
      */
     private Boolean required;
 
     /**
-     * Database Column Remarks:
      * 是否显示
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.show
-     *
-     * @mbg.generated
      */
     private Boolean show;
 
     /**
-     * Database Column Remarks:
+     * 字典编码
-     *   字典code
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.dcode
-     *
-     * @mbg.generated
      */
     private String dcode;
 
     /**
-     * Database Column Remarks:
+     * 占行数量
-     *   占行数量（0-不占一行，其他-占的行数）
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.line
-     *
-     * @mbg.generated
      */
     private Integer line;
 
     /**
-     * Database Column Remarks:
+     * 字段类型
-     *   字段类型(group、string...)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.type
-     *
-     * @mbg.generated
      */
     private String type;
 
     /**
-     * Database Column Remarks:
+     * 是否固定
-     *   固定（0不固定，1固定）
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.fixed
-     *
-     * @mbg.generated
      */
     private Boolean fixed;
 
     /**
-     * Database Column Remarks:
+     * 格式约束
-     *   格式约束:int、double、str、boolean、date、select(下拉选择)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.fmt_constraint
-     *
-     * @mbg.generated
      */
     private String fmtConstraint;
 
     /**
-     * Database Column Remarks:
      * 是否可编辑
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.edit
-     *
-     * @mbg.generated
      */
     private Boolean edit;
 
     /**
-     * Database Column Remarks:
      * 排序
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.sort_order
-     *
-     * @mbg.generated
      */
     private Integer sortOrder;
 
     /**
-     * Database Column Remarks:
+     * 级联关闭
-     *   级联显示关
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.cascade_close
-     *
-     * @mbg.generated
      */
     private String cascadeClose;
 
     /**
-     * Database Column Remarks:
+     * 级联开启
-     *   级联显示开
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.cascade_open
-     *
-     * @mbg.generated
      */
     private String cascadeOpen;
 
     /**
-     * Database Column Remarks:
+     * 编辑禁用提示
-     *   可编辑按钮禁用提示
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.edit_disabled_msg
-     *
-     * @mbg.generated
      */
     private String editDisabledMsg;
 
     /**
-     * Database Column Remarks:
+     * 编辑是否禁用
-     *   可编辑按钮禁用
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.edit_disabled
-     *
-     * @mbg.generated
      */
     private Boolean editDisabled;
 
     /**
-     * Database Column Remarks:
+     * 显示级联
-     *   字典级联显示
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.show_cascade
-     *
-     * @mbg.generated
      */
     private String showCascade;
 
     /**
-     * Database Column Remarks:
      * 创建人
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.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_template_field.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_template_field.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_template_field.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
     /**
-     * Database Column Remarks:
+     * 扩展属性
-     *   扩展属性(JSON格式)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column form_template_field.ext
-     *
-     * @mbg.generated
      */
     private String ext;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table form_template_field
-     *
-     * @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

@@ -1,196 +1,101 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("modify_log_record")
 public class ModifyLogRecord implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
+     * 实体类型
-     *   实体类型，如：FormFieldDict, FormTemplate, FormTemplateField等
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.entity_type
-     *
-     * @mbg.generated
      */
     private String entityType;
 
     /**
-     * Database Column Remarks:
      * 实体ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.entity_id
-     *
-     * @mbg.generated
      */
     private String entityId;
 
     /**
-     * Database Column Remarks:
+     * 表单编码
-     *   form_code
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.form_code
-     *
-     * @mbg.generated
      */
     private String formCode;
 
     /**
-     * Database Column Remarks:
      * 描述
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.description
-     *
-     * @mbg.generated
      */
     private String description;
 
     /**
-     * Database Column Remarks:
      * 字段中文名
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.field_chinese_name
-     *
-     * @mbg.generated
      */
     private String fieldChineseName;
 
     /**
-     * Database Column Remarks:
      * 字段英文名
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.field_english_name
-     *
-     * @mbg.generated
      */
     private String fieldEnglishName;
 
     /**
-     * Database Column Remarks:
      * 修改前值
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.old_value
-     *
-     * @mbg.generated
      */
     private String oldValue;
 
     /**
-     * Database Column Remarks:
      * 修改后值
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.new_value
-     *
-     * @mbg.generated
      */
     private String newValue;
 
     /**
-     * Database Column Remarks:
      * 操作人ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.operator
-     *
-     * @mbg.generated
      */
     private Long operator;
 
     /**
-     * Database Column Remarks:
+     * 操作人姓名
-     *   操作人ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.operator_name
-     *
-     * @mbg.generated
      */
     private String operatorName;
 
     /**
-     * Database Column Remarks:
      * 操作时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.operation_time
-     *
-     * @mbg.generated
      */
     private Date operationTime;
 
     /**
-     * Database Column Remarks:
      * 创建时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.create_time
-     *
-     * @mbg.generated
      */
     private Date createTime;
 
     /**
-     * Database Column Remarks:
      * 更新时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
     /**
-     * Database Column Remarks:
      * 服务名称
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.service_name
-     *
-     * @mbg.generated
      */
     private String serviceName;
 
     /**
-     * Database Column Remarks:
+     * 是否删除
-     *   是否删除(0:否,1:是)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column modify_log_record.deleted
-     *
-     * @mbg.generated
      */
     private Integer deleted;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table modify_log_record
-     *
-     * @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

@@ -1,75 +1,46 @@
 package com.pcloud.booksflow.form.mybatis.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-
 @Data
-@TableName("")
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("tenant_init_status")
 public class TenantInitStatus implements Serializable {
     /**
-     * Database Column Remarks:
      * 主键ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column tenant_init_status.id
-     *
-     * @mbg.generated
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * Database Column Remarks:
+     * 初始化状态
-     *   初始化状态(0:未初始化,1:已初始化)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column tenant_init_status.initialized
-     *
-     * @mbg.generated
      */
     private Integer initialized;
 
     /**
-     * Database Column Remarks:
      * 创建时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column tenant_init_status.create_time
-     *
-     * @mbg.generated
      */
     private Date createTime;
 
     /**
-     * Database Column Remarks:
      * 更新时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column tenant_init_status.update_time
-     *
-     * @mbg.generated
      */
     private Date updateTime;
 
     /**
-     * Database Column Remarks:
      * 租户ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column tenant_init_status.agent_id
-     *
-     * @mbg.generated
      */
     private Long agentId;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table tenant_init_status
-     *
-     * @mbg.generated
-     */
     private static final long serialVersionUID = 1L;
 }

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

@@ -2,7 +2,14 @@ package com.pcloud.booksflow.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormDict;
+import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 表单字典Mapper接口
+ * 
+ * @author lizhw
+ */
+@Mapper
 public interface FormDictMapper extends BaseMapper<FormDict> {
 
 }

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

@@ -4,19 +4,24 @@ 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.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 表单字段字典Mapper接口
+ *
+ * @author lizhw
+ */
+@Mapper
 public interface FormFieldDictMapper extends BaseMapper<FormFieldDict> {
-    List<FormFieldDict> selectByExampleWithPagingBLOBs(@Param("example") FormFieldDictExample example,
+    /**
-                                                       @Param("offset") int offset,
+     * 根据编码列表获取字典项
-                                                       @Param("limit") int limit,
+     *
-                                                       @Param("queryStr") String queryStr);
+     * @param dtos 编码DTO列表
-
+     * @return 字典项列表
-    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

@@ -2,7 +2,14 @@ package com.pcloud.booksflow.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.Form;
+import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 表单Mapper接口
+ * 
+ * @author lizhw
+ */
+@Mapper
 public interface FormMapper extends BaseMapper<Form> {
 
 }

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

@@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig;
 import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 表单打印配置Mapper接口
+ * 
+ * @author lizhw
+ */
 @Mapper
 public interface FormPrintConfigMapper extends BaseMapper<FormPrintConfig> {
 

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

@@ -1,8 +0,0 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl;
-
-public interface FormPrintConfigTplMapper extends BaseMapper<FormPrintConfigTpl> {
-
-}

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

@@ -2,7 +2,14 @@ package com.pcloud.booksflow.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField;
+import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 表单模板字段Mapper接口
+ * 
+ * @author lizhw
+ */
+@Mapper
 public interface FormTemplateFieldMapper extends BaseMapper<FormTemplateField> {
 
 }

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

@@ -2,7 +2,14 @@ package com.pcloud.booksflow.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.FormTemplate;
+import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 表单模板Mapper接口
+ * 
+ * @author lizhw
+ */
+@Mapper
 public interface FormTemplateMapper extends BaseMapper<FormTemplate> {
 
 }

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

@@ -2,7 +2,14 @@ package com.pcloud.booksflow.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord;
+import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 修改日志记录Mapper接口
+ * 
+ * @author lizhw
+ */
+@Mapper
 public interface ModifyLogRecordMapper extends BaseMapper<ModifyLogRecord> {
 
 }

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

@@ -2,7 +2,14 @@ package com.pcloud.booksflow.form.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus;
+import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 租户初始化状态Mapper接口
+ * 
+ * @author lizhw
+ */
+@Mapper
 public interface TenantInitStatusMapper extends BaseMapper<TenantInitStatus> {
 
 }

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

@@ -2,384 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormDictMapperExt">
     <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormDict">
-    <!--
+        <id column="id" jdbcType="BIGINT" property="id"/>
-      WARNING - @mbg.generated
+        <result column="name" jdbcType="VARCHAR" property="name"/>
-      This element is automatically generated by MyBatis Generator, do not modify.
+        <result column="code" jdbcType="VARCHAR" property="code"/>
-    -->
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
-    <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="created_by" jdbcType="BIGINT" property="createdBy"/>
-    <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/>
-    <result column="code" jdbcType="VARCHAR" property="code" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+        <result column="deleted" jdbcType="TINYINT" property="deleted"/>
-    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="deleted" jdbcType="TINYINT" property="deleted" />
     </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
     <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
         id, `name`, code, remarks, created_by, updated_by, create_time, update_time, deleted
     </sql>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDictExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from form_dict
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_dict
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDictExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_dict (`name`, code, remarks, 
-      created_by, updated_by, create_time, 
-      update_time, deleted)
-    values (#{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
-      #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_dict
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="deleted != null">
-        deleted,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=TINYINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDictExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_dict
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        `name` = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.code != null">
-        code = #{record.code,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createdBy != null">
-        created_by = #{record.createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.updatedBy != null">
-        updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.deleted != null">
-        deleted = #{record.deleted,jdbcType=TINYINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_dict
-    set id = #{record.id,jdbcType=BIGINT},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      code = #{record.code,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      deleted = #{record.deleted,jdbcType=TINYINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_dict
-    <set>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleted != null">
-        deleted = #{deleted,jdbcType=TINYINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_dict
-    set `name` = #{name,jdbcType=VARCHAR},
-      code = #{code,jdbcType=VARCHAR},
-      remarks = #{remarks,jdbcType=VARCHAR},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=TINYINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDictExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_dict
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormDictExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form_dict (`name`, 
-      code, remarks, created_by, 
-      updated_by, create_time, update_time, 
-      deleted)
-    values <foreach collection="list" item="item" separator=","> (#{item.name,jdbcType=VARCHAR}, 
-      #{item.code,jdbcType=VARCHAR}, #{item.remarks,jdbcType=VARCHAR}, #{item.createdBy,jdbcType=BIGINT}, 
-      #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleted,jdbcType=TINYINT})</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormDictMapperExt" />

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

@@ -1,547 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapperExt">
+<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper">
     <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
         <!--
           WARNING - @mbg.generated
           This element is automatically generated by MyBatis Generator, do not modify.
         -->
-    <id column="id" jdbcType="BIGINT" property="id" />
+        <id column="id" jdbcType="BIGINT" property="id"/>
-    <result column="config_type" jdbcType="VARCHAR" property="configType" />
+        <result column="config_type" jdbcType="VARCHAR" property="configType"/>
-    <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="name" jdbcType="VARCHAR" property="name"/>
-    <result column="code" jdbcType="VARCHAR" property="code" />
+        <result column="code" jdbcType="VARCHAR" property="code"/>
-    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+        <result column="parent_id" jdbcType="BIGINT" property="parentId"/>
-    <result column="check_ids" jdbcType="VARCHAR" property="checkIds" />
+        <result column="sort_order" jdbcType="INTEGER" property="sortOrder"/>
-    <result column="sort_order" jdbcType="INTEGER" property="sortOrder" />
+        <result column="status" jdbcType="TINYINT" property="status"/>
-    <result column="status" jdbcType="TINYINT" property="status" />
+        <result column="created_by" jdbcType="BIGINT" property="createdBy"/>
-    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+        <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/>
-    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="deleted" jdbcType="TINYINT" property="deleted"/>
-    <result column="deleted" jdbcType="TINYINT" property="deleted" />
     </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
+    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs"
-    <!--
+               type="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
-      WARNING - @mbg.generated
+        <result column="other_fields" jdbcType="LONGVARCHAR" property="otherFields"/>
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <result column="other_fields" jdbcType="LONGVARCHAR" property="otherFields" />
     </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
     <sql id="Base_Column_List">
-    <!--
+        id
-      WARNING - @mbg.generated
+        , config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by,
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    id, config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by, 
     updated_by, create_time, update_time, deleted
     </sql>
-  <sql id="Blob_Column_List">
+
-    <!--
+
-      WARNING - @mbg.generated
+    <select id="getByCodes" resultMap="ResultMapWithBLOBs">
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    other_fields
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
         select
-    <if test="distinct">
+        <include refid="Base_Column_List"/>
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
         ,
-    <include refid="Blob_Column_List" />
+        <include refid="Blob_Column_List"/>
         from form_field_dict
-    <if test="_parameter != null">
+        <where>
-      <include refid="Example_Where_Clause" />
+            deleted = 0 and
-    </if>
+            <foreach item="item" index="index" collection="list" open="(" separator="or" close=")">
-    <if test="orderByClause != null">
+                config_type = #{item.configType}
-      order by ${orderByClause}
+                AND code in
-    </if>
+                <foreach item="item2" index="index" collection="item.codes" open="(" separator="," close=")">
+                    #{item2}
+                </foreach>
+            </foreach>
+        </where>
     </select>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_field_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from form_field_dict
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_field_dict
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_field_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_field_dict (config_type, `name`, code, 
-      parent_id, check_ids, sort_order, 
-      `status`, created_by, updated_by, 
-      create_time, update_time, deleted, 
-      other_fields)
-    values (#{configType,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
-      #{parentId,jdbcType=BIGINT}, #{checkIds,jdbcType=VARCHAR}, #{sortOrder,jdbcType=INTEGER}, 
-      #{status,jdbcType=TINYINT}, #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}, 
-      #{otherFields,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_field_dict
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="configType != null">
-        config_type,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-      <if test="parentId != null">
-        parent_id,
-      </if>
-      <if test="checkIds != null">
-        check_ids,
-      </if>
-      <if test="sortOrder != null">
-        sort_order,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="deleted != null">
-        deleted,
-      </if>
-      <if test="otherFields != null">
-        other_fields,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="configType != null">
-        #{configType,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null">
-        #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="checkIds != null">
-        #{checkIds,jdbcType=VARCHAR},
-      </if>
-      <if test="sortOrder != null">
-        #{sortOrder,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=TINYINT},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=TINYINT},
-      </if>
-      <if test="otherFields != null">
-        #{otherFields,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form_field_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_field_dict
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.configType != null">
-        config_type = #{record.configType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        `name` = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.code != null">
-        code = #{record.code,jdbcType=VARCHAR},
-      </if>
-      <if test="record.parentId != null">
-        parent_id = #{record.parentId,jdbcType=BIGINT},
-      </if>
-      <if test="record.checkIds != null">
-        check_ids = #{record.checkIds,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sortOrder != null">
-        sort_order = #{record.sortOrder,jdbcType=INTEGER},
-      </if>
-      <if test="record.status != null">
-        `status` = #{record.status,jdbcType=TINYINT},
-      </if>
-      <if test="record.createdBy != null">
-        created_by = #{record.createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.updatedBy != null">
-        updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.deleted != null">
-        deleted = #{record.deleted,jdbcType=TINYINT},
-      </if>
-      <if test="record.otherFields != null">
-        other_fields = #{record.otherFields,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_field_dict
-    set id = #{record.id,jdbcType=BIGINT},
-      config_type = #{record.configType,jdbcType=VARCHAR},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      code = #{record.code,jdbcType=VARCHAR},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
-      check_ids = #{record.checkIds,jdbcType=VARCHAR},
-      sort_order = #{record.sortOrder,jdbcType=INTEGER},
-      `status` = #{record.status,jdbcType=TINYINT},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      deleted = #{record.deleted,jdbcType=TINYINT},
-      other_fields = #{record.otherFields,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_field_dict
-    set id = #{record.id,jdbcType=BIGINT},
-      config_type = #{record.configType,jdbcType=VARCHAR},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      code = #{record.code,jdbcType=VARCHAR},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
-      check_ids = #{record.checkIds,jdbcType=VARCHAR},
-      sort_order = #{record.sortOrder,jdbcType=INTEGER},
-      `status` = #{record.status,jdbcType=TINYINT},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      deleted = #{record.deleted,jdbcType=TINYINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_field_dict
-    <set>
-      <if test="configType != null">
-        config_type = #{configType,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="checkIds != null">
-        check_ids = #{checkIds,jdbcType=VARCHAR},
-      </if>
-      <if test="sortOrder != null">
-        sort_order = #{sortOrder,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=TINYINT},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleted != null">
-        deleted = #{deleted,jdbcType=TINYINT},
-      </if>
-      <if test="otherFields != null">
-        other_fields = #{otherFields,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_field_dict
-    set config_type = #{configType,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      code = #{code,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=BIGINT},
-      check_ids = #{checkIds,jdbcType=VARCHAR},
-      sort_order = #{sortOrder,jdbcType=INTEGER},
-      `status` = #{status,jdbcType=TINYINT},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=TINYINT},
-      other_fields = #{otherFields,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_field_dict
-    set config_type = #{configType,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-      code = #{code,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=BIGINT},
-      check_ids = #{checkIds,jdbcType=VARCHAR},
-      sort_order = #{sortOrder,jdbcType=INTEGER},
-      `status` = #{status,jdbcType=TINYINT},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=TINYINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_field_dict
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_field_dict
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form_field_dict (config_type, 
-      `name`, code, parent_id, 
-      check_ids, sort_order, `status`, 
-      created_by, updated_by, create_time, 
-      update_time, deleted, other_fields
-      )
-    values <foreach collection="list" item="item" separator=","> (#{item.configType,jdbcType=VARCHAR}, 
-      #{item.name,jdbcType=VARCHAR}, #{item.code,jdbcType=VARCHAR}, #{item.parentId,jdbcType=BIGINT}, 
-      #{item.checkIds,jdbcType=VARCHAR}, #{item.sortOrder,jdbcType=INTEGER}, #{item.status,jdbcType=TINYINT}, 
-      #{item.createdBy,jdbcType=BIGINT}, #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=TINYINT}, #{item.otherFields,jdbcType=LONGVARCHAR}
-      )</foreach>
-  </insert>
 </mapper>

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapperExt" >
-    <sql id="Example_Where_Clause_Not_Where">
-        <foreach collection="example.oredCriteria" item="criteria" separator="or">
-            <if test="criteria.valid">
-                <trim prefix="(" prefixOverrides="and" suffix=")">
-                    <foreach collection="criteria.criteria" item="criterion">
-                        <choose>
-                            <when test="criterion.noValue">
-                                and ${criterion.condition}
-                            </when>
-                            <when test="criterion.singleValue">
-                                and ${criterion.condition} #{criterion.value}
-                            </when>
-                            <when test="criterion.betweenValue">
-                                and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                            </when>
-                            <when test="criterion.listValue">
-                                and ${criterion.condition}
-                                <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                                    #{listItem}
-                                </foreach>
-                            </when>
-                        </choose>
-                    </foreach>
-                </trim>
-            </if>
-        </foreach>
-    </sql>
-
-    <select id="selectByExampleWithPagingBLOBs" resultMap="ResultMapWithBLOBs">
-        select
-        <if test="example.distinct">
-            distinct
-        </if>
-        <include refid="Base_Column_List" />
-        ,
-        <include refid="Blob_Column_List" />
-        from form_field_dict
-        <where>
-            <if test="example != null">
-                <include refid="Example_Where_Clause_Not_Where" />
-            </if>
-            <if test="queryStr != null and queryStr != ''">
-                and (name like concat(#{queryStr}, '%') or code like concat(#{queryStr}, '%'))
-            </if>
-        </where>
-        <if test="example.orderByClause != null">
-            order by ${example.orderByClause}
-        </if>
-        LIMIT #{offset}, #{limit}
-    </select>
-
-    <select id="countByExampleExt" resultType="java.lang.Long">
-        select count(id) from form_field_dict
-        <where>
-            <if test="example != null">
-                <include refid="Example_Where_Clause_Not_Where"/>
-            </if>
-            <if test="queryStr != null and queryStr != ''">
-                and (name like concat(#{queryStr}, '%') or code like concat(#{queryStr}, '%'))
-            </if>
-        </where>
-    </select>
-    <select id="getByCodes" resultMap="ResultMapWithBLOBs">
-        select
-        <include refid="Base_Column_List"/>
-        ,
-        <include refid="Blob_Column_List"/>
-        from form_field_dict
-        <where>
-            deleted = 0 and
-            <foreach item="item" index="index" collection="list" open="(" separator="or" close=")">
-                config_type = #{item.configType}
-                AND code in
-                <foreach item="item2" index="index" collection="item.codes" open="(" separator="," close=")">
-                    #{item2}
-                </foreach>
-            </foreach>
-        </where>
-    </select>
-
-</mapper>

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

@@ -2,286 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormMapperExt">
     <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.Form">
-    <!--
+        <id column="id" jdbcType="BIGINT" property="id"/>
-      WARNING - @mbg.generated
+        <result column="name" jdbcType="VARCHAR" property="name"/>
-      This element is automatically generated by MyBatis Generator, do not modify.
+        <result column="code" jdbcType="VARCHAR" property="code"/>
-    -->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
     </resultMap>
-  <sql id="Example_Where_Clause">
+
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
     <sql id="Base_Column_List">
-    <!--
+        id
-      WARNING - @mbg.generated
+        , `name`, code
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    id, `name`, code
     </sql>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from form
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.Form">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form (`name`, code)
-    values (#{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.Form">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        `name` = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.code != null">
-        code = #{record.code,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form
-    set id = #{record.id,jdbcType=BIGINT},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      code = #{record.code,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.Form">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form
-    <set>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.Form">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form
-    set `name` = #{name,jdbcType=VARCHAR},
-      code = #{code,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form (`name`, 
-      code)
-    values <foreach collection="list" item="item" separator=","> (#{item.name,jdbcType=VARCHAR}, 
-      #{item.code,jdbcType=VARCHAR})</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormMapperExt" />

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

@@ -39,729 +39,14 @@
     <result column="print_fields" jdbcType="LONGVARCHAR" property="printFields" />
     <result column="ext" jdbcType="LONGVARCHAR" property="ext" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      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,
     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,
     `mode`, created_by, updated_by, create_time, update_time
   </sql>
   <sql id="Blob_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     print_fields, ext
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample" resultMap="ResultMapWithBLOBs">
+
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from form_print_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_print_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from form_print_config
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_print_config
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_print_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <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.
-    -->
-    <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,
-      display_format, document_no_prefix, show_document_no,
-      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,
-      `mode`, created_by, updated_by,
-      create_time, update_time, print_fields,
-      ext)
-    values (#{formId,jdbcType=BIGINT}, #{mainTitle,jdbcType=VARCHAR}, #{subTitle,jdbcType=VARCHAR},
-      #{displayFormat,jdbcType=VARCHAR}, #{documentNoPrefix,jdbcType=VARCHAR}, #{showDocumentNo,jdbcType=BIT},
-      #{printDateFormat,jdbcType=VARCHAR}, #{showPrintDate,jdbcType=BIT}, #{showPageNumber,jdbcType=BIT},
-      #{columnWidthMode,jdbcType=VARCHAR}, #{tableStyle,jdbcType=VARCHAR}, #{rowHeight,jdbcType=VARCHAR},
-      #{fileSize,jdbcType=INTEGER}, #{fileName,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
-      #{fileWpsId,jdbcType=VARCHAR}, #{fileUrlAi,jdbcType=VARCHAR}, #{fileUrl,jdbcType=VARCHAR},
-      #{mode,jdbcType=INTEGER}, #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{printFields,jdbcType=LONGVARCHAR},
-      #{ext,jdbcType=LONGVARCHAR})
-  </insert>
-  <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.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_print_config
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="formId != null">
-        form_id,
-      </if>
-      <if test="mainTitle != null">
-        main_title,
-      </if>
-      <if test="subTitle != null">
-        sub_title,
-      </if>
-      <if test="displayFormat != null">
-        display_format,
-      </if>
-      <if test="documentNoPrefix != null">
-        document_no_prefix,
-      </if>
-      <if test="showDocumentNo != null">
-        show_document_no,
-      </if>
-      <if test="printDateFormat != null">
-        print_date_format,
-      </if>
-      <if test="showPrintDate != null">
-        show_print_date,
-      </if>
-      <if test="showPageNumber != null">
-        show_page_number,
-      </if>
-      <if test="columnWidthMode != null">
-        column_width_mode,
-      </if>
-      <if test="tableStyle != null">
-        table_style,
-      </if>
-      <if test="rowHeight != null">
-        row_height,
-      </if>
-      <if test="fileSize != null">
-        file_size,
-      </if>
-      <if test="fileName != null">
-        file_name,
-      </if>
-      <if test="fileType != null">
-        file_type,
-      </if>
-      <if test="fileWpsId != null">
-        file_wps_id,
-      </if>
-      <if test="fileUrlAi != null">
-        file_url_ai,
-      </if>
-      <if test="fileUrl != null">
-        file_url,
-      </if>
-      <if test="mode != null">
-        `mode`,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="printFields != null">
-        print_fields,
-      </if>
-      <if test="ext != null">
-        ext,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="formId != null">
-        #{formId,jdbcType=BIGINT},
-      </if>
-      <if test="mainTitle != null">
-        #{mainTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="subTitle != null">
-        #{subTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="displayFormat != null">
-        #{displayFormat,jdbcType=VARCHAR},
-      </if>
-      <if test="documentNoPrefix != null">
-        #{documentNoPrefix,jdbcType=VARCHAR},
-      </if>
-      <if test="showDocumentNo != null">
-        #{showDocumentNo,jdbcType=BIT},
-      </if>
-      <if test="printDateFormat != null">
-        #{printDateFormat,jdbcType=VARCHAR},
-      </if>
-      <if test="showPrintDate != null">
-        #{showPrintDate,jdbcType=BIT},
-      </if>
-      <if test="showPageNumber != null">
-        #{showPageNumber,jdbcType=BIT},
-      </if>
-      <if test="columnWidthMode != null">
-        #{columnWidthMode,jdbcType=VARCHAR},
-      </if>
-      <if test="tableStyle != null">
-        #{tableStyle,jdbcType=VARCHAR},
-      </if>
-      <if test="rowHeight != null">
-        #{rowHeight,jdbcType=VARCHAR},
-      </if>
-      <if test="fileSize != null">
-        #{fileSize,jdbcType=INTEGER},
-      </if>
-      <if test="fileName != null">
-        #{fileName,jdbcType=VARCHAR},
-      </if>
-      <if test="fileType != null">
-        #{fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="fileWpsId != null">
-        #{fileWpsId,jdbcType=VARCHAR},
-      </if>
-      <if test="fileUrlAi != null">
-        #{fileUrlAi,jdbcType=VARCHAR},
-      </if>
-      <if test="fileUrl != null">
-        #{fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="mode != null">
-        #{mode,jdbcType=INTEGER},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="printFields != null">
-        #{printFields,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="ext != null">
-        #{ext,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form_print_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.formId != null">
-        form_id = #{record.formId,jdbcType=BIGINT},
-      </if>
-      <if test="record.mainTitle != null">
-        main_title = #{record.mainTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subTitle != null">
-        sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="record.displayFormat != null">
-        display_format = #{record.displayFormat,jdbcType=VARCHAR},
-      </if>
-      <if test="record.documentNoPrefix != null">
-        document_no_prefix = #{record.documentNoPrefix,jdbcType=VARCHAR},
-      </if>
-      <if test="record.showDocumentNo != null">
-        show_document_no = #{record.showDocumentNo,jdbcType=BIT},
-      </if>
-      <if test="record.printDateFormat != null">
-        print_date_format = #{record.printDateFormat,jdbcType=VARCHAR},
-      </if>
-      <if test="record.showPrintDate != null">
-        show_print_date = #{record.showPrintDate,jdbcType=BIT},
-      </if>
-      <if test="record.showPageNumber != null">
-        show_page_number = #{record.showPageNumber,jdbcType=BIT},
-      </if>
-      <if test="record.columnWidthMode != null">
-        column_width_mode = #{record.columnWidthMode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tableStyle != null">
-        table_style = #{record.tableStyle,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rowHeight != null">
-        row_height = #{record.rowHeight,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileSize != null">
-        file_size = #{record.fileSize,jdbcType=INTEGER},
-      </if>
-      <if test="record.fileName != null">
-        file_name = #{record.fileName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileType != null">
-        file_type = #{record.fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileWpsId != null">
-        file_wps_id = #{record.fileWpsId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileUrlAi != null">
-        file_url_ai = #{record.fileUrlAi,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileUrl != null">
-        file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mode != null">
-        `mode` = #{record.mode,jdbcType=INTEGER},
-      </if>
-      <if test="record.createdBy != null">
-        created_by = #{record.createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.updatedBy != null">
-        updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.printFields != null">
-        print_fields = #{record.printFields,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.ext != null">
-        ext = #{record.ext,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config
-    set id = #{record.id,jdbcType=BIGINT},
-      form_id = #{record.formId,jdbcType=BIGINT},
-      main_title = #{record.mainTitle,jdbcType=VARCHAR},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      display_format = #{record.displayFormat,jdbcType=VARCHAR},
-      document_no_prefix = #{record.documentNoPrefix,jdbcType=VARCHAR},
-      show_document_no = #{record.showDocumentNo,jdbcType=BIT},
-      print_date_format = #{record.printDateFormat,jdbcType=VARCHAR},
-      show_print_date = #{record.showPrintDate,jdbcType=BIT},
-      show_page_number = #{record.showPageNumber,jdbcType=BIT},
-      column_width_mode = #{record.columnWidthMode,jdbcType=VARCHAR},
-      table_style = #{record.tableStyle,jdbcType=VARCHAR},
-      row_height = #{record.rowHeight,jdbcType=VARCHAR},
-      file_size = #{record.fileSize,jdbcType=INTEGER},
-      file_name = #{record.fileName,jdbcType=VARCHAR},
-      file_type = #{record.fileType,jdbcType=VARCHAR},
-      file_wps_id = #{record.fileWpsId,jdbcType=VARCHAR},
-      file_url_ai = #{record.fileUrlAi,jdbcType=VARCHAR},
-      file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      `mode` = #{record.mode,jdbcType=INTEGER},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      print_fields = #{record.printFields,jdbcType=LONGVARCHAR},
-      ext = #{record.ext,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config
-    set id = #{record.id,jdbcType=BIGINT},
-      form_id = #{record.formId,jdbcType=BIGINT},
-      main_title = #{record.mainTitle,jdbcType=VARCHAR},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      display_format = #{record.displayFormat,jdbcType=VARCHAR},
-      document_no_prefix = #{record.documentNoPrefix,jdbcType=VARCHAR},
-      show_document_no = #{record.showDocumentNo,jdbcType=BIT},
-      print_date_format = #{record.printDateFormat,jdbcType=VARCHAR},
-      show_print_date = #{record.showPrintDate,jdbcType=BIT},
-      show_page_number = #{record.showPageNumber,jdbcType=BIT},
-      column_width_mode = #{record.columnWidthMode,jdbcType=VARCHAR},
-      table_style = #{record.tableStyle,jdbcType=VARCHAR},
-      row_height = #{record.rowHeight,jdbcType=VARCHAR},
-      file_size = #{record.fileSize,jdbcType=INTEGER},
-      file_name = #{record.fileName,jdbcType=VARCHAR},
-      file_type = #{record.fileType,jdbcType=VARCHAR},
-      file_wps_id = #{record.fileWpsId,jdbcType=VARCHAR},
-      file_url_ai = #{record.fileUrlAi,jdbcType=VARCHAR},
-      file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      `mode` = #{record.mode,jdbcType=INTEGER},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <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.
-    -->
-    update form_print_config
-    <set>
-      <if test="formId != null">
-        form_id = #{formId,jdbcType=BIGINT},
-      </if>
-      <if test="mainTitle != null">
-        main_title = #{mainTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="subTitle != null">
-        sub_title = #{subTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="displayFormat != null">
-        display_format = #{displayFormat,jdbcType=VARCHAR},
-      </if>
-      <if test="documentNoPrefix != null">
-        document_no_prefix = #{documentNoPrefix,jdbcType=VARCHAR},
-      </if>
-      <if test="showDocumentNo != null">
-        show_document_no = #{showDocumentNo,jdbcType=BIT},
-      </if>
-      <if test="printDateFormat != null">
-        print_date_format = #{printDateFormat,jdbcType=VARCHAR},
-      </if>
-      <if test="showPrintDate != null">
-        show_print_date = #{showPrintDate,jdbcType=BIT},
-      </if>
-      <if test="showPageNumber != null">
-        show_page_number = #{showPageNumber,jdbcType=BIT},
-      </if>
-      <if test="columnWidthMode != null">
-        column_width_mode = #{columnWidthMode,jdbcType=VARCHAR},
-      </if>
-      <if test="tableStyle != null">
-        table_style = #{tableStyle,jdbcType=VARCHAR},
-      </if>
-      <if test="rowHeight != null">
-        row_height = #{rowHeight,jdbcType=VARCHAR},
-      </if>
-      <if test="fileSize != null">
-        file_size = #{fileSize,jdbcType=INTEGER},
-      </if>
-      <if test="fileName != null">
-        file_name = #{fileName,jdbcType=VARCHAR},
-      </if>
-      <if test="fileType != null">
-        file_type = #{fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="fileWpsId != null">
-        file_wps_id = #{fileWpsId,jdbcType=VARCHAR},
-      </if>
-      <if test="fileUrlAi != null">
-        file_url_ai = #{fileUrlAi,jdbcType=VARCHAR},
-      </if>
-      <if test="fileUrl != null">
-        file_url = #{fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="mode != null">
-        `mode` = #{mode,jdbcType=INTEGER},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="printFields != null">
-        print_fields = #{printFields,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="ext != null">
-        ext = #{ext,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <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.
-    -->
-    update form_print_config
-    set form_id = #{formId,jdbcType=BIGINT},
-      main_title = #{mainTitle,jdbcType=VARCHAR},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
-      display_format = #{displayFormat,jdbcType=VARCHAR},
-      document_no_prefix = #{documentNoPrefix,jdbcType=VARCHAR},
-      show_document_no = #{showDocumentNo,jdbcType=BIT},
-      print_date_format = #{printDateFormat,jdbcType=VARCHAR},
-      show_print_date = #{showPrintDate,jdbcType=BIT},
-      show_page_number = #{showPageNumber,jdbcType=BIT},
-      column_width_mode = #{columnWidthMode,jdbcType=VARCHAR},
-      table_style = #{tableStyle,jdbcType=VARCHAR},
-      row_height = #{rowHeight,jdbcType=VARCHAR},
-      file_size = #{fileSize,jdbcType=INTEGER},
-      file_name = #{fileName,jdbcType=VARCHAR},
-      file_type = #{fileType,jdbcType=VARCHAR},
-      file_wps_id = #{fileWpsId,jdbcType=VARCHAR},
-      file_url_ai = #{fileUrlAi,jdbcType=VARCHAR},
-      file_url = #{fileUrl,jdbcType=VARCHAR},
-      `mode` = #{mode,jdbcType=INTEGER},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      print_fields = #{printFields,jdbcType=LONGVARCHAR},
-      ext = #{ext,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config
-    set form_id = #{formId,jdbcType=BIGINT},
-      main_title = #{mainTitle,jdbcType=VARCHAR},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
-      display_format = #{displayFormat,jdbcType=VARCHAR},
-      document_no_prefix = #{documentNoPrefix,jdbcType=VARCHAR},
-      show_document_no = #{showDocumentNo,jdbcType=BIT},
-      print_date_format = #{printDateFormat,jdbcType=VARCHAR},
-      show_print_date = #{showPrintDate,jdbcType=BIT},
-      show_page_number = #{showPageNumber,jdbcType=BIT},
-      column_width_mode = #{columnWidthMode,jdbcType=VARCHAR},
-      table_style = #{tableStyle,jdbcType=VARCHAR},
-      row_height = #{rowHeight,jdbcType=VARCHAR},
-      file_size = #{fileSize,jdbcType=INTEGER},
-      file_name = #{fileName,jdbcType=VARCHAR},
-      file_type = #{fileType,jdbcType=VARCHAR},
-      file_wps_id = #{fileWpsId,jdbcType=VARCHAR},
-      file_url_ai = #{fileUrlAi,jdbcType=VARCHAR},
-      file_url = #{fileUrl,jdbcType=VARCHAR},
-      `mode` = #{mode,jdbcType=INTEGER},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_print_config
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_print_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form_print_config (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,
-      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,
-      print_fields, ext)
-    values <foreach collection="list" item="item" separator=","> (#{item.formId,jdbcType=BIGINT},
-      #{item.mainTitle,jdbcType=VARCHAR}, #{item.subTitle,jdbcType=VARCHAR}, #{item.displayFormat,jdbcType=VARCHAR},
-      #{item.documentNoPrefix,jdbcType=VARCHAR}, #{item.showDocumentNo,jdbcType=BIT},
-      #{item.printDateFormat,jdbcType=VARCHAR}, #{item.showPrintDate,jdbcType=BIT}, #{item.showPageNumber,jdbcType=BIT},
-      #{item.columnWidthMode,jdbcType=VARCHAR}, #{item.tableStyle,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.fileUrl,jdbcType=VARCHAR}, #{item.mode,jdbcType=INTEGER}, #{item.createdBy,jdbcType=BIGINT},
-      #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP},
-      #{item.printFields,jdbcType=LONGVARCHAR}, #{item.ext,jdbcType=LONGVARCHAR})</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigMapperExt" />

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

@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigTplMapperExt">
-  <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="form_print_config_id" jdbcType="BIGINT" property="formPrintConfigId" />
-    <result column="file_url" jdbcType="VARCHAR" property="fileUrl" />
-    <result column="file_type" jdbcType="VARCHAR" property="fileType" />
-    <result column="file_wps_id" jdbcType="VARCHAR" property="fileWpsId" />
-    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
-    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="deleted" jdbcType="TINYINT" property="deleted" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    id, form_print_config_id, file_url, file_type, file_wps_id, created_by, updated_by, 
-    create_time, update_time, deleted
-  </sql>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTplExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_print_config_tpl
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from form_print_config_tpl
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_print_config_tpl
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTplExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_print_config_tpl
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <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.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_print_config_tpl (form_print_config_id, file_url, file_type, 
-      file_wps_id, created_by, updated_by, 
-      create_time, update_time, deleted
-      )
-    values (#{formPrintConfigId,jdbcType=BIGINT}, #{fileUrl,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
-      #{fileWpsId,jdbcType=VARCHAR}, #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
-      )
-  </insert>
-  <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.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_print_config_tpl
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="formPrintConfigId != null">
-        form_print_config_id,
-      </if>
-      <if test="fileUrl != null">
-        file_url,
-      </if>
-      <if test="fileType != null">
-        file_type,
-      </if>
-      <if test="fileWpsId != null">
-        file_wps_id,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="deleted != null">
-        deleted,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="formPrintConfigId != null">
-        #{formPrintConfigId,jdbcType=BIGINT},
-      </if>
-      <if test="fileUrl != null">
-        #{fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="fileType != null">
-        #{fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="fileWpsId != null">
-        #{fileWpsId,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=TINYINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTplExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form_print_config_tpl
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config_tpl
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.formPrintConfigId != null">
-        form_print_config_id = #{record.formPrintConfigId,jdbcType=BIGINT},
-      </if>
-      <if test="record.fileUrl != null">
-        file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileType != null">
-        file_type = #{record.fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileWpsId != null">
-        file_wps_id = #{record.fileWpsId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createdBy != null">
-        created_by = #{record.createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.updatedBy != null">
-        updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.deleted != null">
-        deleted = #{record.deleted,jdbcType=TINYINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config_tpl
-    set id = #{record.id,jdbcType=BIGINT},
-      form_print_config_id = #{record.formPrintConfigId,jdbcType=BIGINT},
-      file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      file_type = #{record.fileType,jdbcType=VARCHAR},
-      file_wps_id = #{record.fileWpsId,jdbcType=VARCHAR},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      deleted = #{record.deleted,jdbcType=TINYINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <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.
-    -->
-    update form_print_config_tpl
-    <set>
-      <if test="formPrintConfigId != null">
-        form_print_config_id = #{formPrintConfigId,jdbcType=BIGINT},
-      </if>
-      <if test="fileUrl != null">
-        file_url = #{fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="fileType != null">
-        file_type = #{fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="fileWpsId != null">
-        file_wps_id = #{fileWpsId,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleted != null">
-        deleted = #{deleted,jdbcType=TINYINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_print_config_tpl
-    set form_print_config_id = #{formPrintConfigId,jdbcType=BIGINT},
-      file_url = #{fileUrl,jdbcType=VARCHAR},
-      file_type = #{fileType,jdbcType=VARCHAR},
-      file_wps_id = #{fileWpsId,jdbcType=VARCHAR},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=TINYINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTplExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_print_config_tpl
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTplExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_print_config_tpl
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form_print_config_tpl (form_print_config_id, 
-      file_url, file_type, file_wps_id, 
-      created_by, updated_by, create_time, 
-      update_time, deleted)
-    values <foreach collection="list" item="item" separator=","> (#{item.formPrintConfigId,jdbcType=BIGINT}, 
-      #{item.fileUrl,jdbcType=VARCHAR}, #{item.fileType,jdbcType=VARCHAR}, #{item.fileWpsId,jdbcType=VARCHAR}, 
-      #{item.createdBy,jdbcType=BIGINT}, #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=TINYINT})</foreach>
-  </insert>
-</mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigTplMapperExt" />

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

@@ -33,737 +33,17 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     <result column="ext" jdbcType="LONGVARCHAR" property="ext" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
+
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     id, template_id, code, parent_id, title, show_title, db_field, required, `show`,
     dcode, line, `type`, fixed, fmt_constraint, edit, sort_order, cascade_close, cascade_open,
     edit_disabled_msg, edit_disabled, show_cascade, created_by, updated_by, create_time,
     update_time
   </sql>
   <sql id="Blob_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     ext
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample" resultMap="ResultMapWithBLOBs">
+
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from form_template_field
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_template_field
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from form_template_field
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_template_field
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_template_field
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_template_field (template_id, code, parent_id, 
-      title, show_title, db_field, 
-      required, `show`, dcode, line, 
-      `type`, fixed, fmt_constraint, 
-      edit, sort_order, cascade_close, 
-      cascade_open, edit_disabled_msg, edit_disabled, 
-      show_cascade, created_by, updated_by, 
-      create_time, update_time, ext
-      )
-    values (#{templateId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, 
-      #{title,jdbcType=VARCHAR}, #{showTitle,jdbcType=VARCHAR}, #{dbField,jdbcType=VARCHAR}, 
-      #{required,jdbcType=BIT}, #{show,jdbcType=BIT}, #{dcode,jdbcType=VARCHAR}, #{line,jdbcType=TINYINT}, 
-      #{type,jdbcType=VARCHAR}, #{fixed,jdbcType=BIT}, #{fmtConstraint,jdbcType=VARCHAR}, 
-      #{edit,jdbcType=BIT}, #{sortOrder,jdbcType=INTEGER}, #{cascadeClose,jdbcType=VARCHAR}, 
-      #{cascadeOpen,jdbcType=VARCHAR}, #{editDisabledMsg,jdbcType=VARCHAR}, #{editDisabled,jdbcType=BIT}, 
-      #{showCascade,jdbcType=VARCHAR}, #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{ext,jdbcType=LONGVARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_template_field
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="templateId != null">
-        template_id,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-      <if test="parentId != null">
-        parent_id,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="showTitle != null">
-        show_title,
-      </if>
-      <if test="dbField != null">
-        db_field,
-      </if>
-      <if test="required != null">
-        required,
-      </if>
-      <if test="show != null">
-        `show`,
-      </if>
-      <if test="dcode != null">
-        dcode,
-      </if>
-      <if test="line != null">
-        line,
-      </if>
-      <if test="type != null">
-        `type`,
-      </if>
-      <if test="fixed != null">
-        fixed,
-      </if>
-      <if test="fmtConstraint != null">
-        fmt_constraint,
-      </if>
-      <if test="edit != null">
-        edit,
-      </if>
-      <if test="sortOrder != null">
-        sort_order,
-      </if>
-      <if test="cascadeClose != null">
-        cascade_close,
-      </if>
-      <if test="cascadeOpen != null">
-        cascade_open,
-      </if>
-      <if test="editDisabledMsg != null">
-        edit_disabled_msg,
-      </if>
-      <if test="editDisabled != null">
-        edit_disabled,
-      </if>
-      <if test="showCascade != null">
-        show_cascade,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="ext != null">
-        ext,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="templateId != null">
-        #{templateId,jdbcType=BIGINT},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null">
-        #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="showTitle != null">
-        #{showTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="dbField != null">
-        #{dbField,jdbcType=VARCHAR},
-      </if>
-      <if test="required != null">
-        #{required,jdbcType=BIT},
-      </if>
-      <if test="show != null">
-        #{show,jdbcType=BIT},
-      </if>
-      <if test="dcode != null">
-        #{dcode,jdbcType=VARCHAR},
-      </if>
-      <if test="line != null">
-        #{line,jdbcType=TINYINT},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="fixed != null">
-        #{fixed,jdbcType=BIT},
-      </if>
-      <if test="fmtConstraint != null">
-        #{fmtConstraint,jdbcType=VARCHAR},
-      </if>
-      <if test="edit != null">
-        #{edit,jdbcType=BIT},
-      </if>
-      <if test="sortOrder != null">
-        #{sortOrder,jdbcType=INTEGER},
-      </if>
-      <if test="cascadeClose != null">
-        #{cascadeClose,jdbcType=VARCHAR},
-      </if>
-      <if test="cascadeOpen != null">
-        #{cascadeOpen,jdbcType=VARCHAR},
-      </if>
-      <if test="editDisabledMsg != null">
-        #{editDisabledMsg,jdbcType=VARCHAR},
-      </if>
-      <if test="editDisabled != null">
-        #{editDisabled,jdbcType=BIT},
-      </if>
-      <if test="showCascade != null">
-        #{showCascade,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ext != null">
-        #{ext,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form_template_field
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template_field
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.templateId != null">
-        template_id = #{record.templateId,jdbcType=BIGINT},
-      </if>
-      <if test="record.code != null">
-        code = #{record.code,jdbcType=VARCHAR},
-      </if>
-      <if test="record.parentId != null">
-        parent_id = #{record.parentId,jdbcType=BIGINT},
-      </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.showTitle != null">
-        show_title = #{record.showTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="record.dbField != null">
-        db_field = #{record.dbField,jdbcType=VARCHAR},
-      </if>
-      <if test="record.required != null">
-        required = #{record.required,jdbcType=BIT},
-      </if>
-      <if test="record.show != null">
-        `show` = #{record.show,jdbcType=BIT},
-      </if>
-      <if test="record.dcode != null">
-        dcode = #{record.dcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.line != null">
-        line = #{record.line,jdbcType=TINYINT},
-      </if>
-      <if test="record.type != null">
-        `type` = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fixed != null">
-        fixed = #{record.fixed,jdbcType=BIT},
-      </if>
-      <if test="record.fmtConstraint != null">
-        fmt_constraint = #{record.fmtConstraint,jdbcType=VARCHAR},
-      </if>
-      <if test="record.edit != null">
-        edit = #{record.edit,jdbcType=BIT},
-      </if>
-      <if test="record.sortOrder != null">
-        sort_order = #{record.sortOrder,jdbcType=INTEGER},
-      </if>
-      <if test="record.cascadeClose != null">
-        cascade_close = #{record.cascadeClose,jdbcType=VARCHAR},
-      </if>
-      <if test="record.cascadeOpen != null">
-        cascade_open = #{record.cascadeOpen,jdbcType=VARCHAR},
-      </if>
-      <if test="record.editDisabledMsg != null">
-        edit_disabled_msg = #{record.editDisabledMsg,jdbcType=VARCHAR},
-      </if>
-      <if test="record.editDisabled != null">
-        edit_disabled = #{record.editDisabled,jdbcType=BIT},
-      </if>
-      <if test="record.showCascade != null">
-        show_cascade = #{record.showCascade,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createdBy != null">
-        created_by = #{record.createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.updatedBy != null">
-        updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.ext != null">
-        ext = #{record.ext,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template_field
-    set id = #{record.id,jdbcType=BIGINT},
-      template_id = #{record.templateId,jdbcType=BIGINT},
-      code = #{record.code,jdbcType=VARCHAR},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
-      title = #{record.title,jdbcType=VARCHAR},
-      show_title = #{record.showTitle,jdbcType=VARCHAR},
-      db_field = #{record.dbField,jdbcType=VARCHAR},
-      required = #{record.required,jdbcType=BIT},
-      `show` = #{record.show,jdbcType=BIT},
-      dcode = #{record.dcode,jdbcType=VARCHAR},
-      line = #{record.line,jdbcType=TINYINT},
-      `type` = #{record.type,jdbcType=VARCHAR},
-      fixed = #{record.fixed,jdbcType=BIT},
-      fmt_constraint = #{record.fmtConstraint,jdbcType=VARCHAR},
-      edit = #{record.edit,jdbcType=BIT},
-      sort_order = #{record.sortOrder,jdbcType=INTEGER},
-      cascade_close = #{record.cascadeClose,jdbcType=VARCHAR},
-      cascade_open = #{record.cascadeOpen,jdbcType=VARCHAR},
-      edit_disabled_msg = #{record.editDisabledMsg,jdbcType=VARCHAR},
-      edit_disabled = #{record.editDisabled,jdbcType=BIT},
-      show_cascade = #{record.showCascade,jdbcType=VARCHAR},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      ext = #{record.ext,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template_field
-    set id = #{record.id,jdbcType=BIGINT},
-      template_id = #{record.templateId,jdbcType=BIGINT},
-      code = #{record.code,jdbcType=VARCHAR},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
-      title = #{record.title,jdbcType=VARCHAR},
-      show_title = #{record.showTitle,jdbcType=VARCHAR},
-      db_field = #{record.dbField,jdbcType=VARCHAR},
-      required = #{record.required,jdbcType=BIT},
-      `show` = #{record.show,jdbcType=BIT},
-      dcode = #{record.dcode,jdbcType=VARCHAR},
-      line = #{record.line,jdbcType=TINYINT},
-      `type` = #{record.type,jdbcType=VARCHAR},
-      fixed = #{record.fixed,jdbcType=BIT},
-      fmt_constraint = #{record.fmtConstraint,jdbcType=VARCHAR},
-      edit = #{record.edit,jdbcType=BIT},
-      sort_order = #{record.sortOrder,jdbcType=INTEGER},
-      cascade_close = #{record.cascadeClose,jdbcType=VARCHAR},
-      cascade_open = #{record.cascadeOpen,jdbcType=VARCHAR},
-      edit_disabled_msg = #{record.editDisabledMsg,jdbcType=VARCHAR},
-      edit_disabled = #{record.editDisabled,jdbcType=BIT},
-      show_cascade = #{record.showCascade,jdbcType=VARCHAR},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template_field
-    <set>
-      <if test="templateId != null">
-        template_id = #{templateId,jdbcType=BIGINT},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="showTitle != null">
-        show_title = #{showTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="dbField != null">
-        db_field = #{dbField,jdbcType=VARCHAR},
-      </if>
-      <if test="required != null">
-        required = #{required,jdbcType=BIT},
-      </if>
-      <if test="show != null">
-        `show` = #{show,jdbcType=BIT},
-      </if>
-      <if test="dcode != null">
-        dcode = #{dcode,jdbcType=VARCHAR},
-      </if>
-      <if test="line != null">
-        line = #{line,jdbcType=TINYINT},
-      </if>
-      <if test="type != null">
-        `type` = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="fixed != null">
-        fixed = #{fixed,jdbcType=BIT},
-      </if>
-      <if test="fmtConstraint != null">
-        fmt_constraint = #{fmtConstraint,jdbcType=VARCHAR},
-      </if>
-      <if test="edit != null">
-        edit = #{edit,jdbcType=BIT},
-      </if>
-      <if test="sortOrder != null">
-        sort_order = #{sortOrder,jdbcType=INTEGER},
-      </if>
-      <if test="cascadeClose != null">
-        cascade_close = #{cascadeClose,jdbcType=VARCHAR},
-      </if>
-      <if test="cascadeOpen != null">
-        cascade_open = #{cascadeOpen,jdbcType=VARCHAR},
-      </if>
-      <if test="editDisabledMsg != null">
-        edit_disabled_msg = #{editDisabledMsg,jdbcType=VARCHAR},
-      </if>
-      <if test="editDisabled != null">
-        edit_disabled = #{editDisabled,jdbcType=BIT},
-      </if>
-      <if test="showCascade != null">
-        show_cascade = #{showCascade,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ext != null">
-        ext = #{ext,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template_field
-    set template_id = #{templateId,jdbcType=BIGINT},
-      code = #{code,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=BIGINT},
-      title = #{title,jdbcType=VARCHAR},
-      show_title = #{showTitle,jdbcType=VARCHAR},
-      db_field = #{dbField,jdbcType=VARCHAR},
-      required = #{required,jdbcType=BIT},
-      `show` = #{show,jdbcType=BIT},
-      dcode = #{dcode,jdbcType=VARCHAR},
-      line = #{line,jdbcType=TINYINT},
-      `type` = #{type,jdbcType=VARCHAR},
-      fixed = #{fixed,jdbcType=BIT},
-      fmt_constraint = #{fmtConstraint,jdbcType=VARCHAR},
-      edit = #{edit,jdbcType=BIT},
-      sort_order = #{sortOrder,jdbcType=INTEGER},
-      cascade_close = #{cascadeClose,jdbcType=VARCHAR},
-      cascade_open = #{cascadeOpen,jdbcType=VARCHAR},
-      edit_disabled_msg = #{editDisabledMsg,jdbcType=VARCHAR},
-      edit_disabled = #{editDisabled,jdbcType=BIT},
-      show_cascade = #{showCascade,jdbcType=VARCHAR},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      ext = #{ext,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template_field
-    set template_id = #{templateId,jdbcType=BIGINT},
-      code = #{code,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=BIGINT},
-      title = #{title,jdbcType=VARCHAR},
-      show_title = #{showTitle,jdbcType=VARCHAR},
-      db_field = #{dbField,jdbcType=VARCHAR},
-      required = #{required,jdbcType=BIT},
-      `show` = #{show,jdbcType=BIT},
-      dcode = #{dcode,jdbcType=VARCHAR},
-      line = #{line,jdbcType=TINYINT},
-      `type` = #{type,jdbcType=VARCHAR},
-      fixed = #{fixed,jdbcType=BIT},
-      fmt_constraint = #{fmtConstraint,jdbcType=VARCHAR},
-      edit = #{edit,jdbcType=BIT},
-      sort_order = #{sortOrder,jdbcType=INTEGER},
-      cascade_close = #{cascadeClose,jdbcType=VARCHAR},
-      cascade_open = #{cascadeOpen,jdbcType=VARCHAR},
-      edit_disabled_msg = #{editDisabledMsg,jdbcType=VARCHAR},
-      edit_disabled = #{editDisabled,jdbcType=BIT},
-      show_cascade = #{showCascade,jdbcType=VARCHAR},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_template_field
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateFieldExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_template_field
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form_template_field (template_id, 
-      code, parent_id, title, 
-      show_title, db_field, required, 
-      `show`, dcode, line, 
-      `type`, fixed, fmt_constraint, 
-      edit, sort_order, cascade_close, 
-      cascade_open, edit_disabled_msg, 
-      edit_disabled, show_cascade, created_by, 
-      updated_by, create_time, update_time, 
-      ext)
-    values <foreach collection="list" item="item" separator=","> (#{item.templateId,jdbcType=BIGINT}, 
-      #{item.code,jdbcType=VARCHAR}, #{item.parentId,jdbcType=BIGINT}, #{item.title,jdbcType=VARCHAR}, 
-      #{item.showTitle,jdbcType=VARCHAR}, #{item.dbField,jdbcType=VARCHAR}, #{item.required,jdbcType=BIT}, 
-      #{item.show,jdbcType=BIT}, #{item.dcode,jdbcType=VARCHAR}, #{item.line,jdbcType=TINYINT}, 
-      #{item.type,jdbcType=VARCHAR}, #{item.fixed,jdbcType=BIT}, #{item.fmtConstraint,jdbcType=VARCHAR}, 
-      #{item.edit,jdbcType=BIT}, #{item.sortOrder,jdbcType=INTEGER}, #{item.cascadeClose,jdbcType=VARCHAR}, 
-      #{item.cascadeOpen,jdbcType=VARCHAR}, #{item.editDisabledMsg,jdbcType=VARCHAR}, 
-      #{item.editDisabled,jdbcType=BIT}, #{item.showCascade,jdbcType=VARCHAR}, #{item.createdBy,jdbcType=BIGINT}, 
-      #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.ext,jdbcType=LONGVARCHAR})</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormTemplateFieldMapperExt" />

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

@@ -15,356 +15,8 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     id, form_id, version, content_encoding, created_by, updated_by, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateExample" resultMap="BaseResultMap">
+
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_template
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from form_template
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_template
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from form_template
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplate">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_template (form_id, version, content_encoding, 
-      created_by, updated_by, create_time, 
-      update_time)
-    values (#{formId,jdbcType=BIGINT}, #{version,jdbcType=INTEGER}, #{contentEncoding,jdbcType=VARCHAR}, 
-      #{createdBy,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplate">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into form_template
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="formId != null">
-        form_id,
-      </if>
-      <if test="version != null">
-        version,
-      </if>
-      <if test="contentEncoding != null">
-        content_encoding,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="formId != null">
-        #{formId,jdbcType=BIGINT},
-      </if>
-      <if test="version != null">
-        #{version,jdbcType=INTEGER},
-      </if>
-      <if test="contentEncoding != null">
-        #{contentEncoding,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from form_template
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.formId != null">
-        form_id = #{record.formId,jdbcType=BIGINT},
-      </if>
-      <if test="record.version != null">
-        version = #{record.version,jdbcType=INTEGER},
-      </if>
-      <if test="record.contentEncoding != null">
-        content_encoding = #{record.contentEncoding,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createdBy != null">
-        created_by = #{record.createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.updatedBy != null">
-        updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template
-    set id = #{record.id,jdbcType=BIGINT},
-      form_id = #{record.formId,jdbcType=BIGINT},
-      version = #{record.version,jdbcType=INTEGER},
-      content_encoding = #{record.contentEncoding,jdbcType=VARCHAR},
-      created_by = #{record.createdBy,jdbcType=BIGINT},
-      updated_by = #{record.updatedBy,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplate">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template
-    <set>
-      <if test="formId != null">
-        form_id = #{formId,jdbcType=BIGINT},
-      </if>
-      <if test="version != null">
-        version = #{version,jdbcType=INTEGER},
-      </if>
-      <if test="contentEncoding != null">
-        content_encoding = #{contentEncoding,jdbcType=VARCHAR},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=BIGINT},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplate">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update form_template
-    set form_id = #{formId,jdbcType=BIGINT},
-      version = #{version,jdbcType=INTEGER},
-      content_encoding = #{contentEncoding,jdbcType=VARCHAR},
-      created_by = #{createdBy,jdbcType=BIGINT},
-      updated_by = #{updatedBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_template
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.FormTemplateExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from form_template
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into form_template (form_id, 
-      version, content_encoding, created_by, 
-      updated_by, create_time, update_time
-      )
-    values <foreach collection="list" item="item" separator=","> (#{item.formId,jdbcType=BIGINT}, 
-      #{item.version,jdbcType=INTEGER}, #{item.contentEncoding,jdbcType=VARCHAR}, #{item.createdBy,jdbcType=BIGINT}, 
-      #{item.updatedBy,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}
-      )</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormTemplateMapperExt" />

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

@@ -23,482 +23,9 @@
     <result column="service_name" jdbcType="VARCHAR" property="serviceName" />
     <result column="deleted" jdbcType="TINYINT" property="deleted" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     id, entity_type, entity_id, form_code, description, field_chinese_name, field_english_name,
     old_value, new_value, `operator`, operator_name, operation_time, create_time, update_time,
     service_name, deleted
   </sql>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecordExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from modify_log_record
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from modify_log_record
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from modify_log_record
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecordExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from modify_log_record
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into modify_log_record (entity_type, entity_id, form_code, 
-      description, field_chinese_name, field_english_name, 
-      old_value, new_value, `operator`, 
-      operator_name, operation_time, create_time, 
-      update_time, service_name, deleted
-      )
-    values (#{entityType,jdbcType=VARCHAR}, #{entityId,jdbcType=VARCHAR}, #{formCode,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{fieldChineseName,jdbcType=VARCHAR}, #{fieldEnglishName,jdbcType=VARCHAR}, 
-      #{oldValue,jdbcType=VARCHAR}, #{newValue,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, 
-      #{operatorName,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{serviceName,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into modify_log_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="entityType != null">
-        entity_type,
-      </if>
-      <if test="entityId != null">
-        entity_id,
-      </if>
-      <if test="formCode != null">
-        form_code,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="fieldChineseName != null">
-        field_chinese_name,
-      </if>
-      <if test="fieldEnglishName != null">
-        field_english_name,
-      </if>
-      <if test="oldValue != null">
-        old_value,
-      </if>
-      <if test="newValue != null">
-        new_value,
-      </if>
-      <if test="operator != null">
-        `operator`,
-      </if>
-      <if test="operatorName != null">
-        operator_name,
-      </if>
-      <if test="operationTime != null">
-        operation_time,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="serviceName != null">
-        service_name,
-      </if>
-      <if test="deleted != null">
-        deleted,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="entityType != null">
-        #{entityType,jdbcType=VARCHAR},
-      </if>
-      <if test="entityId != null">
-        #{entityId,jdbcType=VARCHAR},
-      </if>
-      <if test="formCode != null">
-        #{formCode,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="fieldChineseName != null">
-        #{fieldChineseName,jdbcType=VARCHAR},
-      </if>
-      <if test="fieldEnglishName != null">
-        #{fieldEnglishName,jdbcType=VARCHAR},
-      </if>
-      <if test="oldValue != null">
-        #{oldValue,jdbcType=VARCHAR},
-      </if>
-      <if test="newValue != null">
-        #{newValue,jdbcType=VARCHAR},
-      </if>
-      <if test="operator != null">
-        #{operator,jdbcType=BIGINT},
-      </if>
-      <if test="operatorName != null">
-        #{operatorName,jdbcType=VARCHAR},
-      </if>
-      <if test="operationTime != null">
-        #{operationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="serviceName != null">
-        #{serviceName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        #{deleted,jdbcType=TINYINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecordExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from modify_log_record
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update modify_log_record
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.entityType != null">
-        entity_type = #{record.entityType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.entityId != null">
-        entity_id = #{record.entityId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.formCode != null">
-        form_code = #{record.formCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fieldChineseName != null">
-        field_chinese_name = #{record.fieldChineseName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fieldEnglishName != null">
-        field_english_name = #{record.fieldEnglishName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.oldValue != null">
-        old_value = #{record.oldValue,jdbcType=VARCHAR},
-      </if>
-      <if test="record.newValue != null">
-        new_value = #{record.newValue,jdbcType=VARCHAR},
-      </if>
-      <if test="record.operator != null">
-        `operator` = #{record.operator,jdbcType=BIGINT},
-      </if>
-      <if test="record.operatorName != null">
-        operator_name = #{record.operatorName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.operationTime != null">
-        operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.serviceName != null">
-        service_name = #{record.serviceName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.deleted != null">
-        deleted = #{record.deleted,jdbcType=TINYINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update modify_log_record
-    set id = #{record.id,jdbcType=BIGINT},
-      entity_type = #{record.entityType,jdbcType=VARCHAR},
-      entity_id = #{record.entityId,jdbcType=VARCHAR},
-      form_code = #{record.formCode,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      field_chinese_name = #{record.fieldChineseName,jdbcType=VARCHAR},
-      field_english_name = #{record.fieldEnglishName,jdbcType=VARCHAR},
-      old_value = #{record.oldValue,jdbcType=VARCHAR},
-      new_value = #{record.newValue,jdbcType=VARCHAR},
-      `operator` = #{record.operator,jdbcType=BIGINT},
-      operator_name = #{record.operatorName,jdbcType=VARCHAR},
-      operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      service_name = #{record.serviceName,jdbcType=VARCHAR},
-      deleted = #{record.deleted,jdbcType=TINYINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update modify_log_record
-    <set>
-      <if test="entityType != null">
-        entity_type = #{entityType,jdbcType=VARCHAR},
-      </if>
-      <if test="entityId != null">
-        entity_id = #{entityId,jdbcType=VARCHAR},
-      </if>
-      <if test="formCode != null">
-        form_code = #{formCode,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="fieldChineseName != null">
-        field_chinese_name = #{fieldChineseName,jdbcType=VARCHAR},
-      </if>
-      <if test="fieldEnglishName != null">
-        field_english_name = #{fieldEnglishName,jdbcType=VARCHAR},
-      </if>
-      <if test="oldValue != null">
-        old_value = #{oldValue,jdbcType=VARCHAR},
-      </if>
-      <if test="newValue != null">
-        new_value = #{newValue,jdbcType=VARCHAR},
-      </if>
-      <if test="operator != null">
-        `operator` = #{operator,jdbcType=BIGINT},
-      </if>
-      <if test="operatorName != null">
-        operator_name = #{operatorName,jdbcType=VARCHAR},
-      </if>
-      <if test="operationTime != null">
-        operation_time = #{operationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="serviceName != null">
-        service_name = #{serviceName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleted != null">
-        deleted = #{deleted,jdbcType=TINYINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update modify_log_record
-    set entity_type = #{entityType,jdbcType=VARCHAR},
-      entity_id = #{entityId,jdbcType=VARCHAR},
-      form_code = #{formCode,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      field_chinese_name = #{fieldChineseName,jdbcType=VARCHAR},
-      field_english_name = #{fieldEnglishName,jdbcType=VARCHAR},
-      old_value = #{oldValue,jdbcType=VARCHAR},
-      new_value = #{newValue,jdbcType=VARCHAR},
-      `operator` = #{operator,jdbcType=BIGINT},
-      operator_name = #{operatorName,jdbcType=VARCHAR},
-      operation_time = #{operationTime,jdbcType=TIMESTAMP},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      service_name = #{serviceName,jdbcType=VARCHAR},
-      deleted = #{deleted,jdbcType=TINYINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecordExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from modify_log_record
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecordExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from modify_log_record
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into modify_log_record (entity_type, 
-      entity_id, form_code, description, 
-      field_chinese_name, field_english_name, 
-      old_value, new_value, `operator`, 
-      operator_name, operation_time, 
-      create_time, update_time, service_name, 
-      deleted)
-    values <foreach collection="list" item="item" separator=","> (#{item.entityType,jdbcType=VARCHAR}, 
-      #{item.entityId,jdbcType=VARCHAR}, #{item.formCode,jdbcType=VARCHAR}, #{item.description,jdbcType=VARCHAR}, 
-      #{item.fieldChineseName,jdbcType=VARCHAR}, #{item.fieldEnglishName,jdbcType=VARCHAR}, 
-      #{item.oldValue,jdbcType=VARCHAR}, #{item.newValue,jdbcType=VARCHAR}, #{item.operator,jdbcType=BIGINT}, 
-      #{item.operatorName,jdbcType=VARCHAR}, #{item.operationTime,jdbcType=TIMESTAMP}, 
-      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.serviceName,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=TINYINT})</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.ModifyLogRecordMapperExt" />

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

@@ -12,310 +12,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="agent_id" jdbcType="BIGINT" property="agentId" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     id, initialized, create_time, update_time, agent_id
   </sql>
-  <select id="selectByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatusExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from tenant_init_status
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from tenant_init_status
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from tenant_init_status
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatusExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    delete from tenant_init_status
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into tenant_init_status (initialized, create_time, update_time, 
-      agent_id)
-    values (#{initialized,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{agentId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into tenant_init_status
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="initialized != null">
-        initialized,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="agentId != null">
-        agent_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="initialized != null">
-        #{initialized,jdbcType=TINYINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="agentId != null">
-        #{agentId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatusExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select count(*) from tenant_init_status
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update tenant_init_status
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.initialized != null">
-        initialized = #{record.initialized,jdbcType=TINYINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.agentId != null">
-        agent_id = #{record.agentId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update tenant_init_status
-    set id = #{record.id,jdbcType=BIGINT},
-      initialized = #{record.initialized,jdbcType=TINYINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      agent_id = #{record.agentId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update tenant_init_status
-    <set>
-      <if test="initialized != null">
-        initialized = #{initialized,jdbcType=TINYINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="agentId != null">
-        agent_id = #{agentId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    update tenant_init_status
-    set initialized = #{initialized,jdbcType=TINYINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      agent_id = #{agentId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="selectByExampleWithPaging" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatusExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="example.distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from tenant_init_status
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-    <if test="example.orderByClause != null">
-      order by ${example.orderByClause}
-    </if>
-    LIMIT #{offset}, #{limit}
-  </select>
-  <select id="selectOneByExample" parameterType="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatusExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from tenant_init_status
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    LIMIT 1
-  </select>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    insert into tenant_init_status (initialized, 
-      create_time, update_time, agent_id
-      )
-    values <foreach collection="list" item="item" separator=","> (#{item.initialized,jdbcType=TINYINT}, 
-      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.agentId,jdbcType=BIGINT}
-      )</foreach>
-  </insert>
 </mapper>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.TenantInitStatusMapperExt" />

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

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Copyright 2009-2012 The MyBatis Team Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License 
-	at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-	CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -->
-<!DOCTYPE configuration
-    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-<configuration>
-	<settings>
-		<!-- 这个配置使全局的映射器启用或禁用 缓存 -->
-		<setting name="cacheEnabled" value="true" />
-		<!-- 全局启用或禁用延迟加载。当禁用时, 所有关联对象都会即时加载 -->
-		<setting name="lazyLoadingEnabled" value="true" />
-		<!-- 允许或不允许多种结果集从一个单独 的语句中返回(需要适合的驱动) -->
-		<setting name="multipleResultSetsEnabled" value="true" />
-		<!-- 使用列标签代替列名。 不同的驱动在这 方便表现不同。 参考驱动文档或充分测 试两种方法来决定所使用的驱动 -->
-		<setting name="useColumnLabel" value="true" />
-		<!-- 允许 JDBC 支持生成的键。 需要适合的 驱动。 如果设置为 true 则这个设置强制 生成的键被使用, 尽管一些驱动拒绝兼 容但仍然有效(比如 Derby) -->
-		<setting name="useGeneratedKeys" value="false" />
-		<!-- 配置默认的执行器。SIMPLE 执行器没 有什么特别之处。REUSE 执行器重用 预处理语句。BATCH 执行器重用语句 和批量更新 -->
-		<setting name="defaultExecutorType" value="SIMPLE" />
-		<!-- 设置超时时间, 它决定驱动等待一个数 据库响应的时间 -->
-		<setting name="defaultStatementTimeout" value="100" />
-		<setting name="safeRowBoundsEnabled" value="false" />
-		<setting name="mapUnderscoreToCamelCase" value="false" />
-		<setting name="localCacheScope" value="SESSION" />
-		<setting name="jdbcTypeForNull" value="OTHER" />
-		<setting name="lazyLoadTriggerMethods" value="equals,clone,hashCode,toString" />
-		<!-- 打印查询语句 -->
-        <!-- <setting name="logImpl" value="STDOUT_LOGGING" /> -->
-	</settings>
-
-	<!-- 在mappers定义之前 -->
-	<typeHandlers>
-		<typeHandler javaType="Boolean" jdbcType="SMALLINT" handler="com.pcloud.common.core.mybatis.BooleanTypeHandler" />
-	</typeHandlers>
-
-	<!-- 数据库适配器 -->
-	<plugins>
-		<plugin interceptor="com.pcloud.common.core.mybatis.interceptor.ExecutorInterceptor">
-			<property name="dialectClass" value="${dialectClass}" />
-		</plugin>
-	</plugins>
-
-</configuration>

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/generatorConfig.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-		PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-		"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-<!--
-   Mybatis生成Mapper配置文件
-   1，cmd切换至该xml所在项目根目录，即pom所在目录
-   2，mvn mybatis-generator:generate
- -->
-<generatorConfiguration>
-	<!--targetRuntime：代码风格；（MyBatis3、MyBatis3Simple、MyBatis3DynamicSql）-->
-	<context id="default" targetRuntime="MyBatis3">
-		<property name="autoDelimitKeywords" value="true"/>
-		<property name="beginningDelimiter"
-				  value="`"/><!-- beginningDelimiter和endingDelimiter：指明数据库的用于标记数据库对象名的符号，比如ORACLE就是双引号，MYSQL默认是`反引号； -->
-		<property name="endingDelimiter" value="`"/>
-		<property name="javaFileEncoding" value="UTF-8"/>
-		<!--实体类序列化插件-->
-		<plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
-		<!--MapperExt接口生成插件-->
-		<plugin type="com.pcloud.plugins.mybatis.generator.MapperExtPluginAdapter"/>
-		<!--实体类Lombok插件-->
-		<plugin type="com.pcloud.plugins.mybatis.generator.LombokPlugin"/>
-
-		<commentGenerator>
-			<property name="suppressDate" value="true"/><!--阻止生成的注释包含时间戳-->
-			<property name="suppressAllComments" value="false"/><!--是否不生成任何注解-->
-			<property name="addRemarkComments" value="true"/><!--注释中添加数据库的注释-->
-		</commentGenerator>
-
-		<!--数据库相关设置-->
-        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
-                        connectionURL="jdbc:mysql://192.168.92.41:3306/booksflow_form"
-                        userId="root"
-                        password="LGSC2016.lgsc">
-            <property name="nullCatalogMeansCurrent" value="true"/>
-        </jdbcConnection>
-
-		<!--是否强制DECIMAL和NUMERIC类型的字段转换为Java类型的java.math.BigDecimal-->
-		<javaTypeResolver type="com.pcloud.plugins.mybatis.generator.TinyintTypeResolver">
-			<property name="forceBigDecimals" value="false"/>
-		</javaTypeResolver>
-
-		<!--
-        targetPackage：实体类包名；（生成的类要放的包，真实的包受enableSubPackages属性控制）
-        targetProject：实体类位置；（目标项目，指定一个存在的目录下，生成的内容会放到指定目录中，如果目录不存在，MBG不会自动建目录）
-        -->
-		<javaModelGenerator targetPackage="com.pcloud.booksflow.form.mybatis.entity"
-							targetProject="src/main/java">
-			<property name="enableSubPackages"
-					  value="true"/><!-- 在targetPackage的基础上，根据数据库的schema再生成一层package，最终生成的类放在这个package下，默认为false -->
-			<property name="trimStrings" value="false"/><!-- 设置是否在getter方法中，对String类型字段调用trim()方法 -->
-		</javaModelGenerator>
-
-		<!-- 生成SQL map的XML文件生成器，
-        注意，在Mybatis3之后，我们可以使用mapper.xml文件+Mapper接口（或者不用mapper接口），
-            或者只使用Mapper接口+Annotation，所以，如果 javaClientGenerator 配置中配置了需要生成XML的话，这个元素就必须配置
-        targetPackage/targetProject:同 javaModelGenerator
-        -->
-		<sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources">
-			<property name="enableSubPackages" value="true"/>
-		</sqlMapGenerator>
-
-		<!-- 对于mybatis来说，即生成Mapper接口，注意，如果没有配置该元素，那么默认不会生成Mapper接口
-        targetPackage/targetProject:同javaModelGenerator
-        type：选择怎么生成mapper接口（在MyBatis3/MyBatis3Simple下）：
-            1，ANNOTATEDMAPPER：会生成使用Mapper接口+Annotation的方式创建（SQL生成在annotation中），不会生成对应的XML；
-            2，MIXEDMAPPER：使用混合配置，会生成Mapper接口，并适当添加合适的Annotation，但是XML会生成在XML中；
-            3，XMLMAPPER：会生成Mapper接口，接口完全依赖XML；
-        注意，如果context是MyBatis3Simple：只支持ANNOTATEDMAPPER和XMLMAPPER
-        -->
-		<javaClientGenerator type="XMLMAPPER" targetPackage="com.pcloud.booksflow.form.mybatis.mapper"
-							 targetProject="src/main/java">
-			<property name="enableSubPackages" value="true"/>
-			<!-- 可以为所有生成的接口添加一个父接口，但是MBG只负责生成，不负责检查
-        <property name="rootInterface" value=""/>
-         -->
-		</javaClientGenerator>
-
-<!--        <table tableName="form">-->
-<!--            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>-->
-<!--            <ignoreColumn column="agent_id"/>-->
-<!--        </table>-->
-<!--        <table tableName="form_field_dict">-->
-<!--            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>-->
-<!--            <ignoreColumn column="agent_id"/>-->
-<!--        </table>-->
-<!--        <table tableName="form_template">-->
-<!--            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>-->
-<!--            <ignoreColumn column="agent_id"/>-->
-<!--        </table>-->
-<!--        <table tableName="form_template_field">-->
-<!--            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>-->
-<!--            <ignoreColumn column="agent_id"/>-->
-<!--            <ignoreColumn column="d_code"/>-->
-<!--            <ignoreColumn column="dt_code"/>-->
-<!--        </table>-->
-<!--        <table tableName="modify_log_record">-->
-<!--            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>-->
-<!--            <ignoreColumn column="agent_id"/>-->
-<!--        </table>-->
-<!--        <table tableName="tenant_init_status">-->
-<!--            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>-->
-<!--        </table>-->
-        <table tableName="form_print_config">
-            <generatedKey column="id" sqlStatement="Mysql" identity="true"/>
-            <ignoreColumn column="agent_id"/>
-        </table>
-	</context>
-</generatorConfiguration>

ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/logback.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="3 seconds">
-	<!-- 控制台调试输出 -->
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
-		</encoder>
-		<!--日志级别过滤-->
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>DEBUG</level>
-		</filter>
-	</appender>
-	
-
-	<!-- INFO级别以上的日志全部都输出，不同的级别输出在不同的文件里面 -->
-	<root>
-		<level value="INFO"/>
-		<appender-ref ref="STDOUT" />
-	</root>
-
-	<logger name="com.pcloud.booksflow.form.mybatis.mapper" level="DEBUG"/>
-
-</configuration>

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

@@ -10,16 +10,6 @@
 
     <artifactId>booksflow-form-service</artifactId>
 
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
-        <javacv.version>1.5.7</javacv.version>
-        <opencv.version>4.5.5-1.5.7</opencv.version>
-        <forest-spring-boot-starter.version>1.5.2-BETA3</forest-spring-boot-starter.version>
-        <xstream.version>1.4.18</xstream.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.dromara</groupId>
@@ -37,14 +27,17 @@
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>org.mapstruct</groupId>
+            <groupId>com.baomidou</groupId>
-            <artifactId>mapstruct</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <version>${org.mapstruct.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.mybatis</groupId>
+            <groupId>org.dromara</groupId>
-            <artifactId>mybatis</artifactId>
+            <artifactId>ruoyi-common-core</artifactId>
-            <version>3.5.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
         </dependency>
     </dependencies>
 

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

@@ -66,7 +66,7 @@ public class FormTemplateController {
                                                      @ApiParam(value = "tree")
                                                      @RequestParam(required = false) Boolean tree) {
         if (formId == null && formCode == null) {
-            throw new BizException("formId or formCode is required");
+            throw new ServiceException("formId or formCode is required");
         }
         if (formCode != null) {
             return new ResponseDto<>(formTemplateService.getVOMaxVersion(formCode, show, tree));

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

@@ -2,10 +2,14 @@ package com.pcloud.booksflow.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pcloud.booksflow.form.api.dto.FormDictDTO;
 import com.pcloud.booksflow.form.mybatis.entity.FormDict;
 import com.pcloud.booksflow.form.mybatis.entity.FormDictExample;
+import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
+import com.pcloud.booksflow.form.mybatis.mapper.FormDictMapper;
 import com.pcloud.booksflow.form.mybatis.mapper.FormDictMapperExt;
+import com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper;
 import com.pcloud.booksflow.form.utils.UserUtils;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
@@ -22,10 +26,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class FormDictService {
+public class FormDictService extends ServiceImpl<FormDictMapper, FormDict> {
-
-    @Autowired
-    private FormDictMapperExt formDictMapperExt;
 
     @Autowired
     private FormFieldDictService formFieldDictService;
@@ -39,10 +40,10 @@ public class FormDictService {
     public Long createOrUpdate(FormDictDTO dto) {
         // 检查code是否已存在（排除自己）
         if (countByCode(dto.getCode(), dto.getId()) > 0) {
-            throw new BizException("编码已存在: " + dto.getCode());
+            throw new ServiceException("编码已存在: " + dto.getCode());
         }
         if (countByName(dto.getName(), dto.getId()) > 0) {
-            throw new BizException("名称已存在: " + dto.getName());
+            throw new ServiceException("名称已存在: " + dto.getName());
         }
 
         if (dto.getId() == null) {
@@ -52,7 +53,7 @@ public class FormDictService {
             entity.setDeleted(0);
             entity.setCreatedBy(UserUtils.getUserId());
             entity.setCreateTime(new Date());
-            formDictMapperExt.insertSelective(entity);
+            baseMapper.insertSelective(entity);
             return entity.getId();
         } else {
             // 更新现有的表单字典
@@ -61,7 +62,7 @@ public class FormDictService {
             entity.setId(dto.getId());
             entity.setUpdatedBy(UserUtils.getUserId());
             entity.setUpdateTime(new Date());
-            formDictMapperExt.updateByPrimaryKeySelective(entity);
+            baseMapper.updateByPrimaryKeySelective(entity);
             return entity.getId();
         }
     }
@@ -73,7 +74,7 @@ public class FormDictService {
      * @return 表单字典对象
      */
     public FormDict getById(Long id) {
-        return formDictMapperExt.selectByPrimaryKey(id);
+        return baseMapper.selectByPrimaryKey(id);
     }
 
     /**
@@ -97,7 +98,7 @@ public class FormDictService {
         entity.setDeleted(1);
         entity.setUpdatedBy(UserUtils.getUserId());
         entity.setUpdateTime(new Date());
-        return formDictMapperExt.updateByPrimaryKeySelective(entity);
+        return baseMapper.updateByPrimaryKeySelective(entity);
     }
 
     /**
@@ -112,7 +113,7 @@ public class FormDictService {
         if (name != null && !name.isEmpty()) {
             criteria.andNameLike(name + "%");
         }
-        return formDictMapperExt.selectByExample(example);
+        return baseMapper.selectByExample(example);
     }
 
     /**
@@ -137,8 +138,8 @@ public class FormDictService {
         }
 
         example.setOrderByClause("id desc");
-        int count = (int) formDictMapperExt.countByExample(example);
+        int count = (int) baseMapper.countByExample(example);
-        List<FormDict> records = formDictMapperExt.selectByExampleWithPaging(example, currentPage * numPerPage, numPerPage);
+        List<FormDict> records = baseMapper.selectByExampleWithPaging(example, currentPage * numPerPage, numPerPage);
         return new PageBeanNew<>(currentPage, numPerPage, count, records);
     }
 
@@ -157,7 +158,7 @@ public class FormDictService {
         if (notId != null) {
             criteria.andIdNotEqualTo(notId);
         }
-        return formDictMapperExt.countByExample(example);
+        return baseMapper.countByExample(example);
     }
 
     private long countByName(String name, Long notId) {
@@ -168,7 +169,7 @@ public class FormDictService {
         if (notId != null) {
             criteria.andIdNotEqualTo(notId);
         }
-        return formDictMapperExt.countByExample(example);
+        return baseMapper.countByExample(example);
     }
 
     public List<FormDict> list(List<String> configTypes) {
@@ -176,7 +177,7 @@ public class FormDictService {
         example.createCriteria()
                 .andCodeIn(configTypes)
                 .andDeletedEqualTo(0);
-        return formDictMapperExt.selectByExample(example);
+        return baseMapper.selectByExample(example);
     }
 
     @Transactional
@@ -184,7 +185,7 @@ public class FormDictService {
         for (FormDict dict : dicts) {
             dict.setId(null);
         }
-        return formDictMapperExt.batchInsert(dicts);
+        return baseMapper.batchInsert(dicts);
     }
 
     /**
@@ -200,7 +201,7 @@ public class FormDictService {
         example.createCriteria()
                 .andCodeIn(new ArrayList<>(codes))
                 .andDeletedEqualTo(0);
-        List<FormDict> list = formDictMapperExt.selectByExample(example);
+        List<FormDict> list = baseMapper.selectByExample(example);
         if (list.isEmpty()) {
             return codes;
         }

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

@@ -1,24 +1,20 @@
 package com.pcloud.booksflow.form.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pcloud.booksflow.form.api.constant.FormFieldDictType;
+import com.pcloud.booksflow.form.api.dto.DictCodesDTO;
 import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO;
 import com.pcloud.booksflow.form.api.dto.FormFieldDictQ;
 import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo;
-import com.pcloud.booksflow.form.api.dto.DictCodesDTO;
 import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
 import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDictExample;
+import com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper;
-import com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapperExt;
 import com.pcloud.booksflow.form.utils.UserUtils;
-import com.pcloud.common.exceptions.BizException;
-import com.pcloud.common.page.PageBeanNew;
-import com.pcloud.common.utils.string.StringUtil;
-import com.pcloud.universe.commons.utils.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.json.utils.JsonUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -31,10 +27,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class FormFieldDictService {
+public class FormFieldDictService extends ServiceImpl<FormFieldDictMapper, FormFieldDict> {
-
-    @Autowired
-    private FormFieldDictMapperExt formFieldDictMapperExt;
 
     /**
      * 创建新的表单字段配置
@@ -44,23 +37,20 @@ public class FormFieldDictService {
      */
     public Long createOrUpdate(FormFieldDictDTO dto) {
         if (countByCode(dto.getConfigType(), dto.getCode(), dto.getId()) > 0) {
-            throw new BizException("已存在相同的编码：" + dto.getCode());
+            throw new ServiceException("已存在相同的编码：" + dto.getCode());
         }
         if (countByName(dto.getConfigType(), dto.getName(), dto.getId()) > 0) {
-            throw new BizException("已存在相同的名称：" + dto.getName());
+            throw new ServiceException("已存在相同的名称：" + dto.getName());
         }
         if (dto.getId() != null && dto.getId().equals(dto.getParentId())) {
-            throw new BizException("不能设置自己为父级");
+            throw new ServiceException("不能设置自己为父级");
         }
         if (dto.getParentId() != null) {
-            FormFieldDict parentE = formFieldDictMapperExt.selectByPrimaryKey(dto.getParentId());
+            FormFieldDict parentE = baseMapper.selectById(dto.getParentId());
             Assert.notNull(parentE, "无效的 parentId");
             Assert.isTrue(parentE.getConfigType().equals(dto.getConfigType()), "configType 和 parent字典项的 configType不一样");
         }
 
-        //获取关联的Id，在删除时做校验用
-        Set<Long> ids = getDelCheckIds(dto);
-
         if (dto.getId() == null) {
             //新增
             FormFieldDict entity = new FormFieldDict();
@@ -69,14 +59,9 @@ public class FormFieldDictService {
             entity.setCreateTime(new Date());
             entity.setCreatedBy(UserUtils.getUserId());
             if (dto.getOtherFields() != null) {
-                entity.setOtherFields(JsonUtils.serialize(dto.getOtherFields()));
+                entity.setOtherFields(JsonUtils.toJsonString(dto.getOtherFields()));
             }
-            if (!ids.isEmpty()) {
+            baseMapper.insert(entity);
-                entity.setCheckIds(StrUtil.join(",", ids));
-            } else {
-                entity.setCheckIds("");
-            }
-            formFieldDictMapperExt.insertSelective(entity);
             return entity.getId();
         } else {
             //更新
@@ -85,14 +70,9 @@ public class FormFieldDictService {
             entity.setUpdateTime(new Date());
             entity.setUpdatedBy(UserUtils.getUserId());
             if (dto.getOtherFields() != null) {
-                entity.setOtherFields(JsonUtils.serialize(dto.getOtherFields()));
+                entity.setOtherFields(JsonUtils.toJsonString(dto.getOtherFields()));
             }
-            if (!ids.isEmpty()) {
+            baseMapper.updateById(entity);
-                entity.setCheckIds(StrUtil.join(",", ids));
-            } else {
-                entity.setCheckIds("");
-            }
-            formFieldDictMapperExt.updateByPrimaryKeySelective(entity);
             return entity.getId();
         }
     }
@@ -270,7 +250,7 @@ public class FormFieldDictService {
             return 0;
         }
         if (item.getDeleted() == 1) {
-            throw new BizException("已删除的表单字段配置不能修改状态");
+            throw new ServiceException("已删除的表单字段配置不能修改状态");
         }
         //如果有子节点，也要全部修改状态
         updateStatusChildren(item.getConfigType(), Collections.singletonList(item.getId()), status, 0, userId);
@@ -286,7 +266,7 @@ public class FormFieldDictService {
     private void updateStatusChildren(String configType, List<Long> pids, Integer status, int depth, Long userId) {
         // 限制递归深度，防止死循环
         if (depth >= 10) {
-            throw new BizException("树形层级过深，超过10层，无法继续更新状态");
+            throw new ServiceException("树形层级过深，超过10层，无法继续更新状态");
         }
 
         // 查找所有直接子节点
@@ -568,10 +548,10 @@ public class FormFieldDictService {
         List<DictCodesDTO> list = new ArrayList<>();
         q.forEach((configType, itemCodes) -> {
             if (CollUtil.isEmpty(itemCodes)) {
-                throw new BizException("请指定字典项编码！");
+                throw new ServiceException("请指定字典项编码！");
             }
             if (StrUtil.isBlank(configType)) {
-                throw new BizException("请指定字典编码！");
+                throw new ServiceException("请指定字典编码！");
             }
             list.add(new DictCodesDTO(configType, itemCodes));
         });

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

@@ -47,14 +47,8 @@ import java.util.Map;
 @Service
 public class FormPrintConfigService {
 
-    @Autowired
-    private FormPrintConfigMapperExt formPrintConfigMapperExt;
     @Autowired
     private FormService formService;
-    @Autowired
-    private WpsWebOfficeService wpsWebOfficeService;
-    @Autowired
-    private DifyClient difyClient;
 
     /**
      * 创建或更新表单打印配置
@@ -189,7 +183,7 @@ public class FormPrintConfigService {
 
     public Integer updateFileWpsId(Long userId, FormPrintConfig entity) {
         if (!"docx".equals(entity.getFileType())) {
-            throw new BizException("请上传docx文件");
+            throw new ServiceException("请上传docx文件");
         }
         CreateFileRequest rq = new CreateFileRequest();
         rq.setFileUrl(entity.getFileUrl());
@@ -257,21 +251,21 @@ public class FormPrintConfigService {
             config = getEntityByFormId(dto.getFormId());
         }
         if (config == null) {
-            throw new BizException("未找到打印配置");
+            throw new ServiceException("未找到打印配置");
         }
         if (StringUtil.isBlank(config.getFileWpsId())) {
-            throw new BizException("未找到wpsId打印文件");
+            throw new ServiceException("未找到wpsId打印文件");
         }
         String fileName = config.getFileName();
         String fileType = config.getFileType();
         if (StringUtil.isBlank(fileName)) {
-            throw new BizException("未找到文件名");
+            throw new ServiceException("未找到文件名");
         }
         if (StringUtil.isBlank(fileType)) {
-            throw new BizException("未找到文件类型");
+            throw new ServiceException("未找到文件类型");
         }
         if (!fileType.trim().equalsIgnoreCase("docx")) {
-            throw new BizException("只支持docx文件");
+            throw new ServiceException("只支持docx文件");
         }
         String exportUrl = wpsWebOfficeService.getExportUrl(config.getFileWpsId());
 

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

@@ -31,10 +31,10 @@ public class FormService {
     public Form create(Form form) {
         // 检查code是否已存在（排除自己）
         if (countByCode(form.getCode(), null) > 0) {
-            throw new BizException("编码已存在: " + form.getCode());
+            throw new ServiceException("编码已存在: " + form.getCode());
         }
         if (countByName(form.getName(), null) > 0) {
-            throw new BizException("名称已存在: " + form.getName());
+            throw new ServiceException("名称已存在: " + form.getName());
         }
         form.setId(null);
         formMapperExt.insertSelective(form);
@@ -61,10 +61,10 @@ public class FormService {
     public Form update(Long id, Form form) {
         // 检查code是否已存在（排除自己）
         if (countByCode(form.getCode(), id) > 0) {
-            throw new BizException("编码已存在: " + form.getCode());
+            throw new ServiceException("编码已存在: " + form.getCode());
         }
         if (countByName(form.getName(), id) > 0) {
-            throw new BizException("名称已存在: " + form.getName());
+            throw new ServiceException("名称已存在: " + form.getName());
         }
         form.setId(id);
         formMapperExt.updateByPrimaryKeySelective(form);

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

@@ -85,7 +85,7 @@ public class FormTemplateService {
         //***** 检验内容是否和最新版一致
         String md5 = DigestUtil.md5Hex(JsonUtils.serialize(dto));
         if (StrUtil.isBlank(md5)) {
-            throw new BizException("md5生成错误！");
+            throw new ServiceException("md5生成错误！");
         }
         if (checkContentEncoding(maxVersionEntity, md5)) {
             log.info("表单和上次保存的一致，模板不用更新");
@@ -156,7 +156,7 @@ public class FormTemplateService {
 
     private FormTemplate create(Long formId, String md5) {
         if (formId == null) {
-            throw new BizException("表单ID不能为空");
+            throw new ServiceException("表单ID不能为空");
         }
         FormTemplate entity = new FormTemplate();
         entity.setFormId(formId);
@@ -324,11 +324,11 @@ public class FormTemplateService {
         }
         for (FormTemplateDTO.FieldDTO field : templateFields) {
             if (!fieldCodes.add(field.getCode())) {
-                throw new BizException("字段编码不能重复: " + field.getCode());
+                throw new ServiceException("字段编码不能重复: " + field.getCode());
             }
             if (CollUtil.isNotEmpty(field.getChildren())) {
                 if (!formTemplateFieldService.isGroup(field.getType())) {
-                    throw new BizException("字段类型不支持children有值，字段类型错误：" + field.getType());
+                    throw new ServiceException("字段类型不支持children有值，字段类型错误：" + field.getType());
                 }
                 checkDTO(field.getChildren(), fieldCodes);
             }

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

@@ -37,14 +37,14 @@ public class ModifyLogRecordService {
         }
         // 限制一次最多1000条记录
         if (dtos.size() > 1000) {
-            throw new BizException("批量保存记录数不能超过1000条");
+            throw new ServiceException("批量保存记录数不能超过1000条");
         }
 
         Date date = new Date();
         List<ModifyLogRecord> modifyLogRecords = dtos.stream()
                 .map(dto -> {
                     if (StrUtil.isBlank(dto.getEntityId())) {
-                        throw new BizException("实体ID不能为空");
+                        throw new ServiceException("实体ID不能为空");
                     }
                     ModifyLogRecord record = new ModifyLogRecord();
                     BeanUtils.copyProperties(dto, record);