formulaExp

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

@@ -212,7 +212,7 @@ public class ReportGeneratorImpl {
 
 
                         if (StringUtils.isBlank(resultFormula)) {
-                            resultFormula = null;
+                            resultFormula = " ";
                         }
                         cellData.setFormulaExp(resultFormula);
                         cellData.setCreateBy("Admin");

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

@@ -884,7 +884,7 @@ public class ReportServiceImpl {
                 cellData.setCellTemplateId(Long.parseLong(data.getCellTemplateId()));
                 cellData.setData(data.getAmount() == null ? null : data.getAmount().toString());
                 cellData.setKeyinData(data.getKeyinData());
-                cellData.setFormulaExp(data.getAmount() == null ? null : data.getAmount().toString());
+                cellData.setFormulaExp(data.getAmount() == null ? " " : data.getAmount().toString());
                 cellData.setCreateBy("admin");
                 cellData.setCreateTime(new Date());
                 cellData.setUpdateBy("admin");
@@ -897,6 +897,8 @@ public class ReportServiceImpl {
                 PeriodCellData cellData = periodCellDataMapper.selectByPrimaryKey(data.getCellId());
                 if(StringUtils.isNotBlank(data.getKeyinData())){
                     cellData.setKeyinData(data.getKeyinData());
+                    if (StringUtils.isEmpty(cellData.getFormulaExp()))
+                        cellData.setFormulaExp(data.getKeyinData());
                     periodCellDataMapper.updateByPrimaryKeySelective(cellData);
                 }else if (data.getAmount() != null && cellData.getData() != data.getAmount().toString()) {
                     cellData.setData(data.getAmount().toString());