设备新增，修改是工艺字段可以为多个，修改mapper,sql

jinpengyong

2021-12-16 4450dd41e8d5828e5da4d277c86e54551a6b6c15

 screen-manage/src/main/resources/mapper/DeviceMapper.xml

@@ -14,6 +14,7 @@
        <result column="operate_ids" property="operateIds"/>
        <result column="monitor_point_id" property="monitorPointId"/>
        <result column="organization_id" property="organizationId"/>
        <result column="guid" property="guid"/>
        <result column="device_version_id" property="deviceVersionId"/>
        <result column="profession" property="profession"/>
        <result column="tech" property="tech"/>
@@ -27,9 +28,6 @@
    </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"/>

@@ -49,7 +47,15 @@
        <association property="monitorPoint" javaType="com.moral.api.entity.MonitorPoint">
            <result column="mp_id" property="id"/>
            <result column="mp_name" property="name"/>
            <result column="mp_address" property="address"/>
            <result column="mp_area_code" property="areaCode"/>
            <result column="mp_city_code" property="cityCode"/>
            <result column="mp_province_code" property="provinceCode"/>
        </association>

        <!--国控站点-->
        <association property="govMonitorPoint" javaType="com.moral.api.entity.GovMonitorPoint">
            <result column="gmp_guid" property="guid"/>
            <result column="gmp_name" property="name"/>
        </association>

        <!--型号-->
@@ -62,6 +68,12 @@
        <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>

@@ -116,12 +128,17 @@
            o.`name` org_name,
            mp.id mp_id,
            mp.`name` mp_name,
            mp.address mp_address,
            mp.area_code mp_area_code,
            mp.city_code mp_city_code,
            mp.province_code mp_province_code,
            gmp.guid gmp_guid,
            gmp.name gmp_name,
            ma.id operate_id,
            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
@@ -132,6 +149,8 @@
                           ON d.organization_id = o.id
                 LEFT JOIN `monitor_point` mp
                           ON mp.id = d.monitor_point_id
                 LEFT JOIN `gov_monitor_point` gmp
                           ON gmp.guid = d.guid
                 LEFT JOIN `manage_account` ma
                           ON FIND_IN_SET
                               (
@@ -145,7 +164,10 @@
                 WHERE sdt.id = sdd.dict_type_id
                   AND sdt.`name` = 'profession'
             ) profession
             ON d.profession = profession.dataKey
             ON FIND_IN_SET
             (
                 profession.dataKey, (SELECT profession FROM device WHERE id = d.id)
             )

                 LEFT JOIN
             (