Skip to content

T
traffic-front
Commit a2da0e64 authored by HP's avatar HP
Browse files
Options

conflict

parent 12093ef8
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationExtendsMapper.xml
View file @ a2da0e64
...@@ -59,25 +59,25 @@ ...@@ -59,25 +59,25 @@
reg.MERGER_NAME AS REGION_NAME, reg.MERGER_NAME AS REGION_NAME,
org.IS_ACTIVE AS IS_ACTIVE org.IS_ACTIVE AS IS_ACTIVE
FROM FROM
ORGANIZATION AS ORG ORGANIZATION ORG
LEFT JOIN LEFT JOIN
INDUSTRY AS IND INDUSTRY IND
on on
org.INDUSTRY_ID = ind.ID org.INDUSTRY_ID = ind.ID
LEFT JOIN LEFT JOIN
BUSINESS_UNIT AS BU BUSINESS_UNIT BU
on on
org.BUSINESS_UNIT_ID = bu.ID org.BUSINESS_UNIT_ID = bu.ID
LEFT JOIN LEFT JOIN
AREA AS AREA AREA AREA
on on
org.AREA_ID = area.ID org.AREA_ID = area.ID
left JOIN left JOIN
ORGANIZATION_STRUCTURE AS OS ORGANIZATION_STRUCTURE OS
on on
org.STRUCTURE_ID = os.ID org.STRUCTURE_ID = os.ID
left JOIN left JOIN
REGION AS REG REGION REG
on on
org.REGION_ID = reg.ID org.REGION_ID = reg.ID
<if test="orgIsActive != null and orgIsActive == true"> <if test="orgIsActive != null and orgIsActive == true">
...@@ -132,21 +132,21 @@ ...@@ -132,21 +132,21 @@
org.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER, org.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER,
org.IS_ACTIVE AS IS_ACTIVE org.IS_ACTIVE AS IS_ACTIVE
FROM FROM
ORGANIZATION AS ORG ORGANIZATION ORG
left JOIN left JOIN
INDUSTRY AS IND INDUSTRY IND
on on
org.INDUSTRY_ID = ind.ID org.INDUSTRY_ID = ind.ID
left JOIN left JOIN
BUSINESS_UNIT AS BU BUSINESS_UNIT BU
on on
org.BUSINESS_UNIT_ID = bu.ID org.BUSINESS_UNIT_ID = bu.ID
left JOIN left JOIN
AREA AS AREA AREA AREA
on on
org.AREA_ID = area.ID org.AREA_ID = area.ID
left JOIN left JOIN
ORGANIZATION_STRUCTURE AS OS ORGANIZATION_STRUCTURE OS
on on
org.STRUCTURE_ID = os.ID org.STRUCTURE_ID = os.ID
<if test="orgIsActive != null and orgIsActive == true "> <if test="orgIsActive != null and orgIsActive == true ">
...@@ -244,21 +244,21 @@ ...@@ -244,21 +244,21 @@
dv.ID AS DIMENSION_VALUE_ID, dv.ID AS DIMENSION_VALUE_ID,
dv.NAME AS DIMENSION_VALUE_NAME dv.NAME AS DIMENSION_VALUE_NAME
FROM FROM
ORGANIZATION AS ORG ORGANIZATION ORG
JOIN JOIN
DIMENSION_VALUE_ORG AS DVG DIMENSION_VALUE_ORG DVG
ON ON
org.ID = dvg.ORGANIZATION_ID org.ID = dvg.ORGANIZATION_ID
JOIN JOIN
DIMENSION_VALUE AS DV DIMENSION_VALUE DV
ON ON
dvg.DIMENSION_VALUE_ID = dv.ID dvg.DIMENSION_VALUE_ID = dv.ID
JOIN JOIN
DIMENSION AS D DIMENSION D
ON ON
dv.DIMENSION_ID = d.ID dv.DIMENSION_ID = d.ID
JOIN JOIN
STATISTIC_ATTRIBUTE AS S STATISTIC_ATTRIBUTE S
ON ON
d.ATTRIBUTE_ID = s.ID d.ATTRIBUTE_ID = s.ID
WHERE WHERE
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
org.CREATE_TIME AS CREATE_TIME, org.CREATE_TIME AS CREATE_TIME,
org.UPDATE_TIME AS UPDATE_TIME org.UPDATE_TIME AS UPDATE_TIME
FROM FROM
ORGANIZATION AS ORG ORGANIZATION ORG
where where
org.IS_ACTIVE = 1 org.IS_ACTIVE = 1
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
bu.CREATE_TIME AS CREATE_TIME, bu.CREATE_TIME AS CREATE_TIME,
bu.UPDATE_TIME AS UPDATE_TIME bu.UPDATE_TIME AS UPDATE_TIME
FROM FROM
BUSINESS_UNIT AS BU BUSINESS_UNIT BU
where where
bu.IS_ACTIVE = 1 bu.IS_ACTIVE = 1
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
) )
AS UPDATE_TIME AS UPDATE_TIME
FROM FROM
AREA AS AREA AREA
where where
area.IS_ACTIVE = 1 area.IS_ACTIVE = 1
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
org.ID AS ORGANIZATION_ID, org.ID AS ORGANIZATION_ID,
org.NAME AS NAME org.NAME AS NAME
FROM FROM
ORGANIZATION AS ORG ORGANIZATION ORG
WHERE WHERE
org.IS_ACTIVE = 1 org.IS_ACTIVE = 1
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
org.ID AS ORGANIZATION_ID, org.ID AS ORGANIZATION_ID,
org.NAME AS NAME org.NAME AS NAME
FROM FROM
ORGANIZATION AS ORG ORGANIZATION ORG
WHERE WHERE
org.IS_ACTIVE = 1 org.IS_ACTIVE = 1
...@@ -403,9 +403,9 @@ ...@@ -403,9 +403,9 @@
dv.ORGANIZATION_ID AS ORGANIZATION_ID, dv.ORGANIZATION_ID AS ORGANIZATION_ID,
org.NAME AS NAME org.NAME AS NAME
FROM FROM
DIMENSION_VALUE_ORG AS DV DIMENSION_VALUE_ORG DV
JOIN JOIN
ORGANIZATION AS ORG ORGANIZATION ORG
on on
dv.ORGANIZATION_ID = org.ID dv.ORGANIZATION_ID = org.ID
WHERE WHERE
...@@ -443,25 +443,25 @@ ...@@ -443,25 +443,25 @@
ID, ID,
Name Name
FROM FROM
ORGANIZATION AS P ORGANIZATION P
where where
p.IS_ACTIVE = 1 p.IS_ACTIVE = 1
) )
AS Q AS Q
JOIN JOIN
DIMENSION_VALUE_ORG AS DVG DIMENSION_VALUE_ORG DVG
on on
q.ID = dvg.ORGANIZATION_ID q.ID = dvg.ORGANIZATION_ID
JOIN JOIN
DIMENSION_VALUE AS DV DIMENSION_VALUE DV
on on
dvg.DIMENSION_VALUE_ID = dv.ID dvg.DIMENSION_VALUE_ID = dv.ID
JOIN JOIN
DIMENSION AS D DIMENSION D
on on
dv.DIMENSION_ID = d.ID dv.DIMENSION_ID = d.ID
JOIN JOIN
STATISTIC_ATTRIBUTE AS S STATISTIC_ATTRIBUTE S
on on
d.ATTRIBUTE_ID = s.ID d.ATTRIBUTE_ID = s.ID
where where
...@@ -540,29 +540,29 @@ ...@@ -540,29 +540,29 @@
ar.NAME AS AREA_NAME, ar.NAME AS AREA_NAME,
bu.NAME AS BUSINESS_UNIT_NAME bu.NAME AS BUSINESS_UNIT_NAME
FROM FROM
ORGANIZATION AS M ORGANIZATION M
left JOIN left JOIN
INDUSTRY AS N INDUSTRY N
on on
m.INDUSTRY_ID = n.ID m.INDUSTRY_ID = n.ID
left JOIN left JOIN
REGION AS T REGION T
on on
m.REGION_ID = t.ID m.REGION_ID = t.ID
left JOIN left JOIN
REGION AS PREGION REGION PREGION
on on
t.PARENT_ID = pregion.ID t.PARENT_ID = pregion.ID
left JOIN left JOIN
AREA AS AR AREA AR
on on
m.AREA_ID = ar.ID m.AREA_ID = ar.ID
left JOIN left JOIN
ORGANIZATION_STRUCTURE AS S ORGANIZATION_STRUCTURE S
on on
m.STRUCTURE_ID = s.ID m.STRUCTURE_ID = s.ID
left JOIN left JOIN
BUSINESS_UNIT AS BU BUSINESS_UNIT BU
on on
m.BUSINESS_UNIT_ID = bu.ID m.BUSINESS_UNIT_ID = bu.ID
where where
...@@ -610,35 +610,35 @@ ...@@ -610,35 +610,35 @@
m.AREA_ID AS AREA_ID, m.AREA_ID AS AREA_ID,
m.BUSINESS_UNIT_ID AS BUSINESS_UNIT_ID m.BUSINESS_UNIT_ID AS BUSINESS_UNIT_ID
FROM FROM
ORGANIZATION AS M ORGANIZATION M
LEFT JOIN LEFT JOIN
INDUSTRY AS N INDUSTRY N
ON ON
m.INDUSTRY_ID = n.ID m.INDUSTRY_ID = n.ID
LEFT JOIN LEFT JOIN
ORGANIZATION_SERVICE_TEMP_LATE_GROUP AS STG ORGANIZATION_SERVICE_TEMP_LATE_GROUP STG
ON ON
m.ID = stg.ORGANIZATION_ID m.ID = stg.ORGANIZATION_ID
LEFT JOIN LEFT JOIN
SERVICE_TYPE AS ST SERVICE_TYPE ST
ON ON
stg.ORGANIZATION_ID = st.ID stg.ORGANIZATION_ID = st.ID
LEFT JOIN LEFT JOIN
BUSINESS_UNIT AS T BUSINESS_UNIT T
ON ON
t.IS_ACTIVE = 1 t.IS_ACTIVE = 1
AND M.BUSINESS_UNIT_ID = t.ID AND M.BUSINESS_UNIT_ID = t.ID
LEFT JOIN LEFT JOIN
AREA AS AR AREA AR
ON ON
ar.IS_ACTIVE = 1 ar.IS_ACTIVE = 1
AND M.AREAID = ar.ID AND M.AREAID = ar.ID
LEFT JOIN LEFT JOIN
ENTERPRISE_ACCOUNT_SET_ORG AS SET_ORG ENTERPRISE_ACCOUNT_SET_ORG SET_ORG
ON ON
m.ID = setOrg.ORGANIZATION_ID m.ID = setOrg.ORGANIZATION_ID
LEFT JOIN LEFT JOIN
ENTERPRISE_ACCOUNT_SET AS ACC_SET ENTERPRISE_ACCOUNT_SET ACC_SET
ON ON
accSet.IS_ACTIVE = 1 accSet.IS_ACTIVE = 1
AND SET_ORG.ENTERPRISE_ACCOUNTS_ET_ID = accSet.ID AND SET_ORG.ENTERPRISE_ACCOUNTS_ET_ID = accSet.ID
......
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