Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -4,22 +4,20 @@
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="inspectionServiceDaoImpl">

			<!-- 保存巡检点信息 add by wuxw 2018-07-03

			-->
			<!-- 保存巡检点信息 add by wuxw 2018-07-03 -->
			<insert id="saveBusinessInspectionInfo" parameterType="Map">
			insert into business_inspection_point
			(inspection_id,operate,remark,inspection_name,community_id,b_id,point_obj_type,point_obj_id,point_obj_name)
			(inspection_id,operate,remark,inspection_name,community_id,b_id,point_obj_type,point_obj_id,point_obj_name,item_id,nfc_code)
			values
			(#{inspectionId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId},#{pointObjType},#{pointObjId},#{pointObjName})
			(#{inspectionId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId},#{pointObjType},#{pointObjId},#{pointObjName},#{itemId},#{nfcCode})
			</insert>


			<!-- 查询巡检点信息（Business） add by wuxw 2018-07-03 -->
			<select id="getBusinessInspectionInfo" parameterType="Map" resultType="Map">
			select t.inspection_id,t.inspection_id inspectionId,t.operate,t.remark,t.inspection_name,t.inspection_name inspectionName,
			select t.inspection_id,t.inspection_id inspectionId,t.operate,t.remark,t.inspection_name,t.inspection_name
			inspectionName,
			t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.point_obj_type,t.point_obj_id,t.point_obj_name,
			t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName
			t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName,t.item_id ,t.item_id itemId,t.nfc_code,t.nfc_code nfcCode
			from business_inspection_point t
			where 1 =1
			<if test="inspectionId !=null and inspectionId != ''">
			@@ -40,20 +38,17 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>

			</select>


			<!-- 保存巡检点信息至 instance表中 add by wuxw 2018-07-03 -->
			<insert id="saveInspectionInfoInstance" parameterType="Map">
			insert into
			inspection_point(
			inspection_id,remark,status_cd,inspection_name,community_id,b_id,
			point_obj_type,point_obj_id,point_obj_name
			point_obj_type,point_obj_id,point_obj_name,item_id,nfc_code
			) select t.inspection_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id,
			t.point_obj_type,t.point_obj_id,t.point_obj_name
			from
			business_inspection_point t where 1=1
			t.point_obj_type,t.point_obj_id,t.point_obj_name,t.item_id,t.nfc_code
			from business_inspection_point t where 1=1
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			@@ -70,9 +65,7 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>

			</insert>


			<!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
			<select id="getInspectionInfo" parameterType="Map" resultType="Map">
			@@ -80,15 +73,18 @@
			t.inspection_id,t.inspection_id inspectionId,t.remark,t.status_cd,t.status_cd statusCd,
			t.inspection_name,t.inspection_name inspectionName,t.community_id,
			t.community_id communityId,t.b_id,t.b_id bId,
			t.point_obj_type,t.point_obj_id,t.point_obj_name,
			t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName
			t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
			t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName,t.item_id ,t.item_id itemId,t.nfc_code,t.nfc_code nfcCode,ii.item_name itemName
			from inspection_point t
			LEFT JOIN inspection_item ii on t.item_id = ii.item_id and ii.status_cd = '0'
			<if test="inspectionRouteId != null and inspectionRouteId != ''">
			left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
			and c.status_cd = '0'
			and c.inspection_route_id is null
			</if>
			where 1 =1
			left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
			td.table_columns = 'point_obj_type'
			where 1 = 1
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			@@ -97,6 +93,12 @@
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="itemId !=null and itemId != ''">
			and t.item_id= #{itemId}
			</if>
			<if test="nfcCode !=null and nfcCode != ''">
			and t.nfc_code= #{nfcCode}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			@@ -115,9 +117,7 @@
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			<!-- 修改巡检点信息 add by wuxw 2018-07-03 -->
			<update id="updateInspectionInfoInstance" parameterType="Map">
			@@ -134,7 +134,7 @@
			<if test="pointObjName !=null and pointObjName != ''">
			, t.point_obj_name= #{pointObjName}
			</if>
			<if test="remark !=null and remark != ''">
			<if test="remark !=null ">
			, t.remark= #{remark}
			</if>
			<if test="inspectionName !=null and inspectionName != ''">
			@@ -142,6 +142,12 @@
			</if>
			<if test="communityId !=null and communityId != ''">
			, t.community_id= #{communityId}
			</if>
			<if test="itemId !=null and itemId != ''">
			, t.item_id= #{itemId}
			</if>
			<if test="nfcCode !=null and nfcCode != ''">
			, t.nfc_code= #{nfcCode}
			</if>
			where 1=1
			<if test="inspectionId !=null and inspectionId != ''">
			@@ -171,6 +177,12 @@
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="itemId !=null and itemId != ''">
			and t.item_id= #{itemId}
			</if>
			<if test="nfcCode !=null and nfcCode != ''">
			and t.nfc_code= #{nfcCode}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			</if>
			@@ -183,10 +195,7 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>


			</select>


			<!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
			<select id="getInspectionRelationShipInfo" parameterType="Map" resultType="Map">
			@@ -194,13 +203,16 @@
			t.inspection_id,t.inspection_id inspectionId,t.remark,t.status_cd,t.status_cd statusCd,
			t.inspection_name,t.inspection_name inspectionName,t.community_id,
			t.community_id communityId,t.b_id,t.b_id bId,
			t.point_obj_type,t.point_obj_id,t.point_obj_name,
			t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName
			d.name locationTypeName
			t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
			t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName,
			t.item_id ,t.item_id itemId,t.nfc_code,t.nfc_code nfcCode,ii.item_name itemName
			from inspection_point t
			left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and c.inspection_route_id = #{inspectionRouteId}
			where 1 =1

			LEFT JOIN inspection_item ii on t.item_id = ii.item_id and ii.status_cd = '0'
			left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and
			c.inspection_route_id = #{inspectionRouteId}
			left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
			td.table_columns = 'point_obj_type'
			where 1 = 1
			<if test="relationship != null and relationship == 1">
			and c.inspection_id is not null
			</if>
			@@ -215,6 +227,12 @@
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="itemId !=null and itemId != ''">
			and t.item_id= #{itemId}
			</if>
			<if test="nfcCode !=null and nfcCode != ''">
			and t.nfc_code= #{nfcCode}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			@@ -238,9 +256,9 @@
			<select id="queryInspectionsRelationShipCount" parameterType="Map" resultType="Map">
			select count(1) count
			from inspection_point t
			left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and c.inspection_route_id = #{inspectionRouteId}
			left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and
			c.inspection_route_id = #{inspectionRouteId}
			where 1 =1

			<if test="relationship != null and relationship == 1">
			and c.inspection_id is not null
			</if>
			@@ -256,6 +274,12 @@
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="itemId !=null and itemId != ''">
			and t.item_id= #{itemId}
			</if>
			<if test="nfcCode !=null and nfcCode != ''">
			and t.nfc_code= #{nfcCode}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			</if>
			@@ -270,15 +294,13 @@
			</if>
			</select>



			<!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
			<select id="queryInspectionsByPlan" parameterType="Map" resultType="Map">
			select
			t.inspection_id,t.inspection_id inspectionId,t.machine_id,
			t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
			t.inspection_name,t.inspection_name inspectionName,t.community_id,
			t.community_id communityId,t.b_id,t.b_id bId,
			t.community_id communityId,t.b_id,t.b_id bId
			m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
			locationObjId,m.machine_id machineId,
			d.name locationTypeName
			@@ -302,6 +324,12 @@
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="itemId !=null and itemId != ''">
			and t.item_id= #{itemId}
			</if>
			<if test="nfcCode !=null and nfcCode != ''">
			and t.nfc_code= #{nfcCode}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			</if>
			@@ -317,5 +345,4 @@
			group by t.inspection_id
			order by t.create_time desc
			</select>

			</mapper>