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/PeriodCellTemplateConfigMapper.xml

@@ -6,30 +6,31 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-        <id column="id" jdbcType="BIGINT" property="id"/>
-        <result column="period" jdbcType="INTEGER" property="period"/>
-        <result column="cell_template_id" jdbcType="BIGINT" property="cellTemplateId"/>
-        <result column="report_template_id" jdbcType="BIGINT" property="reportTemplateId"/>
-        <result column="data_source_type" jdbcType="INTEGER" property="dataSourceType"/>
-        <result column="formula" jdbcType="VARCHAR" property="formula"/>
-        <result column="parsed_formula" jdbcType="VARCHAR" property="parsedFormula"/>
-        <result column="formula_description" jdbcType="VARCHAR" property="formulaDescription"/>
-        <result column="account_codes" jdbcType="VARCHAR" property="accountCodes"/>
-        <result column="invoice_type" jdbcType="INTEGER" property="invoiceType"/>
-        <result column="tax_rate" jdbcType="VARCHAR" property="taxRate"/>
-        <result column="invoice_amount_type" jdbcType="INTEGER" property="invoiceAmountType"/>
-        <result column="model_ids" jdbcType="VARCHAR" property="modelIds"/>
-        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="invoice_category" jdbcType="VARCHAR" property="invoiceCategory"/>
-        <result column="formula_data_source" jdbcType="VARCHAR" property="formulaDataSource"/>
-        <result column="validation" jdbcType="VARCHAR" property="validation"/>
-        <result column="parsed_validation" jdbcType="VARCHAR" property="parsedValidation"/>
-        <result column="validation_description" jdbcType="VARCHAR" property="validationDescription"/>
-        <result column="voucher_keyword" jdbcType="VARCHAR" property="voucherKeyword"/>
-        <result column="cell_template_config_id" jdbcType="BIGINT" property="cellTemplateConfigId"/>
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="cell_template_id" jdbcType="BIGINT" property="cellTemplateId" />
+    <result column="report_template_id" jdbcType="BIGINT" property="reportTemplateId" />
+    <result column="data_source_type" jdbcType="INTEGER" property="dataSourceType" />
+    <result column="formula" jdbcType="VARCHAR" property="formula" />
+    <result column="parsed_formula" jdbcType="VARCHAR" property="parsedFormula" />
+    <result column="formula_description" jdbcType="VARCHAR" property="formulaDescription" />
+    <result column="account_codes" jdbcType="VARCHAR" property="accountCodes" />
+    <result column="invoice_type" jdbcType="INTEGER" property="invoiceType" />
+    <result column="tax_rate" jdbcType="VARCHAR" property="taxRate" />
+    <result column="invoice_amount_type" jdbcType="INTEGER" property="invoiceAmountType" />
+    <result column="model_ids" jdbcType="VARCHAR" property="modelIds" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="invoice_category" jdbcType="VARCHAR" property="invoiceCategory" />
+    <result column="formula_data_source" jdbcType="VARCHAR" property="formulaDataSource" />
+    <result column="validation" jdbcType="VARCHAR" property="validation" />
+    <result column="parsed_validation" jdbcType="VARCHAR" property="parsedValidation" />
+    <result column="validation_description" jdbcType="VARCHAR" property="validationDescription" />
+    <result column="voucher_keyword" jdbcType="VARCHAR" property="voucherKeyword" />
+    <result column="cell_template_config_id" jdbcType="BIGINT" property="cellTemplateConfigId" />
+    <result column="key_value_parsed_formula" jdbcType="VARCHAR" property="keyValueParsedFormula" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -53,8 +54,7 @@
                 </when>
                 <when test="criterion.listValue">
                   and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
-                                             separator=",">
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -87,8 +87,7 @@
                 </when>
                 <when test="criterion.listValue">
                   and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
-                                             separator=",">
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -107,10 +106,10 @@
     id, period, cell_template_id, report_template_id, data_source_type, formula, parsed_formula, 
     formula_description, account_codes, invoice_type, tax_rate, invoice_amount_type, 
     model_ids, create_by, create_time, update_by, update_time, invoice_category, formula_data_source, 
-        validation, parsed_validation, validation_description, voucher_keyword, cell_template_config_id
+    validation, parsed_validation, validation_description, voucher_keyword, cell_template_config_id, 
+    key_value_parsed_formula
   </sql>
-    <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfigExample"
-            resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfigExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -119,10 +118,10 @@
     <if test="distinct">
       distinct
     </if>
-        <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List" />
     from period_cell_template_config
     <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
     <if test="orderByClause != null">
       order by ${orderByClause}
@@ -134,7 +133,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select 
-        <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List" />
     from period_cell_template_config
     where id = #{id,jdbcType=BIGINT}
   </select>
@@ -153,7 +152,7 @@
     -->
     delete from period_cell_template_config
     <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
   </delete>
   <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig">
@@ -169,7 +168,8 @@
       update_by, update_time, invoice_category, 
       formula_data_source, validation, parsed_validation, 
       validation_description, voucher_keyword, 
-        cell_template_config_id)
+      cell_template_config_id, key_value_parsed_formula
+      )
     values (#{id,jdbcType=BIGINT}, #{period,jdbcType=INTEGER}, #{cellTemplateId,jdbcType=BIGINT}, 
       #{reportTemplateId,jdbcType=BIGINT}, #{dataSourceType,jdbcType=INTEGER}, #{formula,jdbcType=VARCHAR}, 
       #{parsedFormula,jdbcType=VARCHAR}, #{formulaDescription,jdbcType=VARCHAR}, #{accountCodes,jdbcType=VARCHAR}, 
@@ -178,7 +178,8 @@
       #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{invoiceCategory,jdbcType=VARCHAR}, 
       #{formulaDataSource,jdbcType=VARCHAR}, #{validation,jdbcType=VARCHAR}, #{parsedValidation,jdbcType=VARCHAR}, 
       #{validationDescription,jdbcType=VARCHAR}, #{voucherKeyword,jdbcType=VARCHAR}, 
-        #{cellTemplateConfigId,jdbcType=BIGINT})
+      #{cellTemplateConfigId,jdbcType=BIGINT}, #{keyValueParsedFormula,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig">
     <!--
@@ -259,6 +260,9 @@
       <if test="cellTemplateConfigId != null">
         cell_template_config_id,
       </if>
+      <if test="keyValueParsedFormula != null">
+        key_value_parsed_formula,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -333,17 +337,19 @@
       <if test="cellTemplateConfigId != null">
         #{cellTemplateConfigId,jdbcType=BIGINT},
       </if>
+      <if test="keyValueParsedFormula != null">
+        #{keyValueParsedFormula,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-    <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfigExample"
-            resultType="java.lang.Long">
+  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfigExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from period_cell_template_config
     <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
@@ -425,9 +431,12 @@
       <if test="record.cellTemplateConfigId != null">
         cell_template_config_id = #{record.cellTemplateConfigId,jdbcType=BIGINT},
       </if>
+      <if test="record.keyValueParsedFormula != null">
+        key_value_parsed_formula = #{record.keyValueParsedFormula,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause"/>
+      <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
@@ -459,9 +468,10 @@
       parsed_validation = #{record.parsedValidation,jdbcType=VARCHAR},
       validation_description = #{record.validationDescription,jdbcType=VARCHAR},
       voucher_keyword = #{record.voucherKeyword,jdbcType=VARCHAR},
-        cell_template_config_id = #{record.cellTemplateConfigId,jdbcType=BIGINT}
+      cell_template_config_id = #{record.cellTemplateConfigId,jdbcType=BIGINT},
+      key_value_parsed_formula = #{record.keyValueParsedFormula,jdbcType=VARCHAR}
     <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause"/>
+      <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig">
@@ -540,6 +550,9 @@
       <if test="cellTemplateConfigId != null">
         cell_template_config_id = #{cellTemplateConfigId,jdbcType=BIGINT},
       </if>
+      <if test="keyValueParsedFormula != null">
+        key_value_parsed_formula = #{keyValueParsedFormula,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -571,11 +584,11 @@
       parsed_validation = #{parsedValidation,jdbcType=VARCHAR},
       validation_description = #{validationDescription,jdbcType=VARCHAR},
       voucher_keyword = #{voucherKeyword,jdbcType=VARCHAR},
-        cell_template_config_id = #{cellTemplateConfigId,jdbcType=BIGINT}
+      cell_template_config_id = #{cellTemplateConfigId,jdbcType=BIGINT},
+      key_value_parsed_formula = #{keyValueParsedFormula,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
-    <select id="selectByExampleWithRowbounds"
-            parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfigExample" resultMap="BaseResultMap">
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfigExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -584,10 +597,10 @@
     <if test="distinct">
       distinct
     </if>
-        <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List" />
     from period_cell_template_config
     <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
+      <include refid="Example_Where_Clause" />
     </if>
     <if test="orderByClause != null">
       order by ${orderByClause}
@@ -648,17 +661,16 @@
             ,#{item.cellTemplateConfigId,jdbcType=INTEGER})
         </foreach>
     </insert>
-    <resultMap id="periodCellTemplateConfigExtendDtoMap"
-               type="pwc.taxtech.atms.dto.vatdto.PeriodCellTemplateConfigExtendDto" extends="BaseResultMap">
-        <result column="column_index" jdbcType="INTEGER" property="columnIndex"/>
-        <result column="row_index" jdbcType="INTEGER" property="rowIndex"/>
-        <result column="column_name" jdbcType="VARCHAR" property="columnName"/>
-        <result column="row_name" jdbcType="VARCHAR" property="rowName"/>
-        <result column="data_type" jdbcType="INTEGER" property="dataType"/>
-        <result column="is_read_only" jdbcType="INTEGER" property="isReadOnly"/>
-        <result column="cell_template_id" jdbcType="INTEGER" property="cellTemplateID"/>
-        <result column="report_template_id" jdbcType="INTEGER" property="reportTemplateID"/>
-        <result column="comment" jdbcType="INTEGER" property="comment"/>
+    <resultMap extends="BaseResultMap" id="periodCellTemplateConfigExtendDtoMap" type="pwc.taxtech.atms.dto.vatdto.PeriodCellTemplateConfigExtendDto">
+        <result column="column_index" jdbcType="INTEGER" property="columnIndex" />
+        <result column="row_index" jdbcType="INTEGER" property="rowIndex" />
+        <result column="column_name" jdbcType="VARCHAR" property="columnName" />
+        <result column="row_name" jdbcType="VARCHAR" property="rowName" />
+        <result column="data_type" jdbcType="INTEGER" property="dataType" />
+        <result column="is_read_only" jdbcType="INTEGER" property="isReadOnly" />
+        <result column="cell_template_id" jdbcType="INTEGER" property="cellTemplateID" />
+        <result column="report_template_id" jdbcType="INTEGER" property="reportTemplateID" />
+        <result column="comment" jdbcType="INTEGER" property="comment" />
     </resultMap>
     <select id="getPeriodCellTemplateConfigExtendDtos" resultMap="periodCellTemplateConfigExtendDtoMap">
         SELECT
@@ -676,7 +688,7 @@
         JOIN period_cell_template_config config
         ON cell_template.cell_template_id = config.cell_template_id
         WHERE cell_template.report_template_id IN
-        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item}
         </foreach>
         AND cell_template.period = #{period,jdbcType=INTEGER}

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