Lianxun_Java.git

			@@ -7,9 +7,10 @@
			<!-- 保存车辆管理信息 add by wuxw 2018-07-03 -->
			<insert id="saveBusinessOwnerCarInfo" parameterType="Map">
			insert into business_owner_car(
			car_color,car_brand,car_type,operate,car_num,ps_id,remark,owner_id,b_id,user_id,car_id,community_id
			car_color,car_brand,car_type,operate,car_num,ps_id,remark,owner_id,b_id,user_id,car_id,community_id,start_time,end_time,state
			) values (
			#{carColor},#{carBrand},#{carType},#{operate},#{carNum},#{psId},#{remark},#{ownerId},#{bId},#{userId},#{carId},#{communityId}
			#{carColor},#{carBrand},#{carType},#{operate},#{carNum},#{psId},#{remark},#{ownerId},#{bId},#{userId},#{carId},#{communityId},
			#{startTime},#{endTime},#{state}
			)
			</insert>

			@@ -19,7 +20,7 @@
			select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t.car_type,t.car_type
			carType,t.operate,t.car_num,t.car_num carNum,t.ps_id,t.ps_id psId,t.remark,t.owner_id,t.owner_id
			ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.car_id,t.car_id carId,t.community_id,t.community_id
			communityId
			communityId,t.start_time,t.end_time,t.state,t.start_time startTime,t.end_time endTime
			from business_owner_car t
			where 1 =1
			<if test="carColor !=null and carColor != ''">
			@@ -65,9 +66,9 @@
			<!-- 保存车辆管理信息至 instance表中 add by wuxw 2018-07-03 -->
			<insert id="saveOwnerCarInfoInstance" parameterType="Map">
			insert into owner_car(
			car_color,car_brand,car_type,car_num,ps_id,remark,status_cd,owner_id,b_id,user_id,car_id,community_id
			car_color,car_brand,car_type,car_num,ps_id,remark,status_cd,owner_id,b_id,user_id,car_id,community_id,start_time,end_time,state
			) select
			t.car_color,t.car_brand,t.car_type,t.car_num,t.ps_id,t.remark,'0',t.owner_id,t.b_id,t.user_id,t.car_id,t.community_id
			t.car_color,t.car_brand,t.car_type,t.car_num,t.ps_id,t.remark,'0',t.owner_id,t.b_id,t.user_id,t.car_id,t.community_id,t.start_time,t.end_time,t.state
			from business_owner_car t where 1=1
			<if test="carColor !=null and carColor != ''">
			and t.car_color= #{carColor}
			@@ -109,25 +110,19 @@

			<!-- 查询车辆管理信息 add by wuxw 2018-07-03 -->
			<select id="getOwnerCarInfo" parameterType="Map" resultType="Map">
			select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t1.name car_type,t1.name carType,
			select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t.car_type,t.car_type carType,t1.name
			carTypeName,
			t.car_num,t.car_num carNum,t.ps_id,t.ps_id psId,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,
			t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.car_id,t.car_id carId ,t.create_time
			createTime,t.community_id communityId
			<if test="withOwner == true">
			,bow.name ownerName,bow.id_card idCard,bow.link
			</if>
			from owner_car t,t_dict t1
			<if test="withOwner == true">
			,building_owner bow
			</if>
			createTime,t.community_id communityId,bow.name ownerName,bow.id_card idCard,bow.link,t2.name stateName,
			t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.state
			from owner_car t
			left join t_dict t1 on t.car_type=t1.status_cd and t1.table_name='owner_car' and t1.table_columns = 'car_type'
			left join t_dict t2 on t.state=t2.status_cd and t2.table_name='owner_car' and t2.table_columns = 'state'
			left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
			t.community_id
			where
			t.car_type=t1.status_cd
			and t1.table_name='owner_car'
			<if test="withOwner == true">
			and t.owner_id = bow.owner_id
			and bow.status_cd = '0'
			</if>

			t.status_cd = '0'
			<if test="carColor !=null and carColor != ''">
			and t.car_color= #{carColor}
			</if>
			@@ -158,6 +153,9 @@
			<if test="ownerId !=null and ownerId != ''">
			and t.owner_id= #{ownerId}
			</if>
			<if test="ownerName !=null and ownerName != ''">
			and bow.name= #{ownerName}
			</if>
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			@@ -167,8 +165,20 @@
			<if test="carId !=null and carId != ''">
			and t.car_id= #{carId}
			</if>
			<if test="carIds !=null">
			and t.car_id in
			<foreach collection="carIds" item="item" index="index" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="valid == '1'">
			and t.end_time > now()
			</if>
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			@@ -208,6 +218,15 @@
			<if test="userId !=null and userId != ''">
			, t.user_id= #{userId}
			</if>
			<if test="startTime !=null ">
			, t.start_time= #{startTime}
			</if>
			<if test="endTime !=null ">
			, t.end_time= #{endTime}
			</if>
			<if test="state !=null ">
			, t.state= #{state}
			</if>
			where 1=1
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			@@ -225,6 +244,7 @@
			<select id="queryOwnerCarsCount" parameterType="Map" resultType="Map">
			select count(1) count
			from owner_car t
			left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id = t.community_id
			where 1 =1
			<if test="carColor !=null and carColor != ''">
			and t.car_color= #{carColor}
			@@ -250,6 +270,9 @@
			<if test="ownerId !=null and ownerId != ''">
			and t.owner_id= #{ownerId}
			</if>
			<if test="ownerName !=null and ownerName != ''">
			and bow.name= #{ownerName}
			</if>
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			@@ -262,6 +285,9 @@
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>


			</select>