Просмотр исходного кода

修改时间范围日期格式

RuoYi 1 год назад
Родитель
Сommit
fcff9dfdea

+ 4 - 4
ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -68,10 +68,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
68
 				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
68
 				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
69
 			</if>
69
 			</if>
70
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
70
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
71
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
71
+				AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
72
 			</if>
72
 			</if>
73
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
73
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
74
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
74
+				AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
75
 			</if>
75
 			</if>
76
 		</where>
76
 		</where>
77
 	</select>
77
 	</select>
@@ -88,10 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
88
 			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
88
 			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
89
 		</if>
89
 		</if>
90
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
90
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
91
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
91
+			AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
92
 		</if>
92
 		</if>
93
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
93
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
94
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
94
+			AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
95
 		</if>
95
 		</if>
96
         order by create_time desc
96
         order by create_time desc
97
 	</select>
97
 	</select>

+ 2 - 2
ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml

@@ -36,10 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
36
 				AND invoke_target like concat('%', #{invokeTarget}, '%')
36
 				AND invoke_target like concat('%', #{invokeTarget}, '%')
37
 			</if>
37
 			</if>
38
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
38
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
39
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
39
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
40
 			</if>
40
 			</if>
41
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
41
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
42
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
42
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
43
 			</if>
43
 			</if>
44
 		</where>
44
 		</where>
45
         order by create_time desc
45
         order by create_time desc

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
51
 				AND config_key like concat('%', #{configKey}, '%')
51
 				AND config_key like concat('%', #{configKey}, '%')
52
 			</if>
52
 			</if>
53
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
53
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
54
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
54
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
55
 			</if>
55
 			</if>
56
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
56
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
57
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
57
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
58
 			</if>
58
 			</if>
59
 		</where>
59
 		</where>
60
     </select>
60
     </select>

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -33,10 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
33
 				AND dict_type like concat('%', #{dictType}, '%')
33
 				AND dict_type like concat('%', #{dictType}, '%')
34
 			</if>
34
 			</if>
35
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
35
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
36
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
36
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
37
 			</if>
37
 			</if>
38
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
38
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
39
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
39
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
40
 			</if>
40
 			</if>
41
 	    </where>
41
 	    </where>
42
 	</select>
42
 	</select>

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -46,10 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
46
 			AND r.role_key like concat('%', #{roleKey}, '%')
46
 			AND r.role_key like concat('%', #{roleKey}, '%')
47
 		</if>
47
 		</if>
48
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
48
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
49
-			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
49
+			and date_format(r.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
50
 		</if>
50
 		</if>
51
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
51
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
52
-			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
52
+			and date_format(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
53
 		</if>
53
 		</if>
54
 		<!-- 数据范围过滤 -->
54
 		<!-- 数据范围过滤 -->
55
 		${params.dataScope}
55
 		${params.dataScope}

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -73,10 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
73
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
73
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
74
 		</if>
74
 		</if>
75
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
75
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
76
-			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
76
+			AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
77
 		</if>
77
 		</if>
78
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
78
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
79
-			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
79
+			AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
80
 		</if>
80
 		</if>
81
 		<if test="deptId != null and deptId != 0">
81
 		<if test="deptId != null and deptId != 0">
82
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
82
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))