Merge branch 'dev_neo' into 'dev'

[DEV] add some  data for data save in bb

See merge request root/atms!66

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/FormulaDataSourceDto.java

@@ -3,7 +3,7 @@ package pwc.taxtech.atms.dto.vatdto;
 import pwc.taxtech.atms.constant.enums.CellDataSourceType;
 
 public class FormulaDataSourceDto extends DataSourceDto {
-    Integer type;
+    public Integer type;
 
     public FormulaDataSourceDto() {
         super();

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/ReportCellDataSourceDto.java

@@ -39,6 +39,7 @@ public class ReportCellDataSourceDto extends FormulaDataSourceDto {
     public static ReportCellDataSourceDto extractFromGroup(BBParasBo bbParasBo, CurrentPeriodBo currentPeriodBo,
                                                      CellData cellData, CellTemplatePerGroupDto cellTemplateData) {
         ReportCellDataSourceDto dataSource = new ReportCellDataSourceDto();
+        dataSource.name = DataSourceName.ReportDataSource;
         dataSource.year = currentPeriodBo.curYear;
         dataSource.period = currentPeriodBo.curPeriod;
         dataSource.columnIndex = bbParasBo.getColumnIndex();

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

@@ -9,6 +9,7 @@ import pwc.taxtech.atms.dto.vatdto.CellTemplatePerGroupDto;
 import pwc.taxtech.atms.dto.vatdto.FormulaDataSourceDto;
 import pwc.taxtech.atms.entitiy.ProjectServiceType;
 import pwc.taxtech.atms.entitiy.ProjectServiceTypeExample;
+import pwc.taxtech.atms.service.impl.DistributedIDService;
 import pwc.taxtech.atms.vat.dao.CellDataMapper;
 import pwc.taxtech.atms.vat.dao.FormulaProjectMapper;
 import pwc.taxtech.atms.vat.dao.ReportMapper;
@@ -18,6 +19,7 @@ import pwc.taxtech.atms.vat.entity.DataSource;
 import pwc.taxtech.atms.vat.entity.Report;
 import pwc.taxtech.atms.vat.entity.ReportExample;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import static pwc.taxtech.atms.constant.Constant.FIRST_OR_DEFAULT;
@@ -32,6 +34,8 @@ public class FormulaAgent extends VatAbstractService {
     public ReportMapper reportMapper;
     @Autowired
     public CellDataMapper cellDataMapper;
+    @Autowired
+    public DistributedIDService distributedIDService;
 
 
     public List<CellTemplatePerGroupDto> getCellTemplateGroupDto(Long templateGroupId, String projectId) {
@@ -73,20 +77,20 @@ public class FormulaAgent extends VatAbstractService {
         return null;
     }
 
-    public void save(List<FormulaDataSourceDto> dataSourceDtos){
-        dataSourceDtos.forEach(m->{
+    public void save(List<FormulaDataSourceDto> dataSourceDtos) {
+        dataSourceDtos.forEach(m -> {
             DataSource ds = new DataSource();
-            ds.setAmount(m.getAmount());
+            ds.setAmount(m.getAmount()==null?new BigDecimal(0) :m.getAmount());
             ds.setCreateBy(m.getCreator());
             ds.setCreateTime(m.getCreateTime());
-            ds.setDescription(m.getDescription());
+            ds.setDescription(m.getDescription() == null ? "" : m.getDescription());
             ds.setKeyValueDataId(m.getKeyValueDataID());
             ds.setName(m.getName());
             ds.setId(m.getId());
-            ds.setType(m.getType());
+            ds.setType(m.type);
             ds.setUpdateBy(m.getUpdater());
             ds.setUpdateTime(m.getUpdateTime());
-
+            ds.setId(distributedIDService.nextId());
             dataSourceMapper.insert(ds);
         });
 

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

@@ -116,6 +116,8 @@ public class ReportFormulaFactory {
                     MyAsserts.assertNotNull(cellData, Exceptions.BB_CELL_DATA_NULL);
 
                     nullCellDto = ReportCellDataSourceDto.extractFromGroup(bo, curPeriod, cellData, cellTemplateData);
+                    closeDataSource.clean();
+                    closeDataSource.addDS(nullCellDto);
                     // todo: fix datasource name by templateList(neo)
 
                     MyAsserts.assertNotNull(cellData.getData(), Exceptions.BB_CELL_DATA_NULL);