Skip to content

T
traffic-front
Commit 81a74e4d authored by zhkwei's avatar zhkwei
Browse files
Options

CIT数据预览

parent babc14ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 424 additions and 304 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 81a74e4d
...@@ -1112,6 +1112,7 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -1112,6 +1112,7 @@ public class CitImportExcelServiceImpl extends BaseService {
*/ */
public OperationResultDto autoGeneTB(Integer period, String orgId, List<String> orgList){ public OperationResultDto autoGeneTB(Integer period, String orgId, List<String> orgList){
OperationResultDto autoGeneResult = new OperationResultDto();
//第一步，根据合并日记账计算出借方发生额，贷方发生额，科目代码等相关信息 //第一步，根据合并日记账计算出借方发生额，贷方发生额，科目代码等相关信息
StringBuilder periodSb = new StringBuilder(); StringBuilder periodSb = new StringBuilder();
periodSb.append(period); periodSb.append(period);
...@@ -1143,7 +1144,7 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -1143,7 +1144,7 @@ public class CitImportExcelServiceImpl extends BaseService {
criteria.andAccountCodeEqualTo(citJournal.getSubjectCode()); criteria.andAccountCodeEqualTo(citJournal.getSubjectCode());
criteria.andPeriodEqualTo(period-1); criteria.andPeriodEqualTo(period-1);
List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample); List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample);
if(trialBalances != null || trialBalances.size() > 0){ if(trialBalances != null && trialBalances.size() > 0){
lastYearBegBla = trialBalances.get(0).getBeginningBalance(); lastYearBegBla = trialBalances.get(0).getBeginningBalance();
} }
trialBalance.setBeginningBalance(lastYearBegBla); trialBalance.setBeginningBalance(lastYearBegBla);
...@@ -1154,7 +1155,9 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -1154,7 +1155,9 @@ public class CitImportExcelServiceImpl extends BaseService {
} }
int insertBatch = citTrialBalanceMapper.insertBatch(trialBalanceList); int insertBatch = citTrialBalanceMapper.insertBatch(trialBalanceList);
return null; autoGeneResult.setResult(true);
autoGeneResult.setResultMsg("自动生成TB成功");
return autoGeneResult;
} }
} }
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitTrialBalanceExtendsMapper.xml
View file @ 81a74e4d
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<otherwise>0,</otherwise> <otherwise>0,</otherwise>
</choose> </choose>
<choose> <choose>
<when test="item.createBy != null">#{item.createdBy,jdbcType=VARCHAR},</when> <when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>'',</otherwise>
</choose> </choose>
<choose> <choose>
...@@ -77,45 +77,10 @@ ...@@ -77,45 +77,10 @@
SELECT 1 FROM DUAL; SELECT 1 FROM DUAL;
</insert> </insert>
<select id="selectLastYearBegBla" parameterType="map" resultMap="BaseResultMap"> <select id="selectLastYearBegBla" parameterType="map" resultMap="BaseResultMap">
SELECT
subject_code as subject_code,
sum(jfinal.accounted_dr) as accounted_dr,
sum(jfinal.accounted_cr) as accounted_cr
from
(
select select
cj.accounted_dr as accounted_dr, <include refid="Base_Column_List" />
cj.accounted_cr as accounted_cr , from cit_trial_balance
cj.subject_code as subject_code where caccount_code=#{item.accountCode} AND ctb.period=#{item.period}
from
cit_journal_entry_adjust cj
where
cj.period like #{period}
<if test="orgList != null and orgList.size > 0">
AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
UNION ALL
select
j.accounted_dr as accounted_dr,
j.accounted_cr as accounted_cr,
j.segment3 as subject_code
from
journal_entry j
where
j.period like #{period}
<if test="orgList != null and orgList.size > 0">
AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
) as jfinal
group by jfinal.subject_code
</select> </select>
</mapper> </mapper>
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ 81a74e4d
...@@ -88,5 +88,11 @@ ...@@ -88,5 +88,11 @@
"CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT", "CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",
"CitDraftAccountMappingImport": "底稿&科目Mapping表导入-CIT", "CitDraftAccountMappingImport": "底稿&科目Mapping表导入-CIT",
"PleaseSelectOrganization": "请选择机构！", "PleaseSelectOrganization": "请选择机构！",
"PleaseSelectPeriod": "请选择期间！" "PleaseSelectPeriod": "请选择期间！",
"balanceSheet": "试算平衡表",
"bsGenerateVer": "试算平衡生成版",
"bsMappingVer": "试算平衡Mapping版",
"salaryAdvance": "预提重分类",
"eamDisposal": "EAM资产处置金额记录表"
} }
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 81a74e4d
...@@ -1113,6 +1113,10 @@ ...@@ -1113,6 +1113,10 @@
"PleaseEnterTheFiledWordings": "请输入取值字段", "PleaseEnterTheFiledWordings": "请输入取值字段",
"PleaseEnterTheFilteredCondition": "请输入筛选条件", "PleaseEnterTheFilteredCondition": "请输入筛选条件",
"PleaseSelectTheField": "请选择字段", "PleaseSelectTheField": "请选择字段",
"PleaseFillinAllDataField": "请输入数据源筛选条件" "PleaseFillinAllDataField": "请输入数据源筛选条件",
"bsGenerateVer": "试算平衡生成版",
"bsMappingVer": "试算平衡Mapping版",
"salaryAdvance": "预提重分类",
"eamDisposal": "EAM资产处置金额记录表"
} }
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.ctrl.js → atms-web/src/main/webapp/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.ctrl.js
View file @ 81a74e4d
citModule.controller('citPreviewBalanceSheetController', ['$scope', 'vatSessionService', 'citSessionService', citModule.controller('citPreviewBalanceSheetController', ['$scope', 'vatSessionService', 'citSessionService',
function ($scope, vatSessionService, citSessionService) { function ($scope, vatSessionService, citSessionService) {
'use strict'; 'use strict';
$scope.citProject = vatSessionService.project; $scope.citProject = vatSessionService.project;
$scope.month = citSessionService.month; $scope.month = citSessionService.month;
} }
]); ]);
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.js → atms-web/src/main/webapp/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.js
View file @ 81a74e4d
citModule.directive('citPreviewBalanceSheet', ['$log','browserService','$translate', citModule.directive('citPreviewBalanceSheet', ['$log','browserService','$translate',
function ($log, browserService, $translate) { function ($log, browserService, $translate) {
$log.debug('citPreviewBalanceSheet.ctor()...'); $log.debug('citPreviewBalanceSheet.ctor()...');
return { return {
restrict: 'E', restrict: 'E',
templateUrl: '/app/cit/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.html' + '?_=' + Math.random(), templateUrl: '/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.html' + '?_=' + Math.random(),
scope: {}, scope: {},
controller: 'citPreviewBalanceSheetController', controller: 'citPreviewBalanceSheetController',
link: function ($scope, element) { link: function ($scope, element) {
} }
}; };
} }
]); ]);
atms-web/src/main/webapp/app/cit/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.less → atms-web/src/main/webapp/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.less
View file @ 81a74e4d
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.vat-preview-balanceSheet { .vat-preview-balanceSheet {
background-color: white; background-color: white;
height: 100%; height: 100%;
overflow-x: auto; overflow-x: auto;
white-space: nowrap; white-space: nowrap;
.leftFilter { .leftFilter {
padding-left: 5px; padding-left: 5px;
padding-top: 10px; padding-top: 10px;
height:60px; height:60px;
.filter-button { .filter-button {
width: 30px; width: 30px;
} }
.leftFilterButton { .leftFilterButton {
} }
} }
.margin-right5{ .margin-right5{
margin-right: 5px; margin-right: 5px;
} }
.margin-right10 { .margin-right10 {
margin-right: 10px; margin-right: 10px;
} }
.margin-right30 { .margin-right30 {
margin-right: 30px; margin-right: 30px;
} }
.margin-right50 { .margin-right50 {
margin-right: 50px; margin-right: 50px;
} }
.margin-left20 { .margin-left20 {
margin-left: 20px; margin-left: 20px;
} }
.mainArea { .mainArea {
padding-left: 20px; padding-left: 20px;
} }
.margin-top5{ .margin-top5{
margin-top:5px; margin-top:5px;
} }
.popover { .popover {
min-width: 370px; min-width: 370px;
left: 119px !important; left: 119px !important;
.arrow { .arrow {
left: 5% !important; left: 5% !important;
} }
} }
.popover-content { .popover-content {
td { td {
text-align: right; text-align: right;
padding: 6px; padding: 6px;
span { span {
float: left; float: left;
} }
} }
.form-control { .form-control {
display: inline-block; display: inline-block;
&:focus { &:focus {
border-color: transparent; border-color: transparent;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
} }
.input-width-small { .input-width-small {
width: 100px; width: 100px;
} }
.input-width-middle { .input-width-middle {
width: 217px; width: 217px;
} }
} }
.alignRight { .alignRight {
text-align: right; text-align: right;
} }
.alignCenter { .alignCenter {
text-align: center; text-align: center;
} }
.ui-grid-invisible { .ui-grid-invisible {
display: none; display: none;
} }
.text-align-left-padding { .text-align-left-padding {
text-align: left; text-align: left;
padding-left: 30px; padding-left: 30px;
} }
.cursorPointer { .cursorPointer {
cursor: pointer; cursor: pointer;
} }
.dropdownListWithNoBorder { .dropdownListWithNoBorder {
border: 0px; border: 0px;
background-color: transparent; background-color: transparent;
} }
// Double Header: // Double Header:
.topHeaderLayout { .topHeaderLayout {
background-color: #F1F1F1; background-color: #F1F1F1;
border-color: #D3D3D3; border-color: #D3D3D3;
font-weight: bold; font-weight: bold;
} }
.topLevelHeader { .topLevelHeader {
border-color: #D3D3D3; border-color: #D3D3D3;
} }
.balanceSheetGrid { .balanceSheetGrid {
width: 98%;/*1200px;*/ width: 98%;/*1200px;*/
height: 95%;/*95%;*/ height: 95%;/*95%;*/
} }
.ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-header-cell { .ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-header-cell {
background-color: #F1F1F1 !important; background-color: #F1F1F1 !important;
border-right: solid thin; border-right: solid thin;
border-right-color: #D3D3D3; border-right-color: #D3D3D3;
} }
.dataColumn8{ .dataColumn8{
border-right:none !important; border-right:none !important;
} }
.ui-grid-header-cell-row { .ui-grid-header-cell-row {
clear: both; clear: both;
border: none !important; border: none !important;
border-top: none !important; border-top: none !important;
} }
.ui-grid { .ui-grid {
border-top: none !important; border-top: none !important;
} }
.subjectHeader { .subjectHeader {
position: absolute !important; position: absolute !important;
margin-top: -10px !important; margin-top: -10px !important;
left: 0 !important; left: 0 !important;
} }
.ui-grid-contents-wrapper .ui-grid-header-canvas { .ui-grid-contents-wrapper .ui-grid-header-canvas {
background-color: #f1f1f1; background-color: #f1f1f1;
} }
.ui-grid-top-panel .ui-grid-top-panel
{ {
height:31px; height:31px;
} }
.ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-cell-contents .ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-cell-contents
{ {
padding-left: 1px; padding-left: 1px;
padding-right:1px; padding-right:1px;
} }
/*.ui-grid-cell-contents /*.ui-grid-cell-contents
{ {
line-height: 1.9; line-height: 1.9;
}*/ }*/
/*.ui-grid-contents-wrapper .ui-grid-render-container i { /*.ui-grid-contents-wrapper .ui-grid-render-container i {
padding-top: 10px !important; padding-top: 10px !important;
}*/ }*/
.ui-grid-tree-header-row .ui-grid-tree-header-row
{ {
clear:both; clear:both;
font-weight:normal !important; font-weight:normal !important;
} }
.watermark { .watermark {
position: absolute; position: absolute;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
opacity: 0.25; opacity: 0.25;
font-size: 3em; font-size: 3em;
width: 100%; width: 100%;
text-align: center; text-align: center;
z-index: 1000; z-index: 1000;
} }
/*******************************************/ /*******************************************/
/*Filter Criteria tags:*/ /*Filter Criteria tags:*/
.tag { .tag {
font-size: 12px; font-size: 12px;
padding: .3em .4em .4em; padding: .3em .4em .4em;
margin: 0 .1em; margin: 0 .1em;
} }
.tag a { .tag a {
color: #bbb; color: #bbb;
cursor: pointer; cursor: pointer;
opacity: 0.6; opacity: 0.6;
} }
.tag a:hover { .tag a:hover {
opacity: 1.0; opacity: 1.0;
} }
.tag .remove { .tag .remove {
vertical-align: bottom; vertical-align: bottom;
top: 0; top: 0;
} }
.tag a { .tag a {
margin: 0 0 0 .3em; margin: 0 0 0 .3em;
} }
.tag a .glyphicon-white { .tag a .glyphicon-white {
color: #fff; color: #fff;
margin-bottom: 2px; margin-bottom: 2px;
} }
/*Filter Criteria tags:*/ /*Filter Criteria tags:*/
/*******************************************/ /*******************************************/
} }
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 81a74e4d
...@@ -623,7 +623,25 @@ constant.citPermission = { ...@@ -623,7 +623,25 @@ constant.citPermission = {
}, },
accountVoucher: { accountVoucher: {
queryCode: '03.002.002' queryCode: '03.002.002'
}, },
journalMerge: {
queryCode: '03.002.003'
},
bsGenerateVer: {
queryCode: '03.002.004'
},
bsMappingVer: {
queryCode: '03.002.005'
},
assetsList: {
queryCode: '03.002.006'
},
salaryAdvance: {
queryCode: '03.002.007'
},
eamDisposal: {
queryCode: '03.002.008'
},
}, },
dataManage: { dataManage: {
dataManageCode: '03.003', dataManageCode: '03.003',
...@@ -833,6 +851,12 @@ constant.citMenuList = [ ...@@ -833,6 +851,12 @@ constant.citMenuList = [
constant.citPermission.dataPreview.balanceSheet.queryCode, constant.citPermission.dataPreview.balanceSheet.queryCode,
constant.citPermission.dataPreview.accountVoucher.queryCode, constant.citPermission.dataPreview.accountVoucher.queryCode,
constant.citPermission.dataPreview.journalMerge.queryCode,
constant.citPermission.dataPreview.bsGenerateVer.queryCode,
constant.citPermission.dataPreview.bsMappingVer.queryCode,
constant.citPermission.dataPreview.assetsList.queryCode,
constant.citPermission.dataPreview.salaryAdvance.queryCode,
constant.citPermission.dataPreview.eamDisposal.queryCode,
constant.citPermission.dataManage.accountMappingCode, constant.citPermission.dataManage.accountMappingCode,
constant.citPermission.dataManage.caculateDataCode, constant.citPermission.dataManage.caculateDataCode,
......
atms-web/src/main/webapp/app/module-part2.js
View file @ 81a74e4d
...@@ -760,6 +760,120 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru ...@@ -760,6 +760,120 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'cit.previewData.journalMerge',
url: '/journalMerge',
views: {
'@cit.previewData': {
controller: [
'$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'cit.previewData.bsGenerateVer',
url: '/bsGenerateVer',
views: {
'@cit.previewData': {
controller: [
'$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'cit.previewData.bsMappingVer',
url: '/bsMappingVer',
views: {
'@cit.previewData': {
controller: [
'$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'cit.previewData.assetsList',
url: '/assetsList',
views: {
'@cit.previewData': {
controller: [
'$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'cit.previewData.salaryAdvance',
url: '/salaryAdvance',
views: {
'@cit.previewData': {
controller: [
'$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'cit.previewData.eamDisposal',
url: '/eamDisposal',
views: {
'@cit.previewData': {
controller: [
'$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({ $stateProvider.state({
name: 'cit.previewData.outputInvoice', name: 'cit.previewData.outputInvoice',
url: '/outputInvoice', url: '/outputInvoice',
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.js
View file @ 81a74e4d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
return { return {
restrict: 'E', restrict: 'E',
templateUrl: '/app/vat/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.html' + '?_=' + Math.random(), templateUrl: '/app/vat/preview/vat-preview-balanceSheet/cit-preview-balanceSheet.html' + '?_=' + Math.random(),
scope: {}, scope: {},
controller: 'vatPreviewBalanceSheetController', controller: 'vatPreviewBalanceSheetController',
link: function ($scope, element) { link: function ($scope, element) {
......
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