|
@@ -609,24 +609,16 @@
|
|
SELECT DISTINCT
|
|
SELECT DISTINCT
|
|
t12.libName AS libName,
|
|
t12.libName AS libName,
|
|
t12.libType AS libType,
|
|
t12.libType AS libType,
|
|
- t12.ruleType AS ruleType,
|
|
|
|
- t13.`name` AS libTypeName
|
|
|
|
|
|
+ t12.ruleType AS ruleType
|
|
FROM
|
|
FROM
|
|
(
|
|
(
|
|
SELECT
|
|
SELECT
|
|
t1.concept_id AS conceptId,
|
|
t1.concept_id AS conceptId,
|
|
- CONCAT_WS(
|
|
|
|
- "_",
|
|
|
|
- t1.concept_id,
|
|
|
|
- t1.rule_type
|
|
|
|
- ) AS conceptGroup,
|
|
|
|
t1.id AS ruleId,
|
|
t1.id AS ruleId,
|
|
t4.lib_name AS libName,
|
|
t4.lib_name AS libName,
|
|
t4.lib_type AS libType,
|
|
t4.lib_type AS libType,
|
|
t1.rule_type AS ruleType,
|
|
t1.rule_type AS ruleType,
|
|
t1.has_sub_cond AS hasSubCond,
|
|
t1.has_sub_cond AS hasSubCond,
|
|
- t1.description AS description,
|
|
|
|
- t1.msg AS msg,
|
|
|
|
t1.gmt_modified AS gmtModified
|
|
t1.gmt_modified AS gmtModified
|
|
FROM
|
|
FROM
|
|
kl_rule t1,
|
|
kl_rule t1,
|
|
@@ -639,17 +631,23 @@
|
|
AND t4. STATUS = 1
|
|
AND t4. STATUS = 1
|
|
AND t4.lib_type BETWEEN 100
|
|
AND t4.lib_type BETWEEN 100
|
|
AND 299
|
|
AND 299
|
|
- UNION
|
|
|
|
|
|
+ <if test="libName!=null and libName!=''">
|
|
|
|
+ AND UPPER(t4.lib_name) LIKE CONCAT('%', UPPER(trim(#{libName})), '%')
|
|
|
|
+ </if>
|
|
|
|
+ <if test="libType !=null">
|
|
|
|
+ AND t4.lib_type = #{libType}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="ruleType !=null">
|
|
|
|
+ AND t1.rule_type = #{ruleType}
|
|
|
|
+ </if>
|
|
|
|
+ UNION ALL
|
|
SELECT
|
|
SELECT
|
|
t11.id AS conceptId,
|
|
t11.id AS conceptId,
|
|
- CONCAT_WS("_", t11.id, t1.rule_type) AS conceptGroup,
|
|
|
|
t1.id AS ruleId,
|
|
t1.id AS ruleId,
|
|
t11.lib_name AS libName,
|
|
t11.lib_name AS libName,
|
|
t11.lib_type AS libType,
|
|
t11.lib_type AS libType,
|
|
t1.rule_type AS ruleType,
|
|
t1.rule_type AS ruleType,
|
|
t1.has_sub_cond AS hasSubCond,
|
|
t1.has_sub_cond AS hasSubCond,
|
|
- t1.description AS description,
|
|
|
|
- t1.msg AS msg,
|
|
|
|
t1.gmt_modified AS gmtModified
|
|
t1.gmt_modified AS gmtModified
|
|
FROM
|
|
FROM
|
|
kl_rule t1,
|
|
kl_rule t1,
|
|
@@ -673,20 +671,16 @@
|
|
AND t11.is_deleted = "N"
|
|
AND t11.is_deleted = "N"
|
|
AND t10. STATUS = 1
|
|
AND t10. STATUS = 1
|
|
AND t11. STATUS = 1
|
|
AND t11. STATUS = 1
|
|
- ) t12,
|
|
|
|
- kl_lexicon t13
|
|
|
|
- WHERE
|
|
|
|
- t12.libType = t13.`code`
|
|
|
|
- AND t13.is_deleted = "N"
|
|
|
|
<if test="libName!=null and libName!=''">
|
|
<if test="libName!=null and libName!=''">
|
|
- AND UPPER(t12.libName) LIKE CONCAT('%', UPPER(trim(#{libName})), '%')
|
|
|
|
|
|
+ AND UPPER(t11.lib_name) LIKE CONCAT('%', UPPER(trim(#{libName})), '%')
|
|
</if>
|
|
</if>
|
|
<if test="libType !=null">
|
|
<if test="libType !=null">
|
|
- AND t12.libType = #{libType}
|
|
|
|
|
|
+ AND t11.lib_type = #{libType}
|
|
</if>
|
|
</if>
|
|
<if test="ruleType !=null">
|
|
<if test="ruleType !=null">
|
|
- AND t12.ruleType = #{ruleType}
|
|
|
|
|
|
+ AND t1.rule_type = #{ruleType}
|
|
</if>
|
|
</if>
|
|
|
|
+ ) t12
|
|
ORDER BY
|
|
ORDER BY
|
|
t12.conceptId,
|
|
t12.conceptId,
|
|
t12.ruleType,
|
|
t12.ruleType,
|