diff --git a/mh-admin/src/main/resources/application.yml b/mh-admin/src/main/resources/application.yml index 11f54be..5ccb02f 100644 --- a/mh-admin/src/main/resources/application.yml +++ b/mh-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ mh: # 名称 name: MH # 版本 - version: 3.8.8 + version: 1.0.0 # 版权年份 copyrightYear: 2024 # 文件路径 示例( Windows配置D:/mh/uploadPath,Linux配置 /home/mh/uploadPath) diff --git a/mh-admin/src/main/resources/banner.txt b/mh-admin/src/main/resources/banner.txt index 0931cb8..91e8992 100644 --- a/mh-admin/src/main/resources/banner.txt +++ b/mh-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${mh.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// // _ooOoo_ // diff --git a/mh-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/mh-generator/src/main/resources/mapper/generator/GenTableMapper.xml index c701cc2..ba060bc 100644 --- a/mh-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/mh-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -68,10 +68,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) - AND date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') + AND to_char(create_time, 'YYYYMMDD') >= to_char(#{params.beginTime}::date, 'YYYYMMDD') - AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + AND to_char(create_time, 'YYYYMMDD') >= to_char(#{params.endTime}::date, 'YYYYMMDD') @@ -88,10 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) - AND date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') + AND to_char(create_time, 'YYYYMMDD') >= to_char(#{params.beginTime}::date, 'YYYYMMDD') - AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + AND to_char(create_time, 'YYYYMMDD') >= to_char(#{params.endTime}::date, 'YYYYMMDD') order by create_time desc diff --git a/mh-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/mh-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 69d6a83..d3db827 100644 --- a/mh-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/mh-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -36,10 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND invoke_target like concat('%', #{invokeTarget}, '%') - and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') + and to_char(create_time, 'YYYYMMDD') >= to_char(#{params.beginTime}::date, 'YYYYMMDD') - and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + and to_char(create_time, 'YYYYMMDD') >= to_char(#{params.endTime}::date, 'YYYYMMDD') order by create_time desc diff --git a/mh-system/src/main/resources/mapper/system/SysConfigMapper.xml b/mh-system/src/main/resources/mapper/system/SysConfigMapper.xml index 1549a7b..9cdb1ce 100644 --- a/mh-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/mh-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND config_key like concat('%', #{configKey}, '%') - and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') + and to_char(create_time, 'YYYYMMDD') >= to_char(#{params.beginTime}::date, 'YYYYMMDD') - and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + and to_char(create_time, 'YYYYMMDD') <= to_char(#{params.endTime}::date, 'YYYYMMDD') diff --git a/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml b/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml index 9ef9b04..df5cbdd 100644 --- a/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -75,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/mh-system/src/main/resources/mapper/system/SysRoleMapper.xml b/mh-system/src/main/resources/mapper/system/SysRoleMapper.xml index 05b4bc3..b3539df 100644 --- a/mh-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/mh-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -46,10 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.role_key like concat('%', #{roleKey}, '%') - and date_format(r.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') + AND to_char(r.create_time, 'YYYYMMDD') >= to_char(#{params.beginTime}::date, 'YYYYMMDD') - and date_format(r.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + AND to_char(u.create_time, 'YYYYMMDD') >= to_char(#{params.endTime}::date, 'YYYYMMDD') ${params.dataScope} diff --git a/mh-system/src/main/resources/mapper/system/SysUserMapper.xml b/mh-system/src/main/resources/mapper/system/SysUserMapper.xml index ffd2b1f..bb24c26 100644 --- a/mh-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/mh-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -73,10 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.phonenumber like concat('%', #{phonenumber}, '%') - AND date_format(u.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d') + AND to_char(u.create_time, 'YYYYMMDD') >= to_char(#{params.beginTime}::date, 'YYYYMMDD') - AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + AND to_char(u.create_time, 'YYYYMMDD') <= to_char(#{params.endTime}::date, 'YYYYMMDD') AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id