更新

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

@@ -56,19 +56,17 @@
 
     <!-- 大屏待处理污染统计 -->
     <select id="getCategoryQuestionInfo" resultType="java.util.Map">
-        SELECT o.category, count(f.id) AS total_num FROM tauv_inspect_file AS f
-        INNER JOIN tauv_question_options AS o ON o.id = f.question_id
-        INNER JOIN tauv_inspect_question AS q ON q.inspect_file_id = f.id
-        WHERE q.status &lt; 3 AND o.category=#{category} AND f.mark=1 AND f.is_effective=1 AND f.is_review=1 AND f.`status`=1 AND o.mark=1
+        SELECT o.category, count(q.question_id) AS total_num FROM tauv_inspect_question AS q
+        INNER JOIN tauv_question_options AS o ON o.id=q.question_id
+        WHERE q.status &lt; 2 AND o.category=#{category} AND q.mark=1 AND q.mark=1
         GROUP BY o.category
     </select>
 
     <!-- 大屏巡检问题河湖统计 -->
     <select id="getQuestionDriverList" resultType="java.util.Map">
         SELECT d.driver_id AS driverId, d.driver_name AS driverName, count(d.driver_id) AS totalNum FROM tauv_inspect_question AS q
-        INNER JOIN tauv_inspect_file AS f ON q.inspect_file_id=f.id
-        INNER JOIN tauv_inspect_driver AS d ON d.id = f.inspect_driver_id
-        WHERE q.mark=1 AND f.is_review=1 AND f.is_effective=1 AND f.`status`=1 AND d.mark=1
+        INNER JOIN tauv_inspect_driver AS d ON d.id = q.inspect_driver_id
+        WHERE q.mark=1 AND d.mark=1
         GROUP BY d.driver_id
         ORDER BY totalNum DESC
         LIMIT 0,6

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.taauav.admin.entity.TauvInspectQuestion;
 import com.taauav.admin.entity.TauvWaterAlarm;
 import com.taauav.admin.entity.TauvWaterAlarmInfo;
+import com.taauav.admin.entity.TauvWaterWarn;
 import com.taauav.admin.service.ISysCityService;
 import com.taauav.common.bean.Response;
 import com.taauav.common.service.impl.BaseServiceImpl;
@@ -211,7 +212,7 @@ public class UserWaterAlarmServiceImpl extends BaseServiceImpl<UserWaterAlarmMap
     @Override
     public Response getWaterAlarmList(Integer num) {
         QueryWrapper<TauvWaterAlarm> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", 2);
+        queryWrapper.in("status", new Integer[]{2, 4, 5});
         queryWrapper.eq("mark", 1);
         List<TauvWaterAlarm> waterAlarmList = userWaterAlarmMapper.selectList(queryWrapper);
         return response.success(waterAlarmList);