Merge branch 'dev_mysql_chase_bug_1' into 'dev_mysql'

fix 报表计算小数位问题

See merge request root/atms!446

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

@@ -174,6 +174,13 @@ public class ReportGeneratorImpl {
                     //如果有正则匹配就进行更新公式解析
                     if (isFind) {
                         periodCellTemplateConfig.setParsedFormula(StringUtils.isNotBlank(resultFormula) ? resultFormula : null);
+                        if (StringUtils.isNotBlank(resultFormula)) {
+                            Pattern pattern = Pattern.compile("[0-9.]*");
+                            Matcher isNum = pattern.matcher(resultFormula);
+                            if (isNum.matches()) {
+                                periodCellTemplateConfig.setParsedFormula(new BigDecimal(resultFormula).setScale(2, BigDecimal.ROUND_CEILING).toString());
+                            }
+                        }
                         periodCellTemplateConfigMapper.updateByPrimaryKeySelective(periodCellTemplateConfig);
                     }
 
@@ -211,7 +218,7 @@ public class ReportGeneratorImpl {
                             Pattern pattern = Pattern.compile("[0-9.]*");
                             Matcher isNum = pattern.matcher(data);
                             if (isNum.matches()) {
-                                cellData.setData(new BigDecimal(data).toString());
+                                cellData.setData(new BigDecimal(data).setScale(2, BigDecimal.ROUND_CEILING).toString());
                             } else {
                                 cellData.setData(data);
                             }
@@ -275,7 +282,13 @@ public class ReportGeneratorImpl {
                                     cellData.setData("0.0");
                                 if (StringUtils.isEmpty(cellData.getFormulaExp().trim()))
                                     cellData.setFormulaExp("0.0");
-
+                                if (StringUtils.isNotBlank(cellData.getData())) {
+                                    Pattern pattern = Pattern.compile("[0-9.]*");
+                                    Matcher isNum = pattern.matcher(cellData.getData());
+                                    if (isNum.matches()) {
+                                        cellData.setData(new BigDecimal(cellData.getData()).setScale(2, BigDecimal.ROUND_CEILING).toString());
+                                    }
+                                }
                                 PeriodCellDataSource cellDataSource = new PeriodCellDataSource();
                                 cellDataSource.setId(distributedIdService.nextId());
                                 cellDataSource.setCellTemplateId(keyInCellTemplateConfig.getCellTemplateId());