moral.git - Gitblit

			@@ -25,12 +25,11 @@
			<result column="install_time" property="installTime"/>
			<result column="is_delete" property="isDelete"/>
			<result column="extend" property="extend"/>
			<result column="town_code" property="townCode"/>
			<result column="dev_num" property="devNum"/>
			</resultMap>

			<resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap">
			<!--行业-->
			<result column="profession_name" property="professionName"/>

			<!--工艺-->
			<result column="tech_name" property="techName"/>

			@@ -67,10 +66,22 @@
			<result column="version_name" property="name"/>
			</association>

			<!--乡镇街道-->
			<association property="town" javaType="java.util.HashMap">
			<result column="town_code" property="townCode"/>
			<result column="town_name" property="townName"/>
			</association>

			<!--设备维护人-->
			<collection property="operators" ofType="com.moral.api.entity.ManageAccount">
			<result column="operate_id" property="id" jdbcType="INTEGER"/>
			<result column="operate_name" property="userName" jdbcType="VARCHAR"/>
			</collection>

			<!--行业-->
			<collection property="professions" ofType="java.util.HashMap">
			<result column="profession_key" property="dataKey" jdbcType="INTEGER"/>
			<result column="profession_value" property="dataValue" jdbcType="VARCHAR"/>
			</collection>
			</resultMap>

			@@ -121,6 +132,8 @@
			d.create_time,
			d.install_time,
			d.extend,
			d.town_code,
			sa.area_name town_name,
			o.id org_id,
			o.`name` org_name,
			mp.id mp_id,
			@@ -134,7 +147,8 @@
			v.id version_id,
			v.`name` version_name,
			ma.user_name operate_name,
			profession.dataValue profession_name,
			profession.dataKey profession_key,
			profession.dataValue profession_value,
			tech.dataValue tech_name,
			detector.dataValue detector_name,
			purchaser.dataValue purchaser_name
			@@ -152,15 +166,21 @@
			(
			ma.id, (SELECT operate_ids FROM device WHERE id = d.id)
			)
			LEFT JOIN `sys_area` sa
			ON d.town_code = sa.area_code
			LEFT JOIN
			(
			SELECT sdt.`name`, sdd.dataKey, sdd.dataValue
			FROM sys_dict_type sdt,
			sys_dict_data sdd
			WHERE sdt.id = sdd.dict_type_id
			AND sdt.`name` = 'profession'
			AND sdt.`name` = 'profession'
			AND sdd.is_delete = '0'
			) profession
			ON d.profession = profession.dataKey
			ON FIND_IN_SET
			(
			profession.dataKey, (SELECT profession FROM device WHERE id = d.id)
			)

			LEFT JOIN
			(
			@@ -168,7 +188,8 @@
			FROM sys_dict_type sdt,
			sys_dict_data sdd
			WHERE sdt.id = sdd.dict_type_id
			AND sdt.`name` = 'tech'
			AND sdt.`name` = 'tech'
			AND sdd.is_delete = '0'
			) tech
			ON d.tech = tech.dataKey

			@@ -178,7 +199,8 @@
			FROM sys_dict_type sdt,
			sys_dict_data sdd
			WHERE sdt.id = sdd.dict_type_id
			AND sdt.`name` = 'detector'
			AND sdt.`name` = 'detector'
			AND sdd.is_delete = '0'
			) detector
			ON d.detector = detector.dataKey

			@@ -188,7 +210,8 @@
			FROM sys_dict_type sdt,
			sys_dict_data sdd
			WHERE sdt.id = sdd.dict_type_id
			AND sdt.`name` = 'purchaser'
			AND sdt.`name` = 'purchaser'
			AND sdd.is_delete = '0'
			) purchaser
			ON d.purchaser = purchaser.dataKey
			WHERE d.id = #{deviceId}
			@@ -228,7 +251,10 @@
			on
			d.`device_version_id` = oua.`version_id` and d.`organization_id` = oua.`organization_id` and oua.`is_delete` = 0
			where
			d.`is_delete` = 0;
			d.`is_delete` = 0
			<if test="mac != null and mac != '' ">
			and d.mac = #{mac}
			</if>
			</select>