Commit be3a1c62 authored by ZWT's avatar ZWT

得到的

parent f87f7bb5
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
</sql> </sql>
<sql id="now" databaseId="MySQL"> <sql id="now" databaseId="MySQL">
NOW() NOW
()
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -145,36 +146,42 @@ ...@@ -145,36 +146,42 @@
<select id="selectSysDictionaryTree" resultType="pps.core.system.entity.SysDictionaryView"> <select id="selectSysDictionaryTree" resultType="pps.core.system.entity.SysDictionaryView">
SELECT DISTINCT SD.ID, SD.PID, SD.DIC_NAME, SD.SORT SELECT DISTINCT SD.ID, SD.PID, SD.DIC_NAME, SD.SORT
FROM SYS_DICTIONARY SD FROM SYS_DICTIONARY SD
LEFT JOIN SYS_DICTIONARY SD1 ON SD.ID = SD1.PID LEFT JOIN SYS_DICTIONARY SD1 ON SD.ID = SD1.PID
LEFT JOIN SYS_DICTIONARY SD2 ON SD1.ID = SD2.PID LEFT JOIN SYS_DICTIONARY SD2 ON SD1.ID = SD2.PID
WHERE SD.PID = '30' WHERE SD.PID = '30'
AND SD.EFFECT_TIME &lt;= <include refid="now"/> AND SD.EFFECT_TIME &lt;=
AND SD.END_TIME &gt;= <include refid="now"/> <include refid="now"/>
AND SD.DIC_NAME IS NOT NULL AND SD.END_TIME &gt;=
<include refid="now"/>
AND SD.DIC_NAME IS NOT NULL
UNION ALL UNION ALL
SELECT DISTINCT SD1.ID, SELECT DISTINCT SD1.ID,
SD1.PID, SD1.PID,
SD1.DIC_NAME, SD1.DIC_NAME,
SD1.SORT SD1.SORT
FROM SYS_DICTIONARY SD FROM SYS_DICTIONARY SD
LEFT JOIN SYS_DICTIONARY SD1 ON SD.ID = SD1.PID LEFT JOIN SYS_DICTIONARY SD1 ON SD.ID = SD1.PID
LEFT JOIN SYS_DICTIONARY SD2 ON SD1.ID = SD2.PID LEFT JOIN SYS_DICTIONARY SD2 ON SD1.ID = SD2.PID
WHERE SD.PID = '30' WHERE SD.PID = '30'
AND SD1.EFFECT_TIME &lt;= <include refid="now"/> AND SD1.EFFECT_TIME &lt;=
AND SD1.END_TIME &gt;= <include refid="now"/> <include refid="now"/>
AND SD1.DIC_NAME IS NOT NULL AND SD1.END_TIME &gt;=
<include refid="now"/>
AND SD1.DIC_NAME IS NOT NULL
UNION ALL UNION ALL
SELECT DISTINCT SD2.ID, SELECT DISTINCT SD2.ID,
SD2.PID, SD2.PID,
SD2.DIC_NAME, SD2.DIC_NAME,
SD2.SORT SD2.SORT
FROM SYS_DICTIONARY SD FROM SYS_DICTIONARY SD
LEFT JOIN SYS_DICTIONARY SD1 ON SD.ID = SD1.PID LEFT JOIN SYS_DICTIONARY SD1 ON SD.ID = SD1.PID
LEFT JOIN SYS_DICTIONARY SD2 ON SD1.ID = SD2.PID LEFT JOIN SYS_DICTIONARY SD2 ON SD1.ID = SD2.PID
WHERE SD.PID = '30' WHERE SD.PID = '30'
AND SD2.EFFECT_TIME &lt;= <include refid="now"/> AND SD2.EFFECT_TIME &lt;=
AND SD2.END_TIME &gt;= <include refid="now"/> <include refid="now"/>
AND SD2.DIC_NAME IS NOT NULL AND SD2.END_TIME &gt;=
<include refid="now"/>
AND SD2.DIC_NAME IS NOT NULL
</select> </select>
<select id="selectListsByDicPath" parameterType="pps.core.system.entity.SysDictionaryView" <select id="selectListsByDicPath" parameterType="pps.core.system.entity.SysDictionaryView"
...@@ -182,8 +189,10 @@ ...@@ -182,8 +189,10 @@
SELECT ID, PID, DIC_KEY, DIC_NAME SELECT ID, PID, DIC_KEY, DIC_NAME
FROM SYS_DICTIONARY SD FROM SYS_DICTIONARY SD
WHERE DIC_PATH LIKE CONCAT('%/', #{dicPath}, '%') WHERE DIC_PATH LIKE CONCAT('%/', #{dicPath}, '%')
AND SD.EFFECT_TIME &lt;= <include refid="now"/> AND SD.EFFECT_TIME &lt;=
AND SD.END_TIME &gt;= <include refid="now"/> <include refid="now"/>
AND SD.END_TIME &gt;=
<include refid="now"/>
ORDER BY LEVELS, DIC_NAME ORDER BY LEVELS, DIC_NAME
</select> </select>
...@@ -192,8 +201,11 @@ ...@@ -192,8 +201,11 @@
SELECT ID, PID, DIC_KEY, DIC_NAME SELECT ID, PID, DIC_KEY, DIC_NAME
FROM SYS_DICTIONARY SD FROM SYS_DICTIONARY SD
WHERE ID = #{dicPath} WHERE ID = #{dicPath}
OR DIC_PATH LIKE CONCAT('%', #{dicPath}, '%') OR DIC_PATH LIKE CONCAT('%', #{dicPath}, '%')
AND SD.EFFECT_TIME &lt;= <include refid="now"/> AND SD.END_TIME &gt;= <include refid="now"/> AND SD.EFFECT_TIME &lt;=
<include refid="now"/>
AND SD.END_TIME &gt;=
<include refid="now"/>
ORDER BY LEVELS, DIC_NAME ORDER BY LEVELS, DIC_NAME
</select> </select>
<select id="selectListByCondition" parameterType="pps.core.system.entity.SysDictionaryView" <select id="selectListByCondition" parameterType="pps.core.system.entity.SysDictionaryView"
...@@ -204,7 +216,9 @@ ...@@ -204,7 +216,9 @@
FROM SYS_ORGANIZATION_DICTIONARY SOD FROM SYS_ORGANIZATION_DICTIONARY SOD
LEFT JOIN SYS_DICTIONARY SD ON SOD.DIC_CODE =SD.ID LEFT JOIN SYS_DICTIONARY SD ON SOD.DIC_CODE =SD.ID
LEFT JOIN SYS_ORGANIZATION SO ON SO.ID =SOD.OU_ID LEFT JOIN SYS_ORGANIZATION SO ON SO.ID =SOD.OU_ID
WHERE SOD.END_TIME ><include refid="now"/> AND SOD.DIC_CODE IS NOT NULL WHERE SOD.END_TIME >
<include refid="now"/>
AND SOD.DIC_CODE IS NOT NULL
<if test="dicName != null and dicName != ''"> <if test="dicName != null and dicName != ''">
AND SD.DIC_NAME LIKE CONCAT('%',#{dicName},'%') AND SD.DIC_NAME LIKE CONCAT('%',#{dicName},'%')
</if> </if>
...@@ -213,7 +227,8 @@ ...@@ -213,7 +227,8 @@
</if>)A </if>)A
LEFT JOIN SYS_DICTIONARY ASD ON ASD.ID = A.ID LEFT JOIN SYS_DICTIONARY ASD ON ASD.ID = A.ID
LEFT JOIN SYS_ORGANIZATION_DICTIONARY AASD ON A.OU_ID = AASD.OU_ID AND A.ID=AASD.DIC_CODE LEFT JOIN SYS_ORGANIZATION_DICTIONARY AASD ON A.OU_ID = AASD.OU_ID AND A.ID=AASD.DIC_CODE
WHERE AASD.END_TIME ><include refid="now"/> WHERE AASD.END_TIME >
<include refid="now"/>
</select> </select>
<select id="selectListByConditionByPage" parameterType="pps.core.system.entity.SysDictionaryView" <select id="selectListByConditionByPage" parameterType="pps.core.system.entity.SysDictionaryView"
......
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