From e9f2adb9ddc511c62e1628fbd527ba7cda8294d4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 09 五月 2025 14:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
index e530ca4..b5065aa 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -42,6 +42,7 @@
column.setJavaField(StringUtils.toCamelCase(columnName));
// 璁剧疆榛樿绫诲瀷
column.setJavaType(GenConstants.TYPE_STRING);
+ column.setQueryType(GenConstants.QUERY_EQ);
if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
{
@@ -112,10 +113,15 @@
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
- // 鍥剧墖瀛楁璁剧疆鍗曞浘鎺т欢
+ // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
{
column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+ }
+ // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
+ else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+ {
+ column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
@@ -146,8 +152,7 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
@@ -160,8 +165,7 @@
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
- return businessName;
+ return StringUtils.substring(tableName, lastIndex + 1, nameLength);
}
/**
@@ -250,4 +254,4 @@
return 0;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3