Lianxun_Java.git

old mode 100644 new mode 100755

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


			<!-- 查询巡检点信息（Business） add by wuxw 2018-07-03 -->
			<select id="getBusinessInspectionInfo" parameterType="Map" resultType="Map">
			select t.inspection_id,t.inspection_id inspectionId,t.machine_id,t.machine_id
			machineId,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
			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
			from business_inspection_point t
			where 1 =1
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="machineId !=null and machineId != ''">
			and t.machine_id= #{machineId}
			</if>
			<if test="operate !=null and operate != ''">
			and t.operate= #{operate}
			@@ -41,22 +38,19 @@
			<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,machine_id,remark,status_cd,inspection_name,community_id,b_id
			) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
			business_inspection_point t where 1=1
			inspection_id,remark,status_cd,inspection_name,community_id,b_id,
			point_obj_type,point_obj_id,point_obj_name
			) 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
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="machineId !=null and machineId != ''">
			and t.machine_id= #{machineId}
			</if>
			and t.operate= 'ADD'
			<if test="remark !=null and remark != ''">
			@@ -71,34 +65,30 @@
			<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">
			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_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,
			m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
			locationObjId,m.machine_id machineId,
			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
			from inspection_point t
			left join machine m on t.machine_id = m.machine_id and m.status_cd = 0
			left join t_dict d on d.status_cd = m.location_type_cd
			<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>
			<if test="machineCode !=null and machineCode != ''">
			and m.machine_code= #{machineCode}
			<if test="pointObjType !=null and pointObjType != ''">
			and t.point_obj_type= #{pointObjType}
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			@@ -120,9 +110,7 @@
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			<!-- 修改巡检点信息 add by wuxw 2018-07-03 -->
			<update id="updateInspectionInfoInstance" parameterType="Map">
			@@ -130,10 +118,16 @@
			<if test="newBId != null and newBId != ''">
			,t.b_id = #{newBId}
			</if>
			<if test="machineId !=null and machineId != ''">
			, t.machine_id= #{machineId}
			<if test="pointObjType !=null and pointObjType != ''">
			, t.point_obj_type= #{pointObjType}
			</if>
			<if test="remark !=null and remark != ''">
			<if test="pointObjId !=null and pointObjId != ''">
			, t.point_obj_id= #{pointObjId}
			</if>
			<if test="pointObjName !=null and pointObjName != ''">
			, t.point_obj_name= #{pointObjName}
			</if>
			<if test="remark !=null ">
			, t.remark= #{remark}
			</if>
			<if test="inspectionName !=null and inspectionName != ''">
			@@ -149,7 +143,6 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>

			</update>

			<!-- 查询巡检点数量 add by wuxw 2018-07-03 -->
			@@ -165,8 +158,8 @@
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="machineId !=null and machineId != ''">
			and t.machine_id= #{machineId}
			<if test="pointObjType !=null and pointObjType != ''">
			and t.point_obj_type= #{pointObjType}
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			@@ -175,7 +168,7 @@
			and t.status_cd= #{statusCd}
			</if>
			<if test="inspectionName !=null and inspectionName != ''">
			and t.inspection_name= #{inspectionName}
			and t.inspection_name like concat('%',#{inspectionName},'%')
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			@@ -183,27 +176,22 @@
			<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">
			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_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,
			m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
			locationObjId,m.machine_id machineId,
			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
			from inspection_point t
			inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
			INNER JOIN t_dict d ON d.status_cd = m.location_type_cd and d.table_name = 'machine' and d.table_columns = 'location_type_cd'
			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_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>
			@@ -213,8 +201,8 @@
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="machineCode !=null and machineCode != ''">
			and m.machine_code= #{machineCode}
			<if test="pointObjType !=null and pointObjType != ''">
			and t.point_obj_type= #{pointObjType}
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			@@ -241,11 +229,8 @@
			<select id="queryInspectionsRelationShipCount" parameterType="Map" resultType="Map">
			select count(1) count
			from inspection_point t
			inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
			INNER JOIN t_dict d ON d.status_cd = m.location_type_cd and d.table_name = 'machine' and d.table_columns = 'location_type_cd'
			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
			@@ -256,8 +241,8 @@
			<if test="inspectionId !=null and inspectionId != ''">
			and t.inspection_id= #{inspectionId}
			</if>
			<if test="machineId !=null and machineId != ''">
			and t.machine_id= #{machineId}
			<if test="pointObjType !=null and pointObjType != ''">
			and t.point_obj_type= #{pointObjType}
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			@@ -266,7 +251,7 @@
			and t.status_cd= #{statusCd}
			</if>
			<if test="inspectionName !=null and inspectionName != ''">
			and t.inspection_name= #{inspectionName}
			and t.inspection_name like concat('%',#{inspectionName},'%')
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			@@ -276,15 +261,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
			@@ -323,5 +306,4 @@
			group by t.inspection_id
			order by t.create_time desc
			</select>

			</mapper>