From 7255692b5abbd79f4c4847621641a7103fe7c4da Mon Sep 17 00:00:00 2001
From: elliott <382696293@qq.com>
Date: Fri, 23 Feb 2024 10:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E5=A4=8D=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=BB=84=E5=90=88=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/WxModeCombineInfo.java   | 10 ++++++++++
 .../main/resources/mapper/WxModeCombineInfoMapper.xml  |  7 ++++++-
 flossom-ui/src/views/system/mode/index.vue             |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java
index b322d01..74ffa5a 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java
@@ -23,6 +23,8 @@ public class WxModeCombineInfo extends BaseEntity
     /** 关联模式ID */
     @Excel(name = "关联模式ID")
     private Long modeId;
+    /** 关联模式组合ID */
+    private Long combineModeId;
 
     /** 组合时间 */
     @Excel(name = "组合时间")
@@ -91,6 +93,14 @@ public class WxModeCombineInfo extends BaseEntity
         this.technologyArray = technologyArray;
     }
 
+    public Long getCombineModeId() {
+        return combineModeId;
+    }
+
+    public void setCombineModeId(Long combineModeId) {
+        this.combineModeId = combineModeId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml
index 6e4c15f..99d28e1 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="modeId"    column="mode_id"    />
         <result property="combine"    column="combine"    />
+        <result property="combineModeId"    column="combine_mode_id"    />
         <result property="technologyInfo"    column="technology_info"    />
         <result property="effectContent"    column="effect_content"    />
         <result property="createTime"    column="create_time"    />
@@ -15,13 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxModeCombineInfoVo">
-        select id, mode_id, combine, technology_info, effect_content, create_time, create_by from wx_mode_combine_info
+        select id, combine_mode_id,mode_id, combine, technology_info, effect_content, create_time, create_by from wx_mode_combine_info
     </sql>
 
     <select id="selectWxModeCombineInfoList" parameterType="WxModeCombineInfo" resultMap="WxModeCombineInfoResult">
         <include refid="selectWxModeCombineInfoVo"/>
         <where>
             <if test="modeId != null "> and mode_id = #{modeId}</if>
+            <if test="combineModeId != null "> and combine_mode_id = #{combineModeId}</if>
             <if test="combine != null "> and combine = #{combine}</if>
             <if test="technologyInfo != null  and technologyInfo != ''"> and technology_info = #{technologyInfo}</if>
             <if test="effectContent != null  and effectContent != ''"> and effect_content = #{effectContent}</if>
@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="modeId != null">mode_id,</if>
+            <if test="combineModeId != null">combine_mode_id,</if>
             <if test="combine != null">combine,</if>
             <if test="technologyInfo != null">technology_info,</if>
             <if test="effectContent != null">effect_content,</if>
@@ -48,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="modeId != null">#{modeId},</if>
+            <if test="combineModeId != null">#{combineModeId},</if>
             <if test="combine != null">#{combine},</if>
             <if test="technologyInfo != null">#{technologyInfo},</if>
             <if test="effectContent != null">#{effectContent},</if>
@@ -60,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update wx_mode_combine_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="modeId != null">mode_id = #{modeId},</if>
+            <if test="combineModeId != null">combine_mode_id = #{combineModeId},</if>
             <if test="combine != null">combine = #{combine},</if>
             <if test="technologyInfo != null">technology_info = #{technologyInfo},</if>
             <if test="effectContent != null">effect_content = #{effectContent},</if>
diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue
index 6bf76ff..33eda37 100644
--- a/flossom-ui/src/views/system/mode/index.vue
+++ b/flossom-ui/src/views/system/mode/index.vue
@@ -351,7 +351,7 @@
             <el-form-item label="模式名称" prop="modeName" label-width="110px" style="margin-top: 10px">
               <el-row>
                 <el-col :span ="12">
-                  <el-select v-model="item.modeId">
+                  <el-select v-model="item.combineModeId">
                     <el-option
                       v-for="mode in combineModeList"
                       :key="mode.id"