Merge branch 'dev_wzk_phase1' of http://code.tech.tax.asia.pwcinternal.com/root/atms into sam_p1

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

@@ -164,7 +164,7 @@ public class ReportUploadService extends BaseService {
         FileTypesExample fileTypesExample = new FileTypesExample();
         fileTypesExample.createCriteria().andFileTypeEqualTo("增值税及附加税费计算底稿");
         List<FileTypes> fileTypesList = fileTypesMapper.selectByExample(fileTypesExample);
-        if(CollectionUtils.isNotEmpty(dataList)){
+        if(CollectionUtils.isNotEmpty(fileTypesList)){
             taxDocument.setFileAttr(fileTypesList.get(0).getFileAttr());
             taxDocument.setFileTypeId(fileTypesList.get(0).getId());
         }

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.ctrl.js

@@ -82,7 +82,7 @@
                         $scope.ledgerCurrencyCodeFirst = itemFirst.ledgerCurrencyCode;
                         $scope.ledgerStatusFirst = itemFirst.status;
                         //TODO
-                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
                     }
                     $scope.gridOptions.data = data.list;
                     $scope.queryIncomeInvoiceItemResult.pageInfo = data;

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js

@@ -105,7 +105,7 @@
                     if(data.size>0){
                         $scope.currencyCode = data.list[0].ledgerCurrencyCode;
                         $scope.status = data.list[0].status;
-                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
                     }
                 }
             });