From 24b7b7ccde67273d0f2ed9b57c5c952add0c4d3e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Jun 2023 19:32:25 +0800
Subject: [PATCH] 添加巡查任务获取全部接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 152 ++++++++++++++++++++++++++++++--------------------
1 files changed, 92 insertions(+), 60 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index 1f0c270..5a9c4fb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -300,65 +300,8 @@
-
-
-
-
- <!--市查区-->
- <select id="getTaskReportRegionList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
- SELECT
- aab."ad_name" AS adName,
- aab."guid" AS adCode,
- #{patrolTaskReport.startTime} AS startTime,
- #{patrolTaskReport.endTime} AS endTime,
- COUNT(*) AS need,
- SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
- SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
- FROM SM_PATROL_TASK t
- LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
- LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
- WHERE t.IS_DELETED = 0
- <if test="patrolTaskReport.padCode !=null and patrolTaskReport.padCode !=''">
- AND aab."p_ad_code" = #{patrolTaskReport.padCode}
- </if>
- <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
- AND DATE_FORMAT(t.start_time,'%Y-%m-%d') >= #{patrolTaskReport.startTime}
- </if>
- <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
- AND DATE_FORMAT(t.start_time,'%Y-%m-%d') <= #{patrolTaskReport.endTime}
- </if>
- GROUP BY (aab."ad_name",aab."guid")
- </select>
- <!--区查水库-->
- <select id="getTaskReportReservoirList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
- SELECT
- arb."guid" AS reservoirId,
- arb."name" AS reservoirName,
- aab."guid" AS adCode,
- aab."ad_name" AS adName,
- #{patrolTaskReport.startTime} AS startTime,
- #{patrolTaskReport.endTime} AS endTime,
- COUNT(*) AS need,
- SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
- SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
- FROM SM_PATROL_TASK t
- LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
- LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
- WHERE
- t.IS_DELETED = 0
- <if test="patrolTaskReport.adCode != null and patrolTaskReport.adCode !=''">
- AND aab."ad_code" = #{patrolTaskReport.adCode}
- </if>
- <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
- AND DATE_FORMAT(t.start_time,'%Y-%m-%d') >= #{patrolTaskReport.startTime}
- </if>
- <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
- AND DATE_FORMAT(t.start_time,'%Y-%m-%d') <= #{patrolTaskReport.endTime}
- </if>
- GROUP BY (arb."guid",arb."name",aab."guid",aab."ad_name")
- </select>
- <!--省查市-->
- <select id="getTaskReportProvinceList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
+ <!--获取市级巡查数据-->
+ <select id="getCityReportList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
SELECT
a."p_ad_code" adCode,
a."p_ad_name" adName,
@@ -384,10 +327,99 @@
AND DATE_FORMAT(t.start_time,'%Y-%m-%d') <= #{patrolTaskReport.endTime}
</if>
GROUP BY (aab."p_ad_code",aab."p_ad_name")
+ ORDER BY aab."p_ad_code"
) A
GROUP BY (a."p_ad_code",a."p_ad_name") order by a."p_ad_code"
+
</select>
- <!--获取市下的所有水库巡查-->
+ <!--获取区县巡查数据-->
+ <select id="getCountyReportList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
+ SELECT
+ aab."ad_name" AS adName,
+ aab."guid" AS adCode,
+ #{patrolTaskReport.startTime} AS startTime,
+ #{patrolTaskReport.endTime} AS endTime,
+ COUNT(*) AS need,
+ SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
+ SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
+ FROM SM_PATROL_TASK t
+ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
+ LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000')
+ WHERE t.IS_DELETED = 0
+ <if test="patrolTaskReport.padCode !=null and patrolTaskReport.padCode !=''">
+ AND aab."p_ad_code" = #{patrolTaskReport.padCode}
+ </if>
+ <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
+ AND DATE_FORMAT(t.start_time,'%Y-%m-%d') >= #{patrolTaskReport.startTime}
+ </if>
+ <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
+ AND DATE_FORMAT(t.start_time,'%Y-%m-%d') <= #{patrolTaskReport.endTime}
+ </if>
+ GROUP BY (aab."ad_name",aab."guid")
+ ORDER BY aab."guid"
+ </select>
+ <!--获取乡镇巡查数据-->
+ <select id="getTownReportList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
+ SELECT
+ aab."ad_name" AS adName,
+ aab."guid" AS adCode,
+ #{patrolTaskReport.startTime} AS startTime,
+ #{patrolTaskReport.endTime} AS endTime,
+ COUNT(*) AS need,
+ SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
+ SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
+ FROM SM_PATROL_TASK t
+ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
+ LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
+ WHERE t.IS_DELETED = 0
+ <if test="patrolTaskReport.padCode !=null and patrolTaskReport.padCode !=''">
+ AND aab."p_ad_code" = #{patrolTaskReport.padCode}
+ </if>
+ <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
+ AND DATE_FORMAT(t.start_time,'%Y-%m-%d') >= #{patrolTaskReport.startTime}
+ </if>
+ <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
+ AND DATE_FORMAT(t.start_time,'%Y-%m-%d') <= #{patrolTaskReport.endTime}
+ </if>
+ GROUP BY (aab."ad_name",aab."guid")
+ ORDER BY aab."guid"
+ </select>
+ <!--获取水库巡查数据-->
+ <select id="getReservoirReportList" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
+ SELECT
+ arb."guid" AS reservoirId,
+ arb."name" AS reservoirName,
+ aab."guid" AS adCode,
+ aab."ad_name" AS adName,
+ #{patrolTaskReport.startTime} AS startTime,
+ #{patrolTaskReport.endTime} AS endTime,
+ COUNT(*) AS need,
+ SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish,
+ SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo
+ FROM SM_PATROL_TASK t
+ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id
+ LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
+ WHERE
+ t.IS_DELETED = 0
+ <if test="patrolTaskReport.adCode != null and patrolTaskReport.adCode !=''">
+ AND aab."ad_code" = #{patrolTaskReport.adCode}
+ </if>
+ <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
+ AND DATE_FORMAT(t.start_time,'%Y-%m-%d') >= #{patrolTaskReport.startTime}
+ </if>
+ <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
+ AND DATE_FORMAT(t.start_time,'%Y-%m-%d') <= #{patrolTaskReport.endTime}
+ </if>
+ GROUP BY (arb."guid",arb."name",aab."guid",aab."ad_name")
+ ORDER BY arb."guid"
+ </select>
+
+
+
+
+
+
+ <!--水库巡查-->
<select id="getTaskReportDetailRegion" resultType="cn.gistack.sm.patrol.vo.PatrolTaskReport">
SELECT
arb."guid" AS reservoirId,
--
Gitblit v1.9.3