ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调生成器的名称

Browse Source
This commit is contained in:
dftre 2024-09-10 18:24:30 +08:00
parent 59208c9c48
commit 0e03732a6b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View File

@ -113,6 +113,10 @@ public class GenTableColumn extends BaseEntity
return subColumnFkName;
}
public String getSubColumnFkJavaField(){
return StringUtils.toCamelCase(this.subColumnFkName);
}
public void setSubColumnFkName(String subColumnFkName) {
this.subColumnFkName = subColumnFkName;
}

2
ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
View File

@ -621,7 +621,7 @@ function remoteMethod${JavaField}(query){
loading${JavaField}.value = true
list目标业务名({${column.subColumnJavaField}:query}).then(res=>{
loading${JavaField}.value = false
options${JavaField}.value = res.rows.map(item=>({label:item.${column.subColumnJavaField},value:item.${column.subColumnFkName}}))
options${JavaField}.value = res.rows.map(item=>({label:item.${column.subColumnJavaField},value:item.${column.getSubColumnFkJavaField()}}))
})
} else {
options${JavaField}.value = []

4
ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
View File

@ -24,10 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="select${ClassName}Vo">
#if($table.haveSubColumn=="1")
select#foreach($column in $columns) #if($column.subColumnTableName)${column.subColumnTableName}.${column.subColumnName},#end${tableName}.${column.columnName}#if($foreach.count != $columns.size()),#end#end from ${tableName}
select#foreach($column in $columns) #if($column.subColumnTableName)${column.subColumnTableName}.${column.subColumnName},#end${businessName}.${column.columnName}#if($foreach.count != $columns.size()),#end#end from ${tableName} as ${businessName}
#foreach($column in $columns)
#if($column.subColumnTableName)
left join ${column.subColumnTableName} on ${column.subColumnTableName}.${column.subColumnFkName}=${tableName}.${column.columnName}
left join ${column.subColumnTableName} on ${column.subColumnTableName}.${column.subColumnFkName}=${businessName}.${column.columnName}
#end
#end
#else