tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 代码生成问题修复和优化

Browse Source
This commit is contained in:
ray
2024-08-24 23:30:51 +08:00
parent 60a475c2b3
commit 33c8278a6a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/youlai/system/enums/FormTypeEnum.java
View File

@@ -55,12 +55,12 @@ public enum FormTypeEnum implements IBaseEnum<Integer> {
/** /**
* 日期时间框 * 日期时间框
*/ */
DATE_TIME(8, "日期时间框"), DATE(8, "日期框"),
/** /**
* 日期框 * 日期框
*/ */
DATE(9, "日期框"); DATE_TIME(9, "日期时间框");
// Mybatis-Plus 提供注解表示插入数据库时插入该值 // Mybatis-Plus 提供注解表示插入数据库时插入该值

8
src/main/resources/templates/generator/mapper.xml.vm
View File

@@ -40,18 +40,18 @@
#if($fieldConfig.formType == "DATE" || $fieldConfig.formType == "DATE_TIME") #if($fieldConfig.formType == "DATE" || $fieldConfig.formType == "DATE_TIME")
<if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''"> <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
<bind name="startDate" value="queryParams.${fieldConfig.fieldName}[0].length() == 10 ? queryParams.${fieldConfig.fieldName}[0] + ' 00:00:00' : queryParams.${fieldConfig.fieldName}[0]"/> <bind name="startDate" value="queryParams.${fieldConfig.fieldName}[0].length() == 10 ? queryParams.${fieldConfig.fieldName}[0] + ' 00:00:00' : queryParams.${fieldConfig.fieldName}[0]"/>
AND ${fieldConfig.fieldName} &gt;= #{startDate} AND ${fieldConfig.columnName} &gt;= #{startDate}
</if> </if>
<if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''"> <if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''">
<bind name="endDate" value="queryParams.${fieldConfig.fieldName}[1].length() == 10 ? queryParams.${fieldConfig.fieldName}[1] + ' 23:59:59' : queryParams.${fieldConfig.fieldName}[1]"/> <bind name="endDate" value="queryParams.${fieldConfig.fieldName}[1].length() == 10 ? queryParams.${fieldConfig.fieldName}[1] + ' 23:59:59' : queryParams.${fieldConfig.fieldName}[1]"/>
AND ${fieldConfig.fieldName} &lt;= #{endDate} AND ${fieldConfig.columnName} &lt;= #{endDate}
</if> </if>
#else #else
<if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''"> <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
AND ${fieldConfig.fieldName} &gt;= #{queryParams.${fieldConfig.fieldName}[0]} AND ${fieldConfig.columnName} &gt;= #{queryParams.${fieldConfig.fieldName}[0]}
</if> </if>
<if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''"> <if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''">
AND ${fieldConfig.fieldName} &lt;= #{queryParams.${fieldConfig.fieldName}[1]} AND ${fieldConfig.columnName} &lt;= #{queryParams.${fieldConfig.fieldName}[1]}
</if> </if>
#end #end
#elseif($queryType == "GT") #elseif($queryType == "GT")

1
src/main/resources/templates/generator/query.java.vm
View File

@@ -24,6 +24,7 @@ import java.math.BigDecimal;
public class ${entityName}Query extends BasePageQuery { public class ${entityName}Query extends BasePageQuery {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#if($fieldConfigs) #if($fieldConfigs)
#foreach($fieldConfig in ${fieldConfigs}) #foreach($fieldConfig in ${fieldConfigs})
#if($fieldConfig.isShowInQuery) #if($fieldConfig.isShowInQuery)