Browse Source

修改BUG

master
牧羊人 4 years ago
parent
commit
58b8436bae
2 changed files with 9 additions and 8 deletions
  1. +7
    -7
      src/main/java/com/taauav/front/mapper/UserInspectQuestionMapper.xml
  2. +2
    -1
      src/main/java/com/taauav/front/mapper/UserWaterAlarmMapper.xml

+ 7
- 7
src/main/java/com/taauav/front/mapper/UserInspectQuestionMapper.xml View File

<!-- 获取巡检问题列表 --> <!-- 获取巡检问题列表 -->
<select id="getInspectQuestionList" parameterType="com.taauav.front.query.UserInspectQuestionQuery" resultType="com.taauav.front.vo.inspectquestion.UserInspectQuestionListVo"> <select id="getInspectQuestionList" parameterType="com.taauav.front.query.UserInspectQuestionQuery" resultType="com.taauav.front.vo.inspectquestion.UserInspectQuestionListVo">
SELECT q.id,q.question_no,q.assign_user,q.`status`,f.src as file_src,o.content as question_type,f.description,d.driver_id,d.driver_name,d.driver_area,c.name as driver_area_name,i.inspect_time SELECT q.id,q.question_no,q.assign_user,q.`status`,f.src as file_src,o.content as question_type,f.description,d.driver_id,d.driver_name,d.driver_area,c.name as driver_area_name,i.inspect_time
FROM tauv_inspect_file f
INNER JOIN tauv_inspect_question q ON f.id=q.inspect_file_id
INNER JOIN tauv_inspect_driver d ON d.id=f.inspect_driver_id
INNER JOIN tauv_inspect i ON f.inspect_id=i.id
FROM tauv_inspect_question q
LEFT JOIN tauv_inspect_file f ON f.id=q.inspect_file_id
INNER JOIN tauv_inspect_driver d ON d.id=q.inspect_driver_id
INNER JOIN tauv_inspect i ON d.inspect_id=i.id
INNER JOIN sys_city c ON c.id=d.driver_area INNER JOIN sys_city c ON c.id=d.driver_area
INNER JOIN tauv_question_options o ON o.id=f.question_id
WHERE q.mark=1 AND f.is_review=1 AND f.is_effective=1 AND f.`status`=1 AND f.mark=1 AND d.mark=1 AND i.mark=1
INNER JOIN tauv_question_options o ON o.id=q.question_id
WHERE q.mark=1 AND d.mark=1 AND i.mark=1
<if test="query.questionNo != null"> <if test="query.questionNo != null">
and q.question_no like concat('%', #{query.questionNo}, '%')
and q.question_no like concat('%', #{query.questionNo}, '%')
</if> </if>
<if test="query.driverAreaList != null and query.driverAreaList !=''"> and d.driver_area in <if test="query.driverAreaList != null and query.driverAreaList !=''"> and d.driver_area in
<foreach collection="query.driverArea" item="area" open="(" close=")" separator=","> <foreach collection="query.driverArea" item="area" open="(" close=")" separator=",">

+ 2
- 1
src/main/java/com/taauav/front/mapper/UserWaterAlarmMapper.xml View File

END END
) 'measuredName' FROM tauv_water_alarm AS a ) 'measuredName' FROM tauv_water_alarm AS a
INNER JOIN sys_city AS c ON c.id=a.driver_area INNER JOIN sys_city AS c ON c.id=a.driver_area
WHERE a.mark=1
WHERE a.mark=1 AND a.measured_standard >=4
<if test="startTime != null and startTime !='' and endTime != null and endTime !=''"> <if test="startTime != null and startTime !='' and endTime != null and endTime !=''">
and a.create_time between #{startTime} and #{endTime} and a.create_time between #{startTime} and #{endTime}
</if> </if>
LIMIT 6 LIMIT 6
) AS g ) AS g
GROUP BY inspectDriverId GROUP BY inspectDriverId
ORDER BY measuredStandard DESC
</select> </select>


<!-- 单河流水质数据统计 --> <!-- 单河流水质数据统计 -->

Loading…
Cancel
Save