更新

yiqi-admin/src/main/java/com/yiqi/web/controller/system/SysDataGroupController.java

@@ -157,6 +157,46 @@ public class SysDataGroupController extends BaseController {
         return getDataTable(objectList, new PageInfo(list).getTotal());
     }
 
+    /**
+     * 查询组合数据列表
+     */
+    @GetMapping("/data/select/{gid}")
+    @ApiOperation(value = "查询组合数据结果(下拉筛选)")
+    public AjaxResult dataList(@PathVariable("gid") Integer gid) {
+        SysDataGroup sysDataGroup = sysDataGroupService.selectSysDataGroupById(gid);
+        List<SysDataGroupInfo> list = sysDataGroupInfoService.getDataList(gid, 1);
+        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(JSONUtil.parseArray(sysDataGroup.getFields()), DataGroupFiled.class);
+        Map<String, DataGroupRules> rulesMap = new HashMap<>();
+        for (DataGroupFiled dataGroupFiled : dataGroupFileds) {
+            DataGroupRules dataGroupHeader = DataGroupRules.create(dataGroupFiled.getType(), dataGroupFiled.getTitle(), dataGroupFiled.getName(), dataGroupFiled.getParam(), null);
+            rulesMap.put(dataGroupHeader.getField(), dataGroupHeader);
+        }
+        List<Map<String, Object>> objectList = new ArrayList<>();
+        for (SysDataGroupInfo sysDataGroupInfo : list) {
+            JSONObject jsonObject = JSONUtil.parseObj(sysDataGroupInfo.getValue());
+            Map<String, Object> map = new HashMap<>();
+            for (DataGroupFiled dataGroupFiled : dataGroupFileds) {
+                if (jsonObject.get(dataGroupFiled.getTitle()) != null) {
+                    if (dataGroupFiled.getType().equals("input") || dataGroupFiled.getType().equals("textarea")) {
+                        map.put(dataGroupFiled.getTitle(), jsonObject.get(dataGroupFiled.getTitle()));
+                    } else if (dataGroupFiled.getType().equals("radio") || dataGroupFiled.getType().equals("select")) {
+                        map.put(dataGroupFiled.getTitle(), DataGroupRules.getSigleOptionValue(jsonObject.get(dataGroupFiled.getTitle()).toString(), dataGroupFiled.getParam()));
+                    } else if (dataGroupFiled.getType().equals("checkbox")) {
+                        map.put(dataGroupFiled.getTitle(), DataGroupRules.getMuliteOptionValue(jsonObject.get(dataGroupFiled.getTitle()).toString(), dataGroupFiled.getParam()));
+                    } else if (dataGroupFiled.getType().equals("upload")) {
+                        map.put(dataGroupFiled.getTitle(), jsonObject.get(dataGroupFiled.getTitle()));
+                    }
+                }
+            }
+            map.put("sort", sysDataGroupInfo.getSort());
+            map.put("id", sysDataGroupInfo.getId());
+            map.put("status", sysDataGroupInfo.getStatus());
+            map.put("createTime", sysDataGroupInfo.getCreateTime());
+            objectList.add(map);
+        }
+        return success(objectList);
+    }
+
     /**
      * 查询组合数据列表
      */

yiqi-generator/src/main/resources/vm/java/controller.java.vm

@@ -41,7 +41,6 @@ public class ${ClassName}Controller extends BaseController {
     private I${ClassName}Service ${className}Service;
 
 
-    //<editor-folder desc="基础函数">
 /**
  * 查询${functionName}列表
  */
@@ -136,5 +135,4 @@ public class ${ClassName}Controller extends BaseController {
         #end
     #end
 
-    //</editor-folder>
 }

yiqi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -17,14 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ${packageName}.domain.${
  */
 @Mapper
 public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
-    //<editor-folder desc="基础韩素">
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -34,22 +26,6 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
      */
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
-    /**
-     * 新增${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int insert${ClassName}(${ClassName} ${className});
-
-    /**
-     * 修改${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    public int update${ClassName}(${ClassName} ${className});
-
     /**
      * 删除${functionName}
      *
@@ -92,5 +68,4 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
          */
         public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
     #end
-    //</editor-folder>
 }

yiqi-generator/src/main/resources/vm/java/service.java.vm

@@ -12,7 +12,6 @@ import ${packageName}.domain.${ClassName};
  */
 public interface I${ClassName}Service extends IService<${ClassName}> {
 
-    //<editor-folder desc="基础函数">
     /**
      * 查询${functionName}
      *
@@ -73,5 +72,4 @@ public interface I${ClassName}Service extends IService<${ClassName}> {
             public int update${ClassName}Status(${ClassName} ${className});
         #end
     #end
-    //</editor-folder>
 }

yiqi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -31,7 +31,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${ClassName}> implements I${ClassName}Service {
 
-    //<editor-folder desc="基础韩素">
     /**
      * 查询${functionName}
      *
@@ -40,7 +39,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${Cl
      */
     @Override
     public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
-        return baseMapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return baseMapper.selectById(${pkColumn.javaField});
     }
 
     /**
@@ -71,11 +70,11 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${Cl
             #end
         #end
         #if($table.sub)
-            int rows = ${className}Mapper.insert${ClassName}(${className});
-            insert${subClassName}(${className});
+            int rows = ${className}Mapper.insert(${className});
+            insert(${className});
             return rows;
         #else
-            return baseMapper.insert${ClassName}(${className});
+            return baseMapper.insert(${className});
         #end
     }
 
@@ -98,9 +97,9 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${Cl
         #if($table.sub)
             baseMapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}())
             ;
-            insert${subClassName}(${className});
+            insert(${className});
         #end
-        return baseMapper.update${ClassName}(${className});
+        return baseMapper.updateById(${className});
     }
 
     /**
@@ -194,6 +193,4 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${Cl
         #end
     #end
 
-    //</editor-folder>
-
 }

yiqi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -113,7 +113,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <Page uri="/mapi/goods/goodsComment/list" :request-params="queryParams" ref="pagination" @selection-change="handleSelectionChange">
+        <Page uri="/mapi/${moduleName}/${businessName}/list" :request-params="queryParams" ref="pagination" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" fixed="left"/>
             #foreach($column in $columns)
                 #set($javaField=$column.javaField)
@@ -179,7 +179,7 @@
         </Page>
 
         <!-- 添加或修改${functionName}对话框 -->
-        <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body :before-close="checkClose">
+        <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body>
             <el-row :gutter="15" style="margin-bottom: 80px">
                 <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                     <el-col :span="24">
@@ -198,7 +198,7 @@
                                     #if($column.htmlType == "input")
                                         <el-form-item label="${comment}" prop="${field}">
                                             #if($column.javaType == "String" && !$null.isNull($column.columnLength))
-                                              <el-input v-model="form.${field}" placeholder="请输入${comment}" maxlength="${length}" show-word-limit />
+                                              <el-input v-model="form.${field}" placeholder="请输入${comment}"  show-word-limit />
                                             #else
                                               <el-input v-model="form.${field}" placeholder="请输入${comment}" />
                                             #end
@@ -228,7 +228,7 @@
                                                 ></el-option>
                                             </el-select>
                                         </el-form-item>
-                                    #elseif($column.htmlType == "select" && $dictType)
+                                    #elseif($column.htmlType == "select" && "" == $dictType)
                                         <el-form-item label="${comment}" prop="${field}">
                                             <el-select v-model="form.${field}" placeholder="请选择${comment}">
                                                 <el-option label="请选择字典生成" value="" />
@@ -280,7 +280,7 @@
                                     #elseif($column.htmlType == "textarea")
                                         <el-form-item label="${comment}" prop="${field}">
                                             #if($column.javaType == "String" && !$null.isNull($column.columnLength))
-                                              <el-input v-model="form.${field}" type="textarea" placeholder="请输入${comment}" maxlength="${length}" show-word-limit/>
+                                              <el-input v-model="form.${field}" type="textarea" placeholder="请输入${comment}"  show-word-limit/>
                                             #else
                                               <el-input v-model="form.${field}" type="textarea" placeholder="请输入${comment}" />
                                             #end
@@ -353,7 +353,7 @@
                 </el-form>
             </el-row>
 
-            <div class="horizontal-view box-shadow drawer-bottom-buttons">
+            <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>

yiqi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -79,66 +79,6 @@
         </where>
     </select>
 
-    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}"
-            resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-        #if($table.crud || $table.tree)
-            <include refid="select${ClassName}Vo"/>
-            where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-            #if($softDel)
-                and del_flag='0'
-            #end
-        #elseif($table.sub)
-            select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
-            #foreach($column in $subTable.columns) b.$column.columnName as
-                sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
-
-            from ${tableName} a
-            left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
-            where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
-            #if($softDel)
-                and a.del_flag='0'
-            #end
-        #end
-    </select>
-
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true"
-            keyProperty="$pkColumn.javaField"#end>
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            #foreach($column in $columns)
-                #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-                    <if test="$column.javaField != null#if($column.javaType ==
-                        'String' && $column.required) and $column.javaField != ''#end">$column.columnName,
-                    </if>
-                #end
-            #end
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            #foreach($column in $columns)
-                #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-                    <if test="$column.javaField != null#if($column.javaType ==
-                        'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},
-                    </if>
-                #end
-            #end
-        </trim>
-    </insert>
-
-    <update id="update${ClassName}" parameterType="${ClassName}">
-        update ${tableName}
-        <trim prefix="SET" suffixOverrides=",">
-            #foreach($column in $columns)
-                #if($column.columnName != $pkColumn.columnName)
-                    <if test="$column.javaField != null#if($column.javaType ==
-                        'String' && $column.required) and $column.javaField != ''#end">$column.columnName =
-                        #{$column.javaField},
-                    </if>
-                #end
-            #end
-        </trim>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </update>
-
     #if($softDel)
         <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
             update ${tableName} set del_flag='2' where ${pkColumn.columnName} = #{${pkColumn.javaField}}