jfpt-BladeX.git

			@@ -60,12 +60,17 @@


			<select id="selectEquipmentPage" resultMap="equipmentResultMap">
			select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
			parent_id,district,province,city,
			jd ,
			wd ,
			street,
			addvcd,pay,expireTime from sys_equipment where 1=1
			select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
			,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
			equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
			equipment.jd ,
			equipment.wd ,
			equipment.street,catalog.pid,
			equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
			left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber

			where 1=1

			<if test="equipment.deviceName!=null">
			and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
			concat('%',#{equipment.deviceName},'%'))
			@@ -187,9 +192,9 @@
			parameterType="org.springblade.jfpt.equipment.entity.Equipment">
			SELECT
			dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
			dept.ownerId,dept.devicestate,dept.stime,
			dept.ownerId,dept.devicestate,dept.stime,dept.district,dept.province,dept.city,
			ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
			dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,
			dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
			(
			SELECT
			CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
			@@ -249,4 +254,8 @@
			update sys_equipment SET heartbeat=#{heartbeat} where deviceNumber=#{deviceNumber}
			</update>

			<update id="updateexpireTime">
			update sys_equipment SET expireTime=#{expireTime} where deviceNumber=#{deviceNumber}
			</update>

			</mapper>