Skip to content

T
traffic-front
Commit 30419404 authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_oracle_neo' into 'dev_oracle' 

Dev oracle neo

See merge request root/atms!114
parents c6d3e83a 0fa9fef2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 119 deletions
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/MyStatisticAttributeMapper.xml 0 → 100644
View file @ 30419404
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.MyStatisticAttributeMapper">
<resultMap id="BaseResultMap"
type="pwc.taxtech.atms.dpo.StatisticAttributeDisplayDto">
<id column="ID" jdbcType="VARCHAR" property="id"/>
<result column="ATTRIBUTE_ID" jdbcType="VARCHAR" property="attributeId"/>
<result column="ATTRIBUTE_NAME" jdbcType="NVARCHAR" property="attributeName"/>
<result column="DIMENSION_ID" jdbcType="VARCHAR" property="dimensionId"/>
<result column="DIMENSION_NAME" jdbcType="VARCHAR" property="dimensionName"/>
<result column="ORDER_INDEX" jdbcType="SMALLINT" property="orderIndex"/>
</resultMap>
<select id="selectByParentDimensionId" parameterType="map"
resultMap="BaseResultMap"><![CDATA[
SELECT
P.ID AS ATTRIBUTE_ID,
P.NAME AS ATTRIBUTE_NAME,
D.ID AS DIMENSION_ID,
D.NAME AS DIMENSION_NAME,
SD.ORDER_INDEX AS ORDER_INDEX
FROM
STATISTIC_ATTRIBUTE P
JOIN STATISTIC_ATTRIBUTE_DIMENSION SD ON P.ID = SD.STATISTICS_ATTRIBUTE_ID
JOIN DIMENSION D ON SD.DIMENSION_ID = D.ID
WHERE
P.IS_ACTIVE = 1
AND D.IS_ACTIVE = 1 AND D.ID = #{parentDimensionId,jdbcType=VARCHAR}
ORDER BY SD.ORDER_INDEX
]]></select>
<select id="selectByOrgSubChildrenID" parameterType="map"
resultMap="BaseResultMap"><![CDATA[
SELECT
P.STATISTICS_ATTRIBUTE_ID AS ATTRIBUTE_ID,
D.DICT_VALUE AS ATTRIBUTE_NAME,
#{parentDimensionId} AS DIMENSION_ID,
'' AS DIMENSION_NAME,
P.ORDER_INDEX AS ORDER_INDEX
FROM
STATISTIC_ATTRIBUTE_DIMENSION P
JOIN DICTIONARY D ON P.STATISTICS_ATTRIBUTE_ID = D.ID
WHERE
P.DIMENSION_ID=#{parentDimensionId}
]]></select>
</mapper>
\ No newline at end of file
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ 30419404
......@@ -869,19 +869,19 @@
}
else {
var menuList = [
constant.vatPermission.dataImport.balanceSheet.queryCode,
constant.vatPermission.dataImport.journalEntry.queryCode,
constant.vatPermission.dataImport.erpImport.queryCode,
constant.vatPermission.dataImport.outputInvoice.queryCode,
constant.vatPermission.dataImport.inputInvoice.queryCode,
constant.vatPermission.dataImport.customInvoice.queryCode,
constant.vatPermission.dataImport.voucherMapping.queryCode,
constant.vatPermission.dataImport.invoiceMapping.queryCode,
constant.vatPermission.dataImport.auditAdjust.queryCode,
constant.vatPermission.dataPreview.balanceSheet.queryCode,
constant.vatPermission.dataPreview.accountVoucher.queryCode,
constant.vatPermission.dataPreview.customInvoice.queryCode,
// constant.vatPermission.dataImport.balanceSheet.queryCode,
// constant.vatPermission.dataImport.journalEntry.queryCode,
// constant.vatPermission.dataImport.erpImport.queryCode,
// constant.vatPermission.dataImport.outputInvoice.queryCode,
// constant.vatPermission.dataImport.inputInvoice.queryCode,
// constant.vatPermission.dataImport.customInvoice.queryCode,
// constant.vatPermission.dataImport.voucherMapping.queryCode,
// constant.vatPermission.dataImport.invoiceMapping.queryCode,
// constant.vatPermission.dataImport.auditAdjust.queryCode,
// constant.vatPermission.dataPreview.balanceSheet.queryCode,
// constant.vatPermission.dataPreview.accountVoucher.queryCode,
// constant.vatPermission.dataPreview.customInvoice.queryCode,
constant.vatPermission.dataPreview.outputInvoice.queryCode,
constant.vatPermission.dataPreview.inputInvoice.queryCode,
......@@ -916,20 +916,23 @@
// $state.go('vat.importData.customInvoice');
// } else if (data[constant.vatPermission.dataImport.voucherMapping.queryCode]) {
// $state.go('vat.importData.voucherMapping');
// } else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {
// } else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {./
// $state.go('vat.importData.invoiceMapping');
// } else
if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
$state.go('vat.previewData.balanceSheet');
} else if (data[constant.vatPermission.dataPreview.accountVoucher.queryCode]) {
$state.go('vat.previewData.accountVoucher');
} else if (data[constant.vatPermission.dataPreview.inputInvoice.queryCode]) {
// if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
// $state.go('vat.previewData.balanceSheet');
// } else if (data[constant.vatPermission.dataPreview.accountVoucher.queryCode]) {
// $state.go('vat.previewData.accountVoucher');
// } 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.dataPreview.customInvoice.queryCode]) {
$state.go('vat.previewData.customInvoice');
} else if (data[constant.vatPermission.dataManage.accountMappingCode]) {
}
// else if (data[constant.vatPermission.dataPreview.customInvoice.queryCode]) {
// $state.go('vat.previewData.customInvoice');
// }
else if (data[constant.vatPermission.dataManage.accountMappingCode]) {
$state.go('vat.reductionData.accountMapping');
} else if (data[constant.vatPermission.dataManage.goodsMappingCode]) {
$state.go('vat.reductionData.goodsMapping');
......
atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js
View file @ 30419404
......@@ -20,14 +20,14 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
$scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
$scope.linkShort = enums.linkShort.PreviewData;
$scope.menus = [
{
name: 'balanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: true
},
{
name: 'accountVoucher', permission: constant.vatPermission.dataPreview.accountVoucher.queryCode,
text: $translate.instant('accountVoucher'), icon: 'fa fa-columns', show: true
},
// {
// name: 'balanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
// text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: true
// },
// {
// name: 'accountVoucher', permission: constant.vatPermission.dataPreview.accountVoucher.queryCode,
// text: $translate.instant('accountVoucher'), icon: 'fa fa-columns', show: true
// },
{
name: 'outputInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
text: $translate.instant('outputInvoice'), icon: 'fa fa-file-text-o', show: true
......@@ -35,11 +35,13 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
{
name: 'inputInvoice', permission: constant.vatPermission.dataPreview.inputInvoice.queryCode,
text: $translate.instant('inputInvoice'), icon: 'fa fa-file-text-o', show: true
},
{
name: 'customInvoice', permission: constant.vatPermission.dataPreview.customInvoice.queryCode,
text: $translate.instant('customInvoice'), icon: 'fa fa-bookmark', show: true
}];
}
// ,
// {
// name: 'customInvoice', permission: constant.vatPermission.dataPreview.customInvoice.queryCode,
// text: $translate.instant('customInvoice'), icon: 'fa fa-bookmark', show: true
// }
];
}
else if ($location && $location.absUrl().indexOf('reductionData') > -1) {
$scope.nodeDicKey = constant.DictionaryDictKey.DataProcess;
......@@ -65,18 +67,19 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
else {
$scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
$scope.linkShort = enums.linkShort.ImportData;
$scope.menus = [{
name: 'balanceSheet', permission: constant.vatPermission.dataImport.balanceSheet.queryCode,
text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: true
},
{
name: 'journalEntry', permission: constant.vatPermission.dataImport.journalEntry.queryCode,
text: $translate.instant('journalEntry'), icon: 'fa fa-align-left', show: true
},
{
name: 'erpData', permission: constant.vatPermission.dataImport.erpImport.queryCode,
text: $translate.instant('erpData'), icon: 'fa fa-list-ul', show: true
},
$scope.menus = [
// {
// name: 'balanceSheet', permission: constant.vatPermission.dataImport.balanceSheet.queryCode,
// text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: true
// },
// {
// name: 'journalEntry', permission: constant.vatPermission.dataImport.journalEntry.queryCode,
// text: $translate.instant('journalEntry'), icon: 'fa fa-align-left', show: true
// },
// {
// name: 'erpData', permission: constant.vatPermission.dataImport.erpImport.queryCode,
// text: $translate.instant('erpData'), icon: 'fa fa-list-ul', show: true
// },
{
name: 'outputInvoice', permission: constant.vatPermission.dataImport.outputInvoice.queryCode,
text: $translate.instant('outputInvoice'), icon: 'fa fa-file-text-o', show: true
......@@ -84,23 +87,25 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
{
name: 'inputInvoice', permission: constant.vatPermission.dataImport.inputInvoice.queryCode,
text: $translate.instant('inputInvoice'), icon: 'fa fa-file-text-o', show: true
},
{
name: 'customInvoice', permission: constant.vatPermission.dataImport.customInvoice.queryCode,
text: $translate.instant('customInvoice'), icon: 'fa fa-bookmark', show: true
},
{
name: 'voucherMapping', permission: constant.vatPermission.dataImport.voucherMapping.queryCode,
text: $translate.instant('voucherMapping'), icon: 'fa fa-columns', show: true
},
{
name: 'invoiceMapping', permission: constant.vatPermission.dataImport.invoiceMapping.queryCode,
text: $translate.instant('invoiceMapping'), icon: 'fa fa-columns', show: true
},
{
name: 'auditAdjust', permission: constant.vatPermission.dataImport.auditAdjust.queryCode,
text: $translate.instant('auditAdjust'), icon: 'fa fa-adjust', show: true
}];
}
// ,
// {
// name: 'customInvoice', permission: constant.vatPermission.dataImport.customInvoice.queryCode,
// text: $translate.instant('customInvoice'), icon: 'fa fa-bookmark', show: true
// },
// {
// name: 'voucherMapping', permission: constant.vatPermission.dataImport.voucherMapping.queryCode,
// text: $translate.instant('voucherMapping'), icon: 'fa fa-columns', show: true
// },
// {
// name: 'invoiceMapping', permission: constant.vatPermission.dataImport.invoiceMapping.queryCode,
// text: $translate.instant('invoiceMapping'), icon: 'fa fa-columns', show: true
// },
// {
// name: 'auditAdjust', permission: constant.vatPermission.dataImport.auditAdjust.queryCode,
// text: $translate.instant('auditAdjust'), icon: 'fa fa-adjust', show: true
// }
];
}
......
atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
View file @ 30419404
......@@ -124,9 +124,9 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
// constant.vatPermission.dataImport.invoiceMapping.queryCode,
// constant.vatPermission.dataImport.auditAdjust.queryCode,
constant.vatPermission.dataPreview.balanceSheet.queryCode,
constant.vatPermission.dataPreview.accountVoucher.queryCode,
constant.vatPermission.dataPreview.customInvoice.queryCode,
// constant.vatPermission.dataPreview.balanceSheet.queryCode,
// constant.vatPermission.dataPreview.accountVoucher.queryCode,
// constant.vatPermission.dataPreview.customInvoice.queryCode,
constant.vatPermission.dataPreview.outputInvoice.queryCode,
constant.vatPermission.dataPreview.inputInvoice.queryCode,
......@@ -246,27 +246,28 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
// });
//}
if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
});
subMenus.push({
name: 'previewData.balanceSheet', state: 'previewData.balanceSheet', num: 2,
permission: constant.vatPermission.dataPreview.balanceSheet.queryCode, url: '#/vat/previewData/balanceSheet'
});
}
else if (data[constant.vatPermission.dataPreview.accountVoucher.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
});
subMenus.push({
name: 'previewData.accountVoucher', state: 'previewData.accountVoucher', num: 2,
permission: constant.vatPermission.dataPreview.accountVoucher.queryCode, url: '#/vat/previewData/accountVoucher'
});
}
else if (data[constant.vatPermission.dataPreview.inputInvoice.queryCode]) {
// if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
// $scope.menus.push({
// name: 'previewData', state: 'previewData', num: 2,
// permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
// });
// subMenus.push({
// name: 'previewData.balanceSheet', state: 'previewData.balanceSheet', num: 2,
// permission: constant.vatPermission.dataPreview.balanceSheet.queryCode, url: '#/vat/previewData/balanceSheet'
// });
// }
// else if (data[constant.vatPermission.dataPreview.accountVoucher.queryCode]) {
// $scope.menus.push({
// name: 'previewData', state: 'previewData', num: 2,
// permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
// });
// subMenus.push({
// name: 'previewData.accountVoucher', state: 'previewData.accountVoucher', num: 2,
// permission: constant.vatPermission.dataPreview.accountVoucher.queryCode, url: '#/vat/previewData/accountVoucher'
// });
// }
// else
if (data[constant.vatPermission.dataPreview.inputInvoice.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
......@@ -286,16 +287,16 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
permission: constant.vatPermission.dataPreview.outputInvoice.queryCode, url: '#/vat/previewData/outputInvoice'
});
}
else if (data[constant.vatPermission.dataPreview.customInvoice.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
});
subMenus.push({
name: 'previewData.customInvoice', state: 'previewData.customInvoice', num: 2,
permission: constant.vatPermission.dataPreview.customInvoice.queryCode, url: '#/vat/previewData/customInvoice'
});
}
// else if (data[constant.vatPermission.dataPreview.customInvoice.queryCode]) {
// $scope.menus.push({
// name: 'previewData', state: 'previewData', num: 2,
// permission: constant.vatPermission.dataPreview.dataPreviewCode, url: '#/vat/previewData'
// });
// subMenus.push({
// name: 'previewData.customInvoice', state: 'previewData.customInvoice', num: 2,
// permission: constant.vatPermission.dataPreview.customInvoice.queryCode, url: '#/vat/previewData/customInvoice'
// });
// }
//else {
// $scope.menus.push({
// name: 'previewData', state: 'previewData', num: 2,
......
atms-web/src/main/webapp/bundles/framework.js
View file @ 30419404
......@@ -1795,19 +1795,19 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
}
else {
var menuList = [
constant.vatPermission.dataImport.balanceSheet.queryCode,
constant.vatPermission.dataImport.journalEntry.queryCode,
constant.vatPermission.dataImport.erpImport.queryCode,
constant.vatPermission.dataImport.outputInvoice.queryCode,
constant.vatPermission.dataImport.inputInvoice.queryCode,
constant.vatPermission.dataImport.customInvoice.queryCode,
constant.vatPermission.dataImport.voucherMapping.queryCode,
constant.vatPermission.dataImport.invoiceMapping.queryCode,
constant.vatPermission.dataImport.auditAdjust.queryCode,
constant.vatPermission.dataPreview.balanceSheet.queryCode,
constant.vatPermission.dataPreview.accountVoucher.queryCode,
constant.vatPermission.dataPreview.customInvoice.queryCode,
// constant.vatPermission.dataImport.balanceSheet.queryCode,
// constant.vatPermission.dataImport.journalEntry.queryCode,
// constant.vatPermission.dataImport.erpImport.queryCode,
// constant.vatPermission.dataImport.outputInvoice.queryCode,
// constant.vatPermission.dataImport.inputInvoice.queryCode,
// constant.vatPermission.dataImport.customInvoice.queryCode,
// constant.vatPermission.dataImport.voucherMapping.queryCode,
// constant.vatPermission.dataImport.invoiceMapping.queryCode,
// constant.vatPermission.dataImport.auditAdjust.queryCode,
// constant.vatPermission.dataPreview.balanceSheet.queryCode,
// constant.vatPermission.dataPreview.accountVoucher.queryCode,
// constant.vatPermission.dataPreview.customInvoice.queryCode,
constant.vatPermission.dataPreview.outputInvoice.queryCode,
constant.vatPermission.dataPreview.inputInvoice.queryCode,
......@@ -1845,17 +1845,20 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
// } else if (data[constant.vatPermission.dataImport.invoiceMapping.queryCode]) {
// $state.go('vat.importData.invoiceMapping');
// } else
if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
$state.go('vat.previewData.balanceSheet');
} else if (data[constant.vatPermission.dataPreview.accountVoucher.queryCode]) {
$state.go('vat.previewData.accountVoucher');
} else if (data[constant.vatPermission.dataPreview.inputInvoice.queryCode]) {
// if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
// $state.go('vat.previewData.balanceSheet');
// } else if (data[constant.vatPermission.dataPreview.accountVoucher.queryCode]) {
// $state.go('vat.previewData.accountVoucher');
// } 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.dataPreview.customInvoice.queryCode]) {
$state.go('vat.previewData.customInvoice');
} else if (data[constant.vatPermission.dataManage.accountMappingCode]) {
}
// else if (data[constant.vatPermission.dataPreview.customInvoice.queryCode]) {
// $state.go('vat.previewData.customInvoice');
// }
else if (data[constant.vatPermission.dataManage.accountMappingCode]) {
$state.go('vat.reductionData.accountMapping');
} else if (data[constant.vatPermission.dataManage.goodsMappingCode]) {
$state.go('vat.reductionData.goodsMapping');
......
atms-web/src/main/webapp/bundles/vat.js
View file @ 30419404
This diff is collapsed.
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