[Bugfix] revert formual revert default value fixed null db field instead

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

@@ -842,9 +842,8 @@ public class ReportServiceImpl {
                 dataSourceModel = dataSourceExtendDtos.get(0).getDataSource();
                 updateCellValueForDataSourceChange(dataSourceModel, data.getAmount());
                 originalAmount = dataSourceModel.getAmount() != null ? dataSourceModel.getAmount() : new BigDecimal("0");
-                dataSourceModel.setKeyValueDataId("EmptyKeyDataValueDataId");
-                dataSourceModel.setName(Utils.isEmpty(data.getName()) ? "EmptyName" : data.getName());
-                dataSourceModel.setDescription(Utils.isEmpty(data.getDescription()) ? "EmptyDescription" : data.getDescription());
+                dataSourceModel.setName(data.getName());
+                dataSourceModel.setDescription(data.getDescription());
                 dataSourceModel.setAmount(data.getAmount());
                 dataSourceModel.setUpdateBy("Admin");
                 dataSourceModel.setUpdateTime(new Date());
@@ -854,9 +853,8 @@ public class ReportServiceImpl {
                 Long cellDataSourceId = distributedIdService.nextId();
                 dataSourceModel.setId(cellDataSourceId);
                 dataSourceModel.setType(FormulaDataSourceType.KeyInSource.getCode());
-                dataSourceModel.setName(Utils.isEmpty(data.getName()) ? "EmptyName" : data.getName());
-                dataSourceModel.setDescription(Utils.isEmpty(data.getDescription()) ? "EmptyDescription" : data.getDescription());
-                dataSourceModel.setKeyValueDataId("EmptyKeyValueDataId");
+                dataSourceModel.setName(data.getName());
+                dataSourceModel.setDescription(data.getDescription());
                 dataSourceModel.setCellTemplateId(Long.parseLong(data.getCellTemplateId()));
                 dataSourceModel.setAmount(data.getAmount());
                 if (periodCellTemplate.isPresent()) {
@@ -918,7 +916,6 @@ public class ReportServiceImpl {
                                 dataSource.setAmount(data.getAmount());
                                 dataSource.setUpdateBy("admin");
                                 dataSource.setUpdateTime(new Date());
-                                dataSource.setKeyValueDataId("EmptyKeyValueDataId");
                                 periodDataSourceMapper.updateByPrimaryKeySelective(dataSource);
                                 if (!cellData.getData().equals("#VALUE!")) {
                                     cellData.setData(new BigDecimal(cellData.getData()).add(changeValue).toString());