修改提交

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -82,6 +82,7 @@
 		count(1) AS total_num
 		FROM
 		p_input_item a
+		LEFT JOIN p_catalog_tree b ON a.catalog_id = b.id
 		where a.is_delete = '0' and a.input_type != '1'
 		<if test="name!=null and name!=''"> and a.name like concat(concat("%",#{name}),"%")</if>
 		<if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
@@ -117,13 +118,13 @@
 		a.item_classify,
 		a.item_type_classify,
 		a.item_level,
-		a.item_start,
-		IF
-		( i.input_item_id IS NULL, 0, 1 ) AS ext
+		a.item_start
+-- 		IF
+-- 		( i.input_item_id IS NULL, 0, 1 ) AS ext
 		FROM
 		p_input_item a
 		LEFT JOIN p_catalog_tree b ON a.catalog_id = b.id
-		LEFT JOIN p_route_point_item i ON a.id = i.input_item_id
+-- 		LEFT JOIN p_route_point_item i ON a.id = i.input_item_id
 		WHERE
 		a.is_delete = '0'
 		AND a.input_type != '1'
@@ -348,7 +349,7 @@
 		<if test="itemType!=null"> and a.item_Type = #{itemType} </if>
 		<if test="checkTypeId!=null and checkTypeId!=''"> and a.check_type_id = #{checkTypeId} </if>
 		<if test="itemStart!=null"> and a.item_start = #{itemStart} </if>
-		<!--<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>-->
+ 		<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
 		<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
 		<if test="itemTypeClassifyIds != null"> and FIND_IN_SET(#{itemTypeClassifyIds}, a.item_type_classify_ids)</if>
 		<if test="planId != null">and a.id NOT IN ( SELECT p.input_item_id FROM p_route_point_item p WHERE p.plan_id = #{planId} )</if>
@@ -367,7 +368,7 @@
 		<if test="itemType!=null"> and a.item_Type = #{itemType} </if>
 		<if test="checkTypeId!=null and checkTypeId!=''"> and a.check_type_id = #{checkTypeId} </if>
 		<if test="itemStart!=null"> and a.item_start = #{itemStart} </if>
-		<!--<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>-->
+		<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
 		<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
 		<if test="itemTypeClassifyIds != null"> and FIND_IN_SET(#{itemTypeClassifyIds}, a.item_type_classify_ids)</if>
 		<if test="planId != null">and a.id NOT IN ( SELECT p.input_item_id FROM p_route_point_item p WHERE p.plan_id = #{planId} )</if>