Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

import template & datasource

See merge request root/atms!228

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellDataExtendsMapper.xml

@@ -61,9 +61,7 @@
                     <when test="item.data != null">#{item.data,jdbcType=VARCHAR},</when>
                     <otherwise>' ',</otherwise>
                 </choose>
-                <choose>
-                    <when test="item.keyinData != null">#{item.keyinData,jdbcType=VARCHAR},</when>
-                </choose>
+
                 <choose>
                     <when test="item.formulaExp != null">#{item.formulaExp,jdbcType=VARCHAR},</when>
                     <otherwise>' ',</otherwise>
@@ -88,6 +86,9 @@
                     <when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
                     <otherwise>' ',</otherwise>
                 </choose>
+                <choose>
+                    <when test="item.keyinData != null">#{item.keyinData,jdbcType=VARCHAR},</when>
+                </choose>
             </trim>
         </foreach>
         SELECT 1 FROM DUAL

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodDataSourceExtendsMapper.xml

@@ -378,11 +378,7 @@
                         0,
                     </otherwise>
                 </choose>
-                <choose>
-                    <when test="item.keyinData != null">
-                        #{item.keyinData,jdbcType=VARCHAR},
-                    </when>
-                </choose>
+
                 <choose>
                     <when test="item.description != null">
                         #{item.description,jdbcType=VARCHAR},
@@ -396,7 +392,7 @@
                         #{item.keyValueDataId,jdbcType=VARCHAR},
                     </when>
                     <otherwise>
-                        0,
+                        '0',
                     </otherwise>
                 </choose>
                 <choose>
@@ -496,6 +492,14 @@
                         '',
                     </otherwise>
                 </choose>
+                <choose>
+                    <when test="item.keyinData != null">
+                        #{item.keyinData,jdbcType=VARCHAR},
+                    </when>
+                    <otherwise>
+                        '',
+                    </otherwise>
+                </choose>
             </trim>
         </foreach>
         SELECT 1 FROM DUAL

atms-web/src/main/webapp/app/common/controls/vat-report-sheet/vat-report-sheet.js

@@ -512,12 +512,18 @@
 
                                 // 设置顺序: 非数值字符串 -> 单元格值覆盖修改 -> 公式或手工数据源 -> 数值
                                 var ifShowParseFloat = true; // 用于标识单元格是否设置成数值
-                                if(_.isString(data.keyinData) && data.keyinData.length > 0 && isNaN(Number(data.keyinData))){
-                                    sheet.setValue(data.rowIndex, data.columnIndex, data.keyinData);
+
+                                if(data.dataSourceList && data.dataSourceList.length > 0 && data.dataSourceList[0].keyinData){
+                                    sheet.setValue(data.rowIndex, data.columnIndex, data.dataSourceList[0].keyinData);
                                     ifShowParseFloat = false; // 非数值字符串，单元格设置为字符串
-                                    data.value = data.keyinData;
+                                    // data.value = data.dataSourceList[0].keyinData;
                                 }
-                                if (_.isString(data.value) && data.value.length > 0 && isNaN(Number(data.value))) {
+                                // else if(_.isString(data.keyinData) && data.keyinData.length > 0 && isNaN(Number(data.keyinData))){
+                                //     sheet.setValue(data.rowIndex, data.columnIndex, data.keyinData);
+                                //     ifShowParseFloat = false; // 非数值字符串，单元格设置为字符串
+                                //     data.value = data.keyinData;
+                                // }
+                                 else if (_.isString(data.value) && data.value.length > 0 && isNaN(Number(data.value))) {
                                     sheet.setValue(data.rowIndex, data.columnIndex, data.value);
                                     ifShowParseFloat = false; // 非数值字符串，单元格设置为字符串
                                 }