Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
d9fabe55
Commit
d9fabe55
authored
Aug 10, 2019
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生成模板默认值修改
parent
12ef6d07
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+1
-1
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+2
-1
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+4
-4
sql/ry_20190808.sql
+1
-1
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
View file @
d9fabe55
...
...
@@ -81,7 +81,7 @@ public class GenConstants
public
static
final
String
TYPE_DATE
=
"Date"
;
/** 模糊查询 */
public
static
final
String
QUERY_LIKE
=
"L
ike
"
;
public
static
final
String
QUERY_LIKE
=
"L
IKE
"
;
/** 需要 */
public
static
final
String
REQUIRE
=
"1"
;
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View file @
d9fabe55
...
...
@@ -34,11 +34,12 @@ public class VelocityUtils
String
businessName
=
genTable
.
getBusinessName
();
String
packageName
=
genTable
.
getPackageName
();
String
tplCategory
=
genTable
.
getTplCategory
();
String
functionName
=
genTable
.
getFunctionName
();
VelocityContext
velocityContext
=
new
VelocityContext
();
velocityContext
.
put
(
"tplCategory"
,
genTable
.
getTplCategory
());
velocityContext
.
put
(
"tableName"
,
genTable
.
getTableName
());
velocityContext
.
put
(
"functionName"
,
genTable
.
getFunctionName
()
);
velocityContext
.
put
(
"functionName"
,
StringUtils
.
isNotEmpty
(
functionName
)
?
functionName
:
"【请填写功能名称】"
);
velocityContext
.
put
(
"ClassName"
,
genTable
.
getClassName
());
velocityContext
.
put
(
"className"
,
StringUtils
.
uncapitalize
(
genTable
.
getClassName
()));
velocityContext
.
put
(
"moduleName"
,
genTable
.
getModuleName
());
...
...
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
View file @
d9fabe55
...
...
@@ -31,13 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName = #{$javaField}
</if>
#elseif($queryType == "NE")
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName != #{$javaField}
</if>
#elseif(
\
$queryType == "GT")
#elseif($queryType == "GT")
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName
>
#{$javaField}
</if>
#elseif(
\
$queryType == "GTE")
#elseif($queryType == "GTE")
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName
>
= #{$javaField}
</if>
#elseif(
\
$queryType == "LT")
#elseif($queryType == "LT")
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName
<
#{$javaField}
</if>
#elseif(
\
$queryType == "LTE")
#elseif($queryType == "LTE")
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName
<
= #{$javaField}
</if>
#elseif($queryType == "LIKE")
<if
test=
"$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"
>
and $columnName like concat('%', #{$javaField}, '%')
</if>
...
...
sql/ry_20190808.sql
View file @
d9fabe55
...
...
@@ -679,7 +679,7 @@ create table gen_table_column (
is_edit
char
(
1
)
comment
'是否编辑字段(1是)'
,
is_list
char
(
1
)
comment
'是否列表字段(1是)'
,
is_query
char
(
1
)
comment
'是否查询字段(1是)'
,
query_type
varchar
(
200
)
default
'
='
comment
'查询方式(等于、不等于、大于、小于、范围)'
,
query_type
varchar
(
200
)
default
'
EQ'
comment
'查询方式(等于、不等于、大于、小于、范围)'
,
html_type
varchar
(
200
)
comment
'显示类型(文本框、文本域、下拉框、复选框、单选框、日期控件)'
,
dict_type
varchar
(
200
)
default
''
comment
'字典类型'
,
sort
int
comment
'排序'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment