Skip to content

T
traffic-front
Commit 68f30e0a authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed admin issue

parent 56feda01
Expand all Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 74 deletions
atms-dao/src/main/java/pwc/taxtech/atms/dpo/EnterpriseAccountDto.java
View file @ 68f30e0a
...@@ -77,6 +77,8 @@ public class EnterpriseAccountDto { ...@@ -77,6 +77,8 @@ public class EnterpriseAccountDto {
private Date updateTime; private Date updateTime;
private String stdParentCode;
/** /**
* @return the id * @return the id
*/ */
...@@ -88,7 +90,7 @@ public class EnterpriseAccountDto { ...@@ -88,7 +90,7 @@ public class EnterpriseAccountDto {
* @param id the id to set * @param id the id to set
*/ */
public void setId(String id) { public void setId(String id) {
id = id; this.id = id;
} }
/** /**
...@@ -529,4 +531,11 @@ public class EnterpriseAccountDto { ...@@ -529,4 +531,11 @@ public class EnterpriseAccountDto {
} }
public String getStdParentCode() {
return stdParentCode;
}
public void setStdParentCode(String stdParentCode) {
this.stdParentCode = stdParentCode;
}
} }
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
View file @ 68f30e0a
...@@ -29,30 +29,9 @@ ...@@ -29,30 +29,9 @@
</delete> </delete>
<insert id="batchInsert" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig"> <insert id="batchInsert" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig">
INSERT INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG INSERT ALL
(ID, <foreach collection="list" item="item">
CELL_TEMPLATE_ID, INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG VALUES
REPORT_TEMPLATE_ID,
DATA_SOURCE_TYPE,
FORMULA,
FORMULA_DESCRIPTION,
ACCOUNT_CODES,
INVOICE_TYPE,
TAX_RATE,
INVOICE_AMOUNT_TYPE,
MODEL_IDS,
CREATE_BY,
CREATE_TIME,
UPDATE_BY,
UPDATE_TIME,
INVOICE_CATEGORY,
FORMULA_DATA_SOURCE,
VALIDATION,
VALIDATION_DESCRIPTION,
VOUCHER_KEYWORD
)
VALUES
<foreach collection="list" item="item" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<choose> <choose>
<when test="item.id != null"> <when test="item.id != null">
...@@ -213,33 +192,13 @@ ...@@ -213,33 +192,13 @@
</choose> </choose>
</trim> </trim>
</foreach> </foreach>
SELECT 1 FROM DUAL
</insert> </insert>
<insert id="batchInsert2" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig"> <insert id="batchInsert2" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig">
INSERT INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG INSERT ALL
(ID, <foreach collection="list" item="item" >
CELL_TEMPLATE_ID, INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG VALUES
REPORT_TEMPLATE_ID,
DATA_SOURCE_TYPE,
FORMULA,
FORMULA_DESCRIPTION,
ACCOUNT_CODES,
INVOICE_TYPE,
TAX_RATE,
INVOICE_AMOUNT_TYPE,
MODEL_IDS,
CREATE_BY,
CREATE_TIME,
UPDATE_BY,
UPDATE_TIME,
INVOICE_CATEGORY,
FORMULA_DATA_SOURCE,
VALIDATION,
VALIDATION_DESCRIPTION,
VOUCHER_KEYWORD
)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=INTEGER}, #{item.cellTemplateId,jdbcType=INTEGER}, (#{item.id,jdbcType=INTEGER}, #{item.cellTemplateId,jdbcType=INTEGER},
#{item.reportTemplateId,jdbcType=INTEGER}, #{item.reportTemplateId,jdbcType=INTEGER},
#{item.dataSourceType,jdbcType=INTEGER}, #{item.formula,jdbcType=VARCHAR}, #{item.dataSourceType,jdbcType=INTEGER}, #{item.formula,jdbcType=VARCHAR},
...@@ -254,5 +213,6 @@ ...@@ -254,5 +213,6 @@
#{item.validation,jdbcType=VARCHAR}, #{item.validation,jdbcType=VARCHAR},
#{item.validationDescription,jdbcType=VARCHAR}, #{item.voucherKeyword,jdbcType=VARCHAR}) #{item.validationDescription,jdbcType=VARCHAR}, #{item.voucherKeyword,jdbcType=VARCHAR})
</foreach> </foreach>
SELECT 1 FROM DUAL
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateExtendsMapper.xml
View file @ 68f30e0a
...@@ -2,25 +2,9 @@ ...@@ -2,25 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CellTemplateMapper"> <mapper namespace="pwc.taxtech.atms.dao.CellTemplateMapper">
<insert id="batchInsert2"> <insert id="batchInsert2">
INSERT INTO INSERT ALL
CELL_TEMPLATE ( <foreach collection="list" item="item">
ID, INTO CELL_TEMPLATE VALUES
REPORT_TEMPLATE_ID,
ROW_INDEX,
ROW_NAME,
COLUMN_INDEX,
COLUMN_NAME,
COMMENT,
CREATE_TIME,
UPDATE_TIME,
COPY_FROM_ID,
DATA_TYPE,
IS_READ_ONLY,
CREATE_BY,
UPDATE_BY
)
VALUES
<foreach collection="list" item="item" separator=",">
( (
#{item.id,jdbcType=INTEGER}, #{item.id,jdbcType=INTEGER},
#{item.reportTemplateId,jdbcType=INTEGER}, #{item.reportTemplateId,jdbcType=INTEGER},
...@@ -38,6 +22,7 @@ ...@@ -38,6 +22,7 @@
#{item.updateBy,jdbcType=VARCHAR} #{item.updateBy,jdbcType=VARCHAR}
) )
</foreach> </foreach>
SELECT 1 FROM DUAL
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/EnterpriseAccountExtendsMapper.xml
View file @ 68f30e0a
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.EnterpriseAccountMapper"> <mapper namespace="pwc.taxtech.atms.dao.EnterpriseAccountMapper">
<resultMap id="EnterpriseAccountDto" type="pwc.taxtech.atms.dpo.EnterpriseAccountDto">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="CODE" jdbcType="VARCHAR" property="code" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode" />
<result column="FULL_NAME" jdbcType="VARCHAR" property="fullName" />
<result column="ACCT_PROP" jdbcType="DECIMAL" property="acctProp" />
<result column="SUB_PROP" jdbcType="DECIMAL" property="subProp" />
<result column="ACCT_LEVEL" jdbcType="DECIMAL" property="acctLevel" />
<result column="DIRECTION" jdbcType="DECIMAL" property="direction" />
<result column="IS_LEAF" jdbcType="DECIMAL" property="isLeaf" />
<result column="RULE_TYPE" jdbcType="DECIMAL" property="ruleType" />
<result column="IS_ACTIVE" jdbcType="DECIMAL" property="isActive" />
<result column="STD_CODE" jdbcType="VARCHAR" property="stdCode" />
<result column="STD_NAME" jdbcType="VARCHAR" property="stdName" />
<result column="STD_PARENT_CODE" jdbcType="VARCHAR" property="stdParentCode" />
<result column="STD_DIRECTION" jdbcType="VARCHAR" property="stdDirection" />
<result column="STD_ACCT_PROP" jdbcType="VARCHAR" property="stdAcctProp" />
<result column="STD_FULL_NAME" jdbcType="VARCHAR" property="stdFullName" />
</resultMap>
<select id="getDto" resultType="pwc.taxtech.atms.dpo.EnterpriseAccountDto">
<select id="getDto" resultMap="EnterpriseAccountDto">
SELECT SELECT
EA.ID, EA.ID,
EA.CODE AS CODE, EA.CODE AS CODE,
......
atms-web/src/main/webapp/app/admin/basicData/financialData/basicDataInfrastructure/basic-data-infrastructure.html
View file @ 68f30e0a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<!--<div class="tab" ng-show="orangizationStructureShow" ui-sref-active="active"><a ui-sref=".orangizationStructureManage"><span>{{'OrangizationStructureTabTitle' | translate }}</span></a></div> <!--<div class="tab" ng-show="orangizationStructureShow" ui-sref-active="active"><a ui-sref=".orangizationStructureManage"><span>{{'OrangizationStructureTabTitle' | translate }}</span></a></div>
<div class="tab" ui-sref-active="active" ng-show="businessUnitShow"><a ui-sref=".businessUnit"><span>{{'BusinessUnitTitle'| translate}}</span></a></div> <div class="tab" ui-sref-active="active" ng-show="businessUnitShow"><a ui-sref=".businessUnit"><span>{{'BusinessUnitTitle'| translate}}</span></a></div>
<div class="tab" ui-sref-active="active" ng-show="areaManageShow"><a ui-sref=".regionManage"><span>{{'RegionTabTitle' | translate }}</span></a></div>--> <div class="tab" ui-sref-active="active" ng-show="areaManageShow"><a ui-sref=".regionManage"><span>{{'RegionTabTitle' | translate }}</span></a></div>-->
<div class="tab" ui-sref-active="active" ng-show="enterpriseAccountSetShow"><a ui-sref=".enterpriseAccountManage"><span>{{'EnterpriceAccountTabTitle' | translate }}</span></a></div> <div class="tab" ui-sref-active="active" ng-show="enterpriseAccountSetShow"><a ui-sref=".enterpriseAccountManage"><span>{{'EnterpriseAccountTabTitle' | translate }}</span></a></div>
<!--<div class="tab" ui-sref-active="active"><a ui-sref=".wordLibraryManage"><span>{{'WordLibraryTitle'| translate}}</span></a></div>--> <!--<div class="tab" ui-sref-active="active"><a ui-sref=".wordLibraryManage"><span>{{'WordLibraryTitle'| translate}}</span></a></div>-->
<div class="tab" ui-sref-active="active" ng-show="customerListShow"><a ui-sref=".customerListManage"><span>{{'CustomerTitle'| translate}}</span></a></div> <div class="tab" ui-sref-active="active" ng-show="customerListShow"><a ui-sref=".customerListManage"><span>{{'CustomerTitle'| translate}}</span></a></div>
<!--<div class="tab" ui-sref-active="active"><a ui-sref=".productManage"><span>产品清单</span></a></div>--> <!--<div class="tab" ui-sref-active="active"><a ui-sref=".productManage"><span>产品清单</span></a></div>-->
......
atms-web/src/main/webapp/app/admin/basicData/financialData/enterpriseAccountManage/enterprise-account-manage.ctrl.js
View file @ 68f30e0a
...@@ -1798,12 +1798,12 @@ ...@@ -1798,12 +1798,12 @@
columnDefs: [{ columnDefs: [{
field: 'code', field: 'code',
name: $translate.instant('EnterpriceAccountCode'), name: $translate.instant('EnterpriseAccountCode'),
width: '15%', width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>'
}, { }, {
field: 'name', field: 'name',
name: $translate.instant('EnterpriceAccountName'), name: $translate.instant('EnterpriseAccountName'),
width: '31%', width: '31%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>'
}, { }, {
......
atms-web/src/main/webapp/bundles/basicData.js
View file @ 68f30e0a
...@@ -2703,12 +2703,12 @@ basicDataModule ...@@ -2703,12 +2703,12 @@ basicDataModule
columnDefs: [{ columnDefs: [{
field: 'code', field: 'code',
name: $translate.instant('EnterpriceAccountCode'), name: $translate.instant('EnterpriseAccountCode'),
width: '15%', width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.code}}">{{row.entity.code}}</span></div>'
}, { }, {
field: 'name', field: 'name',
name: $translate.instant('EnterpriceAccountName'), name: $translate.instant('EnterpriseAccountName'),
width: '31%', width: '31%',
cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>' cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.name}}">{{row.entity.name}}</span></div>'
}, { }, {
......
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