Skip to content

A
amos-boot-zx-biz
Commit a20f6820 authored by yangyang's avatar yangyang
Browse files
Options

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

parents 1a307e43 092818f7
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 52 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RegionalCompaniesMapper.java
View file @ a20f6820
......@@ -15,7 +15,6 @@ import java.util.List;
*/
public interface RegionalCompaniesMapper extends BaseMapper<RegionalCompanies> {
List<RegionalCompanies> selectListData(@Param("regionalCompaniesName") String regionalCompaniesName,@Param("unitId")Long unitId,@Param("sequenceNbr")Long sequenceNbr);
RegionalCompanies selectByid(@Param("sequenceNbr")Long sequenceNbr);
RegionalCompanies selectRegionName(@Param("sequenceNbr")Long sequenceNbr);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RegionalCompaniesMapper.xml
View file @ a20f6820
......@@ -3,37 +3,65 @@
<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper">
<select id="selectListData" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
<!-- select * from (-->
<!-- select-->
<!-- hygf_regional_companies.*,-->
<!-- (SELECT GROUP_CONCAT(REGION_NAME) from-->
<!-- (SELECT T2.REGION_NAME-->
<!-- FROM (-->
<!-- SELECT-->
<!-- @r AS _id,-->
<!-- (SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,-->
<!-- @l := @l + 1 AS lvl-->
<!-- FROM-->
<!-- (SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,-->
<!-- systemctl_region h-->
<!-- WHERE @r != 0) T1-->
<!-- JOIN systemctl_region T2-->
<!-- ON T1._id = T2.sequence_nbr-->
<!-- ORDER BY T1.lvl DESC) s) regionalAddress-->
<!-- from hygf_regional_companies LEFT JOIN privilege_company on-->
<!-- hygf_regional_companies.regional_companies_seq=privilege_company.SEQUENCE_NBR-->
<!-- where hygf_regional_companies.is_delete=0-->
<!-- <if test="regionalCompaniesName!=null and regionalCompaniesName!=''">-->
<!-- and hygf_regional_companies.regional_companies_name like concat(concat('%',#{regionalCompaniesName}),'%')-->
<!-- </if>-->
<!-- <if test="unitId!=null and unitId!=''">-->
<!-- and hygf_regional_companies.unit_id=#{unitId}-->
<!-- </if>-->
<!-- <if test="sequenceNbr!=null and sequenceNbr!=''">-->
<!-- and hygf_regional_companies.unit_info_id=#{sequenceNbr}-->
<!-- </if>-->
<!-- ) a-->
select * from (
select
hygf_regional_companies.*,
(SELECT GROUP_CONCAT(REGION_NAME) from
(SELECT T2.REGION_NAME
FROM (
SELECT
@r AS _id,
(SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,
@l := @l + 1 AS lvl
FROM
(SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,
systemctl_region h
WHERE @r != 0) T1
JOIN systemctl_region T2
ON T1._id = T2.sequence_nbr
ORDER BY T1.lvl DESC) s) regionalAddress
hygf_regional_companies.*,(
WITH RECURSIVE tree_path AS (
SELECT SEQUENCE_NBR, parent_id, REGION_NAME,`level`
FROM systemctl_region
WHERE SEQUENCE_NBR = privilege_company.REGION_SEQ
UNION ALL
SELECT tn.SEQUENCE_NBR, tn.parent_id, tn.REGION_NAME,tn.`level`
FROM systemctl_region tn
JOIN tree_path tp ON tn.SEQUENCE_NBR = tp.parent_id
)
SELECT GROUP_CONCAT(REGION_NAME ORDER BY `level` asc) FROM tree_path
) regionalAddress
from hygf_regional_companies LEFT JOIN privilege_company on
hygf_regional_companies.regional_companies_seq=privilege_company.SEQUENCE_NBR
where hygf_regional_companies.is_delete=0
<if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
and hygf_regional_companies.regional_companies_name like concat(concat('%',#{regionalCompaniesName}),'%')
</if>
<if test="unitId!=null and unitId!=''">
and hygf_regional_companies.unit_id=#{unitId}
</if>
<if test="sequenceNbr!=null and sequenceNbr!=''">
and hygf_regional_companies.unit_info_id=#{sequenceNbr}
and hygf_regional_companies.unit_info_id=#{sequenceNbr}
</if>
) a
</select>
......@@ -42,20 +70,18 @@
select
(SELECT GROUP_CONCAT(REGION_NAME) from
(SELECT T2.REGION_NAME
FROM (
SELECT
@r AS _id,
(SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,
@l := @l + 1 AS lvl
FROM
(SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,
systemctl_region h
WHERE @r != 0) T1
JOIN systemctl_region T2
ON T1._id = T2.sequence_nbr
ORDER BY T1.lvl DESC) s) regionalAddress
(
WITH RECURSIVE tree_path AS (
SELECT SEQUENCE_NBR, parent_id, REGION_NAME,`level`
FROM systemctl_region
WHERE SEQUENCE_NBR = privilege_company.REGION_SEQ
UNION ALL
SELECT tn.SEQUENCE_NBR, tn.parent_id, tn.REGION_NAME,tn.`level`
FROM systemctl_region tn
JOIN tree_path tp ON tn.SEQUENCE_NBR = tp.parent_id
)
SELECT GROUP_CONCAT(REGION_NAME ORDER BY `level` asc) FROM tree_path
) regionalAddress
from hygf_regional_companies LEFT JOIN privilege_company on
hygf_regional_companies.regional_companies_seq=privilege_company.SEQUENCE_NBR
where hygf_regional_companies.is_delete=0 and hygf_regional_companies.sequence_nbr=#{sequenceNbr}
......@@ -65,24 +91,42 @@
</select>
<select id="selectRegionName" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
select
privilege_company.COMPANY_CODE companyCode,
privilege_company.COMPANY_NAME regionalCompaniesName,
privilege_company.ORG_CODE regionalCompaniesCode,
(SELECT GROUP_CONCAT(REGION_NAME) from
(SELECT T2.REGION_NAME
FROM (
SELECT
@r AS _id,
(SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,
@l := @l + 1 AS lvl
FROM
(SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,
systemctl_region h
WHERE @r != 0) T1
JOIN systemctl_region T2
ON T1._id = T2.sequence_nbr
ORDER BY T1.lvl DESC) s) regionalAddress
<!-- select-->
<!-- privilege_company.COMPANY_CODE companyCode,-->
<!-- privilege_company.COMPANY_NAME regionalCompaniesName,-->
<!-- privilege_company.ORG_CODE regionalCompaniesCode,-->
<!-- (SELECT GROUP_CONCAT(REGION_NAME) from-->
<!-- (SELECT T2.REGION_NAME-->
<!-- FROM (-->
<!-- SELECT-->
<!-- @r AS _id,-->
<!-- (SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,-->
<!-- @l := @l + 1 AS lvl-->
<!-- FROM-->
<!-- (SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,-->
<!-- systemctl_region h-->
<!-- WHERE @r != 0) T1-->
<!-- JOIN systemctl_region T2-->
<!-- ON T1._id = T2.sequence_nbr-->
<!-- ORDER BY T1.lvl DESC) s) regionalAddress-->
<!-- from privilege_company where privilege_company.SEQUENCE_NBR=#{sequenceNbr}-->
select
privilege_company.COMPANY_CODE companyCode,
privilege_company.COMPANY_NAME regionalCompaniesName,
privilege_company.ORG_CODE regionalCompaniesCode,
(
WITH RECURSIVE tree_path AS (
SELECT SEQUENCE_NBR, parent_id, REGION_NAME,`level`
FROM systemctl_region
WHERE SEQUENCE_NBR = privilege_company.REGION_SEQ
UNION ALL
SELECT tn.SEQUENCE_NBR, tn.parent_id, tn.REGION_NAME,tn.`level`
FROM systemctl_region tn
JOIN tree_path tp ON tn.SEQUENCE_NBR = tp.parent_id
)
SELECT GROUP_CONCAT(REGION_NAME ORDER BY `level` asc) FROM tree_path
) regionalAddress
from privilege_company where privilege_company.SEQUENCE_NBR=#{sequenceNbr}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UserEmpowerMapper.xml
View file @ a20f6820
......@@ -4,7 +4,7 @@
<select id="georgcodelist" resultType="Map">
select ORG_CODE orgCode from privilege_company where COMPANY_TYPE='region' and LEVEL='outer_company'
select ORG_CODE orgCode from privilege_company where COMPANY_TYPE='region' and `LEVEL`='outer_company'
<if test="orgs != null and orgs.size() >0">
and ORG_CODE not in
......
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