suochencheng пре 7 година
родитељ
комит
7c6f2c0a61

+ 13 - 1
src/main/java/com/izouma/awesomeadmin/dao/GenCodeMapper.xml

@@ -13,9 +13,11 @@
         <result column="field_id" property="fieldId" jdbcType="VARCHAR"/>
         <result column="gen_json" property="genJson" jdbcType="VARCHAR"/>
         <result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>
+        <result column="type_flag" property="typeFlag" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
-		 id, tableName, className, remark, genTable, genClass, genList, genForm, field_id, gen_json, del_flag
+		 id, tableName, className, remark, genTable, genClass,
+		 genList, genForm, field_id, gen_json, del_flag, type_flag
 	</sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -61,6 +63,9 @@
             <if test="genJson != null">
                 gen_json,
             </if>
+            <if test="typeFlag != null">
+                type_flag,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -93,6 +98,9 @@
             <if test="genJson != null">
                 #{genJson,jdbcType=VARCHAR},
             </if>
+            <if test="typeFlag != null">
+                #{typeFlag,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.GenCode">
@@ -125,6 +133,9 @@
             <if test="genJson != null">
                 gen_json = #{genJson,jdbcType=VARCHAR},
             </if>
+            <if test="typeFlag != null">
+                type_flag = #{typeFlag,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -166,6 +177,7 @@
                     OR tableName LIKE concat('%',#{record.searchKey},'%')
                     OR className LIKE concat('%',#{record.searchKey},'%')
                     OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
                 </trim>
             </if>
         </where>

+ 11 - 0
src/main/java/com/izouma/awesomeadmin/model/GenCode.java

@@ -103,6 +103,9 @@ public class GenCode {
 
     private String delFlag;
 
+    private String typeFlag;
+
+
     public List<TableField> getFields() {
         return fields;
     }
@@ -270,5 +273,13 @@ public class GenCode {
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
+
+    public String getTypeFlag() {
+        return typeFlag;
+    }
+
+    public void setTypeFlag(String typeFlag) {
+        this.typeFlag = typeFlag;
+    }
 }
 

+ 4 - 0
src/main/vue/src/pages/GenCode.vue

@@ -7,6 +7,9 @@
                 </el-switch>
 
             </el-form-item>
+            <el-form-item prop="typeFlag" label="分类">
+                <el-input v-model="formData.typeFlag" style="width: 400px;"></el-input>
+            </el-form-item>
             <el-form-item prop="className" label="类名">
                 <el-input v-model="formData.className" style="width: 400px;"></el-input>
             </el-form-item>
@@ -336,6 +339,7 @@ export default {
                 rootPath: [{ required: true, message: '请填写生成目录', trigger: 'blur' }],
                 dataBaseType: [{ required: true, message: '请选择数据库类型', trigger: 'blur' }],
                 dataSourceCode: [{ required: true, message: '请填选择数据库', trigger: 'blur' }],
+                typeFlag: [{ required: true, message: '请填填写分类', trigger: 'blur' }],
             },
             formData: {
                 tableName: '',

+ 7 - 0
src/main/vue/src/pages/GenCodes.vue

@@ -27,6 +27,8 @@
             </el-table-column>
             <el-table-column v-if="isColumnShow('className')" prop="className" label="类名" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag" label="分类" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
@@ -70,6 +72,11 @@ export default {
                     value: 'className',
                     show: true
                 },
+                {
+                    label: '分类',
+                    value: 'typeFlag',
+                    show: true
+                },
                 {
                     label: '备注',
                     value: 'remark',