From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增，修改是工艺字段可以为多个，修改mapper,sql
---
screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java | 3 ++-
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 3 +--
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 17 ++++++++++++-----
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
index 59dd119..eb1404c 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
@@ -4,6 +4,7 @@
import lombok.EqualsAndHashCode;
import java.util.List;
+import java.util.Map;
import com.moral.api.entity.Device;
import com.moral.api.entity.GovMonitorPoint;
@@ -19,7 +20,7 @@
/*
* ������
* */
- private String professionName;
+ private List<Map<String, Object>> professions;
/*
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0691274..aa34315 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -349,8 +349,7 @@
deviceInfo.put("extend", device.getExtend());
//������
- deviceInfo.put("profession", device.getProfession());
- deviceInfo.put("professionName", device.getProfessionName());
+ deviceInfo.put("professions", device.getProfessions());
//������
deviceInfo.put("tech", device.getTech());
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 8b65e97..8e24faa 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -28,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"/>
@@ -71,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>
@@ -134,7 +137,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
@@ -160,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
(
--
Gitblit v1.8.0