diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
index fa5903350..90a24df17 100644
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
@@ -5,10 +5,11 @@
-
+
+
s.service_dict_id AS serviceDictId,
s.item_type AS itemType,
@@ -38,12 +47,23 @@
s.item_desc AS itemDesc,
s.parent_id AS "parent.serviceDictId",
s.is_leaf AS isLeaf,
+ s.level_no AS levelNo,
s.is_valid AS isValid,
s.creator_id AS "serviceDictCreator.id",
s.create_time AS createTime,
s.editor_id AS "serviceDictEditor.id",
s.edit_time AS editTime
+
+ s.service_dict_id AS serviceDictId,
+ s.item_type AS itemType,
+ s.item_code AS itemCode,
+ s.item_value AS itemValue,
+ s.item_desc AS itemDesc,
+ s.parent_id AS "parent.serviceDictId",
+ s.is_leaf AS isLeaf,
+ s.is_valid AS isValid
+
@@ -119,7 +139,7 @@
- SELECT * FROM service_dict_info WHERE is_valid=1
-
-
- AND item_type like '%${itemType}%'
-
-
- AND item_code like '%${itemCode}%'
-
-
- AND item_value like '%${itemValue}%'
-
-
- AND create_time >= #{beginDate,jdbcType=TIMESTAMP}
-
-
- AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-
-
-
-
-
- ORDER BY ${page.orderBy}
-
-
- ORDER BY create_time desc
-
-
-
-
-
-
-
- SELECT * FROM service_dict_info WHERE is_valid=1
+
+
+ SELECT * FROM service_dict_info s WHERE s.is_valid=1
- AND item_code like '%${itemCode}%'
+ AND s.item_code like '%${itemCode}%'
- AND item_value like '%${itemValue}%'
+ AND s.item_value like '%${itemValue}%'
- AND item_type != ${itemType}
+ AND s.item_type = ${itemType}
+
+
+ AND s.create_time >= #{beginDate,jdbcType=TIMESTAMP}
+
+
+ AND s.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+
+ AND s.parent_id not in (
+ SELECT s2.service_dict_id FROM service_dict_info s2 WHERE s2.is_valid=1
+
+ AND s2.item_code like '%${itemCode}%'
+
+
+ AND s2.item_value like '%${itemValue}%'
+
+
+ AND s2.item_type = ${itemType}
+
+
+ AND s2.create_time >= #{beginDate,jdbcType=TIMESTAMP}
+
+
+ AND s2.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+
+ )
+
+
+ ORDER BY s.${page.orderBy}
+
+
+ ORDER BY s.create_time desc
+
+
+
+
+
+
+
+ SELECT * FROM service_dict_info s WHERE s.is_valid=1
+
+
+ AND s.item_code like '%${itemCode}%'
+
+
+ AND s.item_value like '%${itemValue}%'
+
+
+ AND s.item_type != ${itemType}
+
+
+ AND s.create_time >= #{beginDate,jdbcType=TIMESTAMP}
+
+
+ AND s.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+
+ AND s.parent_id not in (
+ SELECT s2.service_dict_id FROM service_dict_info s2 WHERE s2.is_valid=1
+
+ AND s2.item_code like '%${itemCode}%'
+
+
+ AND s2.item_value like '%${itemValue}%'
+
+
+ AND s2.item_type != ${itemType}
+
+
+ AND s2.create_time >= #{beginDate,jdbcType=TIMESTAMP}
+
+
+ AND s2.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+
+ )
+
+
+ ORDER BY s.${page.orderBy}
+
+
+ ORDER BY s.create_time desc
+
+
+
+
+
+
+
+
+
+ SELECT * FROM service_dict_info WHERE is_valid=1
+
+
+ AND item_value like '%${itemValue}%'
+
+
+ AND item_code like '%${itemCode}%'
+
+
+ AND item_type = #{itemType}
AND create_time >= #{beginDate,jdbcType=TIMESTAMP}
AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-
-
-
-
- ORDER BY ${page.orderBy}
-
-
- ORDER BY create_time desc
-
-
-
+
+
+
+ SELECT * FROM service_dict_info WHERE is_valid=1
+
+
+ AND item_value like '%${itemValue}%'
+
+
+ AND item_code like '%${itemCode}%'
+
+
+ AND item_type != #{itemType}
+
+
+ AND create_time >= #{beginDate,jdbcType=TIMESTAMP}
+
+
+ AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+
+
+
+
+
@@ -228,10 +327,10 @@
- insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
+ insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, level_no, is_valid, creator_id, create_time, editor_id, edit_time)
values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER},
#{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR},
- #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER},
+ #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER},#{levelNo,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER},
#{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
@@ -248,11 +347,19 @@
s.item_desc = #{itemDesc},
s.parent_id = #{parent.serviceDictId},
s.is_leaf = #{isLeaf},
+ s.level_no = #{levelNo},
s.creator_id = #{serviceDictCreator.id},
s.editor_id = #{serviceDictEditor.id},
s.edit_time = #{editTime}
WHERE s.service_dict_id = #{serviceDictId}
+
+
+
+ UPDATE service_dict_info s SET
+ s.level_no = #{levelNo}
+ WHERE s.service_dict_id = #{serviceDictId}
+
@@ -260,14 +367,14 @@
UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
-
+
select
-
-
+
select
-