Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

cell data source

See merge request root/atms!181

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

@@ -706,6 +706,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();
         }
@@ -714,7 +716,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();
         }
     }

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -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;