Merge branch 'dev_mysql_chase' into 'dev_mysql'

fix bug

See merge request root/atms!344

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

@@ -113,7 +113,14 @@
     <select id = "selectReportData" resultType="pwc.taxtech.atms.dpo.AnalysisSalesValueDto">
         select cell_template.row_index as rowIndex,
                cell_template.column_index as columnIndex,
-               CONVERT(cell_data.data, decimal(18, 2)) + CONVERT(if(data_source.amount is null, 0, data_source.amount),decimal(18, 2)) as data
+        case
+        when (LOCATE('-', cell_data.data) > 0) then
+        cell_data.data
+        else
+        CONVERT(cell_data.data, decimal(18, 2)) +
+        CONVERT(if(data_source.amount is null, 0, data_source.amount), decimal(18, 2))
+
+        end                      as data
         from period_cell_data cell_data
                left join period_cell_template cell_template
                     on cell_data.cell_template_id = cell_template.cell_template_id