diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml index 256ab02..fa190dc 100644 --- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml @@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and rad.alarm_status = #{alarmStatus} and rad.alarm_data = #{alarmData} and rad.operation_name like concat('%', #{operationName}, '%') - and rad.operation_time >= #{beginOperationTime} - and #{endOperationTime} >= rad.operation_time + and rad.operation_time >= #{beginOperationTime} + and #{endOperationTime} >= rad.operation_time and rad.cause = #{cause} and rad.notify_user = #{notifyUser} @@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rad.notify_user FROM ems_record_alarm_data rad WHERE rad.alarm_status = 1 - AND rad.create_time >= #{startTime} + AND rad.create_time >= #{startTime} ORDER BY rad.obj_id DESC diff --git a/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml b/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml index 639ebec..18b2d46 100644 --- a/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml @@ -34,9 +34,9 @@ sum(expend * dnb_price) price FROM ( SELECT erpd.monitor_code, - CONVERT(VARCHAR(10), erpd.begin_time, 120) pointTime, - CONVERT(VARCHAR(7), erpd.begin_time, 120) pointTime, - CONVERT(VARCHAR(4), erpd.begin_time, 120) pointTime, + DATE_FORMAT(erpd.begin_time, '%Y-%m-%d') pointTime, + DATE_FORMAT(erpd.begin_time, '%Y-%m') pointTime, + DATE_FORMAT(erpd.begin_time, '%Y') pointTime, NULLIF(erpd.expend, 0) expend, case when ebsp.price_type = 0 then '尖峰' @@ -47,9 +47,9 @@ ebsp.dnb_price FROM ems_report_point_dnb erpd join ems_base_share_price ebsp - on LEFT(CONVERT(VARCHAR, erpd.begin_time, 23), 7) = ebsp.year_month_date - and CAST(erpd.begin_time AS time) >= CAST(ebsp.start_hour AS time) - and CAST(erpd.begin_time AS time) < CAST(ebsp.end_hour AS time) + on DATE_FORMAT(erpd.begin_time, '%Y-%m') = ebsp.year_month_date + and TIME(erpd.begin_time) >= TIME(ebsp.start_hour) + and TIME(erpd.begin_time) < TIME(ebsp.end_hour) WHERE FORMAT(erpd.begin_time, 'yyyy-MM-dd') between #{beginCollectTime} and #{endCollectTime} diff --git a/os-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/os-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 1e97f36..faf9013 100644 --- a/os-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/os-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{dictType}, #{sort}, #{createBy}, - sysdate() + now() ) @@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_type = #{dictType}, sort = #{sort}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where column_id = #{columnId} diff --git a/os-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/os-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 803f3b6..3e6a858 100644 --- a/os-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/os-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{genPath}, #{remark}, #{createBy}, - sysdate() + now() ) @@ -195,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" options = #{options}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = now() where table_id = #{tableId} diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml index 7f7725f..8889d76 100644 --- a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml @@ -251,7 +251,7 @@ and ppi.order_code = #{orderCode} and ppi.process_code = #{processCode} - and LEFT(CONVERT(VARCHAR(17), ppd.begin_time, 120), 10) between #{params.beginOrderDate} and #{params.endOrderDate} + and DATE_FORMAT(ppd.begin_time, '%Y-%m-%d') between #{params.beginOrderDate} and #{params.endOrderDate} diff --git a/os-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/os-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 7240d12..f07a71f 100644 --- a/os-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/os-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -36,12 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND invoke_target like concat('%', #{invokeTarget}, '%') - - and datediff(d, create_time, #{params.beginTime}) 0 + AND create_time =]]> #{params.beginTime} - - and datediff(d, create_time, #{params.endTime}) =]]> 0 + AND create_time #{params.endTime} order by create_time desc diff --git a/os-system/src/main/resources/mapper/system/SysConfigMapper.xml b/os-system/src/main/resources/mapper/system/SysConfigMapper.xml index b25c9a1..f343431 100644 --- a/os-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -51,12 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND config_key like concat('%', #{configKey}, '%') - - and datediff(d, create_time, #{params.beginTime}) 0 + AND create_time =]]> #{params.beginTime} - - and datediff(d, create_time, #{params.endTime}) =]]> 0 + AND create_time #{params.endTime} diff --git a/os-system/src/main/resources/mapper/system/SysDeptMapper.xml b/os-system/src/main/resources/mapper/system/SysDeptMapper.xml index 4726cb1..e7a1448 100644 --- a/os-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/os-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/os-system/src/main/resources/mapper/system/SysLogininforMapper.xml index c800eab..a3bcf73 100644 --- a/os-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -34,12 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND user_name like concat('%', #{userName}, '%') - - and datediff(d, login_time, #{params.beginTime}) 0 + AND login_time =]]> #{params.beginTime} - - and datediff(d, login_time, #{params.endTime}) =]]> 0 + AND login_time #{params.endTime} order by info_id desc diff --git a/os-system/src/main/resources/mapper/system/SysMenuMapper.xml b/os-system/src/main/resources/mapper/system/SysMenuMapper.xml index 3caa8a5..6d61c62 100644 --- a/os-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -150,7 +150,7 @@ icon = #{icon}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = now() where menu_id = #{menuId} @@ -191,7 +191,7 @@ #{icon}, #{remark}, #{createBy}, - sysdate() + now() ) diff --git a/os-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/os-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 8079ee1..c63d607 100644 --- a/os-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -59,12 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND oper_name like concat('%', #{operName}, '%') - - and datediff(d, oper_time, #{params.beginTime}) 0 + AND oper_time =]]> #{params.beginTime} - - and datediff(d, oper_time, #{params.endTime}) =]]> 0 + AND oper_time #{params.endTime} order by oper_id desc diff --git a/os-system/src/main/resources/mapper/system/SysRoleMapper.xml b/os-system/src/main/resources/mapper/system/SysRoleMapper.xml index 15d5d08..80b76c1 100644 --- a/os-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -46,12 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.role_key like concat('%', #{roleKey}, '%') - - and datediff(d, r.create_time, #{params.beginTime}) 0 + AND r.create_time =]]> #{params.beginTime} - - and datediff(d, r.create_time, #{params.endTime}) =]]> 0 + AND r.create_time #{params.endTime} ${params.dataScope} diff --git a/os-system/src/main/resources/mapper/system/SysUserMapper.xml b/os-system/src/main/resources/mapper/system/SysUserMapper.xml index c767e7b..89d5c00 100644 --- a/os-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -73,15 +73,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.phonenumber like concat('%', #{phonenumber}, '%') - - and datediff(d, u.create_time, #{params.beginTime}) 0 + AND u.create_time =]]> #{params.beginTime} - - and datediff(d, u.create_time, #{params.endTime}) =]]> 0 + AND u.create_time #{params.endTime} - AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE charindex(',' + CONVERT (nvarchar, #{deptId}), ',' + ancestors) > 0 )) + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE LOCATE(CONCAT(',', #{deptId}, ','), CONCAT(',', ancestors, ',')) > 0 )) ${params.dataScope}