add one column for keyValue formula save function

atms-api/etc/generator/vat_run.bat

 rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
 cd /d %~dp0
-call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose -tables AssetsList
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose -tables period_cell_template_config
 echo @@@@@@@@@@@ DONE @@@@@@@@@@@
 pause

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateConfig.java

@@ -271,6 +271,17 @@ public class PeriodCellTemplateConfig implements Serializable {
      */
     private Long cellTemplateConfigId;
 
+    /**
+     * Database Column Remarks:
+     *   键值对公式解析
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column period_cell_template_config.key_value_parsed_formula
+     *
+     * @mbg.generated
+     */
+    private String keyValueParsedFormula;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table period_cell_template_config
@@ -855,6 +866,30 @@ public class PeriodCellTemplateConfig implements Serializable {
         this.cellTemplateConfigId = cellTemplateConfigId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column period_cell_template_config.key_value_parsed_formula
+     *
+     * @return the value of period_cell_template_config.key_value_parsed_formula
+     *
+     * @mbg.generated
+     */
+    public String getKeyValueParsedFormula() {
+        return keyValueParsedFormula;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column period_cell_template_config.key_value_parsed_formula
+     *
+     * @param keyValueParsedFormula the value for period_cell_template_config.key_value_parsed_formula
+     *
+     * @mbg.generated
+     */
+    public void setKeyValueParsedFormula(String keyValueParsedFormula) {
+        this.keyValueParsedFormula = keyValueParsedFormula == null ? null : keyValueParsedFormula.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table period_cell_template_config
@@ -891,6 +926,7 @@ public class PeriodCellTemplateConfig implements Serializable {
         sb.append(", validationDescription=").append(validationDescription);
         sb.append(", voucherKeyword=").append(voucherKeyword);
         sb.append(", cellTemplateConfigId=").append(cellTemplateConfigId);
+        sb.append(", keyValueParsedFormula=").append(keyValueParsedFormula);
         sb.append("]");
         return sb.toString();
     }

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateConfigExample.java

@@ -1774,6 +1774,76 @@ public class PeriodCellTemplateConfigExample {
             addCriterion("cell_template_config_id not between", value1, value2, "cellTemplateConfigId");
             return (Criteria) this;
         }
+
+        public Criteria andKeyValueParsedFormulaIsNull() {
+            addCriterion("key_value_parsed_formula is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaIsNotNull() {
+            addCriterion("key_value_parsed_formula is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaEqualTo(String value) {
+            addCriterion("key_value_parsed_formula =", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaNotEqualTo(String value) {
+            addCriterion("key_value_parsed_formula <>", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaGreaterThan(String value) {
+            addCriterion("key_value_parsed_formula >", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaGreaterThanOrEqualTo(String value) {
+            addCriterion("key_value_parsed_formula >=", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaLessThan(String value) {
+            addCriterion("key_value_parsed_formula <", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaLessThanOrEqualTo(String value) {
+            addCriterion("key_value_parsed_formula <=", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaLike(String value) {
+            addCriterion("key_value_parsed_formula like", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaNotLike(String value) {
+            addCriterion("key_value_parsed_formula not like", value, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaIn(List<String> values) {
+            addCriterion("key_value_parsed_formula in", values, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaNotIn(List<String> values) {
+            addCriterion("key_value_parsed_formula not in", values, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaBetween(String value1, String value2) {
+            addCriterion("key_value_parsed_formula between", value1, value2, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeyValueParsedFormulaNotBetween(String value1, String value2) {
+            addCriterion("key_value_parsed_formula not between", value1, value2, "keyValueParsedFormula");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxPayerReportRule.java

@@ -54,7 +54,7 @@ public class PeriodTaxPayerReportRule implements Serializable {
      *
      * @mbg.generated
      */
-    private String templateGroupId;
+    private Long templateGroupId;
 
     /**
      *
@@ -222,7 +222,7 @@ public class PeriodTaxPayerReportRule implements Serializable {
      *
      * @mbg.generated
      */
-    public String getTemplateGroupId() {
+    public Long getTemplateGroupId() {
         return templateGroupId;
     }
 
@@ -234,8 +234,8 @@ public class PeriodTaxPayerReportRule implements Serializable {
      *
      * @mbg.generated
      */
-    public void setTemplateGroupId(String templateGroupId) {
-        this.templateGroupId = templateGroupId == null ? null : templateGroupId.trim();
+    public void setTemplateGroupId(Long templateGroupId) {
+        this.templateGroupId = templateGroupId;
     }
 
     /**

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxPayerReportRuleExample.java

@@ -445,62 +445,52 @@ public class PeriodTaxPayerReportRuleExample {
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdEqualTo(String value) {
+        public Criteria andTemplateGroupIdEqualTo(Long value) {
             addCriterion("template_group_id =", value, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdNotEqualTo(String value) {
+        public Criteria andTemplateGroupIdNotEqualTo(Long value) {
             addCriterion("template_group_id <>", value, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdGreaterThan(String value) {
+        public Criteria andTemplateGroupIdGreaterThan(Long value) {
             addCriterion("template_group_id >", value, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdGreaterThanOrEqualTo(String value) {
+        public Criteria andTemplateGroupIdGreaterThanOrEqualTo(Long value) {
             addCriterion("template_group_id >=", value, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdLessThan(String value) {
+        public Criteria andTemplateGroupIdLessThan(Long value) {
             addCriterion("template_group_id <", value, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdLessThanOrEqualTo(String value) {
+        public Criteria andTemplateGroupIdLessThanOrEqualTo(Long value) {
             addCriterion("template_group_id <=", value, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdLike(String value) {
-            addCriterion("template_group_id like", value, "templateGroupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateGroupIdNotLike(String value) {
-            addCriterion("template_group_id not like", value, "templateGroupId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateGroupIdIn(List<String> values) {
+        public Criteria andTemplateGroupIdIn(List<Long> values) {
             addCriterion("template_group_id in", values, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdNotIn(List<String> values) {
+        public Criteria andTemplateGroupIdNotIn(List<Long> values) {
             addCriterion("template_group_id not in", values, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdBetween(String value1, String value2) {
+        public Criteria andTemplateGroupIdBetween(Long value1, Long value2) {
             addCriterion("template_group_id between", value1, value2, "templateGroupId");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIdNotBetween(String value1, String value2) {
+        public Criteria andTemplateGroupIdNotBetween(Long value1, Long value2) {
             addCriterion("template_group_id not between", value1, value2, "templateGroupId");
             return (Criteria) this;
         }

atms-api/src/main/resources/RuntimeDbScripts/MYSQL/CreateProjectDB.sql

@@ -902,8 +902,8 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`cell_comment` (
 
 CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`cell_data` (
   `id` bigint(18) unsigned NOT NULL,
-  `report_id` varchar(128) NOT NULL DEFAULT '',
-  `cell_template_id` varchar(128) NOT NULL DEFAULT '',
+  `report_id` bigint(18) unsigned NOT NULL DEFAULT '0',
+  `cell_template_id` bigint(18) unsigned NOT NULL DEFAULT '0',
   `data` varchar(200) NOT NULL DEFAULT '',
   `formula_exp` varchar(1000) NOT NULL DEFAULT '',
   `create_by` varchar(128) NOT NULL DEFAULT '',
@@ -966,7 +966,7 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`data_source_detail` (
 CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_cell_template` (
   `id` bigint(18) unsigned NOT NULL,
   `period` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '月份',
-  `report_template_id` varchar(128) NOT NULL DEFAULT '' COMMENT '报表模板ID',
+  `report_template_id` bigint(18) unsigned NOT NULL DEFAULT '0' COMMENT '报表模板ID',
   `row_index` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '行号',
   `row_name` varchar(200) NOT NULL DEFAULT '' COMMENT '行名称',
   `column_index` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '列号',
@@ -989,12 +989,12 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_cell_template` (
 CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_cell_template_config` (
   `id` bigint(18) unsigned NOT NULL,
   `period` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '月份',
-  `cell_template_id` varchar(128) NOT NULL DEFAULT '' COMMENT '单元格模板ID',
-  `report_template_id` varchar(128) NOT NULL DEFAULT '' COMMENT '报表模板ID',
+  `cell_template_id` bigint(18) unsigned NOT NULL DEFAULT '0' COMMENT '单元格模板ID',
+  `report_template_id` bigint(18) unsigned NOT NULL DEFAULT '0' COMMENT '报表模板ID',
   `data_source_type` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '数据源类型',
   `formula` varchar(500) NOT NULL DEFAULT '' COMMENT '公式',
   `parsed_formula` varchar(1000) NOT NULL DEFAULT '' COMMENT '解析后公式',
-  `formula_description` varbinary(1000) NOT NULL DEFAULT '' COMMENT '公式描述',
+  `formula_description` varchar(1000) NOT NULL DEFAULT '' COMMENT '公式描述',
   `account_codes` varchar(1000) NOT NULL DEFAULT '' COMMENT '账套代码',
   `invoice_type` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '发票类型',
   `tax_rate` varchar(50) NOT NULL DEFAULT '' COMMENT '税率',
@@ -1011,6 +1011,7 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_cell_template_confi
   `validation_description` varchar(1000) NOT NULL DEFAULT '' COMMENT '验证信息描述',
   `voucher_keyword` varchar(1000) NOT NULL DEFAULT '' COMMENT '票证关键字',
   `cell_template_config_id` bigint(18) unsigned NOT NULL DEFAULT '0',
+   `key_value_parsed_formula` varchar(1000) NOT NULL DEFAULT '' COMMENT '键值对公式解析',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -1040,7 +1041,7 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_tax_payer_report_ru
   `is_default` int(11) unsigned NOT NULL DEFAULT '0',
   `period` int(11) unsigned NOT NULL DEFAULT '0',
   `tax_payer_type` int(11) unsigned NOT NULL DEFAULT '0',
-  `template_group_id` varchar(128) NOT NULL DEFAULT '',
+  `template_group_id` bigint(18) unsigned NOT NULL DEFAULT '0',
   `organization_id` varchar(128) NOT NULL DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
   `update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',

atms-api/src/main/resources/pwc/taxtech/atms/vat/dao/PeriodTaxPayerReportRuleMapper.xml

@@ -10,7 +10,7 @@
     <result column="is_default" jdbcType="INTEGER" property="isDefault" />
     <result column="period" jdbcType="INTEGER" property="period" />
     <result column="tax_payer_type" jdbcType="INTEGER" property="taxPayerType" />
-    <result column="template_group_id" jdbcType="VARCHAR" property="templateGroupId" />
+    <result column="template_group_id" jdbcType="BIGINT" property="templateGroupId" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -148,7 +148,7 @@
       create_time, update_time, tax_payer_report_rule_id, 
       create_by, update_by)
     values (#{id,jdbcType=BIGINT}, #{isDefault,jdbcType=INTEGER}, #{period,jdbcType=INTEGER}, 
-      #{taxPayerType,jdbcType=INTEGER}, #{templateGroupId,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
+      #{taxPayerType,jdbcType=INTEGER}, #{templateGroupId,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{taxPayerReportRuleId,jdbcType=BIGINT}, 
       #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR})
   </insert>
@@ -207,7 +207,7 @@
         #{taxPayerType,jdbcType=INTEGER},
       </if>
       <if test="templateGroupId != null">
-        #{templateGroupId,jdbcType=VARCHAR},
+        #{templateGroupId,jdbcType=BIGINT},
       </if>
       <if test="organizationId != null">
         #{organizationId,jdbcType=VARCHAR},
@@ -259,7 +259,7 @@
         tax_payer_type = #{record.taxPayerType,jdbcType=INTEGER},
       </if>
       <if test="record.templateGroupId != null">
-        template_group_id = #{record.templateGroupId,jdbcType=VARCHAR},
+        template_group_id = #{record.templateGroupId,jdbcType=BIGINT},
       </if>
       <if test="record.organizationId != null">
         organization_id = #{record.organizationId,jdbcType=VARCHAR},
@@ -294,7 +294,7 @@
       is_default = #{record.isDefault,jdbcType=INTEGER},
       period = #{record.period,jdbcType=INTEGER},
       tax_payer_type = #{record.taxPayerType,jdbcType=INTEGER},
-      template_group_id = #{record.templateGroupId,jdbcType=VARCHAR},
+      template_group_id = #{record.templateGroupId,jdbcType=BIGINT},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -322,7 +322,7 @@
         tax_payer_type = #{taxPayerType,jdbcType=INTEGER},
       </if>
       <if test="templateGroupId != null">
-        template_group_id = #{templateGroupId,jdbcType=VARCHAR},
+        template_group_id = #{templateGroupId,jdbcType=BIGINT},
       </if>
       <if test="organizationId != null">
         organization_id = #{organizationId,jdbcType=VARCHAR},
@@ -354,7 +354,7 @@
     set is_default = #{isDefault,jdbcType=INTEGER},
       period = #{period,jdbcType=INTEGER},
       tax_payer_type = #{taxPayerType,jdbcType=INTEGER},
-      template_group_id = #{templateGroupId,jdbcType=VARCHAR},
+      template_group_id = #{templateGroupId,jdbcType=BIGINT},
       organization_id = #{organizationId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},