代码生成同步保留必填/类型选项

RuoYi

2022-02-13 cfbbc7264eb4745f3de364b86c43390276dc845d

代码生成同步保留必填/类型选项

 src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -109,6 +109,9 @@
    /** 模糊查询 */

    public static final String QUERY_LIKE = "LIKE";



    /** 相等查询 */

    public static final String QUERY_EQ = "EQ";



    /** 需要 */

    public static final String REQUIRE = "1";

}


 src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java

@@ -304,8 +304,17 @@
                column.setColumnId(prevColumn.getColumnId());

                if (column.isList())

                {

                    // 如果是列表，继续保留字典类型

                    // 如果是列表，继续保留查询方式/字典类型选项

                    column.setDictType(prevColumn.getDictType());

                    column.setQueryType(prevColumn.getQueryType());

                }

                if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()

                        && (column.isInsert() || column.isEdit())

                        && ((column.isUsableColumn()) || (!column.isSuperColumn())))

                {

                    // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项

                    column.setIsRequired(prevColumn.getIsRequired());

                    column.setHtmlType(prevColumn.getHtmlType());

                }

                genTableColumnMapper.updateGenTableColumn(column);

            }


 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))

        {