Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -120,7 +120,7 @@
			openTypeCd,t.id_card,t.id_card idCard,t.status_cd,t.status_cd statusCd,t.machine_record_id,t.machine_record_id
			machineRecordId,t.machine_id,t.machine_id machineId,t.name,t.tel,t.community_id,t.community_id
			communityId,t.b_id,t.b_id bId,t.file_id,t.file_id fileId,t.record_type_cd,t.record_type_cd recordTypeCd,td1.name
			openTypeName
			openTypeName,t.create_time createTime
			from machine_record t,t_dict td1
			where 1 =1
			and t.open_type_cd = td1.status_cd
			@@ -165,6 +165,7 @@
			<if test="recordTypeCd !=null and recordTypeCd != ''">
			and t.record_type_cd= #{recordTypeCd}
			</if>
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>
			@@ -279,5 +280,18 @@
			limit 0,7
			</select>

			<!-- 保存设备上报信息 add by wuxw 2018-07-03 -->
			<insert id="saveMachineRecords" parameterType="Map">
			insert into machine_record(
			file_time,machine_code,open_type_cd,id_card,machine_record_id,machine_id,`name`,tel,community_id,b_id,file_id,record_type_cd
			) values
			<foreach collection="machineRecords" item="item" separator=",">
			(
			#{item.fileTime},#{item.machineCode},#{item.openTypeCd},#{item.idCard},#{item.machineRecordId},#{item.machineId},#{item.name},#{item.tel},#{item.communityId},'-1',#{item.fileId}
			,#{item.recordTypeCd}
			)
			</foreach>
			</insert>


			</mapper>