Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -7,9 +7,9 @@
			<!-- 保存小区单元信息 add by wuxw 2018-07-03 -->
			<insert id="saveBusinessUnitInfo" parameterType="Map">
			insert into business_building_unit(
			floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id
			floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id,unit_area
			) values (
			#{floorId},#{operate},#{layerCount},#{unitId},#{unitNum},#{lift},#{remark},#{bId},#{userId}
			#{floorId},#{operate},#{layerCount},#{unitId},#{unitNum},#{lift},#{remark},#{bId},#{userId},#{unitArea}
			)
			</insert>

			@@ -17,7 +17,8 @@
			<!-- 查询小区单元信息（Business） add by wuxw 2018-07-03 -->
			<select id="getBusinessUnitInfo" parameterType="Map" resultType="Map">
			select t.floor_id,t.floor_id floorId,t.operate,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
			unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId
			unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId,
			t.unit_area,t.unit_area unitArea
			from business_building_unit t
			where 1 =1
			<if test="floorId !=null and floorId != ''">
			@@ -47,6 +48,7 @@
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			order by unitNum asc

			</select>

			@@ -54,8 +56,9 @@
			<!-- 保存小区单元信息至 instance表中 add by wuxw 2018-07-03 -->
			<insert id="saveUnitInfoInstance" parameterType="Map">
			insert into building_unit(
			floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id
			) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id from
			floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id,unit_area
			) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id,t.unit_area
			from
			business_building_unit t where 1=1
			<if test="floorId !=null and floorId != ''">
			and t.floor_id= #{floorId}
			@@ -90,7 +93,7 @@
			<select id="getUnitInfo" parameterType="Map" resultType="Map">
			select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
			unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
			bId,t.user_id,t.user_id userId
			bId,t.user_id,t.user_id userId,t.unit_area,t.unit_area unitArea
			from building_unit t
			<if test="communityId!=null and communityId != ''">
			,f_floor ff
			@@ -128,6 +131,7 @@
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			order by unitNum asc
			<!-- <if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>limit 10;-->
			@@ -155,6 +159,9 @@
			</if>
			<if test="remark !=null and remark != ''">
			, t.remark= #{remark}
			</if>
			<if test="unitArea !=null and unitArea != ''">
			, t.unit_area= #{unitArea}
			</if>
			<if test="userId !=null and userId != ''">
			, t.user_id= #{userId}
			@@ -208,7 +215,7 @@
			<select id="queryUnitsByCommunityId" parameterType="Map" resultType="Map">
			select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
			unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
			bId,t.user_id,t.user_id userId
			bId,t.user_id,t.user_id userId,t.unit_area,t.unit_area unitArea
			from building_unit t,f_floor f
			where 1 =1
			and t.floor_id = f.floor_id
			@@ -223,7 +230,7 @@
			<if test="unitId !=null and unitId != ''">
			and t.unit_id= #{unitId}
			</if>
			<if test="unitNum !=null and unitNum != ''">
			<if test="unitNum !=null and unitNum != '' or unitNum == 0">
			and t.unit_num= #{unitNum}
			</if>
			<if test="lift !=null and lift != ''">
			@@ -244,6 +251,7 @@
			<if test="page != -1 and page != null">
			limit #{page}, #{row}
			</if>
			order by unitNum asc
			</select>

			<select id="getFloorAndUnitInfo" parameterType="Map" resultType="Map">