Commit f87f7bb5 authored by ZWT's avatar ZWT

得到的

parent 3ffa8923
...@@ -25,6 +25,14 @@ ...@@ -25,6 +25,14 @@
<result column="OU_NAME" property="ouName"/> <result column="OU_NAME" property="ouName"/>
</resultMap> </resultMap>
<sql id="now" databaseId="Oracle">
SYSDATE
</sql>
<sql id="now" databaseId="MySQL">
NOW()
</sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID ID
, ,
...@@ -140,8 +148,8 @@ ...@@ -140,8 +148,8 @@
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;= NOW() AND SD.EFFECT_TIME &lt;= <include refid="now"/>
AND SD.END_TIME &gt;= NOW() AND SD.END_TIME &gt;= <include refid="now"/>
AND SD.DIC_NAME IS NOT NULL AND SD.DIC_NAME IS NOT NULL
UNION ALL UNION ALL
SELECT DISTINCT SD1.ID, SELECT DISTINCT SD1.ID,
...@@ -152,8 +160,8 @@ ...@@ -152,8 +160,8 @@
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;= NOW() AND SD1.EFFECT_TIME &lt;= <include refid="now"/>
AND SD1.END_TIME &gt;= NOW() AND SD1.END_TIME &gt;= <include refid="now"/>
AND SD1.DIC_NAME IS NOT NULL AND SD1.DIC_NAME IS NOT NULL
UNION ALL UNION ALL
SELECT DISTINCT SD2.ID, SELECT DISTINCT SD2.ID,
...@@ -164,8 +172,8 @@ ...@@ -164,8 +172,8 @@
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;= NOW() AND SD2.EFFECT_TIME &lt;= <include refid="now"/>
AND SD2.END_TIME &gt;= NOW() AND SD2.END_TIME &gt;= <include refid="now"/>
AND SD2.DIC_NAME IS NOT NULL AND SD2.DIC_NAME IS NOT NULL
</select> </select>
...@@ -174,8 +182,8 @@ ...@@ -174,8 +182,8 @@
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;= NOW() AND SD.EFFECT_TIME &lt;= <include refid="now"/>
AND SD.END_TIME &gt;= NOW() AND SD.END_TIME &gt;= <include refid="now"/>
ORDER BY LEVELS, DIC_NAME ORDER BY LEVELS, DIC_NAME
</select> </select>
...@@ -185,7 +193,7 @@ ...@@ -185,7 +193,7 @@
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;= NOW() AND SD.END_TIME &gt;= 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"
...@@ -196,7 +204,7 @@ ...@@ -196,7 +204,7 @@
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 >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>
...@@ -205,7 +213,7 @@ ...@@ -205,7 +213,7 @@
</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 >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