diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 6030f939..67f7e013 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -848,6 +848,7 @@ CREATE TABLE `jsh_system_config` ( `minus_stock_flag` varchar(1) DEFAULT '0' COMMENT '负库存启用标记，0未启用，1启用', `purchase_by_sale_flag` varchar(1) DEFAULT '0' COMMENT '以销定购启用标记，0未启用，1启用', `multi_level_approval_flag` varchar(1) DEFAULT '0' COMMENT '多级审核启用标记，0未启用，1启用', + `multi_bill_type` varchar(200) DEFAULT NULL COMMENT '流程类型，可多选', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', PRIMARY KEY (`id`) @@ -856,7 +857,7 @@ CREATE TABLE `jsh_system_config` ( -- ---------------------------- -- Records of jsh_system_config -- ---------------------------- -INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '0', '0', '63', '0'); +INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '0', '0', '', '63', '0'); -- ---------------------------- -- Table structure for jsh_tenant diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 221c2697..ff156d0d 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1429,9 +1429,15 @@ alter table jsh_role add price_limit varchar(50) DEFAULT NULL COMMENT '价格屏 -- 给系统参数表增加多级审核开关字段 -- 给用户表增加是否经理字段，默认为否 -- 给平台配置表增加发起流程地址 --- 给消息表增加接收人字段 -- -------------------------------------------------------- alter table jsh_system_config add multi_level_approval_flag varchar(1) DEFAULT '0' COMMENT '多级审核启用标记，0未启用，1启用' after purchase_by_sale_flag; alter table jsh_user add leader_flag varchar(1) DEFAULT '0' COMMENT '是否经理，0否，1是' after password; INSERT INTO `jsh_platform_config` (`platform_key`, `platform_key_info`, `platform_value`) VALUES ('send_workflow_url', '发起流程地址', ''); -alter table jsh_msg add user_id bigint(20) DEFAULT NULL COMMENT '接收人id' after type; \ No newline at end of file + +-- -------------------------------------------------------- +-- 时间 2023年02月25日 +-- by jishenghua +-- 给消息表增加接收人字段 +-- 给系统参数表增加流程类型 +-- -------------------------------------------------------- +alter table jsh_system_config add multi_bill_type varchar(200) DEFAULT NULL COMMENT '流程类型，可多选' after multi_level_approval_flag; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java index 0911f78f..e304da5a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java @@ -27,6 +27,8 @@ public class SystemConfig { private String multiLevelApprovalFlag; + private String multiBillType; + private Long tenantId; private String deleteFlag; @@ -135,6 +137,14 @@ public class SystemConfig { this.multiLevelApprovalFlag = multiLevelApprovalFlag == null ? null : multiLevelApprovalFlag.trim(); } + public String getMultiBillType() { + return multiBillType; + } + + public void setMultiBillType(String multiBillType) { + this.multiBillType = multiBillType == null ? null : multiBillType.trim(); + } + public Long getTenantId() { return tenantId; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java index 10997321..caff7f4f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java @@ -1004,6 +1004,76 @@ public class SystemConfigExample { return (Criteria) this; } + public Criteria andMultiBillTypeIsNull() { + addCriterion("multi_bill_type is null"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeIsNotNull() { + addCriterion("multi_bill_type is not null"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeEqualTo(String value) { + addCriterion("multi_bill_type =", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeNotEqualTo(String value) { + addCriterion("multi_bill_type <>", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeGreaterThan(String value) { + addCriterion("multi_bill_type >", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeGreaterThanOrEqualTo(String value) { + addCriterion("multi_bill_type >=", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeLessThan(String value) { + addCriterion("multi_bill_type <", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeLessThanOrEqualTo(String value) { + addCriterion("multi_bill_type <=", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeLike(String value) { + addCriterion("multi_bill_type like", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeNotLike(String value) { + addCriterion("multi_bill_type not like", value, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeIn(List values) { + addCriterion("multi_bill_type in", values, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeNotIn(List values) { + addCriterion("multi_bill_type not in", values, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeBetween(String value1, String value2) { + addCriterion("multi_bill_type between", value1, value2, "multiBillType"); + return (Criteria) this; + } + + public Criteria andMultiBillTypeNotBetween(String value1, String value2) { + addCriterion("multi_bill_type not between", value1, value2, "multiBillType"); + return (Criteria) this; + } + public Criteria andTenantIdIsNull() { addCriterion("tenant_id is null"); return (Criteria) this; diff --git a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml index 90f044b5..68983e98 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml @@ -15,6 +15,7 @@ + @@ -79,7 +80,7 @@ id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, - multi_level_approval_flag, tenant_id, delete_flag + multi_level_approval_flag, multi_bill_type, tenant_id, delete_flag