Skip to content

T
traffic-front
Commit 82b94634 authored by neo's avatar neo
Browse files
Options

[dev] use ' ' from empty value

parent 1754b7d2
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 38 deletions
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateConfigExtendsMapper.xml
View file @ 82b94634
...@@ -7,37 +7,115 @@ ...@@ -7,37 +7,115 @@
<foreach collection="list" item="item"> <foreach collection="list" item="item">
INTO PERIOD_CELL_TEMPLATE_CONFIG VALUES INTO PERIOD_CELL_TEMPLATE_CONFIG VALUES
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<choose><when test="item.id != null">#{item.id,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> <choose>
<choose><when test="item.period != null">#{item.period,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> <when test="item.id != null">#{item.id,jdbcType=INTEGER},</when>
<choose><when test="item.cellTemplateId != null">#{item.cellTemplateId,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> <otherwise>0,</otherwise>
<choose><when test="item.reportTemplateId != null">#{item.reportTemplateId,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> </choose>
<choose><when test="item.dataSourceType != null">#{item.dataSourceType,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> <choose>
<choose><when test="item.formula != null">#{item.formula,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<choose><when test="item.parsedFormula != null">#{item.parsedFormula,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <otherwise>0,</otherwise>
<choose><when test="item.formulaDescription != null">#{item.formulaDescription,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> </choose>
<choose><when test="item.accountCodes != null">#{item.accountCodes,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <choose>
<choose><when test="item.invoiceType != null">#{item.invoiceType,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> <when test="item.cellTemplateId != null">#{item.cellTemplateId,jdbcType=INTEGER},</when>
<choose><when test="item.taxRate != null">#{item.taxRate,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <otherwise>0,</otherwise>
<choose><when test="item.invoiceAmountType != null">#{item.invoiceAmountType,jdbcType=INTEGER},</when><otherwise>0,</otherwise></choose> </choose>
<choose><when test="item.modelIds != null">#{item.modelIds,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <choose>
<choose><when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <when test="item.reportTemplateId != null">#{item.reportTemplateId,jdbcType=INTEGER},</when>
<choose><when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when><otherwise>'1970-01-01 08:00:00',</otherwise></choose> <otherwise>0,</otherwise>
<choose><when test="item.updateBy != null">#{item.updateBy,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> </choose>
<choose><when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when><otherwise>'1970-01-01 08:00:00',</otherwise></choose> <choose>
<choose><when test="item.invoiceCategory != null">#{item.invoiceCategory,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <when test="item.dataSourceType != null">#{item.dataSourceType,jdbcType=INTEGER},</when>
<choose><when test="item.formulaDataSource != null">#{item.formulaDataSource,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <otherwise>0,</otherwise>
<choose><when test="item.validation != null">#{item.validation,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> </choose>
<choose><when test="item.parsedValidation != null">#{item.parsedValidation,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <choose>
<choose><when test="item.validationDescription != null">#{item.validationDescription,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <when test="item.formula != null">#{item.formula,jdbcType=VARCHAR},</when>
<choose><when test="item.voucherKeyword != null">#{item.voucherKeyword,jdbcType=VARCHAR},</when><otherwise>'',</otherwise></choose> <otherwise>' ',</otherwise>
<choose><when test="item.cellTemplateConfigId != null">#{item.cellTemplateConfigId,jdbcType=INTEGER},</when><otherwise>'',</otherwise></choose> </choose>
<choose><when test="item.keyValueParsedFormula != null">#{item.keyValueParsedFormula,jdbcType=VARCHAR}</when><otherwise>'',</otherwise></choose> <choose>
<when test="item.parsedFormula != null">#{item.parsedFormula,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.formulaDescription != null">#{item.formulaDescription,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.accountCodes != null">#{item.accountCodes,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.invoiceType != null">#{item.invoiceType,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxRate != null">#{item.taxRate,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.invoiceAmountType != null">#{item.invoiceAmountType,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.modelIds != null">#{item.modelIds,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when>
<otherwise>'1970-01-01 08:00:00',</otherwise>
</choose>
<choose>
<when test="item.updateBy != null">#{item.updateBy,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
<otherwise>'1970-01-01 08:00:00',</otherwise>
</choose>
<choose>
<when test="item.invoiceCategory != null">#{item.invoiceCategory,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.formulaDataSource != null">#{item.formulaDataSource,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.validation != null">#{item.validation,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.parsedValidation != null">#{item.parsedValidation,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.validationDescription != null">#{item.validationDescription,jdbcType=VARCHAR},
</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.voucherKeyword != null">#{item.voucherKeyword,jdbcType=VARCHAR},</when>
<otherwise>' ',</otherwise>
</choose>
<choose>
<when test="item.cellTemplateConfigId != null">#{item.cellTemplateConfigId,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.keyValueParsedFormula != null">#{item.keyValueParsedFormula,jdbcType=VARCHAR}
</when>
<otherwise>' ',</otherwise>
</choose>
</trim> </trim>
</foreach> </foreach>
SELECT 1 FROM DUAL SELECT 1 FROM DUAL
</insert> </insert>
<resultMap extends="BaseResultMap" id="periodCellTemplateConfigExtendDtoMap" type="pwc.taxtech.atms.vat.dpo.PeriodCellTemplateConfigExtendDto"> <resultMap extends="BaseResultMap" id="periodCellTemplateConfigExtendDtoMap"
type="pwc.taxtech.atms.vat.dpo.PeriodCellTemplateConfigExtendDto">
<result column="COLUMN_INDEX" jdbcType="INTEGER" property="columnIndex"/> <result column="COLUMN_INDEX" jdbcType="INTEGER" property="columnIndex"/>
<result column="ROW_INDEX" jdbcType="INTEGER" property="rowIndex"/> <result column="ROW_INDEX" jdbcType="INTEGER" property="rowIndex"/>
<result column="COLUMN_NAME" jdbcType="VARCHAR" property="columnName"/> <result column="COLUMN_NAME" jdbcType="VARCHAR" property="columnName"/>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateExtendsMapper.xml
View file @ 82b94634
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</choose> </choose>
<choose> <choose>
<when test="item.rowName != null">#{item.rowName,jdbcType=VARCHAR},</when> <when test="item.rowName != null">#{item.rowName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.columnIndex != null">#{item.columnIndex,jdbcType=INTEGER},</when> <when test="item.columnIndex != null">#{item.columnIndex,jdbcType=INTEGER},</when>
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
</choose> </choose>
<choose> <choose>
<when test="item.columnName != null">#{item.columnName,jdbcType=VARCHAR},</when> <when test="item.columnName != null">#{item.columnName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.comment != null">#{item.comment,jdbcType=VARCHAR},</when> <when test="item.comment != null">#{item.comment,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when> <when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</choose> </choose>
<choose> <choose>
<when test="item.dataType != null">#{item.dataType,jdbcType=INTEGER},</when> <when test="item.dataType != null">#{item.dataType,jdbcType=INTEGER},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.isReadOnly != null">#{item.isReadOnly,jdbcType=INTEGER},</when> <when test="item.isReadOnly != null">#{item.isReadOnly,jdbcType=INTEGER},</when>
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
</choose> </choose>
<choose> <choose>
<when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when> <when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.updateBy != null">#{item.updateBy,jdbcType=VARCHAR}</when> <when test="item.updateBy != null">#{item.updateBy,jdbcType=VARCHAR}</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
</trim> </trim>
</foreach> </foreach>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodTemplateExtendsMapper.xml
View file @ 82b94634
...@@ -33,15 +33,15 @@ ...@@ -33,15 +33,15 @@
</choose> </choose>
<choose> <choose>
<when test="item.name != null">#{item.name,jdbcType=VARCHAR},</when> <when test="item.name != null">#{item.name,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.code != null">#{item.code,jdbcType=VARCHAR},</when> <when test="item.code != null">#{item.code,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.path != null">#{item.path,jdbcType=VARCHAR},</when> <when test="item.path != null">#{item.path,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.reportType != null">#{item.reportType,jdbcType=INTEGER},</when> <when test="item.reportType != null">#{item.reportType,jdbcType=INTEGER},</when>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</choose> </choose>
<choose> <choose>
<when test="item.parentId != null">#{item.parentId,jdbcType=VARCHAR},</when> <when test="item.parentId != null">#{item.parentId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.templateId != null">#{item.templateId,jdbcType=INTEGER},</when> <when test="item.templateId != null">#{item.templateId,jdbcType=INTEGER},</when>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</choose> </choose>
<choose> <choose>
<when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when> <when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>' ',</otherwise>
</choose> </choose>
</trim> </trim>
</foreach> </foreach>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
TEMPLATE.TEMPLATE_GROUP_ID AS REPORT_TEMPLATE_GROUP_ID, TEMPLATE.TEMPLATE_GROUP_ID AS REPORT_TEMPLATE_GROUP_ID,
IFNULL ( IFNULL (
CELLTEMPLATECONFIG.FORMULA, CELLTEMPLATECONFIG.FORMULA,
'' ' '
) )
AS FORMULA, AS FORMULA,
CELLTEMPLATE.ROW_INDEX AS ROW_INDEX, CELLTEMPLATE.ROW_INDEX AS ROW_INDEX,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment