From a67825fd5d503947193a4f333c351c3ec3013810 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 6 Feb 2024 15:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BB=AA=E5=99=A8ID=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BB=AA=E5=99=A8=E6=A8=A1=E5=BC=8F=E5=B8=A6=E4=B8=8A?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6new=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/flossom/common/core/domain/entity/WxMode.java  | 10 ++++++++++
 .../com/flossom/common/core/domain/ret/WxModeRet.java  | 10 ++++++++++
 .../src/main/resources/mapper/WxModeMapper.xml         |  8 ++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
index 6148dfb..c426a3b 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
@@ -96,6 +96,8 @@ public class WxMode extends BaseEntity
 
     private List<Long> lockCompanyTagArray = new ArrayList<Long>();
 
+    private Integer isNew;
+
 
     public void setId(Long id)
     {
@@ -289,6 +291,14 @@ public class WxMode extends BaseEntity
         this.combineData = combineData;
     }
 
+    public Integer getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Integer isNew) {
+        this.isNew = isNew;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
index 41e23ad..7cbbdb3 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
@@ -130,6 +130,8 @@ public class WxModeRet {
     // 组合实体类
     private List<WxModeCombineInfo> combineData;
 
+    private Integer isNew;
+
 
     private List<Long> lockWechatTagArray = new ArrayList<Long>();
 
@@ -319,4 +321,12 @@ public class WxModeRet {
     public void setCombineData(List<WxModeCombineInfo> combineData) {
         this.combineData = combineData;
     }
+
+    public Integer getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Integer isNew) {
+        this.isNew = isNew;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml
index 56c0c59..5cb6cf4 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml
@@ -27,6 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <resultMap type="WxMode" id="WxModeNewResult" extends="WxModeResult">
+        <result property="isNew"    column="is_new"    />
+    </resultMap>
+
     <sql id="selectWxModeVo">
         select id, instrument_type, instrument_model, mode_name, mode_desc, mode_banner, mode_video, mode_type, mode_class, is_cabin_mode, mode_time, preparation_video, began_video, pause_video, status, create_by, create_time, update_by, update_time, remark from wx_mode
     </sql>
@@ -51,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectListByInstrumentId" parameterType="Long" resultMap="WxModeResult">
+    <select id="selectListByInstrumentId" parameterType="Long" resultMap="WxModeNewResult">
         SELECT
-            DISTINCT mo.*, imo.mode_sort
+            DISTINCT mo.*, imo.mode_sort, imo.is_new
         FROM
             wx_mode mo
             LEFT JOIN `wx_instrument_mode` imo ON imo.mode_id = mo.id