Commit 921d1810 authored by sherlock's avatar sherlock

cell data source

parent 802deee5
......@@ -735,6 +735,8 @@ public class ReportServiceImpl {
private Integer convertType(Integer dataSourceType) {
if (dataSourceType.equals(FormulaDataSourceDetailType.InputInvoiceDataSourceDto.getCode())) {
return CellDataSourceType.InputInvoice.getCode();
} else if(dataSourceType.equals(FormulaDataSourceDetailType.OutputInvoiceDataSourceDto.getCode())){
return CellDataSourceType.OutputInvoice.getCode();
} else {
return CellDataSourceType.Formula.getCode();
}
......@@ -743,7 +745,9 @@ public class ReportServiceImpl {
private Integer convetToFType(Integer cellDataSourceType) {
if (cellDataSourceType.equals(CellDataSourceType.InputInvoice.getCode())) {
return FormulaDataSourceType.InputInvoice.getCode();
} else {
} if(cellDataSourceType.equals(CellDataSourceType.OutputInvoice.getCode())){
return FormulaDataSourceType.OutputInvoice.getCode();
}else {
return FormulaDataSourceType.Other.getCode();
}
}
......
......@@ -160,7 +160,7 @@
//销项数据源
case enums.formulaDataSourceType.OutputInvoice:
obj.period = sourceData.period;
obj.date = sourceData.invoiceDate ? sourceData.invoiceDate.substring(0, 10) : '';
obj.date = sourceData.invoiceDate ? (new Date(sourceData.invoiceDate)).dateTimeToString('yyyyMMdd') : "
obj.acquiringEnterprise = sourceData.buyerName;
obj.invoiceCode = sourceData.invoiceCode;
obj.invoiceNumber = sourceData.invoiceNumber;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment