diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java index 0d80c28e..0db9edf6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -29,7 +29,6 @@ public class GenTableColumn implements Serializable { private Integer isInsert; private Integer isEdit; private Integer isList; - private Integer isDetail; private Integer isQuery; private String queryType; private String htmlType; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 3b43b4a1..e0e58885 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -89,6 +89,11 @@ public class GenUtil { } } + // 非必填字段 + if (GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_EDIT, columnName)) { + column.setIsRequired(0); + } + // 需插入字段 if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_ADD, columnName)) { column.setIsInsert(GenConstants.REQUIRE); @@ -105,11 +110,6 @@ public class GenUtil { column.setIsList(GenConstants.REQUIRE); } - // 需详情的字段 - if (!GenUtil.isArraysContains(new String[]{"is_delete", "delete_time"}, columnName)) { - column.setIsDetail(GenConstants.REQUIRE); - } - // 需查询字段 if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { column.setIsQuery(GenConstants.REQUIRE); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 64f000cf..9f28599a 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -52,7 +52,7 @@ public class VelocityUtil { if (column.getIsList() == 1) { listFields.add(column.getColumnName()); } - if (column.getIsDetail() == 1) { + if (column.getIsEdit() == 1) { detailFields.add(column.getColumnName()); } if (column.getIsQuery() == 1) { diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 38763fc5..eb8e39af 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -14,7 +14,7 @@ import java.util.Map; public interface I${EntityName}Service { #if($table.genTpl=="curd") - /**、 + /** * ${functionName}列表 * #if(!$authorName.equals("")) @@ -22,7 +22,7 @@ public interface I${EntityName}Service { #end * @param pageParam 分页参数 * @param params 搜索参数 - * @return PageResult<${EntityName}Vo}> + * @return PageResult<${EntityName}Vo> */ PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); #elseif($table.genTpl=="tree") diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm index a8ff435c..1cf85a3c 100644 --- a/server/like-generator/src/main/resources/java/voDetail.java.vm +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -13,7 +13,7 @@ public class ${EntityName}DetailVo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isDetail==1) +#if($column.isEdit==1) #if($dateFields.contains($column.columnName)) private String ${column.javaField}; // ${column.columnComment} #else diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm index 5387e5da..65a3a2c0 100644 --- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm +++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm @@ -12,29 +12,29 @@ /> #elseif($column.htmlType=="select") - - - #if($column.dictType=="") - - #else - - - #end - - + + + #if($column.dictType=="") + + #else + + + #end + + #elseif($column.htmlType=="input") - - - + + + #end #end #end @@ -83,8 +83,8 @@ > #else @@ -125,9 +125,7 @@