Lianxun_Java.git

			@@ -1,18 +1,18 @@
			<?xml version="1.0" encoding="UTF-8" ?>
			<!DOCTYPE mapper
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="repairServiceDaoImpl">

			<!-- 保存报修信息信息 add by wuxw 2018-07-03 -->
			<insert id="saveBusinessRepairInfo" parameterType="Map">
			insert into business_repair_pool(
			operate,repair_name,appointment_time,repair_type,context,repair_id,tel,state,community_id,b_id,repair_obj_type,repair_obj_id,
			repair_obj_name, maintenance_type,repair_channel,repair_materials,repair_fee,pay_type
			) values (
			#{operate},#{repairName},#{appointmentTime},#{repairType},#{context},#{repairId},#{tel},#{state},#{communityId},#{bId},
			#{repairObjType},#{repairObjId},#{repairObjName},#{maintenanceType},#{repairChannel},#{repairMaterials},#{repairFee},#{payType}
			)
			insert into business_repair_pool(operate, repair_name, appointment_time, repair_type, context, repair_id, tel,
			state, community_id, b_id, repair_obj_type, repair_obj_id,
			repair_obj_name, maintenance_type, repair_channel, repair_materials,
			repair_fee, pay_type)
			values (#{operate}, #{repairName}, #{appointmentTime}, #{repairType}, #{context}, #{repairId}, #{tel}, #{state},
			#{communityId}, #{bId},
			#{repairObjType}, #{repairObjId}, #{repairObjName}, #{maintenanceType}, #{repairChannel},
			#{repairMaterials}, #{repairFee}, #{payType})
			</insert>

			<!-- 查询报修信息信息（Business） add by wuxw 2018-07-03 -->
			@@ -139,15 +139,17 @@
			t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,
			t.repair_obj_name repairObjName,rrv.visit_type visitType,rrv.context visitContext,a.appraise_score
			appraiseScore, a.door_speed_score doorSpeedScore,a.repairman_service_score repairmanServiceScore,
			t.pay_type,t.pay_type payType,rs.repair_setting_type repairSettingType,d1.name repairSettingTypeName
			t.pay_type,t.pay_type payType,rs.repair_setting_type repairSettingType,d1.name repairSettingTypeName,t.create_time createTime
			<if test="staffId != null and staffId != ''">
			,rru.state repairDispatchState,rru.context repairDispatchContext,td.name repairDispatchStateName
			</if>
			from r_repair_pool t
			left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
			left join r_repair_setting rs on rs.repair_type = t.repair_type and rs.status_cd = '0'
			left join t_dict d1 on rs.repair_setting_type = d1.status_cd and d1.table_name = 'r_repair_setting' and d1.table_columns = 'repair_setting_type'
			left join r_repair_return_visit rrv on t.repair_id = rrv.repair_id and rrv.community_id = t.community_id and rrv.status_cd = '0'
			left join t_dict d1 on rs.repair_setting_type = d1.status_cd and d1.table_name = 'r_repair_setting' and
			d1.table_columns = 'repair_setting_type'
			left join r_repair_return_visit rrv on t.repair_id = rrv.repair_id and rrv.community_id = t.community_id and
			rrv.status_cd = '0'
			left join appraise a on a.obj_id = t.repair_id and a.status_cd = '0'
			<if test="staffId != null and staffId != ''">
			,r_repair_user rru
			@@ -369,6 +371,9 @@
			<if test="repairObjId !=null and repairObjId != ''">
			and t.repair_obj_id= #{repairObjId}
			</if>
			<if test="maintenanceType !=null and maintenanceType != ''">
			and t.maintenance_type= #{maintenanceType}
			</if>
			<if test="repairChannels !=null">
			and t.repair_channel in
			<foreach collection="repairChannels" item="item" open="(" close=")" separator=",">
			@@ -378,8 +383,7 @@
			</select>

			<!-- 查询报修信息信息 add by wuxw 2018-07-03
			将状态先调整 and ru.state in ('10001','10002')
			-->
			将状态先调整 and ru.state in ('10001','10002')-->
			<select id="getStaffRepairInfo" parameterType="Map" resultType="Map">
			select distinct t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
			appointmentTime,t.repair_type,t.repair_type repairType,t.context,t.repair_id,t.repair_id
			@@ -391,7 +395,7 @@
			repairObjId,t.repair_obj_name repairObjName,t.repair_channel repairChannel,
			sru.ru_id startRuId,ru.ru_id ruId,ru.pre_ru_id preRuId,t.maintenance_type,t.maintenance_type maintenanceType,
			t.repair_channel,t.repair_channel repairChannel,t.repair_materials,t.repair_materials repairMaterials,
			t.repair_fee,t.repair_fee repairFee,t.pay_type,t.pay_type payType
			t.repair_fee,t.repair_fee repairFee,t.pay_type,t.pay_type payType,t.create_time
			from r_repair_pool t
			left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
			left join r_repair_setting rs on rs.repair_type = t.repair_type and rs.status_cd = '0'
			@@ -531,7 +535,7 @@
			left join t_dict td on rs.return_visit_flag = td.status_cd and td.table_name='r_repair_setting' and
			td.table_columns='return_visit_flag'
			where 1 =1
			and ru.state in ('10002','10003','10004','10005','10009','11000','12000')
			and ru.state in ('10002','10005','10009','11000','12000')
			<if test="staffId !=null and staffId != ''">
			and ru.staff_id = #{staffId}
			</if>
			@@ -577,6 +581,9 @@
			<if test="repairObjId !=null and repairObjId != ''">
			and t.repair_obj_id= #{repairObjId}
			</if>
			<if test="maintenanceType !=null and maintenanceType != ''">
			and t.maintenance_type= #{maintenanceType}
			</if>
			<if test="payType !=null and payType != ''">
			and t.pay_type= #{payType}
			</if>
			@@ -596,7 +603,7 @@
			left join t_dict td on rs.return_visit_flag = td.status_cd and td.table_name='r_repair_setting' and
			td.table_columns='return_visit_flag'
			where 1 =1
			and ru.state in ('10002','10003','10004','10005','10009','11000','12000')
			and ru.state in ('10002','10005','10009','11000','12000')
			<if test="staffId != null and staffId != ''">
			and ru.staff_id = #{staffId}
			</if>
			@@ -642,6 +649,9 @@
			<if test="repairObjId !=null and repairObjId != ''">
			and t.repair_obj_id= #{repairObjId}
			</if>
			<if test="maintenanceType !=null and maintenanceType != ''">
			and t.maintenance_type= #{maintenanceType}
			</if>
			<if test="payType !=null and payType != ''">
			and t.pay_type= #{payType}
			</if>