Balance Sheet and Profit table

atms-api/src/main/java/pwc/taxtech/atms/controller/DataPreviewController.java

@@ -67,6 +67,12 @@ public class DataPreviewController extends BaseController {
         return dataPreviewSerivceImpl.getCFDataForDisplay(param);
     }
 
+    @PostMapping("getCFManualDataForDisplay")
+    public PageInfo<CashFlowDto> getCFManualDataForDisplay(@RequestBody CashFlowParam param) {
+        logger.debug(String.format("现金流量表查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getCFManualDataForDisplay(param);
+    }
+
     @PostMapping("getBSDataForDisplay")
     public PageInfo<BalanceSheetDto> getBSDataForDisplay(@RequestBody BalanceSheetParam param) {
         logger.debug(String.format("资产负债表PRC查询 Condition:%s", JSON.toJSONString(param)));

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

@@ -48,7 +48,7 @@ public class DataPreviewSerivceImpl extends BaseService {
 
     @Resource
     private ProfitLossStatementPrcManualMapper profitLossStatementPrcManualMapper;
-    
+
     @Resource
     private ProfitLossStatementMapper profitLossStatementMapper;
 
@@ -67,6 +67,9 @@ public class DataPreviewSerivceImpl extends BaseService {
     @Resource
     private CashFlowMapper cashFlowMapper;
 
+    @Resource
+    private CashFlowManualMapper cashFlowManualMapper;
+
     @Resource
     private InvoiceRecordMapper invoiceRecordMapper;
 
@@ -195,6 +198,26 @@ public class DataPreviewSerivceImpl extends BaseService {
         return pageInfo;
     }
 
+    public PageInfo<CashFlowDto> getCFManualDataForDisplay(CashFlowParam param) {
+        CashFlowCondition condition = new CashFlowCondition();
+        beanUtil.copyProperties(param, condition);
+        //Integer totalCount=cashFlowMapper.selectCountByCondition(condition);
+        List<CashFlowDto> cashFlowDtos = Lists.newArrayList();
+        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+        List<CashFlow> cashFlows = cashFlowManualMapper.selectByCondition(condition);
+        //使用page的getTotal()
+        Long total = page.getTotal();
+        cashFlows.forEach(cf -> {
+            CashFlowDto cashFlowDto = new CashFlowDto();
+            beanUtil.copyProperties(cf, cashFlowDto);
+            cashFlowDtos.add(cashFlowDto);
+        });
+        PageInfo<CashFlowDto> pageInfo = new PageInfo<>(cashFlowDtos);
+        pageInfo.setTotal(total);
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+        return pageInfo;
+    }
+
     public PageInfo<AdjustmentTableDto> getAdjustmentTbDataForDisplay(AdjustmentTableParam param) {
 
         AdjustmentTableCondition condition = beanUtil.copyProperties(param, new AdjustmentTableCondition());

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowManualExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
-      AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
+      AND organization_id= #{cfCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="cfCondition.periodStart!=null">
       AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -952,7 +952,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 				deepStateRedirect: true,
 				sticky: true
 			});
-
+			$stateProvider.state({
+				name: 'vat.previewData.cashFlowManual',
+				url: '/cashFlowManual',
+				views: {
+					'@vat.previewData': {
+						controller: ['$scope', '$stateParams', 'appTranslation',
+							function ($scope, $stateParams, appTranslation) {
+								appTranslation.load([appTranslation.vat]);
+							}],
+						template: '<vat-preview-cash-flow-manual></vat-preview-cash-flow-manual>'
+					}
+				},
+				resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
+				deepStateRedirect: true,
+				sticky: true
+			});
 			$stateProvider.state({
 				name: 'vat.previewData.offBalanceSheetPrcManual',
 				url: '/offBalanceSheetPrcManual',

atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json

@@ -1830,6 +1830,7 @@
   "ImportType": "Import Type",
   "cashFlow": "Cash Flow",
   "CashFlowDDTitle": "Cash Flow",
+  "CashFlowManual": "Cash Flow Manual",
   "invoiceData": "Invoice Data",
   "InvoiceDataTitle": "Invoice Data",
   "IDTotalAmount": "Total",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -1853,6 +1853,7 @@
     "TrialBalanceDDTitle": "科目余额表",
     "cashFlow":"现金流量表",
     "CashFlowDDTitle":"现金流量表",
+    "CashFlowManual": "现金流量表人工导入",
 
 
     "TBAccountCode": "科目编号",

atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js

@@ -189,6 +189,9 @@
         getCFDataForDisplay: function (queryParams) {
             return $http.post('/dataPreview/getCFDataForDisplay', queryParams, apiConfig.createVat());
         },
+        getCFManualDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getCFManualDataForDisplay', queryParams, apiConfig.createVat());
+        },
         //服务器导出
         initExportCFData: function (queryParm, fileName) {
             var thisConfig = apiConfig.create();

atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js

@@ -883,6 +883,7 @@
                     constant.vatPermission.dataPreview.invoiceData.queryCode,
                     constant.vatPermission.dataPreview.profitTable.queryCode,
                     constant.vatPermission.dataPreview.balanceSheet.queryCode,
+                    constant.vatPermission.dataPreview.cashFlowManual.queryCode,
 
 
                     constant.vatPermission.dataManage.caculateDataCode,
@@ -933,7 +934,9 @@
                             $state.go('vat.previewData.vatPreviewProfitTable');
                         } else if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
                             $state.go('vat.previewData.vatPreviewTheBalanceSheet');
-                        } else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.cashFlowManual.queryCode]) {
+                            $state.go('vat.previewData.cashFlowManual');
+                        }else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
                             $state.go('vat.reductionData.caculateData');
                         } else if (data[constant.vatPermission.dataManage.revenueDetailCode]) {
                             $state.go('vat.reductionData.revenueDetail');

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.ctrl.js

@@ -211,7 +211,7 @@
         //在popover打开时执行事件
         var showPopover = function () {
             $timeout(function () {
-                initDatePickers1();
+                initDatePicker1();
             }, 500);
         };
 
@@ -256,7 +256,7 @@
         (function initialize() {
             $log.debug('VatPreviewInputInvoiceController.ctor()...');
             initPeriods();
-            initDatePicker1();
+            showPopover();
             $scope.gridOptions = {
                 rowHeight: constant.UIGrid.rowHeight,
                 selectionRowHeaderWidth: constant.UIGrid.rowHeight,

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.html

@@ -10,7 +10,7 @@
         </button>-->
         <span translate="offBalanceSheetPRCManual" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
         <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
-                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:230px;width: 120px;"/>
+                                   style="position:relative;top:-30px;left:230px;width: 120px;"/>
         <span ng-click="downloadBS()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 

atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js

@@ -147,7 +147,8 @@
                 constant.vatPermission.dataPreview.redLetterInformationTable.queryCode,
                 constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode,
                 constant.vatPermission.dataPreview.invoiceData.queryCode,
-
+                constant.vatPermission.dataPreview.profitTable.queryCode,
+                constant.vatPermission.dataPreview.cashFlowManual.queryCode,
 
                 // constant.vatPermission.dataManage.accountMappingCode,
                 // constant.vatPermission.dataManage.goodsMappingCode,
@@ -444,8 +445,39 @@
                                 permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
                                 url: '#/vat/previewData/invoiceData'
                             });
-                        }
+                        } else if (data[constant.vatPermission.dataPreview.profitTable.queryCode]) {
+
+                            $scope.menus.push({
+                                name: 'previewData',
+                                state: 'previewData',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.dataPreviewCode,
+                                url: '#/vat/importData'
+                            });
+                            subMenus.push({
+                                name: 'previewData.vatPreviewProfitTable',
+                                state: 'previewData.vatPreviewProfitTable',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
+                                url: '#/vat/previewData/invoiceData'
+                            });
+                        } else if (data[constant.vatPermission.dataPreview.cashFlowManual.queryCode]) {
 
+                            $scope.menus.push({
+                                name: 'previewData',
+                                state: 'previewData',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.dataPreviewCode,
+                                url: '#/vat/importData'
+                            });
+                            subMenus.push({
+                                name: 'previewData.cashFlowManual',
+                                state: 'previewData.cashFlowManual',
+                                num: 2,
+                                permission: constant.vatPermission.dataPreview.cashFlowManual.queryCode,
+                                url: '#/vat/previewData/cashFlowManual'
+                            });
+                        }
 
                         // TODO 待删除1
                         // TODO Delete