AUTO_COMMITED_BY_SERVER

src/main/java/com/izouma/awesomeadmin/dao/TestaaaoneMapper.xml

@@ -6,7 +6,6 @@
                                         <result column="del_flag" property="delFlag" jdbcType="CHAR" />
                                 <result column="test_name" property="testName" jdbcType="VARCHAR" />
                                 <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="multi_select" property="multiSelect" jdbcType="VARCHAR" />
             </resultMap>
     <sql id="Base_Column_List" >
         <trim  suffixOverrides="," >
@@ -18,8 +17,6 @@
 
             remark,
 
-            multi_select,
-
             </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -46,9 +43,6 @@
             </if>
                 <if test="remark!= null" >
                 remark,
-            </if>
-                <if test="multiSelect!= null" >
-                multi_select,
             </if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -63,9 +57,6 @@
             </if>
                     <if test="remark != null" >
                 #{remark,jdbcType=VARCHAR},
-            </if>
-                    <if test="multiSelect != null" >
-                #{multiSelect,jdbcType=VARCHAR},
             </if>
                 </trim>
     </insert>
@@ -83,9 +74,6 @@
             </if>
                      <if test="remark != null" >
                remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                     <if test="multiSelect != null" >
-               multi_select= #{multiSelect,jdbcType=VARCHAR},
             </if>
                  </set>
         where id = #{id,jdbcType=INTEGER}
@@ -105,15 +93,11 @@
             </if>
                      <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
                 and  remark = #{record.remark}
-            </if>
-                     <if test="record.multiSelect != null and !&quot;&quot;.equals(record.multiSelect)">
-                and  multi_select = #{record.multiSelect}
             </if>
                   <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
              <trim prefix="and (" suffix=")" prefixOverrides="OR" >
                                                                                                                                                                 OR  test_name LIKE concat('%',#{record.searchKey},'%')
                                                                                                     OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  multi_select LIKE concat('%',#{record.searchKey},'%')
                                                              </trim>
          </if>
 
@@ -184,15 +168,11 @@
             </if>
                     <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and  remark = #{remark}
-            </if>
-                    <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
-                and  multi_select = #{multiSelect}
             </if>
                     <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR" >
                                                                                                                                                                                                                                                 OR  test_name LIKE concat('%',#{searchKey},'%')
                                                                                                                                                         OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  multi_select LIKE concat('%',#{searchKey},'%')
                                                                                         </trim>
             </if>
 <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -262,9 +242,6 @@
             </if>
                      <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
-            </if>
-                     <if test="multiSelect != null and !&quot;&quot;.equals(multiSelect)">
-                and multi_select = #{multiSelect}
             </if>
          
         </where>
@@ -280,7 +257,7 @@
         select <include refid="Base_Column_List"/> from test_aaa
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/model/Testaaaone.java

@@ -12,7 +12,6 @@ public class Testaaaone{
     private String delFlag;
     private String testName;
     private String remark;
-    private String multiSelect;
 
 private String searchKey;
 
@@ -54,13 +53,6 @@ private String orderByStr;
     public void setRemark(String remark){
         this.remark = remark;
     }
-    public String getMultiSelect(){
-        return this.multiSelect;
-    }
-
-    public void setMultiSelect(String multiSelect){
-        this.multiSelect = multiSelect;
-    }
 
 public String getSearchKey() {
     return searchKey;

src/main/java/com/izouma/awesomeadmin/web/TestaaaoneController.java

@@ -132,10 +132,10 @@ public class TestaaaoneController extends BaseController{
         String sheetName = "test_aaa";
         String titleName = "Testaaaone数据表";
         String fileName = "Testaaaone表";
-        int columnNumber = 5;
-        int[] columnWidth = { 20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "名字" ,   "备注" ,   "多选"  };
-        String[][] dataList = new String[testaaaones.size()][5];
+        int columnNumber = 4;
+        int[] columnWidth = { 20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "名字" ,   "备注"  };
+        String[][] dataList = new String[testaaaones.size()][4];
 
         for (int i = 0; i < testaaaones.size(); i++) {
 
@@ -143,7 +143,6 @@ public class TestaaaoneController extends BaseController{
                         dataList[i][1] = String.valueOf(testaaaones.get(i).getDelFlag());
                         dataList[i][2] = String.valueOf(testaaaones.get(i).getTestName());
                         dataList[i][3] = String.valueOf(testaaaones.get(i).getRemark());
-                        dataList[i][4] = String.valueOf(testaaaones.get(i).getMultiSelect());
                     }
 
 

src/main/vue/src/pages/Testaaaone.vue

@@ -2,14 +2,14 @@
     <div>
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
-                                                                                                                    <el-form-item prop="testName" label="名字">
+                                                                                        <el-form-item prop="delFlag" label="删除标识">
+                <el-input v-model="formData.delFlag"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="testName" label="名字">
                 <el-input v-model="formData.testName"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="multiSelect" label="多选">
-                <el-input v-model="formData.multiSelect"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -33,13 +33,13 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                        
                         this.formData = res.data;
                     }
                 })
             }
 
-                                                                                                                                                                },
+                                                                                                                                    },
         data() {
             return {
                 saving: false,
@@ -48,18 +48,14 @@
                                                                                                         testName:
                     [
                                                 {required: true, message: '请输入 名字', trigger: 'blur'},
-                                                                    ],
+                                                                                                                                                                         formValidator.number,
+                                                                                                                                                                    ],
                                                                 remark:
                     [
                                                 {required: true, message: '请输入 备注', trigger: 'blur'},
                                                                     ],
-                                                                multiSelect:
-                    [
-                                                {required: true, message: '请输入 多选', trigger: 'blur'},
-                                                                                                                                                                                                                                                                         formValidator.english,
-                                                                    ],
                                     },
-                                                }
+                                        }
         },
         methods: {
             onSave() {

src/main/vue/src/pages/Testaaaones.vue

@@ -43,7 +43,14 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                    
+                                                        
+                                            <el-table-column
+                                v-if="isColumnShow('delFlag')"
+                                prop="delFlag"
+                                label="删除标识"
+                                min-width="100">
+                        </el-table-column>
+                                                                
                                             <el-table-column
                                 v-if="isColumnShow('testName')"
                                 prop="testName"
@@ -57,13 +64,6 @@
                                 label="备注"
                                 min-width="100">
                         </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('multiSelect')"
-                                prop="multiSelect"
-                                label="多选"
-                                min-width="100">
-                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -206,7 +206,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                {
+                                                                                                                    {
+                                label: '删除标识',
+                                value: 'delFlag',
+                                show: true
+                            },
+                                                                                                {
                                 label: '名字',
                                 value: 'testName',
                                 show: true
@@ -215,11 +220,6 @@
                                 label: '备注',
                                 value: 'remark',
                                 show: true
-                            },
-                                                                                                {
-                                label: '多选',
-                                value: 'multiSelect',
-                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -229,17 +229,17 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                {
+                                                                                                                    {
+                                label: '删除标识',
+                                value: 'del_flag'
+                            },
+                                                                                                {
                                 label: '名字',
                                 value: 'test_name'
                             },
                                                                                                 {
                                 label: '备注',
                                 value: 'remark'
-                            },
-                                                                                                {
-                                label: '多选',
-                                value: 'multi_select'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script src=static/fontawesome-v5.2.0.js></script><link href=/static/css/app.0a14a9a451c1d5bc08b6b88ebdf4a446.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.82cad09365f2b7668c10.js></script><script type=text/javascript src=/static/js/vendor.7acda3387afcfdae5bf3.js></script><script type=text/javascript src=/static/js/app.c4fbaa350dd21944549c.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script src=static/fontawesome-v5.2.0.js></script><link href=/static/css/app.0a14a9a451c1d5bc08b6b88ebdf4a446.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f67b1e8fc9b177fa2f7d.js></script><script type=text/javascript src=/static/js/vendor.7acda3387afcfdae5bf3.js></script><script type=text/javascript src=/static/js/app.6250fbf1d5eddc1e9e1d.js></script></body></html>