Skip to content

T
traffic-front
Commit 320b1972 authored by Cheng C Yang's avatar Cheng C Yang
Browse files
Options

Balance Sheet and Profit table

parent 1c0ecab1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 59 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/DataPreviewController.java
View file @ 320b1972
...@@ -37,6 +37,13 @@ public class DataPreviewController extends BaseController { ...@@ -37,6 +37,13 @@ public class DataPreviewController extends BaseController {
return dataPreviewSerivceImpl.getPLDataForDisplay(param); return dataPreviewSerivceImpl.getPLDataForDisplay(param);
} }
//TODO 利润表
@PostMapping("getPLStatementDataForDisplay")
public PageInfo<ProfitLossStatementDto> getPLStatementDataForDisplay(@RequestBody ProfitLossStatementParam param) {
logger.debug(String.format("利润表查询 Condition:%s", JSON.toJSONString(param)));
return dataPreviewSerivceImpl.getPLStatementDataForDisplay(param);
}
@PostMapping("getJEDataForDisplay") @PostMapping("getJEDataForDisplay")
public PageInfo<JournalEntryDto> getJEDataForDisplay(@RequestBody JournalEntryParam param) { public PageInfo<JournalEntryDto> getJEDataForDisplay(@RequestBody JournalEntryParam param) {
logger.debug(String.format("日记账查询 Condition:%s", JSON.toJSONString(param))); logger.debug(String.format("日记账查询 Condition:%s", JSON.toJSONString(param)));
...@@ -55,6 +62,12 @@ public class DataPreviewController extends BaseController { ...@@ -55,6 +62,12 @@ public class DataPreviewController extends BaseController {
return dataPreviewSerivceImpl.getBSDataForDisplay(param); return dataPreviewSerivceImpl.getBSDataForDisplay(param);
} }
@PostMapping("getBalanceSheetDataForDisplay")
public PageInfo<BalanceSheetDto> getBalanceSheetDataForDisplay(@RequestBody BalanceSheetParam param) {
logger.debug(String.format("资产负债表查询 Condition:%s", JSON.toJSONString(param)));
return dataPreviewSerivceImpl.getBalanceSheetDataForDisplay(param);
}
@PostMapping("getIRDataForDisplay") @PostMapping("getIRDataForDisplay")
public PageInfo<InvoiceRecordDto> getIRDataForDisplay(@RequestBody InvoiceRecordParam param) { public PageInfo<InvoiceRecordDto> getIRDataForDisplay(@RequestBody InvoiceRecordParam param) {
logger.debug(String.format("发票记录表查询 Condition:%s", JSON.toJSONString(param))); logger.debug(String.format("发票记录表查询 Condition:%s", JSON.toJSONString(param)));
...@@ -88,7 +101,7 @@ public class DataPreviewController extends BaseController { ...@@ -88,7 +101,7 @@ public class DataPreviewController extends BaseController {
@RequestMapping(value = "exportCFData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportCFData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadCFQueryData(@RequestBody CashFlowParam param, HttpServletResponse response) { public void downloadCFQueryData(@RequestBody CashFlowParam param, HttpServletResponse response) {
logger.debug("enter downloadCFQueryData"); logger.debug("enter downloadCFQueryData");
String fileName="testFile"; String fileName = "testFile";
dataPreviewSerivceImpl.exportCashFlowList(response, param, fileName); dataPreviewSerivceImpl.exportCashFlowList(response, param, fileName);
} }
...@@ -112,7 +125,7 @@ public class DataPreviewController extends BaseController { ...@@ -112,7 +125,7 @@ public class DataPreviewController extends BaseController {
response.setStatus(SC_OK); response.setStatus(SC_OK);
} }
} catch (IOException e) { } catch (IOException e) {
logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage())); logger.error(String.format("下载科目余额表-生成文件异常:%s", e.getMessage()));
} }
} }
...@@ -136,7 +149,7 @@ public class DataPreviewController extends BaseController { ...@@ -136,7 +149,7 @@ public class DataPreviewController extends BaseController {
response.setStatus(SC_OK); response.setStatus(SC_OK);
} }
} catch (IOException e) { } catch (IOException e) {
logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage())); logger.error(String.format("下载科目余额表-生成文件异常:%s", e.getMessage()));
} }
} }
...@@ -160,7 +173,31 @@ public class DataPreviewController extends BaseController { ...@@ -160,7 +173,31 @@ public class DataPreviewController extends BaseController {
response.setStatus(SC_OK); response.setStatus(SC_OK);
} }
} catch (IOException e) { } catch (IOException e) {
logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage())); logger.error(String.format("下载科目余额表-生成文件异常:%s", e.getMessage()));
}
}
@RequestMapping(value = "exportBalanceSheetData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadBalanceSheetQueryData(@RequestBody BalanceSheetParam paras, HttpServletResponse response) {
response.setContentType("application/vnd.ms-excel;charset=utf-8");
response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
response.setCharacterEncoding("UTF-8");
OutputStream os = null;
try {
response.addHeader("Content-Disposition", "attachment;filename="
+ UUID.randomUUID() + ".xls");
response.addHeader("x-file-name", fileName);
os = response.getOutputStream();
int count = dataPreviewSerivceImpl.getBalanceSheetDownloadFilePath(paras, os);
if (count == 0) {
response.setStatus(SC_NO_CONTENT);
} else {
response.setStatus(SC_OK);
}
} catch (IOException e) {
logger.error(String.format("下载科目余额表-生成文件异常:%s", e.getMessage()));
} }
} }
...@@ -184,42 +221,66 @@ public class DataPreviewController extends BaseController { ...@@ -184,42 +221,66 @@ public class DataPreviewController extends BaseController {
response.setStatus(SC_OK); response.setStatus(SC_OK);
} }
} catch (IOException e) { } catch (IOException e) {
logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage())); logger.error(String.format("下载科目余额表-生成文件异常:%s", e.getMessage()));
}
}
@RequestMapping(value = "exportPLStatementData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadPLStatementQueryData(@RequestBody ProfitLossStatementParam paras, HttpServletResponse response) {
response.setContentType("application/vnd.ms-excel;charset=utf-8");
response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
response.setCharacterEncoding("UTF-8");
OutputStream os = null;
try {
response.addHeader("Content-Disposition", "attachment;filename="
+ UUID.randomUUID() + ".xls");
response.addHeader("x-file-name", fileName);
os = response.getOutputStream();
int count = dataPreviewSerivceImpl.getPLStatementDownloadFilePath(paras, os);
if (count == 0) {
response.setStatus(SC_NO_CONTENT);
} else {
response.setStatus(SC_OK);
}
} catch (IOException e) {
logger.error(String.format("下载科目余额表-生成文件异常:%s", e.getMessage()));
} }
} }
@RequestMapping(value = "exportIRData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportIRData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadIRQueryData(@RequestBody InvoiceRecordParam param, HttpServletResponse response) { public void downloadIRQueryData(@RequestBody InvoiceRecordParam param, HttpServletResponse response) {
logger.debug("enter downloadIRQueryData"); logger.debug("enter downloadIRQueryData");
String fileName="testFile"; String fileName = "testFile";
dataPreviewSerivceImpl.exportInvoiceRecordList(response, param, fileName); dataPreviewSerivceImpl.exportInvoiceRecordList(response, param, fileName);
} }
@RequestMapping(value = "exportCILData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportCILData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadCILQueryData(@RequestBody CertifiedInvoicesListParam param, HttpServletResponse response) { public void downloadCILQueryData(@RequestBody CertifiedInvoicesListParam param, HttpServletResponse response) {
logger.debug("enter downloadCILQueryData"); logger.debug("enter downloadCILQueryData");
String fileName="testFile"; String fileName = "testFile";
dataPreviewSerivceImpl.exportCILList(response, param, fileName); dataPreviewSerivceImpl.exportCILList(response, param, fileName);
} }
@RequestMapping(value = "exportRLITData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportRLITData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadRLITQueryData(@RequestBody RedLetterInfoTableParam param, HttpServletResponse response) { public void downloadRLITQueryData(@RequestBody RedLetterInfoTableParam param, HttpServletResponse response) {
logger.debug("enter downloadRLITQueryData"); logger.debug("enter downloadRLITQueryData");
String fileName="testFile"; String fileName = "testFile";
dataPreviewSerivceImpl.exportRLITList(response, param, fileName); dataPreviewSerivceImpl.exportRLITList(response, param, fileName);
} }
@RequestMapping(value = "exportCPRData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportCPRData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadCPRQueryData(@RequestBody CoupaPurchasingReportParam param, HttpServletResponse response) { public void downloadCPRQueryData(@RequestBody CoupaPurchasingReportParam param, HttpServletResponse response) {
logger.debug("enter downloadCPRQueryData"); logger.debug("enter downloadCPRQueryData");
String fileName="testFile"; String fileName = "testFile";
dataPreviewSerivceImpl.exportCPRList(response, param, fileName); dataPreviewSerivceImpl.exportCPRList(response, param, fileName);
} }
@RequestMapping(value = "exportIDData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportIDData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void downloadIDQueryData(@RequestBody InvoiceDataParam param, HttpServletResponse response) { public void downloadIDQueryData(@RequestBody InvoiceDataParam param, HttpServletResponse response) {
logger.debug("enter downloadIDQueryData"); logger.debug("enter downloadIDQueryData");
String fileName="testFile"; String fileName = "testFile";
dataPreviewSerivceImpl.exportIDList(response, param, fileName); dataPreviewSerivceImpl.exportIDList(response, param, fileName);
} }
......
atms-web/src/main/webapp/Scripts/module-part1.js
View file @ 320b1972
...@@ -612,22 +612,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g ...@@ -612,22 +612,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
sticky: true sticky: true
}); });
$stateProvider.state({ // $stateProvider.state({
name: 'vat.previewData.balanceSheet', // name: 'vat.previewData.balanceSheet',
url: '/balanceSheet', // url: '/balanceSheet',
views: { // views: {
'@vat.previewData': { // '@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation', // controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) { // function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]); // appTranslation.load([appTranslation.vat]);
}], // }],
template: '<vat-preview-balance-sheet></vat-preview-balance-sheet>', // template: '<vat-preview-balance-sheet></vat-preview-balance-sheet>',
} // }
}, // },
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat), // resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true, // deepStateRedirect: true,
sticky: true // sticky: true
}); // });
$stateProvider.state({ $stateProvider.state({
name: 'vat.previewData.accountVoucher', name: 'vat.previewData.accountVoucher',
...@@ -767,6 +767,40 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g ...@@ -767,6 +767,40 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'vat.previewData.vatPreviewProfitTable',
url: '/vatPreviewProfitTable',
views: {
'@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]);
}],
template: '<vat-preview-profit-table></vat-preview-profit-table>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'vat.previewData.vatPreviewTheBalanceSheet',
url: '/vatPreviewTheBalanceSheet',
views: {
'@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]);
}],
template: '<vat-preview-the-balance-sheet></vat-preview-the-balance-sheet>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({ $stateProvider.state({
name: 'vat.previewData.coupaPurchasingReport', name: 'vat.previewData.coupaPurchasingReport',
url: '/coupaPurchasingReport', url: '/coupaPurchasingReport',
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 320b1972
...@@ -1990,5 +1990,7 @@ ...@@ -1990,5 +1990,7 @@
"InputAllMandatoryInfo": "Please Input All The Mandatory Information", "InputAllMandatoryInfo": "Please Input All The Mandatory Information",
"NameShouldUniqueWarn": "Name Should Be Unique", "NameShouldUniqueWarn": "Name Should Be Unique",
"ProfitTable": "Profit Table",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 320b1972
...@@ -2301,6 +2301,7 @@ ...@@ -2301,6 +2301,7 @@
"InputAllMandatoryInfo": "请输入所有必填信息", "InputAllMandatoryInfo": "请输入所有必填信息",
"NameShouldUniqueWarn": "收入类型名称应当唯一", "NameShouldUniqueWarn": "收入类型名称应当唯一",
"ProfitTable": "利润表",
"~MustBeEndOneApp": "我必须是最后一个！" "~MustBeEndOneApp": "我必须是最后一个！"
} }
\ No newline at end of file
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 320b1972
...@@ -475,9 +475,6 @@ constant.vatPermission = { ...@@ -475,9 +475,6 @@ constant.vatPermission = {
adjustmentTab: { adjustmentTab: {
queryCode: '02.002.011' queryCode: '02.002.011'
}, },
balanceSheet: {
queryCode: '02.002.012'
},
profitLoss: { profitLoss: {
queryCode: '02.002.013' queryCode: '02.002.013'
}, },
...@@ -501,7 +498,11 @@ constant.vatPermission = { ...@@ -501,7 +498,11 @@ constant.vatPermission = {
}, },
invoiceData: { invoiceData: {
queryCode: '02.002.020' queryCode: '02.002.020'
},
profitTable: {
queryCode: '02.002.021'
} }
}, },
dataManage: { dataManage: {
dataManageCode: '02.003', dataManageCode: '02.003',
......
atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js
View file @ 320b1972
...@@ -201,9 +201,15 @@ ...@@ -201,9 +201,15 @@
getPLDataForDisplay: function (queryParams) { getPLDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getPLDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getPLDataForDisplay', queryParams, apiConfig.createVat());
}, },
getPLStatementDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getPLStatementDataForDisplay', queryParams, apiConfig.createVat());
},
initExportPLData: function (queryParams) { initExportPLData: function (queryParams) {
return $http.post('/dataPreview/exportPLData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' })); return $http.post('/dataPreview/exportPLData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
}, },
initExportPLStatementData: function (queryParams) {
return $http.post('/dataPreview/exportPLStatementData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
},
getJEDataForDisplay: function (queryParams) { getJEDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getJEDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getJEDataForDisplay', queryParams, apiConfig.createVat());
}, },
...@@ -213,9 +219,15 @@ ...@@ -213,9 +219,15 @@
getBSDataForDisplay: function (queryParams) { getBSDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getBSDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getBSDataForDisplay', queryParams, apiConfig.createVat());
}, },
getBalanceSheetDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getBalanceSheetDataForDisplay', queryParams, apiConfig.createVat());
},
initExportBSData: function (queryParams) { initExportBSData: function (queryParams) {
return $http.post('/dataPreview/exportBSData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' })); return $http.post('/dataPreview/exportBSData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
}, },
initExportBalanceSheetData: function (queryParams) {
return $http.post('/dataPreview/exportBalanceSheetData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
},
getIRDataForDisplay: function (queryParams) { getIRDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getIRDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getIRDataForDisplay', queryParams, apiConfig.createVat());
}, },
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ 320b1972
...@@ -881,6 +881,9 @@ ...@@ -881,6 +881,9 @@
constant.vatPermission.dataPreview.redLetterInformationTable.queryCode, constant.vatPermission.dataPreview.redLetterInformationTable.queryCode,
constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode, constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode,
constant.vatPermission.dataPreview.invoiceData.queryCode, constant.vatPermission.dataPreview.invoiceData.queryCode,
constant.vatPermission.dataPreview.profitTable.queryCode,
constant.vatPermission.dataPreview.balanceSheet.queryCode,
constant.vatPermission.dataManage.caculateDataCode, constant.vatPermission.dataManage.caculateDataCode,
constant.vatPermission.dataManage.revenueDetailCode, constant.vatPermission.dataManage.revenueDetailCode,
...@@ -926,6 +929,10 @@ ...@@ -926,6 +929,10 @@
$state.go('vat.previewData.coupaPurchasingReport'); $state.go('vat.previewData.coupaPurchasingReport');
} else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) { } else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
$state.go('vat.previewData.invoiceData'); $state.go('vat.previewData.invoiceData');
} else if (data[constant.vatPermission.dataPreview.profitTable.queryCode]) {
$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.dataManage.caculateDataCode]) {
$state.go('vat.reductionData.caculateData'); $state.go('vat.reductionData.caculateData');
} else if (data[constant.vatPermission.dataManage.revenueDetailCode]) { } else if (data[constant.vatPermission.dataManage.revenueDetailCode]) {
...@@ -973,36 +980,7 @@ ...@@ -973,36 +980,7 @@
// $state.go('vat.reductionData.goodsMapping'); // $state.go('vat.reductionData.goodsMapping');
// } // }
//TODO 删除的部分
// if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
// $state.go('vat.previewData.balanceSheet');
// }
// else if (data[constant.vatPermission.dataPreview.inputInvoice.queryCode]) {
// $state.go('vat.previewData.inputInvoice');
// } else if (data[constant.vatPermission.dataPreview.outputInvoice.queryCode]) {
// $state.go('vat.previewData.outputInvoice');
// }
// else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
// $state.go('vat.reductionData.caculateData');
// } else if (data[constant.vatPermission.dataManage.revenueDetailCode]) {
// $state.go('vat.reductionData.revenueDetail');
// } else if (data[constant.vatPermission.dataManage.billDetailCode]) {
// $state.go('vat.reductionData.billDetail');
// } /*else if (data[constant.vatPermission.dataManage.unbilledInvoiceCode]) {
// $state.go('vat.reductionData.unbilledInvoice');
// }*/ else if (data[constant.vatPermission.reportView.bsplCode] || data[constant.vatPermission.reportView.taxReturnCode]) {
// $state.go('vat.generateReport');
// } else if (data[constant.vatPermission.dataAnalysis.modelAnalysisCode]) {
// $state.go('vat.analyzeLayout.analyzeReport');
// } else if (data[constant.vatPermission.dataAnalysis.dashboard.dashboardCode]) {
// $state.go('analyzeOrganizeDashboard');
// }
//else if (data[constant.vatPermission.dataAnalysis.vatTaxDifferenceCode]) {
// $state.go('vat.analyzeLayout.vatTaxDifference');
//}
} }
}); });
} }
......
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