编译调整

atms-api/pom.xml

@@ -294,11 +294,6 @@
             <artifactId>reflectasm</artifactId>
             <version>1.11.7</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.0</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

atms-api/src/main/java/pwc/taxtech/atms/dto/Common/RemoteValidationRetDto.java

 package pwc.taxtech.atms.dto.Common;
 
 
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
 public class RemoteValidationRetDto {
 
     private Boolean isValid;
     private String value;
 
+    public Boolean getIsValid() {
+        return this.isValid;
+    }
+
+    public void setIsValid(Boolean valid) {
+        this.isValid = valid;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/approval/ApprovalDto.java

 package pwc.taxtech.atms.dto.approval;
 
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
 public class ApprovalDto {
     private String projectId;
     private Long reportId;
@@ -30,4 +25,44 @@ public class ApprovalDto {
     public Integer getYear(){
         return Integer.parseInt(periodDate.split("\\.")[0]);
     }
+
+    public String getProjectId() {
+        return this.projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Long getReportId() {
+        return this.reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getPeriodDate() {
+        return this.periodDate;
+    }
+
+    public void setPeriodDate(String periodDate) {
+        this.periodDate = periodDate;
+    }
+
+    public String getInstanceId() {
+        return this.instanceId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/approval/ApprovalTask.java

 package pwc.taxtech.atms.dto.approval;
 
-import lombok.Getter;
-import lombok.Setter;
 import org.activiti.engine.task.Task;
 
-@Getter
-@Setter
 public class ApprovalTask {
     private String taskId;
     private String name;
@@ -35,4 +31,52 @@ public class ApprovalTask {
         setProcessDefinitionId(task.getProcessDefinitionId());
         return this;
     }
+
+    public String getTaskId() {
+        return this.taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAssignee() {
+        return this.assignee;
+    }
+
+    public void setAssignee(String assignee) {
+        this.assignee = assignee;
+    }
+
+    public String getExecutionId() {
+        return this.executionId;
+    }
+
+    public void setExecutionId(String executionId) {
+        this.executionId = executionId;
+    }
+
+    public String getProcessInstanceId() {
+        return this.processInstanceId;
+    }
+
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+
+    public String getProcessDefinitionId() {
+        return this.processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Setter
-@Getter
 public class AssetDetailDataSourceDto extends FormulaDataSourceDto {
     public AssetDetailDataSourceDto() {
         super();
@@ -52,4 +48,267 @@ public class AssetDetailDataSourceDto extends FormulaDataSourceDto {
     public int dataType;
     public Integer detailGroupType;
 
+    public String getAssetNumber() {
+        return this.assetNumber;
+    }
+
+    public void setAssetNumber(String assetNumber) {
+        this.assetNumber = assetNumber;
+    }
+
+    public String getAssetGroupName() {
+        return this.assetGroupName;
+    }
+
+    public void setAssetGroupName(String assetGroupName) {
+        this.assetGroupName = assetGroupName;
+    }
+
+    public String getAssetDetailGroupId() {
+        return this.assetDetailGroupId;
+    }
+
+    public void setAssetDetailGroupId(String assetDetailGroupId) {
+        this.assetDetailGroupId = assetDetailGroupId;
+    }
+
+    public String getAssetDescription() {
+        return this.assetDescription;
+    }
+
+    public void setAssetDescription(String assetDescription) {
+        this.assetDescription = assetDescription;
+    }
+
+    public Date getBuyDate() {
+        return this.buyDate;
+    }
+
+    public void setBuyDate(Date buyDate) {
+        this.buyDate = buyDate;
+    }
+
+    public Date getDepreciationDate() {
+        return this.depreciationDate;
+    }
+
+    public void setDepreciationDate(Date depreciationDate) {
+        this.depreciationDate = depreciationDate;
+    }
+
+    public Integer getDepreciationPeriod() {
+        return this.depreciationPeriod;
+    }
+
+    public void setDepreciationPeriod(Integer depreciationPeriod) {
+        this.depreciationPeriod = depreciationPeriod;
+    }
+
+    public BigDecimal getAcquisitionValue() {
+        return this.acquisitionValue;
+    }
+
+    public void setAcquisitionValue(BigDecimal acquisitionValue) {
+        this.acquisitionValue = acquisitionValue;
+    }
+
+    public BigDecimal getAdjustmentValue() {
+        return this.adjustmentValue;
+    }
+
+    public void setAdjustmentValue(BigDecimal adjustmentValue) {
+        this.adjustmentValue = adjustmentValue;
+    }
+
+    public Date getDisposedDate() {
+        return this.disposedDate;
+    }
+
+    public void setDisposedDate(Date disposedDate) {
+        this.disposedDate = disposedDate;
+    }
+
+    public BigDecimal getResidualRate() {
+        return this.residualRate;
+    }
+
+    public void setResidualRate(BigDecimal residualRate) {
+        this.residualRate = residualRate;
+    }
+
+    public BigDecimal getYearDepreciationAmount() {
+        return this.yearDepreciationAmount;
+    }
+
+    public void setYearDepreciationAmount(BigDecimal yearDepreciationAmount) {
+        this.yearDepreciationAmount = yearDepreciationAmount;
+    }
+
+    public BigDecimal getYearAdjustmentAmount() {
+        return this.yearAdjustmentAmount;
+    }
+
+    public void setYearAdjustmentAmount(BigDecimal yearAdjustmentAmount) {
+        this.yearAdjustmentAmount = yearAdjustmentAmount;
+    }
+
+    public BigDecimal getYearEndValue() {
+        return this.yearEndValue;
+    }
+
+    public void setYearEndValue(BigDecimal yearEndValue) {
+        this.yearEndValue = yearEndValue;
+    }
+
+    public Integer getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public BigDecimal getAccountAcquisitionValue() {
+        return this.accountAcquisitionValue;
+    }
+
+    public void setAccountAcquisitionValue(BigDecimal accountAcquisitionValue) {
+        this.accountAcquisitionValue = accountAcquisitionValue;
+    }
+
+    public BigDecimal getAccountMonthDepreciationAmount() {
+        return this.accountMonthDepreciationAmount;
+    }
+
+    public void setAccountMonthDepreciationAmount(BigDecimal accountMonthDepreciationAmount) {
+        this.accountMonthDepreciationAmount = accountMonthDepreciationAmount;
+    }
+
+    public BigDecimal getAccountYearDepreciationAmount() {
+        return this.accountYearDepreciationAmount;
+    }
+
+    public void setAccountYearDepreciationAmount(BigDecimal accountYearDepreciationAmount) {
+        this.accountYearDepreciationAmount = accountYearDepreciationAmount;
+    }
+
+    public BigDecimal getAccountTotalepreciationAmount() {
+        return this.accountTotalepreciationAmount;
+    }
+
+    public void setAccountTotalepreciationAmount(BigDecimal accountTotalepreciationAmount) {
+        this.accountTotalepreciationAmount = accountTotalepreciationAmount;
+    }
+
+    public Integer getTaxDepreciationPeriod() {
+        return this.taxDepreciationPeriod;
+    }
+
+    public void setTaxDepreciationPeriod(Integer taxDepreciationPeriod) {
+        this.taxDepreciationPeriod = taxDepreciationPeriod;
+    }
+
+    public Integer getTaxToLastYearDepreciationPeriod() {
+        return this.taxToLastYearDepreciationPeriod;
+    }
+
+    public void setTaxToLastYearDepreciationPeriod(Integer taxToLastYearDepreciationPeriod) {
+        this.taxToLastYearDepreciationPeriod = taxToLastYearDepreciationPeriod;
+    }
+
+    public Integer getTaxToCurrentYearDepreciationPeriod() {
+        return this.taxToCurrentYearDepreciationPeriod;
+    }
+
+    public void setTaxToCurrentYearDepreciationPeriod(Integer taxToCurrentYearDepreciationPeriod) {
+        this.taxToCurrentYearDepreciationPeriod = taxToCurrentYearDepreciationPeriod;
+    }
+
+    public Integer getTaxYearDepreciationPeriod() {
+        return this.taxYearDepreciationPeriod;
+    }
+
+    public void setTaxYearDepreciationPeriod(Integer taxYearDepreciationPeriod) {
+        this.taxYearDepreciationPeriod = taxYearDepreciationPeriod;
+    }
+
+    public BigDecimal getTaxMonthDepreciationAmount() {
+        return this.taxMonthDepreciationAmount;
+    }
+
+    public void setTaxMonthDepreciationAmount(BigDecimal taxMonthDepreciationAmount) {
+        this.taxMonthDepreciationAmount = taxMonthDepreciationAmount;
+    }
+
+    public BigDecimal getTaxToCurrentYearDepreciationAmount() {
+        return this.taxToCurrentYearDepreciationAmount;
+    }
+
+    public void setTaxToCurrentYearDepreciationAmount(BigDecimal taxToCurrentYearDepreciationAmount) {
+        this.taxToCurrentYearDepreciationAmount = taxToCurrentYearDepreciationAmount;
+    }
+
+    public BigDecimal getTaxCurrentYearDepreciationAmount() {
+        return this.taxCurrentYearDepreciationAmount;
+    }
+
+    public void setTaxCurrentYearDepreciationAmount(BigDecimal taxCurrentYearDepreciationAmount) {
+        this.taxCurrentYearDepreciationAmount = taxCurrentYearDepreciationAmount;
+    }
+
+    public BigDecimal getTotalDifferenceAmount() {
+        return this.totalDifferenceAmount;
+    }
+
+    public void setTotalDifferenceAmount(BigDecimal totalDifferenceAmount) {
+        this.totalDifferenceAmount = totalDifferenceAmount;
+    }
+
+    public BigDecimal getYearDifferenceAmount() {
+        return this.yearDifferenceAmount;
+    }
+
+    public void setYearDifferenceAmount(BigDecimal yearDifferenceAmount) {
+        this.yearDifferenceAmount = yearDifferenceAmount;
+    }
+
+    public Integer getAssetType() {
+        return this.assetType;
+    }
+
+    public void setAssetType(Integer assetType) {
+        this.assetType = assetType;
+    }
+
+    public Boolean getIsRetain() {
+        return this.isRetain;
+    }
+
+    public void setIsRetain(Boolean retain) {
+        this.isRetain = retain;
+    }
+
+    public String getAssetDetailGroupName() {
+        return this.assetDetailGroupName;
+    }
+
+    public void setAssetDetailGroupName(String assetDetailGroupName) {
+        this.assetDetailGroupName = assetDetailGroupName;
+    }
+
+    public int getDataType() {
+        return this.dataType;
+    }
+
+    public void setDataType(int dataType) {
+        this.dataType = dataType;
+    }
+
+    public Integer getDetailGroupType() {
+        return this.detailGroupType;
+    }
+
+    public void setDetailGroupType(Integer detailGroupType) {
+        this.detailGroupType = detailGroupType;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
 import org.apache.poi.ss.formula.OperationEvaluationContext;
 import org.apache.poi.ss.formula.eval.EvaluationException;
 import org.apache.poi.ss.formula.eval.ValueEval;
@@ -12,7 +11,6 @@ import static pwc.taxtech.atms.common.util.FormulaUtil.resolverInteger;
 import static pwc.taxtech.atms.common.util.FormulaUtil.resolverString;
 import static pwc.taxtech.atms.exception.Exceptions.BAD_BBVO_PARAMS;
 
-@Getter
 public class BBParasBo {
     private String reportCode;
     private Integer columnIndex;
@@ -118,6 +116,62 @@ public class BBParasBo {
         return formulaExpression;
     }
 
+    public String getReportCode() {
+        return this.reportCode;
+    }
+
+    public void setReportCode(String reportCode) {
+        this.reportCode = reportCode;
+    }
+
+    public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+    public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Integer getYear() {
+        return this.year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public String getFormulaExpression() {
+        return this.formulaExpression;
+    }
+
+    public void setFormulaExpression(String formulaExpression) {
+        this.formulaExpression = formulaExpression;
+    }
+
+    public List<PeriodCellDataTemplate> getExpressionData() {
+        return this.expressionData;
+    }
+
+    public void setExpressionData(List<PeriodCellDataTemplate> expressionData) {
+        this.expressionData = expressionData;
+    }
+
     @Override
     public String toString() {
         return "BBParasBo{" +

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.dto.CellTemplateConfigDto;
 import pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig;
 import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCell;
 
 import java.util.List;
 
-@Setter
-@Getter
 public class CellCalcInfoDto {
     @JsonProperty("cellID")
     private Long cellId;
@@ -76,4 +72,228 @@ public class CellCalcInfoDto {
     private String comment;
 
     private List<PeriodCellTemplateConfig> configList;
+
+    public Long getCellId() {
+        return this.cellId;
+    }
+
+    public void setCellId(Long cellId) {
+        this.cellId = cellId;
+    }
+
+    public Long getReportId() {
+        return this.reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+    public String getColumnName() {
+        return this.columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public String getRowName() {
+        return this.rowName;
+    }
+
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    public String getFormula() {
+        return this.formula;
+    }
+
+    public void setFormula(String formula) {
+        this.formula = formula;
+    }
+
+    public String getParsedFormula() {
+        return this.parsedFormula;
+    }
+
+    public void setParsedFormula(String parsedFormula) {
+        this.parsedFormula = parsedFormula;
+    }
+
+    public Boolean getIsCalculated() {
+        return this.isCalculated;
+    }
+
+    public void setIsCalculated(Boolean calculated) {
+        this.isCalculated = calculated;
+    }
+
+    public String getCellValue() {
+        return this.cellValue;
+    }
+
+    public void setCellValue(String cellValue) {
+        this.cellValue = cellValue;
+    }
+
+    public String getCellTemplateId() {
+        return this.cellTemplateId;
+    }
+
+    public void setCellTemplateId(String cellTemplateId) {
+        this.cellTemplateId = cellTemplateId;
+    }
+
+    public Long getReportTemplateId() {
+        return this.reportTemplateId;
+    }
+
+    public void setReportTemplateId(Long reportTemplateId) {
+        this.reportTemplateId = reportTemplateId;
+    }
+
+    public Integer getDataType() {
+        return this.dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+
+    public Boolean getIsReadOnly() {
+        return this.isReadOnly;
+    }
+
+    public void setIsReadOnly(Boolean readOnly) {
+        this.isReadOnly = readOnly;
+    }
+
+    public String getDataSourceExp() {
+        return this.dataSourceExp;
+    }
+
+    public void setDataSourceExp(String dataSourceExp) {
+        this.dataSourceExp = dataSourceExp;
+    }
+
+    public String getFormulaExp() {
+        return this.formulaExp;
+    }
+
+    public void setFormulaExp(String formulaExp) {
+        this.formulaExp = formulaExp;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Boolean getDataSourceAvailable() {
+        return this.dataSourceAvailable;
+    }
+
+    public void setDataSourceAvailable(Boolean dataSourceAvailable) {
+        this.dataSourceAvailable = dataSourceAvailable;
+    }
+
+    public CellTemplateConfigDto getCellTemplateConfig() {
+        return this.cellTemplateConfig;
+    }
+
+    public void setCellTemplateConfig(CellTemplateConfigDto cellTemplateConfig) {
+        this.cellTemplateConfig = cellTemplateConfig;
+    }
+
+    public List<DataSourceDto> getDataSourceList() {
+        return this.dataSourceList;
+    }
+
+    public void setDataSourceList(List<DataSourceDto> dataSourceList) {
+        this.dataSourceList = dataSourceList;
+    }
+
+    public InvoiceListDto getDataInvoiceList() {
+        return this.dataInvoiceList;
+    }
+
+    public void setDataInvoiceList(InvoiceListDto dataInvoiceList) {
+        this.dataInvoiceList = dataInvoiceList;
+    }
+
+    public Boolean getIsModified() {
+        return this.isModified;
+    }
+
+    public void setIsModified(Boolean modified) {
+        this.isModified = modified;
+    }
+
+    public PeriodModifiedReportCell getModifiedReportCell() {
+        return this.modifiedReportCell;
+    }
+
+    public void setModifiedReportCell(PeriodModifiedReportCell modifiedReportCell) {
+        this.modifiedReportCell = modifiedReportCell;
+    }
+
+    public List<CellVoucherDatasourceDto> getDataVoucherList() {
+        return this.dataVoucherList;
+    }
+
+    public void setDataVoucherList(List<CellVoucherDatasourceDto> dataVoucherList) {
+        this.dataVoucherList = dataVoucherList;
+    }
+
+    public Boolean getIsConfigured() {
+        return this.isConfigured;
+    }
+
+    public void setIsConfigured(Boolean configured) {
+        this.isConfigured = configured;
+    }
+
+    public Boolean getHasModelError() {
+        return this.hasModelError;
+    }
+
+    public void setHasModelError(Boolean hasModelError) {
+        this.hasModelError = hasModelError;
+    }
+
+    public String getComment() {
+        return this.comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public List<PeriodCellTemplateConfig> getConfigList() {
+        return this.configList;
+    }
+
+    public void setConfigList(List<PeriodCellTemplateConfig> configList) {
+        this.configList = configList;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.dto.CellTemplateConfigDto;
 import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCell;
 
 import java.util.List;
 
-@Getter
-@Setter
 public class CellDataDto {
     @JsonProperty("cellID")
     private String cellId;
@@ -63,4 +59,204 @@ public class CellDataDto {
     private List<CellVoucherDatasourceDto> dataVoucherList;
 
     private Boolean isConfigured;
+
+    public String getCellId() {
+        return this.cellId;
+    }
+
+    public void setCellId(String cellId) {
+        this.cellId = cellId;
+    }
+
+    public String getReportId() {
+        return this.reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public int getColumnIndex() {
+        return this.columnIndex;
+    }
+
+    public void setColumnIndex(int columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+    public String getColumnName() {
+        return this.columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public int getRowIndex() {
+        return this.rowIndex;
+    }
+
+    public void setRowIndex(int rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public String getRowName() {
+        return this.rowName;
+    }
+
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    public String getFormula() {
+        return this.formula;
+    }
+
+    public void setFormula(String formula) {
+        this.formula = formula;
+    }
+
+    public Boolean getIsCalculated() {
+        return this.isCalculated;
+    }
+
+    public void setIsCalculated(Boolean calculated) {
+        this.isCalculated = calculated;
+    }
+
+    public String getCellValue() {
+        return this.cellValue;
+    }
+
+    public void setCellValue(String cellValue) {
+        this.cellValue = cellValue;
+    }
+
+    public String getKeyinData() {
+        return this.keyinData;
+    }
+
+    public void setKeyinData(String keyinData) {
+        this.keyinData = keyinData;
+    }
+
+    public String getCellTemplateId() {
+        return this.cellTemplateId;
+    }
+
+    public void setCellTemplateId(String cellTemplateId) {
+        this.cellTemplateId = cellTemplateId;
+    }
+
+    public String getReportTemplateId() {
+        return this.reportTemplateId;
+    }
+
+    public void setReportTemplateId(String reportTemplateId) {
+        this.reportTemplateId = reportTemplateId;
+    }
+
+    public Integer getDataType() {
+        return this.dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+
+    public Boolean getIsReadOnly() {
+        return this.isReadOnly;
+    }
+
+    public void setIsReadOnly(Boolean readOnly) {
+        this.isReadOnly = readOnly;
+    }
+
+    public String getDataSourceExp() {
+        return this.dataSourceExp;
+    }
+
+    public void setDataSourceExp(String dataSourceExp) {
+        this.dataSourceExp = dataSourceExp;
+    }
+
+    public String getFormulaExp() {
+        return this.formulaExp;
+    }
+
+    public void setFormulaExp(String formulaExp) {
+        this.formulaExp = formulaExp;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Boolean getDataSourceAvailable() {
+        return this.dataSourceAvailable;
+    }
+
+    public void setDataSourceAvailable(Boolean dataSourceAvailable) {
+        this.dataSourceAvailable = dataSourceAvailable;
+    }
+
+    public CellTemplateConfigDto getCellTemplateConfig() {
+        return this.cellTemplateConfig;
+    }
+
+    public void setCellTemplateConfig(CellTemplateConfigDto cellTemplateConfig) {
+        this.cellTemplateConfig = cellTemplateConfig;
+    }
+
+    public List<DataSourceDto> getDataSourceList() {
+        return this.dataSourceList;
+    }
+
+    public void setDataSourceList(List<DataSourceDto> dataSourceList) {
+        this.dataSourceList = dataSourceList;
+    }
+
+    public List<InvoiceListDto> getDataInvoiceList() {
+        return this.dataInvoiceList;
+    }
+
+    public void setDataInvoiceList(List<InvoiceListDto> dataInvoiceList) {
+        this.dataInvoiceList = dataInvoiceList;
+    }
+
+    public Boolean getIsModified() {
+        return this.isModified;
+    }
+
+    public void setIsModified(Boolean modified) {
+        this.isModified = modified;
+    }
+
+    public PeriodModifiedReportCell getModifiedReportCell() {
+        return this.modifiedReportCell;
+    }
+
+    public void setModifiedReportCell(PeriodModifiedReportCell modifiedReportCell) {
+        this.modifiedReportCell = modifiedReportCell;
+    }
+
+    public List<CellVoucherDatasourceDto> getDataVoucherList() {
+        return this.dataVoucherList;
+    }
+
+    public void setDataVoucherList(List<CellVoucherDatasourceDto> dataVoucherList) {
+        this.dataVoucherList = dataVoucherList;
+    }
+
+    public Boolean getIsConfigured() {
+        return this.isConfigured;
+    }
+
+    public void setIsConfigured(Boolean configured) {
+        this.isConfigured = configured;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Setter
-@Getter
 public class CellInvoiceDto {
     String id;
     Integer period;
@@ -23,4 +18,108 @@ public class CellInvoiceDto {
     String dataSourceName;
     Integer operationType;
     Integer invoiceType;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getInvoiceDate() {
+        return this.invoiceDate;
+    }
+
+    public void setInvoiceDate(Date invoiceDate) {
+        this.invoiceDate = invoiceDate;
+    }
+
+    public String getInvoiceNumber() {
+        return this.invoiceNumber;
+    }
+
+    public void setInvoiceNumber(String invoiceNumber) {
+        this.invoiceNumber = invoiceNumber;
+    }
+
+    public String getInvoiceCode() {
+        return this.invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
+
+    public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return this.taxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+
+    public BigDecimal getRate() {
+        return this.rate;
+    }
+
+    public void setRate(BigDecimal rate) {
+        this.rate = rate;
+    }
+
+    public String getProductionName() {
+        return this.productionName;
+    }
+
+    public void setProductionName(String productionName) {
+        this.productionName = productionName;
+    }
+
+    public String getDataSourceId() {
+        return this.dataSourceId;
+    }
+
+    public void setDataSourceId(String dataSourceId) {
+        this.dataSourceId = dataSourceId;
+    }
+
+    public String getDataSourceName() {
+        return this.dataSourceName;
+    }
+
+    public void setDataSourceName(String dataSourceName) {
+        this.dataSourceName = dataSourceName;
+    }
+
+    public Integer getOperationType() {
+        return this.operationType;
+    }
+
+    public void setOperationType(Integer operationType) {
+        this.operationType = operationType;
+    }
+
+    public Integer getInvoiceType() {
+        return this.invoiceType;
+    }
+
+    public void setInvoiceType(Integer invoiceType) {
+        this.invoiceType = invoiceType;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
 
-@Setter
-@Getter
 public class CellTemplateReferenceDto {
     @JsonProperty("referenceFromCellID")
     private String referenceFromCellId;
@@ -18,4 +14,52 @@ public class CellTemplateReferenceDto {
     @JsonProperty("referenceToKeyValueID")
     private String referenceToKeyValueId;
     private Boolean isResolved;
+
+    public String getReferenceFromCellId() {
+        return this.referenceFromCellId;
+    }
+
+    public void setReferenceFromCellId(String referenceFromCellId) {
+        this.referenceFromCellId = referenceFromCellId;
+    }
+
+    public String getReferenceFromTemplateId() {
+        return this.referenceFromTemplateId;
+    }
+
+    public void setReferenceFromTemplateId(String referenceFromTemplateId) {
+        this.referenceFromTemplateId = referenceFromTemplateId;
+    }
+
+    public String getReferenceToCellId() {
+        return this.referenceToCellId;
+    }
+
+    public void setReferenceToCellId(String referenceToCellId) {
+        this.referenceToCellId = referenceToCellId;
+    }
+
+    public String getReferenceToTemplateId() {
+        return this.referenceToTemplateId;
+    }
+
+    public void setReferenceToTemplateId(String referenceToTemplateId) {
+        this.referenceToTemplateId = referenceToTemplateId;
+    }
+
+    public String getReferenceToKeyValueId() {
+        return this.referenceToKeyValueId;
+    }
+
+    public void setReferenceToKeyValueId(String referenceToKeyValueId) {
+        this.referenceToKeyValueId = referenceToKeyValueId;
+    }
+
+    public Boolean getIsResolved() {
+        return this.isResolved;
+    }
+
+    public void setIsResolved(Boolean resolved) {
+        this.isResolved = resolved;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Getter
-@Setter
 public class CellVoucherDto {
     String id;
     Integer period;
@@ -33,4 +28,108 @@ public class CellVoucherDto {
     String dataSourceId;
     //数据源名称
     String dataSourceName;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getAccountSubject() {
+        return this.accountSubject;
+    }
+
+    public void setAccountSubject(String accountSubject) {
+        this.accountSubject = accountSubject;
+    }
+
+    public String getStdAccount() {
+        return this.stdAccount;
+    }
+
+    public void setStdAccount(String stdAccount) {
+        this.stdAccount = stdAccount;
+    }
+
+    public String getVoucherCode() {
+        return this.voucherCode;
+    }
+
+    public void setVoucherCode(String voucherCode) {
+        this.voucherCode = voucherCode;
+    }
+
+    public String getVoucherSummary() {
+        return this.voucherSummary;
+    }
+
+    public void setVoucherSummary(String voucherSummary) {
+        this.voucherSummary = voucherSummary;
+    }
+
+    public BigDecimal getDebitAmount() {
+        return this.debitAmount;
+    }
+
+    public void setDebitAmount(BigDecimal debitAmount) {
+        this.debitAmount = debitAmount;
+    }
+
+    public BigDecimal getCreditAmount() {
+        return this.creditAmount;
+    }
+
+    public void setCreditAmount(BigDecimal creditAmount) {
+        this.creditAmount = creditAmount;
+    }
+
+    public Integer getDirection() {
+        return this.direction;
+    }
+
+    public void setDirection(Integer direction) {
+        this.direction = direction;
+    }
+
+    public Date getDate() {
+        return this.date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getDataSourceId() {
+        return this.dataSourceId;
+    }
+
+    public void setDataSourceId(String dataSourceId) {
+        this.dataSourceId = dataSourceId;
+    }
+
+    public String getDataSourceName() {
+        return this.dataSourceName;
+    }
+
+    public void setDataSourceName(String dataSourceName) {
+        this.dataSourceName = dataSourceName;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-
-@Getter
 public class CurrentPeriodBo {
     int curYear = 0;
     int curPeriod;
@@ -36,6 +33,22 @@ public class CurrentPeriodBo {
         }
     }
 
+    public int getCurYear() {
+        return this.curYear;
+    }
+
+    public void setCurYear(int curYear) {
+        this.curYear = curYear;
+    }
+
+    public int getCurPeriod() {
+        return this.curPeriod;
+    }
+
+    public void setCurPeriod(int curPeriod) {
+        this.curPeriod = curPeriod;
+    }
+
     @Override
     public String toString() {
         return "CurrentPeriodBo{" +

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.vat.entity.CellData;
 import pwc.taxtech.atms.vat.entity.CellDataSource;
 
-@Getter
-@Setter
 public class DataSourceCellDataDto {
     Long id;
     CellData cellData;
     CellDataSource cellDataSource;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public CellData getCellData() {
+        return this.cellData;
+    }
+
+    public void setCellData(CellData cellData) {
+        this.cellData = cellData;
+    }
+
+    public CellDataSource getCellDataSource() {
+        return this.cellDataSource;
+    }
+
+    public void setCellDataSource(CellDataSource cellDataSource) {
+        this.cellDataSource = cellDataSource;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-@Getter
-@Setter
 public class DataSourceDto {
 //    private static String _DataSourcePrefix = "DS[";
 //    private static String _DataSourceSuffix = "]";
@@ -59,4 +55,220 @@ public class DataSourceDto {
     String cellTemplateId;
     @JsonProperty("reportTemplateID")
     String reportTemplateId;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getDataSourceType() {
+        return this.dataSourceType;
+    }
+
+    public void setDataSourceType(Integer dataSourceType) {
+        this.dataSourceType = dataSourceType;
+    }
+
+    public String getKeyinData() {
+        return this.keyinData;
+    }
+
+    public void setKeyinData(String keyinData) {
+        this.keyinData = keyinData;
+    }
+
+    public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getOperationType() {
+        return this.operationType;
+    }
+
+    public void setOperationType(Integer operationType) {
+        this.operationType = operationType;
+    }
+
+    public Integer getResultType() {
+        return this.resultType;
+    }
+
+    public void setResultType(Integer resultType) {
+        this.resultType = resultType;
+    }
+
+    public Integer getType() {
+        return this.type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getKeyValueDataId() {
+        return this.keyValueDataId;
+    }
+
+    public void setKeyValueDataId(String keyValueDataId) {
+        this.keyValueDataId = keyValueDataId;
+    }
+
+    public String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdater() {
+        return this.updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCellDataId() {
+        return this.cellDataId;
+    }
+
+    public void setCellDataId(String cellDataId) {
+        this.cellDataId = cellDataId;
+    }
+
+    public List<String> getItems() {
+        return this.items;
+    }
+
+    public void setItems(List<String> items) {
+        this.items = items;
+    }
+
+    public String getProjectId() {
+        return this.projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getServiceTypeId() {
+        return this.serviceTypeId;
+    }
+
+    public void setServiceTypeId(String serviceTypeId) {
+        this.serviceTypeId = serviceTypeId;
+    }
+
+    public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+    public String getRowName() {
+        return this.rowName;
+    }
+
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    public String getColumnName() {
+        return this.columnName;
+    }
+
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    public Integer getYear() {
+        return this.year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public String getSummaryExp() {
+        return this.summaryExp;
+    }
+
+    public void setSummaryExp(String summaryExp) {
+        this.summaryExp = summaryExp;
+    }
+
+    public String getCellTemplateId() {
+        return this.cellTemplateId;
+    }
+
+    public void setCellTemplateId(String cellTemplateId) {
+        this.cellTemplateId = cellTemplateId;
+    }
+
+    public String getReportTemplateId() {
+        return this.reportTemplateId;
+    }
+
+    public void setReportTemplateId(String reportTemplateId) {
+        this.reportTemplateId = reportTemplateId;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
 public class DataSourceDtoExtend {
     String item1;
     DataSourceDto item2;
+
+    public String getItem1() {
+        return this.item1;
+    }
+
+    public void setItem1(String item1) {
+        this.item1 = item1;
+    }
+
+    public DataSourceDto getItem2() {
+        return this.item2;
+    }
+
+    public void setItem2(DataSourceDto item2) {
+        this.item2 = item2;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Setter
-@Getter
 public class InputInvoiceDataSourceDto extends FormulaDataSourceDto {
 
     public InputInvoiceDataSourceDto() {
@@ -23,4 +19,62 @@ public class InputInvoiceDataSourceDto extends FormulaDataSourceDto {
     public String invoiceNumber;
     public BigDecimal taxAmount;
     public Integer invoiceType;
+
+    @Override
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    @Override
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getCertificationDate() {
+        return this.certificationDate;
+    }
+
+    public void setCertificationDate(Date certificationDate) {
+        this.certificationDate = certificationDate;
+    }
+
+    public String getSellerTaxNumber() {
+        return this.sellerTaxNumber;
+    }
+
+    public void setSellerTaxNumber(String sellerTaxNumber) {
+        this.sellerTaxNumber = sellerTaxNumber;
+    }
+
+    public String getInvoiceCode() {
+        return this.invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
+
+    public String getInvoiceNumber() {
+        return this.invoiceNumber;
+    }
+
+    public void setInvoiceNumber(String invoiceNumber) {
+        this.invoiceNumber = invoiceNumber;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return this.taxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+
+    public Integer getInvoiceType() {
+        return this.invoiceType;
+    }
+
+    public void setInvoiceType(Integer invoiceType) {
+        this.invoiceType = invoiceType;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Setter
-@Getter
 public class InputInvoiceDetailDataSourceDto extends FormulaDataSourceDto {
     public InputInvoiceDetailDataSourceDto() {
         super();
@@ -22,4 +18,62 @@ public class InputInvoiceDetailDataSourceDto extends FormulaDataSourceDto {
     public BigDecimal TaxAmount;
     public BigDecimal TaxRate;
     public String ProductionName;
+
+    @Override
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    @Override
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getInvoiceDate() {
+        return this.InvoiceDate;
+    }
+
+    public void setInvoiceDate(Date invoiceDate) {
+        this.InvoiceDate = invoiceDate;
+    }
+
+    public String getInvoiceCode() {
+        return this.InvoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.InvoiceCode = invoiceCode;
+    }
+
+    public String getInvoiceNumber() {
+        return this.InvoiceNumber;
+    }
+
+    public void setInvoiceNumber(String invoiceNumber) {
+        this.InvoiceNumber = invoiceNumber;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return this.TaxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.TaxAmount = taxAmount;
+    }
+
+    public BigDecimal getTaxRate() {
+        return this.TaxRate;
+    }
+
+    public void setTaxRate(BigDecimal taxRate) {
+        this.TaxRate = taxRate;
+    }
+
+    public String getProductionName() {
+        return this.ProductionName;
+    }
+
+    public void setProductionName(String productionName) {
+        this.ProductionName = productionName;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Setter
-@Getter
 public class InputVATInvoiceItemExtendDto {
     String invoiceId;
     String invoiceItemId;
@@ -19,4 +14,84 @@ public class InputVATInvoiceItemExtendDto {
     BigDecimal amount;
     Integer invoiceType;
     BigDecimal taxAmount;
+
+    public String getInvoiceId() {
+        return this.invoiceId;
+    }
+
+    public void setInvoiceId(String invoiceId) {
+        this.invoiceId = invoiceId;
+    }
+
+    public String getInvoiceItemId() {
+        return this.invoiceItemId;
+    }
+
+    public void setInvoiceItemId(String invoiceItemId) {
+        this.invoiceItemId = invoiceItemId;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getCertificationDate() {
+        return this.certificationDate;
+    }
+
+    public void setCertificationDate(Date certificationDate) {
+        this.certificationDate = certificationDate;
+    }
+
+    public String getSellerTaxNumber() {
+        return this.sellerTaxNumber;
+    }
+
+    public void setSellerTaxNumber(String sellerTaxNumber) {
+        this.sellerTaxNumber = sellerTaxNumber;
+    }
+
+    public String getInvoiceCode() {
+        return this.invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
+
+    public String getInvoiceNumber() {
+        return this.invoiceNumber;
+    }
+
+    public void setInvoiceNumber(String invoiceNumber) {
+        this.invoiceNumber = invoiceNumber;
+    }
+
+    public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Integer getInvoiceType() {
+        return this.invoiceType;
+    }
+
+    public void setInvoiceType(Integer invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return this.taxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.vat.entity.GoodsMapping;
 import pwc.taxtech.atms.vat.entity.InputVatInvoice;
 import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
 
-@Setter
-@Getter
 public class InputVATInvoiceResultDto {
     private String invoiceId;
     private InputVatInvoice inputVATInvoice;
     private InputVatInvoiceItem inputVATInvoiceItem;
     private GoodsMapping goodsMapping;
+
+    public String getInvoiceId() {
+        return this.invoiceId;
+    }
+
+    public void setInvoiceId(String invoiceId) {
+        this.invoiceId = invoiceId;
+    }
+
+    public InputVatInvoice getInputVATInvoice() {
+        return this.inputVATInvoice;
+    }
+
+    public void setInputVATInvoice(InputVatInvoice inputVATInvoice) {
+        this.inputVATInvoice = inputVATInvoice;
+    }
+
+    public InputVatInvoiceItem getInputVATInvoiceItem() {
+        return this.inputVATInvoiceItem;
+    }
+
+    public void setInputVATInvoiceItem(InputVatInvoiceItem inputVATInvoiceItem) {
+        this.inputVATInvoiceItem = inputVATInvoiceItem;
+    }
+
+    public GoodsMapping getGoodsMapping() {
+        return this.goodsMapping;
+    }
+
+    public void setGoodsMapping(GoodsMapping goodsMapping) {
+        this.goodsMapping = goodsMapping;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Getter;
-import lombok.Setter;
 
-@Setter
-@Getter
 public class JsonExportDto {
     @JSONField(name = "type")
     private String type;
     @JSONField(name = "jsonData")
     private String jsonData;
+
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getJsonData() {
+        return this.jsonData;
+    }
+
+    public void setJsonData(String jsonData) {
+        this.jsonData = jsonData;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.math.BigDecimal;
 
-@Getter
-@Setter
 public class ManualDataSourceDto {
     Long cellId;
     String cellTemplateId;
@@ -19,4 +14,92 @@ public class ManualDataSourceDto {
     Integer period;
     Long reportId;
     Long id;
+
+    public Long getCellId() {
+        return this.cellId;
+    }
+
+    public void setCellId(Long cellId) {
+        this.cellId = cellId;
+    }
+
+    public String getCellTemplateId() {
+        return this.cellTemplateId;
+    }
+
+    public void setCellTemplateId(String cellTemplateId) {
+        this.cellTemplateId = cellTemplateId;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public String getKeyinData() {
+        return this.keyinData;
+    }
+
+    public void setKeyinData(String keyinData) {
+        this.keyinData = keyinData;
+    }
+
+    public String getProjectId() {
+        return this.projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getServiceTypeId() {
+        return this.serviceTypeId;
+    }
+
+    public void setServiceTypeId(String serviceTypeId) {
+        this.serviceTypeId = serviceTypeId;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Long getReportId() {
+        return this.reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Getter
-@Setter
 public class OutputInvoiceDataSourceDto extends FormulaDataSourceDto {
 
     public OutputInvoiceDataSourceDto() {
@@ -28,4 +24,96 @@ public class OutputInvoiceDataSourceDto extends FormulaDataSourceDto {
     private String dataSourceId;
     //数据源名称
     private String dataSourceName;
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    @Override
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getInvoiceDate() {
+        return this.invoiceDate;
+    }
+
+    public void setInvoiceDate(Date invoiceDate) {
+        this.invoiceDate = invoiceDate;
+    }
+
+    public String getBuyerName() {
+        return this.buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public String getInvoiceCode() {
+        return this.invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
+
+    public String getInvoiceNumber() {
+        return this.invoiceNumber;
+    }
+
+    public void setInvoiceNumber(String invoiceNumber) {
+        this.invoiceNumber = invoiceNumber;
+    }
+
+    public BigDecimal getTaxRate() {
+        return this.taxRate;
+    }
+
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return this.taxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+
+    public Integer getInvoiceType() {
+        return this.invoiceType;
+    }
+
+    public void setInvoiceType(Integer invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+
+    public String getDataSourceId() {
+        return this.dataSourceId;
+    }
+
+    public void setDataSourceId(String dataSourceId) {
+        this.dataSourceId = dataSourceId;
+    }
+
+    public String getDataSourceName() {
+        return this.dataSourceName;
+    }
+
+    public void setDataSourceName(String dataSourceName) {
+        this.dataSourceName = dataSourceName;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.vat.entity.OutputVatInvoice;
 import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
 
-@Getter
-@Setter
 public class OutputVATInvoiceDto {
     private String invoiceId;
     private OutputVatInvoice invoice;
     private OutputVatInvoiceItem invoiceItem;
+
+    public String getInvoiceId() {
+        return this.invoiceId;
+    }
+
+    public void setInvoiceId(String invoiceId) {
+        this.invoiceId = invoiceId;
+    }
+
+    public OutputVatInvoice getInvoice() {
+        return this.invoice;
+    }
+
+    public void setInvoice(OutputVatInvoice invoice) {
+        this.invoice = invoice;
+    }
+
+    public OutputVatInvoiceItem getInvoiceItem() {
+        return this.invoiceItem;
+    }
+
+    public void setInvoiceItem(OutputVatInvoiceItem invoiceItem) {
+        this.invoiceItem = invoiceItem;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import io.jsonwebtoken.lang.Collections;
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import pwc.taxtech.atms.common.util.MyAsserts;
 import pwc.taxtech.atms.exception.Exceptions;
@@ -13,8 +11,6 @@ import java.util.List;
 
 import static pwc.taxtech.atms.dto.vatdto.WrapPeriodJobDto.*;
 
-@Getter
-@Setter
 public class PeriodJobDto {
     private String id;
     private String name;
@@ -54,4 +50,84 @@ public class PeriodJobDto {
 
         return this;
     }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCurrentStep() {
+        return this.currentStep;
+    }
+
+    public void setCurrentStep(String currentStep) {
+        this.currentStep = currentStep;
+    }
+
+    public String getProjectId() {
+        return this.projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public String getStepsCode() {
+        return this.stepsCode;
+    }
+
+    public void setStepsCode(String stepsCode) {
+        this.stepsCode = stepsCode;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getErrorMsg() {
+        return this.errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public String getJobStatus() {
+        return this.jobStatus;
+    }
+
+    public void setJobStatus(String jobStatus) {
+        this.jobStatus = jobStatus;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
 import pwc.taxtech.atms.common.util.MyAsserts;
 import pwc.taxtech.atms.entity.Project;
-import pwc.taxtech.atms.entity.TemplateGroup;
 import pwc.taxtech.atms.exception.Exceptions;
-import pwc.taxtech.atms.service.impl.Message;
 import pwc.taxtech.atms.vat.entity.PeriodCellTemplate;
 import pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig;
 import pwc.taxtech.atms.vat.entity.PeriodTemplate;
@@ -14,7 +11,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Getter
 public class PeriodResources {
     Project project;
     List<PeriodTemplate> periodTemplates = new ArrayList<>();
@@ -47,4 +43,32 @@ public class PeriodResources {
     public Long getTemplateGroupId(){
         return  periodTemplates.get(0).getTemplateGroupId();
     }
+
+    public Project getProject() {
+        return this.project;
+    }
+
+    public List<PeriodTemplate> getPeriodTemplates() {
+        return this.periodTemplates;
+    }
+
+    public void setPeriodTemplates(List<PeriodTemplate> periodTemplates) {
+        this.periodTemplates = periodTemplates;
+    }
+
+    public List<PeriodCellTemplate> getPeriodCellTemplates() {
+        return this.periodCellTemplates;
+    }
+
+    public void setPeriodCellTemplates(List<PeriodCellTemplate> periodCellTemplates) {
+        this.periodCellTemplates = periodCellTemplates;
+    }
+
+    public List<PeriodCellTemplateConfig> getPeriodCellTemplateConfigs() {
+        return this.periodCellTemplateConfigs;
+    }
+
+    public void setPeriodCellTemplateConfigs(List<PeriodCellTemplateConfig> periodCellTemplateConfigs) {
+        this.periodCellTemplateConfigs = periodCellTemplateConfigs;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.constant.DataSourceName;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 import pwc.taxtech.atms.dpo.CellTemplatePerGroupDto;
-import pwc.taxtech.atms.vat.entity.CellData;
 import pwc.taxtech.atms.vat.entity.PeriodCellData;
 
 import java.math.BigDecimal;
 
-@Getter
-@Setter
 public class ReportCellDataSourceDto extends DataSourceDto {
     private String tag = "BB";
     private String name;
@@ -87,4 +82,158 @@ public class ReportCellDataSourceDto extends DataSourceDto {
         reportTemplateId = dto.getReportTemplateId();
         resultType = dto.getResultType();
     }
+
+    public String getTag() {
+        return this.tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public Integer getYear() {
+        return this.year;
+    }
+
+    @Override
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    @Override
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    @Override
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    @Override
+    public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+    @Override
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+    @Override
+    public String getColumnName() {
+        return this.columnName;
+    }
+
+    @Override
+    public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+    @Override
+    public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+    @Override
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    @Override
+    public String getRowName() {
+        return this.rowName;
+    }
+
+    @Override
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    @Override
+    public String getReportTemplateId() {
+        return this.reportTemplateId;
+    }
+
+    @Override
+    public void setReportTemplateId(String reportTemplateId) {
+        this.reportTemplateId = reportTemplateId;
+    }
+
+    public String getReportName() {
+        return this.reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    @Override
+    public String getCellDataId() {
+        return this.cellDataId;
+    }
+
+    @Override
+    public void setCellDataId(String cellDataId) {
+        this.cellDataId = cellDataId;
+    }
+
+    @Override
+    public String getCellTemplateId() {
+        return this.cellTemplateId;
+    }
+
+    @Override
+    public void setCellTemplateId(String cellTemplateId) {
+        this.cellTemplateId = cellTemplateId;
+    }
+
+    public Boolean getIsOnlyManualInput() {
+        return this.isOnlyManualInput;
+    }
+
+    public void setIsOnlyManualInput(Boolean onlyManualInput) {
+        this.isOnlyManualInput = onlyManualInput;
+    }
+
+    @Override
+    public Integer getType() {
+        return this.type;
+    }
+
+    @Override
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    @Override
+    public Integer getResultType() {
+        return this.resultType;
+    }
+
+    @Override
+    public void setResultType(Integer resultType) {
+        this.resultType = resultType;
+    }
+
+    @Override
+    public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+    @Override
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.vat.entity.PeriodFormulaBlock;
 
 import java.util.List;
 
-@Getter
-@Setter
 public class ReportDataDto {
     private List<CellDataDto> cellData;
     private List<PeriodFormulaBlock> formulaBlocks;
     private List<DataSourceDtoExtend> manualDataSources;
+
+    public List<CellDataDto> getCellData() {
+        return this.cellData;
+    }
+
+    public void setCellData(List<CellDataDto> cellData) {
+        this.cellData = cellData;
+    }
+
+    public List<PeriodFormulaBlock> getFormulaBlocks() {
+        return this.formulaBlocks;
+    }
+
+    public void setFormulaBlocks(List<PeriodFormulaBlock> formulaBlocks) {
+        this.formulaBlocks = formulaBlocks;
+    }
+
+    public List<DataSourceDtoExtend> getManualDataSources() {
+        return this.manualDataSources;
+    }
+
+    public void setManualDataSources(List<DataSourceDtoExtend> manualDataSources) {
+        this.manualDataSources = manualDataSources;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.util.Date;
 
-@Getter
-@Setter
 public class ReportDto {
     private String id;
     private String templateId;
@@ -17,4 +12,76 @@ public class ReportDto {
     private Date createTime;
     private String updater;
     private Date updateTime;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTemplateId() {
+        return this.templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateCode() {
+        return this.templateCode;
+    }
+
+    public void setTemplateCode(String templateCode) {
+        this.templateCode = templateCode;
+    }
+
+    public String getTemplateName() {
+        return this.templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public int getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(int period) {
+        this.period = period;
+    }
+
+    public String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdater() {
+        return this.updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
 
-@Setter
-@Getter
 public class ReportExportDto {
     @JSONField(name = "ReportType")
     private String reportType;
     @JSONField(name = "ReportData")
     private String reportData;
+
+    public String getReportType() {
+        return this.reportType;
+    }
+
+    public void setReportType(String reportType) {
+        this.reportType = reportType;
+    }
+
+    public String getReportData() {
+        return this.reportData;
+    }
+
+    public void setReportData(String reportData) {
+        this.reportData = reportData;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -10,8 +8,6 @@ import org.springframework.data.domain.Sort;
 import java.util.ArrayList;
 import java.util.List;
 
-@Getter
-@Setter
 public class RestResponsePage<T> extends PageImpl<T> {
 
     private int number;
@@ -42,4 +38,99 @@ public class RestResponsePage<T> extends PageImpl<T> {
         return new PageImpl<T>(getContent(), new PageRequest(getNumber(),
                 getSize(), getSort()), getTotalElements());
     }
+
+    @Override
+    public int getNumber() {
+        return this.number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+
+    @Override
+    public int getSize() {
+        return this.size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    @Override
+    public int getTotalPages() {
+        return this.totalPages;
+    }
+
+    public void setTotalPages(int totalPages) {
+        this.totalPages = totalPages;
+    }
+
+    @Override
+    public int getNumberOfElements() {
+        return this.numberOfElements;
+    }
+
+    public void setNumberOfElements(int numberOfElements) {
+        this.numberOfElements = numberOfElements;
+    }
+
+    @Override
+    public long getTotalElements() {
+        return this.totalElements;
+    }
+
+    public void setTotalElements(long totalElements) {
+        this.totalElements = totalElements;
+    }
+
+    public boolean getPreviousPage() {
+        return this.previousPage;
+    }
+
+    public void setPreviousPage(boolean previousPage) {
+        this.previousPage = previousPage;
+    }
+
+    public boolean getFirst() {
+        return this.first;
+    }
+
+    public void setFirst(boolean first) {
+        this.first = first;
+    }
+
+    public boolean getNextPage() {
+        return this.nextPage;
+    }
+
+    public void setNextPage(boolean nextPage) {
+        this.nextPage = nextPage;
+    }
+
+    public boolean getLast() {
+        return this.last;
+    }
+
+    public void setLast(boolean last) {
+        this.last = last;
+    }
+
+    @Override
+    public List<T> getContent() {
+        return this.content;
+    }
+
+    public void setContent(List<T> content) {
+        this.content = content;
+    }
+
+    @Override
+    public Sort getSort() {
+        return this.sort;
+    }
+
+    public void setSort(Sort sort) {
+        this.sort = sort;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.dto.TemplateDto;
 
 import java.util.List;
 
-@Getter
-@Setter
 public class TemplateByGroupDto {
     private Long id;
     private String name;
     private int OrderIndex;
     private List<TemplateDto> children;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getOrderIndex() {
+        return this.OrderIndex;
+    }
+
+    public void setOrderIndex(int orderIndex) {
+        this.OrderIndex = orderIndex;
+    }
+
+    public List<TemplateDto> getChildren() {
+        return this.children;
+    }
+
+    public void setChildren(List<TemplateDto> children) {
+        this.children = children;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
 public class VatEnterpriseAccountResultDto {
     Long periodCellTemplateConfigId;
     String acctCode;
     String enterpriseAccountName;
     String directionName;
     String acctPropName;
+
+    public Long getPeriodCellTemplateConfigId() {
+        return this.periodCellTemplateConfigId;
+    }
+
+    public void setPeriodCellTemplateConfigId(Long periodCellTemplateConfigId) {
+        this.periodCellTemplateConfigId = periodCellTemplateConfigId;
+    }
+
+    public String getAcctCode() {
+        return this.acctCode;
+    }
+
+    public void setAcctCode(String acctCode) {
+        this.acctCode = acctCode;
+    }
+
+    public String getEnterpriseAccountName() {
+        return this.enterpriseAccountName;
+    }
+
+    public void setEnterpriseAccountName(String enterpriseAccountName) {
+        this.enterpriseAccountName = enterpriseAccountName;
+    }
+
+    public String getDirectionName() {
+        return this.directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public String getAcctPropName() {
+        return this.acctPropName;
+    }
+
+    public void setAcctPropName(String acctPropName) {
+        this.acctPropName = acctPropName;
+    }
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Select;
 import pwc.taxtech.atms.common.util.MyAsserts;
-import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.entity.Template;
 import pwc.taxtech.atms.exception.Exceptions;
 import pwc.taxtech.atms.vat.entity.PeriodJob;
@@ -46,11 +41,25 @@ public class WrapPeriodJobDto {
         return job;
     }
 
-    @Getter
-    @Setter
     public static class Task {
         String code;
         String status;
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getStatus() {
+            return this.status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
     }
 
     public static List<Task> fromJson(String taskJson) {

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

@@ -2,13 +2,12 @@ package pwc.taxtech.atms.service.impl;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.util.SnowFlake;
 
 import javax.annotation.PostConstruct;
 
 @Component
-public class DistributedIdService extends BaseService {
+public class DistributedIdService {
     @Value("${distributed_id_datacenter}")
     private Integer dataCenterId;
     @Value("${distributed_id_machine}")

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java

 package pwc.taxtech.atms.vat.service.impl.report.functions;
 
-import lombok.Getter;
-import lombok.Setter;
 import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.vat.service.impl.FormulaAgent;
 
-@Setter
-@Getter
 public class FormulaContext {
     private String projectId;
     private Long reportTemplateGroupId;
@@ -55,4 +51,148 @@ public class FormulaContext {
         this.isYear=(period==0);
         return this;
     }
+
+    public String getProjectId() {
+        return this.projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Long getReportTemplateGroupId() {
+        return this.reportTemplateGroupId;
+    }
+
+    public void setReportTemplateGroupId(Long reportTemplateGroupId) {
+        this.reportTemplateGroupId = reportTemplateGroupId;
+    }
+
+    public Long getReportId() {
+        return this.reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getOrganizationId() {
+        return this.organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public Integer getPeriod() {
+        return this.period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Integer getYear() {
+        return this.year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Boolean getIsYear() {
+        return this.isYear;
+    }
+
+    public void setIsYear(Boolean year) {
+        this.isYear = year;
+    }
+
+    public String getIndexResultId() {
+        return this.indexResultId;
+    }
+
+    public void setIndexResultId(String indexResultId) {
+        this.indexResultId = indexResultId;
+    }
+
+    public Integer getYearBeginPeriod() {
+        return this.yearBeginPeriod;
+    }
+
+    public void setYearBeginPeriod(Integer yearBeginPeriod) {
+        this.yearBeginPeriod = yearBeginPeriod;
+    }
+
+    public Integer getYearEndPeriod() {
+        return this.yearEndPeriod;
+    }
+
+    public void setYearEndPeriod(Integer yearEndPeriod) {
+        this.yearEndPeriod = yearEndPeriod;
+    }
+
+    public Boolean getIfRound() {
+        return this.ifRound;
+    }
+
+    public void setIfRound(Boolean ifRound) {
+        this.ifRound = ifRound;
+    }
+
+    public Boolean getIsValidation() {
+        return this.isValidation;
+    }
+
+    public void setIsValidation(Boolean validation) {
+        this.isValidation = validation;
+    }
+
+    public Boolean getIsDetailed() {
+        return this.isDetailed;
+    }
+
+    public void setIsDetailed(Boolean detailed) {
+        this.isDetailed = detailed;
+    }
+
+    public Boolean getIsIndexAnalysis() {
+        return this.isIndexAnalysis;
+    }
+
+    public void setIsIndexAnalysis(Boolean indexAnalysis) {
+        this.isIndexAnalysis = indexAnalysis;
+    }
+
+    public Boolean getCacheHasIndexCode() {
+        return this.cacheHasIndexCode;
+    }
+
+    public void setCacheHasIndexCode(Boolean cacheHasIndexCode) {
+        this.cacheHasIndexCode = cacheHasIndexCode;
+    }
+
+    public Boolean getIfCalcStackValue() {
+        return this.ifCalcStackValue;
+    }
+
+    public void setIfCalcStackValue(Boolean ifCalcStackValue) {
+        this.ifCalcStackValue = ifCalcStackValue;
+    }
+
+    public Integer getCalculateStatus() {
+        return this.calculateStatus;
+    }
+
+    public void setCalculateStatus(Integer calculateStatus) {
+        this.calculateStatus = calculateStatus;
+    }
+
+    public FormulaAgent getFormulaAgent() {
+        return this.formulaAgent;
+    }
+
+    public void setFormulaAgent(FormulaAgent formulaAgent) {
+        this.formulaAgent = formulaAgent;
+    }
 }

atms-api/src/main/resources/applicationContext.xml

@@ -84,7 +84,7 @@
     <property name="dataSource" ref="dataSource"/>
     <property name="transactionManager" ref="transactionManager"/>
     <property name="databaseSchemaUpdate" value="true"/>
-    <property name="jobExecutorActivate" value="true"/>
+    <property name="jobExecutorActivate" value="false"/>
     <!-- 以下2个是为了防止生成流程图片时出现乱码 -->
     <property name="activityFontName" value="宋体"/>
     <property name="labelFontName" value="宋体"/>
@@ -106,7 +106,7 @@
         factory-method="getHistoryService"/>
   <bean id="managementService" factory-bean="processEngine"
         factory-method="getManagementService"/>
-  <bean id="IdentityService" factory-bean="processEngine"
+  <bean id="identityService" factory-bean="processEngine"
         factory-method="getIdentityService"/>
 
 </beans>
\ No newline at end of file