Skip to content

T
traffic-front
Commit 272ee822 authored by gary's avatar gary
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

parents 6a7c0f5a 81a74e4d
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 @ 272ee822
......@@ -1112,6 +1112,7 @@ public class CitImportExcelServiceImpl extends BaseService {
*/
public OperationResultDto autoGeneTB(Integer period, String orgId, List<String> orgList){
OperationResultDto autoGeneResult = new OperationResultDto();
//第一步，根据合并日记账计算出借方发生额，贷方发生额，科目代码等相关信息
StringBuilder periodSb = new StringBuilder();
periodSb.append(period);
......@@ -1143,7 +1144,7 @@ public class CitImportExcelServiceImpl extends BaseService {
criteria.andAccountCodeEqualTo(citJournal.getSubjectCode());
criteria.andPeriodEqualTo(period-1);
List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample);
if(trialBalances != null || trialBalances.size() > 0){
if(trialBalances != null && trialBalances.size() > 0){
lastYearBegBla = trialBalances.get(0).getBeginningBalance();
}
trialBalance.setBeginningBalance(lastYearBegBla);
......@@ -1154,7 +1155,9 @@ public class CitImportExcelServiceImpl extends BaseService {
}
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 @ 272ee822
......@@ -61,7 +61,7 @@
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.createBy != null">#{item.createdBy,jdbcType=VARCHAR},</when>
<when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
......@@ -77,45 +77,10 @@
SELECT 1 FROM DUAL;
</insert>
<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
cj.accounted_dr as accounted_dr,
cj.accounted_cr as accounted_cr ,
cj.subject_code as subject_code
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
<include refid="Base_Column_List" />
from cit_trial_balance
where caccount_code=#{item.accountCode} AND ctb.period=#{item.period}
</select>
</mapper>
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ 272ee822
......@@ -88,5 +88,11 @@
"CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",
"CitDraftAccountMappingImport": "底稿&科目Mapping表导入-CIT",
"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 @ 272ee822
......@@ -1113,6 +1113,10 @@
"PleaseEnterTheFiledWordings": "请输入取值字段",
"PleaseEnterTheFilteredCondition": "请输入筛选条件",
"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 @ 272ee822
citModule.controller('citPreviewBalanceSheetController', ['$scope', 'vatSessionService', 'citSessionService',
function ($scope, vatSessionService, citSessionService) {
'use strict';
$scope.citProject = vatSessionService.project;
$scope.month = citSessionService.month;
}
citModule.controller('citPreviewBalanceSheetController', ['$scope', 'vatSessionService', 'citSessionService',
function ($scope, vatSessionService, citSessionService) {
'use strict';
$scope.citProject = vatSessionService.project;
$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 @ 272ee822
citModule.directive('citPreviewBalanceSheet', ['$log','browserService','$translate',
function ($log, browserService, $translate) {
$log.debug('citPreviewBalanceSheet.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/cit/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.html' + '?_=' + Math.random(),
scope: {},
controller: 'citPreviewBalanceSheetController',
link: function ($scope, element) {
}
};
}
]);
citModule.directive('citPreviewBalanceSheet', ['$log','browserService','$translate',
function ($log, browserService, $translate) {
$log.debug('citPreviewBalanceSheet.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.html' + '?_=' + Math.random(),
scope: {},
controller: 'citPreviewBalanceSheetController',
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 @ 272ee822
@import "~/app-resources/less/theme.less";
.vat-preview-balanceSheet {
background-color: white;
height: 100%;
overflow-x: auto;
white-space: nowrap;
.leftFilter {
padding-left: 5px;
padding-top: 10px;
height:60px;
.filter-button {
width: 30px;
}
.leftFilterButton {
}
}
.margin-right5{
margin-right: 5px;
}
.margin-right10 {
margin-right: 10px;
}
.margin-right30 {
margin-right: 30px;
}
.margin-right50 {
margin-right: 50px;
}
.margin-left20 {
margin-left: 20px;
}
.mainArea {
padding-left: 20px;
}
.margin-top5{
margin-top:5px;
}
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
}
}
.popover-content {
td {
text-align: right;
padding: 6px;
span {
float: left;
}
}
.form-control {
display: inline-block;
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
}
.input-width-small {
width: 100px;
}
.input-width-middle {
width: 217px;
}
}
.alignRight {
text-align: right;
}
.alignCenter {
text-align: center;
}
.ui-grid-invisible {
display: none;
}
.text-align-left-padding {
text-align: left;
padding-left: 30px;
}
.cursorPointer {
cursor: pointer;
}
.dropdownListWithNoBorder {
border: 0px;
background-color: transparent;
}
// Double Header:
.topHeaderLayout {
background-color: #F1F1F1;
border-color: #D3D3D3;
font-weight: bold;
}
.topLevelHeader {
border-color: #D3D3D3;
}
.balanceSheetGrid {
width: 98%;/*1200px;*/
height: 95%;/*95%;*/
}
.ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-header-cell {
background-color: #F1F1F1 !important;
border-right: solid thin;
border-right-color: #D3D3D3;
}
.dataColumn8{
border-right:none !important;
}
.ui-grid-header-cell-row {
clear: both;
border: none !important;
border-top: none !important;
}
.ui-grid {
border-top: none !important;
}
.subjectHeader {
position: absolute !important;
margin-top: -10px !important;
left: 0 !important;
}
.ui-grid-contents-wrapper .ui-grid-header-canvas {
background-color: #f1f1f1;
}
.ui-grid-top-panel
{
height:31px;
}
.ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-cell-contents
{
padding-left: 1px;
padding-right:1px;
}
/*.ui-grid-cell-contents
{
line-height: 1.9;
}*/
/*.ui-grid-contents-wrapper .ui-grid-render-container i {
padding-top: 10px !important;
}*/
.ui-grid-tree-header-row
{
clear:both;
font-weight:normal !important;
}
.watermark {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: 0.25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
}
.tag a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
}
.tag a:hover {
opacity: 1.0;
}
.tag .remove {
vertical-align: bottom;
top: 0;
}
.tag a {
margin: 0 0 0 .3em;
}
.tag a .glyphicon-white {
color: #fff;
margin-bottom: 2px;
}
/*Filter Criteria tags:*/
/*******************************************/
}
@import "~/app-resources/less/theme.less";
.vat-preview-balanceSheet {
background-color: white;
height: 100%;
overflow-x: auto;
white-space: nowrap;
.leftFilter {
padding-left: 5px;
padding-top: 10px;
height:60px;
.filter-button {
width: 30px;
}
.leftFilterButton {
}
}
.margin-right5{
margin-right: 5px;
}
.margin-right10 {
margin-right: 10px;
}
.margin-right30 {
margin-right: 30px;
}
.margin-right50 {
margin-right: 50px;
}
.margin-left20 {
margin-left: 20px;
}
.mainArea {
padding-left: 20px;
}
.margin-top5{
margin-top:5px;
}
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
}
}
.popover-content {
td {
text-align: right;
padding: 6px;
span {
float: left;
}
}
.form-control {
display: inline-block;
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
}
.input-width-small {
width: 100px;
}
.input-width-middle {
width: 217px;
}
}
.alignRight {
text-align: right;
}
.alignCenter {
text-align: center;
}
.ui-grid-invisible {
display: none;
}
.text-align-left-padding {
text-align: left;
padding-left: 30px;
}
.cursorPointer {
cursor: pointer;
}
.dropdownListWithNoBorder {
border: 0px;
background-color: transparent;
}
// Double Header:
.topHeaderLayout {
background-color: #F1F1F1;
border-color: #D3D3D3;
font-weight: bold;
}
.topLevelHeader {
border-color: #D3D3D3;
}
.balanceSheetGrid {
width: 98%;/*1200px;*/
height: 95%;/*95%;*/
}
.ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-header-cell {
background-color: #F1F1F1 !important;
border-right: solid thin;
border-right-color: #D3D3D3;
}
.dataColumn8{
border-right:none !important;
}
.ui-grid-header-cell-row {
clear: both;
border: none !important;
border-top: none !important;
}
.ui-grid {
border-top: none !important;
}
.subjectHeader {
position: absolute !important;
margin-top: -10px !important;
left: 0 !important;
}
.ui-grid-contents-wrapper .ui-grid-header-canvas {
background-color: #f1f1f1;
}
.ui-grid-top-panel
{
height:31px;
}
.ui-grid-contents-wrapper .ui-grid-render-container .ui-grid-cell-contents
{
padding-left: 1px;
padding-right:1px;
}
/*.ui-grid-cell-contents
{
line-height: 1.9;
}*/
/*.ui-grid-contents-wrapper .ui-grid-render-container i {
padding-top: 10px !important;
}*/
.ui-grid-tree-header-row
{
clear:both;
font-weight:normal !important;
}
.watermark {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: 0.25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
}
.tag a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
}
.tag a:hover {
opacity: 1.0;
}
.tag .remove {
vertical-align: bottom;
top: 0;
}
.tag a {
margin: 0 0 0 .3em;
}
.tag a .glyphicon-white {
color: #fff;
margin-bottom: 2px;
}
/*Filter Criteria tags:*/
/*******************************************/
}
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 272ee822
......@@ -623,7 +623,25 @@ constant.citPermission = {
},
accountVoucher: {
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: {
dataManageCode: '03.003',
......@@ -833,6 +851,12 @@ constant.citMenuList = [
constant.citPermission.dataPreview.balanceSheet.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.caculateDataCode,
......
atms-web/src/main/webapp/app/module-part2.js
View file @ 272ee822
......@@ -760,6 +760,120 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
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({
name: 'cit.previewData.outputInvoice',
url: '/outputInvoice',
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-balanceSheet/vat-preview-balanceSheet.js
View file @ 272ee822
......@@ -4,7 +4,7 @@
return {
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: {},
controller: 'vatPreviewBalanceSheetController',
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