Browse Source

时间格式问题

develop
wangsixiang 4 months ago
parent
commit
f7075ed1a8
  1. 4
      zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
  2. 6
      zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

4
zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@ -330,8 +330,8 @@
</select>
<select id="selectWarningEscalation" resultType="java.util.HashMap">
select org.organization_name,warning.warning_type,warning.warning_subclass,
warning_title,warning.warning_state,DATE_FORMAT(warning.warning_time,'%Y-%m-%d %H:%m:%s') warningTime,
warning. warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s') createTime from dc_warning as warning
warning_title,warning.warning_state,DATE_FORMAT(warning.warning_time,'%Y-%m-%d %H:%i:%s') warningTime,
warning. warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%i:%s') createTime from dc_warning as warning
LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark and mark.direction=warning.direction
LEFT JOIN dc_organization as org on mark.stake_mark=org.stake_mark
<where>

6
zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

@ -37,10 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectDcWarningVo">
select id, stake_mark stakeMark, direction, dept_id deptId,
warning_state warningState,vehicle_type vehicleType,
DATE_FORMAT(warning_time,'%Y-%m-%d %H:%m:%s')warningTime,
DATE_FORMAT(warning_time,'%Y-%m-%d %H:%i:%s')warningTime,
user_id userId, warning_source warningSource, warning_level warningLevel,
remark, DATE_FORMAT(create_time,'%Y-%m-%d %H:%m:%s')createTime,
DATE_FORMAT(update_time,'%Y-%m-%d %H:%m:%s')updateTime,
remark, DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')createTime,
DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%s')updateTime,
warning_type warningType, warning_subclass warningSubclass, warning_title warningTitle,
other_config otherConfig, lane from dc_warning
</sql>

Loading…
Cancel
Save