Browse Source

'BUG'

master
daixiantong 4 years ago
parent
commit
356e0cdada
2 changed files with 4 additions and 5 deletions
  1. +3
    -3
      src/main/java/com/taauav/admin/mapper/TauvInspectFileMapper.xml
  2. +1
    -2
      src/main/java/com/taauav/front/vo/LsInspectFileVo.java

+ 3
- 3
src/main/java/com/taauav/admin/mapper/TauvInspectFileMapper.xml View File

and d.driver_area = #{areaId} and d.driver_area = #{areaId}
</if> </if>
<if test="param != null and param.beginTime != null and param.beginTime != ''"> <if test="param != null and param.beginTime != null and param.beginTime != ''">
and d.execution_time between concat(#{param.beginTime}, ' 00:00:00') and concat(#{param.endTime}, ' 23:59:59')
and (d.execution_time between concat(#{param.beginTime}, ' 00:00:00') and concat(#{param.endTime}, ' 23:59:59'))
</if> </if>
group by q.category; group by q.category;
</select> </select>
<select id="getInspectFileList" resultType="com.taauav.front.vo.LsInspectFileVo"> <select id="getInspectFileList" resultType="com.taauav.front.vo.LsInspectFileVo">
select f.id, q.id as 'questionId', i.id as 'inspectDriverId', d.id as 'driverId', a.realname as 'driverManagerName', select f.id, q.id as 'questionId', i.id as 'inspectDriverId', d.id as 'driverId', a.realname as 'driverManagerName',
i.execution_time, f.gaode_latitude as 'latitude', f.gaode_longitude as 'longitude', d.name as 'driverName'
i.execution_time as 'executionTime', f.gaode_latitude as 'latitude', f.gaode_longitude as 'longitude', d.name as 'driverName'
from tauv_inspect_file as f from tauv_inspect_file as f
left join tauv_question_options as q on f.question_id = q.id left join tauv_question_options as q on f.question_id = q.id
left join tauv_inspect_driver as i on f.inspect_driver_id = i.id left join tauv_inspect_driver as i on f.inspect_driver_id = i.id
and q.category = #{param.category} and q.category = #{param.category}
</if> </if>
<if test="param != null and param.beginTime != null and param.beginTime != ''"> <if test="param != null and param.beginTime != null and param.beginTime != ''">
and i.execution_time between concat(#{param.beginTime}, ' 00:00:00') and concat(#{param.endTime}, ' 23:59:59')
and (i.execution_time between concat(#{param.beginTime}, ' 00:00:00') and concat(#{param.endTime}, ' 23:59:59'))
</if> </if>
order by i.execution_time desc order by i.execution_time desc
</select> </select>

+ 1
- 2
src/main/java/com/taauav/front/vo/LsInspectFileVo.java View File

/** /**
* 执行时间 - 拍摄时间 * 执行时间 - 拍摄时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date executionTime;
private String executionTime;


/** /**
* 问题坐标 - 纬度 * 问题坐标 - 纬度

Loading…
Cancel
Save