From f8502840ca221a7ac59f110db554cf14a9615e7e Mon Sep 17 00:00:00 2001 From: lizhengwei <171332584@qq.com> Date: Fri, 13 Feb 2026 15:56:31 +0800 Subject: [PATCH] =?UTF-8?q?h5=20=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../booksflow/form/mybatis/entity/Form.java | 48 +- .../form/mybatis/entity/FormDict.java | 95 +-- .../form/mybatis/entity/FormFieldDict.java | 138 +--- .../form/mybatis/entity/FormPrintConfig.java | 216 +----- .../mybatis/entity/FormPrintConfigTpl.java | 71 -- .../form/mybatis/entity/FormTemplate.java | 89 +-- .../mybatis/entity/FormTemplateField.java | 231 +----- .../form/mybatis/entity/ModifyLogRecord.java | 151 +--- .../form/mybatis/entity/TenantInitStatus.java | 63 +- .../form/mybatis/mapper/FormDictMapper.java | 7 + .../mybatis/mapper/FormFieldDictMapper.java | 21 +- .../form/mybatis/mapper/FormMapper.java | 7 + .../mybatis/mapper/FormPrintConfigMapper.java | 5 + .../mapper/FormPrintConfigTplMapper.java | 8 - .../mapper/FormTemplateFieldMapper.java | 7 + .../mybatis/mapper/FormTemplateMapper.java | 7 + .../mybatis/mapper/ModifyLogRecordMapper.java | 7 + .../mapper/TenantInitStatusMapper.java | 7 + .../main/resources/mapper/FormDictMapper.xml | 397 +--------- .../resources/mapper/FormDictMapperExt.xml | 3 - .../resources/mapper/FormFieldDictMapper.xml | 591 ++------------ .../mapper/FormFieldDictMapperExt.xml | 84 -- .../src/main/resources/mapper/FormMapper.xml | 295 +------ .../main/resources/mapper/FormMapperExt.xml | 3 - .../mapper/FormPrintConfigMapper.xml | 717 +---------------- .../mapper/FormPrintConfigMapperExt.xml | 3 - .../mapper/FormPrintConfigTplMapper.xml | 403 ---------- .../mapper/FormPrintConfigTplMapperExt.xml | 3 - .../mapper/FormTemplateFieldMapper.xml | 732 +----------------- .../mapper/FormTemplateFieldMapperExt.xml | 3 - .../resources/mapper/FormTemplateMapper.xml | 352 +-------- .../mapper/FormTemplateMapperExt.xml | 3 - .../mapper/ModifyLogRecordMapper.xml | 479 +----------- .../mapper/ModifyLogRecordMapperExt.xml | 3 - .../mapper/TenantInitStatusMapper.xml | 305 +------- .../mapper/TenantInitStatusMapperExt.xml | 3 - .../main/resources/mybatis/mybatis-config.xml | 46 -- .../src/test/resources/generatorConfig.xml | 110 --- .../src/test/resources/logback.xml | 23 - .../ruoyi-form/booksflow-form-service/pom.xml | 25 +- .../controller/FormTemplateController.java | 4 +- .../form/service/FormDictService.java | 39 +- .../form/service/FormFieldDictService.java | 58 +- .../form/service/FormPrintConfigService.java | 18 +- .../booksflow/form/service/FormService.java | 12 +- .../form/service/FormTemplateService.java | 10 +- .../form/service/ModifyLogRecordService.java | 6 +- 47 files changed, 418 insertions(+), 5490 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigTpl.java delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigTplMapper.java delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapper.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapperExt.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mybatis/mybatis-config.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/generatorConfig.xml delete mode 100644 ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/logback.xml diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/Form.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/Form.java index a444d775f..f80c37829 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/Form.java +++ b/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 + * 主键ID */ + @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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormDict.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormDict.java index c7e050988..965a8990c 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormDict.java +++ b/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 + * 主键ID */ + @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 + * 是否删除(0:否,1:是) */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormFieldDict.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormFieldDict.java index 679ef0a10..18eb1ec85 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormFieldDict.java +++ b/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 + * 主键ID */ + @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 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column form_field_dict.parent_id - * - * @mbg.generated + * 父级ID */ 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 + * 状态(1:启用,0:禁用) */ 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 + * 是否删除(0:否,1:是) */ 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 + * 其他字段(JSON格式) */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfig.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfig.java index 442ab3f59..b422b7f85 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfig.java +++ b/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 + * 主键ID */ + @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 + * 关联的表单ID */ 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 + * 文件类型：doc、excel */ 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 + * file_wps_id */ private String fileWpsId; /** - * Database Column Remarks: - * ai模板文件url - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column form_print_config.file_url_ai - * - * @mbg.generated + * AI模板文件url */ 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 + * 模板文件url */ 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 + * 打印配置模式（1、默认模式；2、模板打印模式） */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigTpl.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigTpl.java deleted file mode 100644 index a02eb27c1..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormPrintConfigTpl.java +++ /dev/null @@ -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; -} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplate.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplate.java index 33487ef10..02c666048 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplate.java +++ b/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 + * 主键ID */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** - * Database Column Remarks: - * form id - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column form_template.form_id - * - * @mbg.generated + * 表单ID */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplateField.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplateField.java index 7ba73cd81..35e3b221e 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/FormTemplateField.java +++ b/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 + * 主键ID */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** - * Database Column Remarks: - * form_template 的id - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column form_template_field.template_id - * - * @mbg.generated + * 模板ID */ 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 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column form_template_field.parent_id - * - * @mbg.generated + * 父ID */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/ModifyLogRecord.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/ModifyLogRecord.java index ec189c942..a82d0f4c8 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/ModifyLogRecord.java +++ b/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 + * 主键ID */ + @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 + * 实体ID */ 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 + * 操作人ID */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/TenantInitStatus.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/TenantInitStatus.java index 0d1f1dc72..3efb1515a 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/entity/TenantInitStatus.java +++ b/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 + * 主键ID */ + @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 + * 租户ID */ 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; } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormDictMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormDictMapper.java index 2b78c2601..309356e05 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormDictMapper.java +++ b/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 { } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormFieldDictMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormFieldDictMapper.java index b3675be23..85ecf84b2 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormFieldDictMapper.java +++ b/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 { - List selectByExampleWithPagingBLOBs(@Param("example") FormFieldDictExample example, - @Param("offset") int offset, - @Param("limit") int limit, - @Param("queryStr") String queryStr); - - long countByExampleExt(@Param("example") FormFieldDictExample example, @Param("queryStr") String queryStr); - + /** + * 根据编码列表获取字典项 + * + * @param dtos 编码DTO列表 + * @return 字典项列表 + */ List getByCodes(@Param("list") List dtos); } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormMapper.java index f69cb6301..5f6f261d2 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormMapper.java +++ b/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
{ } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigMapper.java index 9410cc084..ee838efa9 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigMapper.java +++ b/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 { diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigTplMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigTplMapper.java deleted file mode 100644 index 5f3968111..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormPrintConfigTplMapper.java +++ /dev/null @@ -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 { - -} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateFieldMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateFieldMapper.java index 09b1209bb..941d343b9 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateFieldMapper.java +++ b/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 { } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateMapper.java index cfacc8a9d..dd335e130 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/FormTemplateMapper.java +++ b/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 { } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/ModifyLogRecordMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/ModifyLogRecordMapper.java index 0e00117f5..c587ec733 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/ModifyLogRecordMapper.java +++ b/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 { } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/TenantInitStatusMapper.java b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/TenantInitStatusMapper.java index 71f1d700a..0555416b8 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/java/com/pcloud/booksflow/form/mybatis/mapper/TenantInitStatusMapper.java +++ b/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 { } diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapper.xml index 57dc80944..f49f1b53e 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapper.xml @@ -1,385 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, `name`, code, remarks, created_by, updated_by, create_time, update_time, deleted - - - - - - delete from form_dict - where id = #{id,jdbcType=BIGINT} - - - - delete from form_dict - - - - - - - - SELECT LAST_INSERT_ID() - - 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}) - - - - - SELECT LAST_INSERT_ID() - - insert into form_dict - - - `name`, - - - code, - - - remarks, - - - created_by, - - - updated_by, - - - create_time, - - - update_time, - - - deleted, - - - - - #{name,jdbcType=VARCHAR}, - - - #{code,jdbcType=VARCHAR}, - - - #{remarks,jdbcType=VARCHAR}, - - - #{createdBy,jdbcType=BIGINT}, - - - #{updatedBy,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{deleted,jdbcType=TINYINT}, - - - - - - - update form_dict - - - 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}, - - - - - - - - - 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} - - - - - - - update form_dict - - - `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 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} - - - - - - insert into form_dict (`name`, - code, remarks, created_by, - updated_by, create_time, update_time, - deleted) - values (#{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}) - - \ No newline at end of file + + + + + + + + + + + + + id, `name`, code, remarks, created_by, updated_by, create_time, update_time, deleted + + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapperExt.xml deleted file mode 100644 index 39a5e7e6b..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormDictMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapper.xml index 9ed1a99e1..5e0cc77ea 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapper.xml @@ -1,547 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by, + + + + + + + + + + + + + + + + + + + + + id + , config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by, updated_by, create_time, update_time, deleted - - - - other_fields - - - - - - - delete from form_field_dict - where id = #{id,jdbcType=BIGINT} - - - - delete from form_field_dict - - - - - - - - SELECT LAST_INSERT_ID() - - 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}) - - - - - SELECT LAST_INSERT_ID() - - 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, - - - - - #{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}, - - - - - - - update form_field_dict - - - 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}, - - - - - - - - - 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} - - - - - - - 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} - - - - - - - update form_field_dict - - - 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 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 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} - - - - - - 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 (#{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} - ) - - \ No newline at end of file + + + + + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapperExt.xml deleted file mode 100644 index 95e33584a..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormFieldDictMapperExt.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapper.xml index 03cb2c4e9..a79fce5b0 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapper.xml @@ -1,287 +1,14 @@ - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, `name`, code - - - - - - delete from form - where id = #{id,jdbcType=BIGINT} - - - - delete from form - - - - - - - - SELECT LAST_INSERT_ID() - - insert into form (`name`, code) - values (#{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}) - - - - - SELECT LAST_INSERT_ID() - - insert into form - - - `name`, - - - code, - - - - - #{name,jdbcType=VARCHAR}, - - - #{code,jdbcType=VARCHAR}, - - - - - - - update form - - - id = #{record.id,jdbcType=BIGINT}, - - - `name` = #{record.name,jdbcType=VARCHAR}, - - - code = #{record.code,jdbcType=VARCHAR}, - - - - - - - - - update form - set id = #{record.id,jdbcType=BIGINT}, - `name` = #{record.name,jdbcType=VARCHAR}, - code = #{record.code,jdbcType=VARCHAR} - - - - - - - update form - - - `name` = #{name,jdbcType=VARCHAR}, - - - code = #{code,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - - update form - set `name` = #{name,jdbcType=VARCHAR}, - code = #{code,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - - - - - insert into form (`name`, - code) - values (#{item.name,jdbcType=VARCHAR}, - #{item.code,jdbcType=VARCHAR}) - - \ No newline at end of file + + + + + + + + id + , `name`, code + + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapperExt.xml deleted file mode 100644 index 37f4ad665..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapper.xml index 2cf6b2162..b48c4e03d 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapper.xml @@ -39,729 +39,14 @@ - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - 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 - print_fields, ext - - - - - - delete from form_print_config - where id = #{id,jdbcType=BIGINT} - - - - delete from form_print_config - - - - - - - - SELECT LAST_INSERT_ID() - - 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}) - - - - - SELECT LAST_INSERT_ID() - - 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, - - - - - #{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}, - - - - - - - update form_print_config - - - 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}, - - - - - - - - - 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} - - - - - - - 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} - - - - - - - update form_print_config - - - 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 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 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} - - - - - - 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 (#{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}) - + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapperExt.xml deleted file mode 100644 index 6a171737c..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapper.xml deleted file mode 100644 index eae5ff34d..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapper.xml +++ /dev/null @@ -1,403 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, form_print_config_id, file_url, file_type, file_wps_id, created_by, updated_by, - create_time, update_time, deleted - - - - - - delete from form_print_config_tpl - where id = #{id,jdbcType=BIGINT} - - - - delete from form_print_config_tpl - - - - - - - - SELECT LAST_INSERT_ID() - - 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} - ) - - - - - SELECT LAST_INSERT_ID() - - 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, - - - - - #{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}, - - - - - - - update form_print_config_tpl - - - 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}, - - - - - - - - - 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} - - - - - - - update form_print_config_tpl - - - 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 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} - - - - - - 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 (#{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}) - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapperExt.xml deleted file mode 100644 index e54f51930..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormPrintConfigTplMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapper.xml index b4f8d6408..b9741613d 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapper.xml @@ -33,737 +33,17 @@ - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - 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, + + 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 - ext - - - - - - delete from form_template_field - where id = #{id,jdbcType=BIGINT} - - - - delete from form_template_field - - - - - - - - SELECT LAST_INSERT_ID() - - 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} - ) - - - - - SELECT LAST_INSERT_ID() - - 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, - - - - - #{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}, - - - - - - - update form_template_field - - - 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}, - - - - - - - - - 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} - - - - - - - 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} - - - - - - - update form_template_field - - - 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 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 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} - - - - - - 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 (#{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}) - - \ No newline at end of file + + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapperExt.xml deleted file mode 100644 index 31f5cf044..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateFieldMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapper.xml index df6c909cb..904d09da7 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapper.xml @@ -15,356 +15,8 @@ - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - id, form_id, version, content_encoding, created_by, updated_by, create_time, update_time - - - - - delete from form_template - where id = #{id,jdbcType=BIGINT} - - - - delete from form_template - - - - - - - - SELECT LAST_INSERT_ID() - - 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}) - - - - - SELECT LAST_INSERT_ID() - - insert into form_template - - - form_id, - - - version, - - - content_encoding, - - - created_by, - - - updated_by, - - - create_time, - - - update_time, - - - - - #{formId,jdbcType=BIGINT}, - - - #{version,jdbcType=INTEGER}, - - - #{contentEncoding,jdbcType=VARCHAR}, - - - #{createdBy,jdbcType=BIGINT}, - - - #{updatedBy,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - - update form_template - - - 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}, - - - - - - - - - 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} - - - - - - - update form_template - - - 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 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} - - - - - - insert into form_template (form_id, - version, content_encoding, created_by, - updated_by, create_time, update_time - ) - values (#{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} - ) - - \ No newline at end of file + + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapperExt.xml deleted file mode 100644 index 70f8bb81e..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/FormTemplateMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapper.xml index 1957d333d..e6022fecb 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapper.xml @@ -23,482 +23,9 @@ - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - 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, + 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 - - - - - delete from modify_log_record - where id = #{id,jdbcType=BIGINT} - - - - delete from modify_log_record - - - - - - - - SELECT LAST_INSERT_ID() - - 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} - ) - - - - - SELECT LAST_INSERT_ID() - - 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, - - - - - #{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}, - - - - - - - update modify_log_record - - - 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}, - - - - - - - - - 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} - - - - - - - update modify_log_record - - - 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 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} - - - - - - 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 (#{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}) - - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapperExt.xml deleted file mode 100644 index 4e39e6bd0..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/ModifyLogRecordMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapper.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapper.xml index 670d6aa6d..67639a7b5 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapper.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapper.xml @@ -12,310 +12,7 @@ - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - id, initialized, create_time, update_time, agent_id - - - - - delete from tenant_init_status - where id = #{id,jdbcType=BIGINT} - - - - delete from tenant_init_status - - - - - - - - SELECT LAST_INSERT_ID() - - 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}) - - - - - SELECT LAST_INSERT_ID() - - insert into tenant_init_status - - - initialized, - - - create_time, - - - update_time, - - - agent_id, - - - - - #{initialized,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{agentId,jdbcType=BIGINT}, - - - - - - - update tenant_init_status - - - 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}, - - - - - - - - - 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} - - - - - - - update tenant_init_status - - - 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 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} - - - - - - insert into tenant_init_status (initialized, - create_time, update_time, agent_id - ) - values (#{item.initialized,jdbcType=TINYINT}, - #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.agentId,jdbcType=BIGINT} - ) - - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapperExt.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapperExt.xml deleted file mode 100644 index bbb92dab8..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mapper/TenantInitStatusMapperExt.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index 71d041be9..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/generatorConfig.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/generatorConfig.xml deleted file mode 100644 index 5e740372e..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/generatorConfig.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/logback.xml b/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/logback.xml deleted file mode 100644 index 735961aa3..000000000 --- a/ruoyi-modules/ruoyi-form/booksflow-form-mapper/src/test/resources/logback.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n - - - - DEBUG - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/pom.xml b/ruoyi-modules/ruoyi-form/booksflow-form-service/pom.xml index 0ce3362af..b600f7c43 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/pom.xml +++ b/ruoyi-modules/ruoyi-form/booksflow-form-service/pom.xml @@ -10,16 +10,6 @@ booksflow-form-service - - true - UTF-8 - 1.5.3.Final - 1.5.7 - 4.5.5-1.5.7 - 1.5.2-BETA3 - 1.4.18 - - org.dromara @@ -37,14 +27,17 @@ ${revision} - org.mapstruct - mapstruct - ${org.mapstruct.version} + com.baomidou + mybatis-plus-spring-boot3-starter + provided - org.mybatis - mybatis - 3.5.7 + org.dromara + ruoyi-common-core + + + org.dromara + ruoyi-common-json diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/controller/FormTemplateController.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/controller/FormTemplateController.java index a8c9a6060..545243080 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/controller/FormTemplateController.java +++ b/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)); @@ -75,4 +75,4 @@ public class FormTemplateController { } } -} \ No newline at end of file +} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormDictService.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormDictService.java index 806aff9e4..0f10f3a18 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormDictService.java +++ b/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 { - - @Autowired - private FormDictMapperExt formDictMapperExt; +public class FormDictService extends ServiceImpl { @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); - List records = formDictMapperExt.selectByExampleWithPaging(example, currentPage * numPerPage, numPerPage); + int count = (int) baseMapper.countByExample(example); + List 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 list(List 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 list = formDictMapperExt.selectByExample(example); + List list = baseMapper.selectByExample(example); if (list.isEmpty()) { return codes; } @@ -213,4 +214,4 @@ public class FormDictService { } return notExistCodes; } -} \ No newline at end of file +} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormFieldDictService.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormFieldDictService.java index d185693b7..17513ade4 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormFieldDictService.java +++ b/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.FormFieldDictMapperExt; +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; -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 { - - @Autowired - private FormFieldDictMapperExt formFieldDictMapperExt; +public class FormFieldDictService extends ServiceImpl { /** * 创建新的表单字段配置 @@ -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 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()) { - entity.setCheckIds(StrUtil.join(",", ids)); - } else { - entity.setCheckIds(""); - } - formFieldDictMapperExt.insertSelective(entity); + baseMapper.insert(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()) { - entity.setCheckIds(StrUtil.join(",", ids)); - } else { - entity.setCheckIds(""); - } - formFieldDictMapperExt.updateByPrimaryKeySelective(entity); + baseMapper.updateById(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 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 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)); }); @@ -625,4 +605,4 @@ public class FormFieldDictService { return formFieldDictMapperExt.countByExample(example); } -} \ No newline at end of file +} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormPrintConfigService.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormPrintConfigService.java index 0fac5c5db..795c65152 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormPrintConfigService.java +++ b/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()); diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormService.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormService.java index 8d0422d47..306b6ff83 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormService.java +++ b/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); @@ -131,5 +131,5 @@ public class FormService { } return formMapperExt.countByExample(example); } - -} \ No newline at end of file + +} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormTemplateService.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormTemplateService.java index a06e71e83..3cee7c4e8 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/FormTemplateService.java +++ b/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); } @@ -433,4 +433,4 @@ public class FormTemplateService { } -} \ No newline at end of file +} diff --git a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/ModifyLogRecordService.java b/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/ModifyLogRecordService.java index 1f4f75ecf..c1b5fec49 100644 --- a/ruoyi-modules/ruoyi-form/booksflow-form-service/src/main/java/com/pcloud/booksflow/form/service/ModifyLogRecordService.java +++ b/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 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); @@ -83,4 +83,4 @@ public class ModifyLogRecordService { return new PageBeanNew<>(currentPage, numPerPage, count, records); } -} \ No newline at end of file +}