给系统配置表增加单据类型选择

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

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;
+
+-- --------------------------------------------------------
+-- 时间 2023年02月25日
+-- by jishenghua
+-- 给消息表增加接收人字段
+-- 给系统参数表增加流程类型
+-- --------------------------------------------------------
+alter table jsh_system_config add multi_bill_type varchar(200) DEFAULT NULL COMMENT '流程类型，可多选' after multi_level_approval_flag;

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;
     }

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<String> values) {
+            addCriterion("multi_bill_type in", values, "multiBillType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiBillTypeNotIn(List<String> 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;

jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml

@@ -15,6 +15,7 @@
     <result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
     <result column="purchase_by_sale_flag" jdbcType="VARCHAR" property="purchaseBySaleFlag" />
     <result column="multi_level_approval_flag" jdbcType="VARCHAR" property="multiLevelApprovalFlag" />
+    <result column="multi_bill_type" jdbcType="VARCHAR" property="multiBillType" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
   </resultMap>
@@ -79,7 +80,7 @@
   <sql id="Base_Column_List">
     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
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
     select
@@ -116,14 +117,14 @@
       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)
     values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, 
       #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, 
       #{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR}, 
       #{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{purchaseBySaleFlag,jdbcType=VARCHAR}, 
-      #{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
+      #{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{multiBillType,jdbcType=VARCHAR}, 
-      )
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
     insert into jsh_system_config
@@ -167,6 +168,9 @@
       <if test="multiLevelApprovalFlag != null">
         multi_level_approval_flag,
       </if>
+      <if test="multiBillType != null">
+        multi_bill_type,
+      </if>
       <if test="tenantId != null">
         tenant_id,
       </if>
@@ -214,6 +218,9 @@
       <if test="multiLevelApprovalFlag != null">
         #{multiLevelApprovalFlag,jdbcType=VARCHAR},
       </if>
+      <if test="multiBillType != null">
+        #{multiBillType,jdbcType=VARCHAR},
+      </if>
       <if test="tenantId != null">
         #{tenantId,jdbcType=BIGINT},
       </if>
@@ -270,6 +277,9 @@
       <if test="record.multiLevelApprovalFlag != null">
         multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
       </if>
+      <if test="record.multiBillType != null">
+        multi_bill_type = #{record.multiBillType,jdbcType=VARCHAR},
+      </if>
       <if test="record.tenantId != null">
         tenant_id = #{record.tenantId,jdbcType=BIGINT},
       </if>
@@ -296,6 +306,7 @@
       minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
       purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
       multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
+      multi_bill_type = #{record.multiBillType,jdbcType=VARCHAR},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -341,6 +352,9 @@
       <if test="multiLevelApprovalFlag != null">
         multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
       </if>
+      <if test="multiBillType != null">
+        multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
+      </if>
       <if test="tenantId != null">
         tenant_id = #{tenantId,jdbcType=BIGINT},
       </if>
@@ -364,6 +378,7 @@
       minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
       purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
       multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
+      multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
       tenant_id = #{tenantId,jdbcType=BIGINT},
       delete_flag = #{deleteFlag,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}