zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gogs/luolin_dev_5.0'

Browse Source
This commit is contained in:
lbw committed 2023-04-28 11:36:07 +08:00
2 parents ae15be5357 f2e637e17c
commit 3fa14e1a6f
2 files changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
table.setDsName(dsName);
table.setTableComment(MapUtil.getStr(queryTable, "tableComment"));
table.setDbType(MapUtil.getStr(queryTable, "dbType"));
table.setFormLayout(FormLayoutEnum.ONE.getValue());
table.setFormLayout(FormLayoutEnum.TWO.getValue());
table.setGeneratorType(GeneratorTypeEnum.ZIP_DOWNLOAD.ordinal());
table.setClassName(NamingCase.toPascalCase(tableName));
table.setModuleName(GenKit.getModuleName(table.getPackageName()));
pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java
+4 -1
View File
@@ -217,7 +217,8 @@ public class GeneratorServiceImpl implements GeneratorService {
// 获取字段列表
List<GenTableColumnEntity> fieldList = columnService.lambdaQuery()
.eq(GenTableColumnEntity::getDsName, table.getDsName())
.eq(GenTableColumnEntity::getTableName, table.getTableName()).list();
.eq(GenTableColumnEntity::getTableName, table.getTableName())
.orderByAsc(GenTableColumnEntity::getSort).list();
table.setFieldList(fieldList);
// 创建数据模型对象
@@ -249,6 +250,8 @@ public class GeneratorServiceImpl implements GeneratorService {
dataModel.put("fieldList", table.getFieldList());
dataModel.put("backendPath", table.getBackendPath());
dataModel.put("frontendPath", table.getFrontendPath());
dataModel.put("vAuthName", table.getClassName().toLowerCase());
dataModel.put("i18nName", StrUtil.lowerFirst(table.getClassName()));
return dataModel;
}