适配达梦数据库-date_format

business-service/src/main/resources/mapper/MsgAlarmMapper.xml

@@ -94,7 +94,8 @@
         SELECT /*+ GROUP_OPT_FLAG(1)*/ p.monthsta as monthsta,sum(p.fre) as frequency,p.monthstaString as monthstaString
         from
         (SELECT /*+ GROUP_OPT_FLAG(1)*/
-        DATE_FORMAT(a.alarm_time,'%Y年%m月') as monthstaString,
+        translate(to_char(a.alarm_time, 'yyyy-mm#'),'-#','年月')
+        /*DATE_FORMAT(a.alarm_time,'%Y年%m月')*/ as monthstaString,
         MONTH(a.alarm_time) as monthsta,
         count(DISTINCT a.alarm_id) as fre
         FROM
@@ -121,7 +122,8 @@
         SELECT p.daysta as monthsta,sum(p.fre) as frequency,p.daystaString as monthstaString
         from
         (SELECT
-        DATE_FORMAT(a.alarm_time,'%Y年%m月%d日') as daystaString,
+        translate(to_char(a.alarm_time, 'yyyy-mm-dd#'),'-#','年月日')
+        /*DATE_FORMAT(a.alarm_time,'%Y年%m月%d日')*/ as daystaString,
         DAY(a.alarm_time) as daysta,
         count(DISTINCT a.alarm_id) as fre
         FROM
@@ -212,10 +214,15 @@
                 and line_dir = #{lineDir}
             </if>
             <if test="beginAlarmTime != null and beginAlarmTime != ''">
-                and date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d %H:%i:%S')
+                and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') &gt;= TO_CHAR(#{beginAlarmTime}, 'YYYY-MM-DD
+                HH24:MI:SS')
+                -- and date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d
+                %H:%i:%S')
             </if>
             <if test="endAlarmTime != null and endAlarmTime != ''">
-                AND date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d %H:%i:%S')
+                and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') &lt;= TO_CHAR(#{endAlarmTime}, 'YYYY-MM-DD HH24:MI:SS')
+                -- AND date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d
+                %H:%i:%S')
             </if>
         </where>
         order by  alarm_time desc

vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java

@@ -71,10 +71,12 @@ public class SysLoginInfoController extends BaseController {
             wrapper.eq(SysLoginInfo::getStatus, sysLoginInfoVo.getStatus());
         }
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getStartTime())) {
-            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getStartTime()), "date_format(login_time,'%y%m%d') >= date_format('" + sysLoginInfoVo.getStartTime() + "','%y%m%d')");
+//            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getStartTime()), "date_format(login_time,'%y%m%d') >= date_format('" + sysLoginInfoVo.getStartTime() + "','%y%m%d')");
+            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getStartTime()), "to_char(login_time,'YYYYMMDD') >= to_char('" + sysLoginInfoVo.getStartTime() + "','YYYYMMDD')");
         }
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getEndTime())) {
-            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getEndTime()), "date_format(login_time,'%y%m%d') <= date_format('" + sysLoginInfoVo.getEndTime() + "','%y%m%d')");
+//            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getEndTime()), "date_format(login_time,'%y%m%d') <= date_format('" + sysLoginInfoVo.getEndTime() + "','%y%m%d')");
+            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getEndTime()), "to_char(login_time,'YYYYMMDD') <= to_char('" + sysLoginInfoVo.getEndTime() + "','YYYYMMDD')");
         }
         wrapper.orderByDesc(SysLoginInfo::getLoginTime);
         IPage<SysLoginInfo> page = logininforService.page(new Page<>(sysLoginInfoVo.getPageNum(), sysLoginInfoVo.getPageSize()), wrapper);

vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -68,10 +68,12 @@ public class SysOperlogController extends BaseController {
             wrapper.like(SysOperLog::getTitle, sysOperlogVo.getTitle());
         }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getStartTime())) {
-            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getStartTime()), "date_format(oper_time,'%y%m%d') >= date_format('" + sysOperlogVo.getStartTime() + "','%y%m%d')");
+//            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getStartTime()), "date_format(oper_time,'%y%m%d') >= date_format('" + sysOperlogVo.getStartTime() + "','%y%m%d')");
+            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getStartTime()), "TO_CHAR(oper_time, 'YYYYMMDD') >= TO_CHAR('" + sysOperlogVo.getStartTime() + "','YYYYMMDD')");
         }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getEndTime())) {
-            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getEndTime()), "date_format(oper_time,'%y%m%d') <= date_format('" + sysOperlogVo.getEndTime() + "','%y%m%d')");
+//            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getEndTime()), "date_format(oper_time,'%y%m%d') <= date_format('" + sysOperlogVo.getEndTime() + "','%y%m%d')");
+            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getEndTime()), "TO_CHAR(oper_time,'YYYYMMDD') <= TO_CHAR('" + sysOperlogVo.getEndTime() + "','YYYYMMDD')");
         }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getBusinessType())) {
             wrapper.eq(SysOperLog::getBusinessType, sysOperlogVo.getBusinessType());