'问题列表'

log.path_IS_UNDEFINED/info/log-info-2020-08-13.0.log

@@ -1,4 +0,0 @@
-2020-08-13 10:49:31.830 [SessionValidationThread-1] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [validateSessions,275] - Validating all active sessions...
-2020-08-13 10:49:31.902 [SessionValidationThread-1] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [validateSessions,308] - Finished session validation.  No sessions were stopped.
-2020-08-13 11:08:25.709 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - [shutdown,208] - Shutting down ExecutorService 'taskScheduler'
-2020-08-13 11:08:26.086 [SpringContextShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,1825] - {dataSource-1} closed

log.path_IS_UNDEFINED/info/log-info-2020-08-14.0.log

@@ -1,3 +0,0 @@
-2020-08-14 09:59:01.928 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - [shutdown,208] - Shutting down ExecutorService 'taskScheduler'
-2020-08-14 09:59:02.172 [SpringContextShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,1825] - {dataSource-1} closed
-2020-08-14 15:08:02.429 [http-nio-8012-exec-2] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [enableSessionValidation,233] - Enabling session validation scheduler...

log.path_IS_UNDEFINED/info/log-info-2020-08-18.0.log

@@ -1,8 +0,0 @@
-2020-08-18 09:46:33.957 [SessionValidationThread-1] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [validateSessions,275] - Validating all active sessions...
-2020-08-18 09:46:34.000 [SessionValidationThread-1] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [validateSessions,308] - Finished session validation.  No sessions were stopped.
-2020-08-18 10:46:33.960 [SessionValidationThread-1] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [validateSessions,275] - Validating all active sessions...
-2020-08-18 10:46:34.098 [SessionValidationThread-1] INFO  o.a.s.s.m.AbstractValidatingSessionManager - [validateSessions,308] - Finished session validation.  No sessions were stopped.
-2020-08-18 10:50:37.500 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - [shutdown,208] - Shutting down ExecutorService 'taskScheduler'
-2020-08-18 10:50:37.809 [SpringContextShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,1825] - {dataSource-1} closed
-2020-08-18 15:05:11.530 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - [shutdown,208] - Shutting down ExecutorService 'taskScheduler'
-2020-08-18 15:05:11.785 [SpringContextShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,1825] - {dataSource-1} closed

log.path_IS_UNDEFINED/log_error.log

@@ -1,2 +0,0 @@
-2020-08-18 09:46:33.995 [SessionValidationThread-1] ERROR o.c.s.RedisSessionDAO - [getActiveSessions,111] - get active sessions error.
-2020-08-18 10:46:34.095 [SessionValidationThread-1] ERROR o.c.s.RedisSessionDAO - [getActiveSessions,111] - get active sessions error.

log.path_IS_UNDEFINED/log_info.log

@@ -1,2 +0,0 @@
-2020-08-19 10:38:11.464 [SpringContextShutdownHook] INFO  o.s.s.c.ThreadPoolTaskScheduler - [shutdown,208] - Shutting down ExecutorService 'taskScheduler'
-2020-08-19 10:38:11.598 [SpringContextShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,1825] - {dataSource-1} closed

src/main/java/com/taauav/front/mapper/UserInspectQuestionMapper.java

@@ -26,6 +26,14 @@ import java.util.Map;
  */
 public interface UserInspectQuestionMapper extends BaseMapper<TauvInspectQuestion> {
 
+    /**
+     * 获取app端巡检问题列表
+     *
+     * @param query 查询条件
+     * @return
+     */
+    List<UserInspectQuestionListVo> getUserInspectQuestionList(IPage<UserInspectQuestionListVo> page, @RequestParam("query") UserInspectQuestionQuery query);
+
     /**
      * 获取巡检问题列表
      *

src/main/java/com/taauav/front/mapper/UserInspectQuestionMapper.xml

@@ -3,6 +3,38 @@
 <mapper namespace="com.taauav.front.mapper.UserInspectQuestionMapper">
 
     <!-- 获取巡检问题列表 -->
+    <select id="getUserInspectQuestionList" 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,q.create_time as inspect_time,q.inspect_driver_id,
+        a1.realname as `assignUserName`,a2.realname as `handlerUserName`
+        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 sys_city c ON c.id=d.driver_area
+        INNER JOIN tauv_question_options o ON o.id=q.question_id
+        LEFT JOIN user_admin as a1 on q.assign_user = a1.id
+        LEFT JOIN user_admin as a2 on q.handler_user = a2.id
+        WHERE q.mark=1 AND d.mark=1 AND i.mark=1
+        <if test="query.questionNo != null and query.questionNo != ''">
+            and q.question_no like concat('%', #{query.questionNo}, '%')
+        </if>
+        <if test="query.driverAreaList != null and query.driverAreaList !=''"> and d.driver_area in
+            <foreach collection="query.driverAreaList" item="area" open="(" close=")" separator=",">
+                #{area}
+            </foreach>
+        </if>
+        <if test="query.driverName != null and query.driverName != ''">
+            and d.driver_name like concat('%', #{query.driverName}, '%')
+        </if>
+        <if test="query.status != null and query.status > 0">
+            and q.status = #{query.status}
+        </if>
+        <if test="query.inspectTime != null and query.inspectTime !=''">
+            and DATE_FORMAT(q.create_time,"%Y-%m-%d") between #{query.inspectStartTime} and #{query.inspectEndTime}
+        </if>
+        ORDER BY q.id DESC
+    </select>
+
     <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,q.inspect_driver_id,

src/main/java/com/taauav/front/service/impl/UserInspectQuestionServiceImpl.java

@@ -101,7 +101,7 @@ public class UserInspectQuestionServiceImpl extends BaseServiceImpl<UserInspectQ
             query.setInspectEndTime(endTime);
         }
         IPage<UserInspectQuestionListVo> page = new Page<>(query.getPage(), query.getPageSize());
-        List<UserInspectQuestionListVo> inspectQuestionList = inspectQuestionMapper.getInspectQuestionList(page, query);
+        List<UserInspectQuestionListVo> inspectQuestionList = inspectQuestionMapper.getUserInspectQuestionList(page, query);
         if (!inspectQuestionList.isEmpty()) {
             inspectQuestionList.forEach(item -> {
                 // 状态描述