[bugfix] formula datasource insert use cell datasouce

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

@@ -6,18 +6,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CloseableFormulaDataSource implements AutoCloseable{
-  private   List<FormulaDataSourceDto> dataSourceList = new ArrayList<>();
+  private   List<ReportCellDataSourceDto> dataSourceList = new ArrayList<>();
   private FormulaAgent agent;
 
     public CloseableFormulaDataSource(FormulaAgent agent) {
         this.agent = agent;
     }
 
-    public void addDS(FormulaDataSourceDto ds){
+    public void addDS(ReportCellDataSourceDto ds){
         dataSourceList.add(ds);
     }
 
-    public void addDS(List<FormulaDataSourceDto> dss){
+    public void addDS(List<ReportCellDataSourceDto> dss){
         dataSourceList.addAll(dss);
     }
 

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import pwc.taxtech.atms.constant.Constant;
+import lombok.Getter;
 import pwc.taxtech.atms.constant.DataSourceName;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
-import pwc.taxtech.atms.dto.CellTemplateDto;
 import pwc.taxtech.atms.vat.entity.CellData;
 
+@Getter
 public class ReportCellDataSourceDto extends FormulaDataSourceDto {
     Integer year;
     Integer period;
@@ -37,7 +37,7 @@ public class ReportCellDataSourceDto extends FormulaDataSourceDto {
     }
 
     public static ReportCellDataSourceDto extractFromGroup(BBParasBo bbParasBo, CurrentPeriodBo currentPeriodBo,
-                                                     CellData cellData, CellTemplatePerGroupDto cellTemplateData) {
+                                                           CellData cellData, CellTemplatePerGroupDto cellTemplateData) {
         ReportCellDataSourceDto dataSource = new ReportCellDataSourceDto();
         dataSource.name = DataSourceName.ReportDataSource;
         dataSource.year = currentPeriodBo.curYear;

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

@@ -7,6 +7,7 @@ import pwc.taxtech.atms.dao.FormulaAdminMapper;
 import pwc.taxtech.atms.dto.GroupId;
 import pwc.taxtech.atms.dto.vatdto.CellTemplatePerGroupDto;
 import pwc.taxtech.atms.dto.vatdto.FormulaDataSourceDto;
+import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
 import pwc.taxtech.atms.entitiy.ProjectServiceType;
 import pwc.taxtech.atms.entitiy.ProjectServiceTypeExample;
 import pwc.taxtech.atms.service.impl.DistributedIDService;
@@ -20,6 +21,7 @@ import pwc.taxtech.atms.vat.entity.Report;
 import pwc.taxtech.atms.vat.entity.ReportExample;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import static pwc.taxtech.atms.constant.Constant.FIRST_OR_DEFAULT;
@@ -77,20 +79,24 @@ public class FormulaAgent extends VatAbstractService {
         return null;
     }
 
-    public void save(List<FormulaDataSourceDto> dataSourceDtos) {
+    public void save(List<ReportCellDataSourceDto> dataSourceDtos) {
         dataSourceDtos.forEach(m -> {
             DataSource ds = new DataSource();
-            ds.setAmount(m.getAmount()==null?new BigDecimal(0) :m.getAmount());
-            ds.setCreateBy(m.getCreator());
-            ds.setCreateTime(m.getCreateTime());
+            ds.setAmount(m.getAmount() == null ? new BigDecimal(0) : m.getAmount());
+            ds.setCreateBy(m.getCreator() == null ? "Admin" : m.getCreator());
+            ds.setCreateTime(m.getCreateTime() == null ? new Date() : m.getCreateTime());
             ds.setDescription(m.getDescription() == null ? "" : m.getDescription());
             ds.setKeyValueDataId(m.getKeyValueDataID());
             ds.setName(m.getName());
-            ds.setId(m.getId());
             ds.setType(m.type);
-            ds.setUpdateBy(m.getUpdater());
-            ds.setUpdateTime(m.getUpdateTime());
+            ds.setUpdateBy(m.getUpdater() == null ? "Admin" : m.getUpdater());
+            ds.setUpdateTime(m.getUpdateTime() == null ? new Date() : m.getUpdateTime());
             ds.setId(distributedIDService.nextId());
+            ds.setKeyValueDataId(m.getDescription()==null"":m.getDescription());//TODO: tobe fixed
+            ds.setRowName(m.getRowName()==null?"":m.getRowName());
+            ds.setColumnName(m.getColumnName()==null?"":m.getColumnName());
+            ds.setRowIndex(m.getRowIndex());
+            ds.setColumnIndex(m.getColumnIndex());
             dataSourceMapper.insert(ds);
         });