添加 自定义组合属性

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java

@@ -55,6 +55,9 @@ public class WxMode extends BaseEntity
     @Excel(name = "模式分类(每个仪器有不一样的模式分类)")
     private Long modeClass;
 
+    /** 是否自定义模式: 0 不是 1是 */
+    private Integer isCustomMode;
+
     /** 是否属于舱体模式：0、不是 1、是 */
     @Excel(name = "是否属于舱体模式：0、不是 1、是")
     private Integer isCabinMode;
@@ -299,6 +302,14 @@ public class WxMode extends BaseEntity
         this.isNew = isNew;
     }
 
+    public Integer getIsCustomMode() {
+        return isCustomMode;
+    }
+
+    public void setIsCustomMode(Integer isCustomMode) {
+        this.isCustomMode = isCustomMode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="modeVideo"    column="mode_video"    />
         <result property="modeType"    column="mode_type"    />
         <result property="modeClass"    column="mode_class"    />
+        <result property="isCustomMode"    column="is_custom_mode"    />
         <result property="isCabinMode"    column="is_cabin_mode"    />
         <result property="modeTime"    column="mode_time"    />
         <result property="preparationVideo"    column="preparation_video"    />
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        select id, instrument_type, instrument_model, mode_name, mode_desc, mode_banner, mode_video, mode_type, mode_class, is_cabin_mode, is_custom_mode, mode_time, preparation_video, began_video, pause_video, status, create_by, create_time, update_by, update_time, remark from wx_mode
     </sql>
 
     <select id="selectWxModeList" parameterType="WxMode" resultMap="WxModeResult">
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="modeVideo != null  and modeVideo != ''"> and mode_video = #{modeVideo}</if>
             <if test="modeType != null "> and mode_type = #{modeType}</if>
             <if test="modeClass != null "> and mode_class = #{modeClass}</if>
+            <if test="isCustomMode != null "> and is_custom_mode = #{isCustomMode}</if>
             <if test="isCabinMode != null "> and is_cabin_mode = #{isCabinMode}</if>
             <if test="modeTime != null "> and mode_time = #{modeTime}</if>
             <if test="preparationVideo != null  and preparationVideo != ''"> and preparation_video = #{preparationVideo}</if>
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="modeVideo != null">mode_video,</if>
             <if test="modeType != null">mode_type,</if>
             <if test="modeClass != null">mode_class,</if>
+            <if test="isCustomMode != null">is_custom_mode,</if>
             <if test="isCabinMode != null">is_cabin_mode,</if>
             <if test="modeTime != null">mode_time,</if>
             <if test="preparationVideo != null">preparation_video,</if>
@@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="modeVideo != null">#{modeVideo},</if>
             <if test="modeType != null">#{modeType},</if>
             <if test="modeClass != null">#{modeClass},</if>
+            <if test="isCustomMode != null">#{isCustomMode},</if>
             <if test="isCabinMode != null">#{isCabinMode},</if>
             <if test="modeTime != null">#{modeTime},</if>
             <if test="preparationVideo != null">#{preparationVideo},</if>
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="modeVideo != null">mode_video = #{modeVideo},</if>
             <if test="modeType != null">mode_type = #{modeType},</if>
             <if test="modeClass != null">mode_class = #{modeClass},</if>
+            <if test="isCustomMode != null">is_custom_mode = #{isCustomMode},</if>
             <if test="isCabinMode != null">is_cabin_mode = #{isCabinMode},</if>
             <if test="modeTime != null">mode_time = #{modeTime},</if>
             <if test="preparationVideo != null">preparation_video = #{preparationVideo},</if>

flossom-ui/src/views/system/mode/index.vue

@@ -193,8 +193,8 @@
           <el-col :span ="12">
             <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != 10&&form.instrumentType==2)" label-width="100px">
               <el-select v-model="form.isCustomMode">
-                <el-option label="是" value="1"></el-option>
-                <el-option label="否" value="0"></el-option>
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>