From 9068efe724da8faed9387615c6c8f425767bac97 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Fri, 23 Feb 2024 14:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8E=BB=E9=99=A4=E4=BB=AA=E5=99=A8=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/entity/WxInstrumentSerial.java     | 22 +++----------------
 .../mapper/WxInstrumentSerialMapper.xml       |  8 +------
 .../impl/WxInstrumentSerialServiceImpl.java   | 17 ++++++++++----
 .../impl/WxUserInstrumentServiceImpl.java     |  5 ++++-
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java
index 6206a2a..14bad3b 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java
@@ -25,10 +25,6 @@ public class WxInstrumentSerial extends BaseEntity
     @Excel(name = "仪器id")
     private Long instrumentId;
 
-    /** 仪器名称 */
-    @Excel(name = "仪器名称")
-    private String instrumentName;
-
     /** 来源 */
     @Excel(name = "来源")
     private String source;
@@ -55,6 +51,9 @@ public class WxInstrumentSerial extends BaseEntity
 
     private String queryInstrumentIds;
 
+    /** 仪器名称 */
+    private String instrumentName;
+
     /**
      * 自定导出字段
      */
@@ -166,19 +165,4 @@ public class WxInstrumentSerial extends BaseEntity
         this.instrumentSerialIdList = instrumentSerialIdList;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("instrumentId", getInstrumentId())
-            .append("instrumentName", getInstrumentName())
-            .append("serial", getSerial())
-            .append("bindingStatus", getBindingStatus())
-            .append("validStatus", getValidStatus())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml
index 7d39cf5..7f27e46 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml
@@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="WxInstrumentSerial" id="WxInstrumentSerialResult">
         <result property="id"    column="id"    />
         <result property="instrumentId"    column="instrument_id"    />
-        <result property="instrumentName"    column="instrument_name"    />
         <result property="serial"    column="serial"    />
         <result property="source"    column="source"    />
         <result property="bindingStatus"    column="binding_status"    />
@@ -19,14 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxInstrumentSerialVo">
-        select id, source,instrument_id, instrument_name, serial, binding_status, valid_status, status, create_by, create_time, remark from wx_instrument_serial
+        select id, source,instrument_id, serial, binding_status, valid_status, status, create_by, create_time, remark from wx_instrument_serial
     </sql>
 
     <select id="selectWxInstrumentSerialList" parameterType="WxInstrumentSerial" resultMap="WxInstrumentSerialResult">
         <include refid="selectWxInstrumentSerialVo"/>
         <where>
             <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
-            <if test="instrumentName != null  and instrumentName != ''"> and instrument_name like concat('%', #{instrumentName}, '%')</if>
             <if test="serial != null  and serial != ''"> and serial  like concat('%', #{serial}, '%')</if>
             <if test="source != null  and source != ''"> and `source`  like concat('%', #{source}, '%')</if>
             <if test="bindingStatus != null "> and binding_status = #{bindingStatus}</if>
@@ -66,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into wx_instrument_serial
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="instrumentId != null">instrument_id,</if>
-            <if test="instrumentName != null and instrumentName != ''">instrument_name,</if>
             <if test="serial != null and serial != ''">serial,</if>
             <if test="source != null and source != ''">`source`,</if>
             <if test="bindingStatus != null">binding_status,</if>
@@ -78,7 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="instrumentId != null">#{instrumentId},</if>
-            <if test="instrumentName != null and instrumentName != ''">#{instrumentName},</if>
             <if test="serial != null and serial != ''">#{serial},</if>
             <if test="source != null and source != ''">#{source},</if>
             <if test="bindingStatus != null">#{bindingStatus},</if>
@@ -94,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update wx_instrument_serial
         <trim prefix="SET" suffixOverrides=",">
             <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
-            <if test="instrumentName != null and instrumentName != ''">instrument_name = #{instrumentName},</if>
             <if test="serial != null and serial != ''">serial = #{serial},</if>
             <if test="source != null and source != ''">`source` = #{source},</if>
             <if test="bindingStatus != null">binding_status = #{bindingStatus},</if>
@@ -111,7 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update wx_instrument_serial
         <trim prefix="SET" suffixOverrides=",">
             <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
-            <if test="instrumentName != null and instrumentName != ''">instrument_name = #{instrumentName},</if>
             <if test="source != null and source != ''">`source` = #{source},</if>
             <if test="bindingStatus != null">binding_status = #{bindingStatus},</if>
             <if test="validStatus != null">valid_status = #{validStatus},</if>
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java
index d9c5757..0e18b6c 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java
@@ -65,7 +65,16 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService
             String instrumentIds = wxInstrumentSerial.getInstrumentIdArray().stream().map(String::valueOf).collect(Collectors.joining(","));
             wxInstrumentSerial.setQueryInstrumentIds(instrumentIds);
         }
-        return wxInstrumentSerialMapper.selectWxInstrumentSerialList(wxInstrumentSerial);
+        List<WxInstrumentSerial> wxInstrumentSerialList = wxInstrumentSerialMapper.selectWxInstrumentSerialList(wxInstrumentSerial);
+        if (wxInstrumentSerialList != null && wxInstrumentSerialList.size() > 0) {
+            wxInstrumentSerialList.forEach(ws-> {
+                WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(ws.getInstrumentId());
+                if(wxInstrument != null) {
+                    ws.setInstrumentName(wxInstrument.getName());
+                }
+            });
+        }
+        return wxInstrumentSerialList;
     }
 
     /**
@@ -80,8 +89,8 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService
         wxInstrumentSerial.setCreateTime(DateUtils.getNowDate());
         if (Objects.nonNull(wxInstrumentSerial.getInstrumentId())) {
             WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(wxInstrumentSerial.getInstrumentId());
-            if (Objects.nonNull(wxInstrument)) {
-                wxInstrumentSerial.setInstrumentName(wxInstrument.getName());
+            if (!Objects.nonNull(wxInstrument)) {
+                throw new ServiceException("仪器不存在");
             }
         }
         WxInstrumentSerial instrumentSerial = new WxInstrumentSerial();
@@ -210,7 +219,7 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService
                             // 开始插入数据
                             WxInstrumentSerial insertRecord = new WxInstrumentSerial();
                             insertRecord.setCreateTime(DateUtils.getNowDate());
-                            insertRecord.setInstrumentName(wxInstrument.getName());
+                            // insertRecord.setInstrumentName(wxInstrument.getName());
                             insertRecord.setSerial(instrumentSerialImport.getSerial());
                             insertRecord.setSource(instrumentSerialImport.getSource());
                             insertRecord.setInstrumentId(wxInstrument.getId());
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
index 97f696d..9d98851 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
@@ -208,7 +208,10 @@ public class WxUserInstrumentServiceImpl implements IWxUserInstrumentService
         WxInstrumentSerial instrumentSerialVo = serialList.get(0);
         userInstrumentRecord.setInstrumentId(instrumentSerialVo.getInstrumentId());
         userInstrumentRecord.setSerial(instrumentSerialVo.getSerial());
-        userInstrumentRecord.setInstrumentName(instrumentSerialVo.getInstrumentName());
+        WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(instrumentSerialVo.getInstrumentId());
+        if(wxInstrument != null) {
+            userInstrumentRecord.setInstrumentName(wxInstrument.getName());
+        }
 //        userInstrumentRecord.setSerialImage(userInstrument.getSerialImage());
         // 从新绑定
         this.saveLog(userInstrumentRecord,0);