From 667c18c338b807fb2ea6340db4e87ca0cb043be2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 May 2023 17:49:04 +0800
Subject: [PATCH] 责任人完成工作流任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml | 95 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 84 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
index fe1beab..12fda72 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
@@ -7,11 +7,10 @@
select
ct."id",
ct."task_name" as taskName,
- date_format(ct."gmt_create",'yyyy-MM-dd HH:mm:ss') as createTime,
+ date_format(ct."gmt_create",'%Y-%m-%d %H:%i:%s') as createTime,
ct."task_status" as taskStatus,
+ date_format(ct."task_schedule_time",'%Y-%m-%d %H:%i:%s') as executeTime,
ctr."calling_number" as callingNumber,
- ctr."callee_number" as calleeNumber,
- date_format(ctr."gmt_create",'yyyy-MM-dd HH:mm:ss') as executeTime,
ctra."callee_number_count" as calleeNumberCount,
ctra."connection_count" as connectionCount,
ctra."failure_count" as failureCount,
@@ -19,9 +18,9 @@
cs."call_scenes_name" as callScenesName
from "SJZT_ODS"."call_task" ct
left join (select * from "SJZT_ODS"."call_scenes" where "is_deleted" = 0) cs on ct."scene_id" = cs."id"
- left join "SJZT_ODS"."call_task_result" ctr on ctr."task_id" = ct."id"
+ left join (select DISTINCT "task_id","calling_number" from "SJZT_ODS"."call_task_result") ctr on ctr."task_id" = ct."id"
left join "SJZT_ODS"."call_task_result_analyse" ctra on ctra."task_id" = ct."id"
- where 1=1
+ where 1=1 and ct."is_deleted" = 0
<if test="callTask.taskName!=null and callTask.taskName!=''">
and ct."task_name" like concat(concat('%',#{callTask.taskName}),'%')
</if>
@@ -29,10 +28,10 @@
and ct."task_status" = #{callTask.taskStatus}
</if>
<if test="callTask.startTime!=null and callTask.startTime!=''">
- and date_format(ct."gmt_create",'%Y-%m-%d') >= #{callTask.startTime}
+ and date_format(ct."task_schedule_time",'%Y-%m-%d') >= #{callTask.startTime}
</if>
<if test="callTask.endTime!=null and callTask.endTime!=''">
- and date_format(ct."gmt_create",'%Y-%m-%d') <= #{callTask.endTime}
+ and date_format(ct."task_schedule_time",'%Y-%m-%d') <= #{callTask.endTime}
</if>
order by ct."gmt_create" desc
</select>
@@ -46,21 +45,83 @@
ctr."call_conversation_round" as callConversationRound,
ctr."call_hangup_direction" as callHangupDirection,
ctr."call_id" as callId,
- date_format(ctr."gmt_create",'yyyy-MM-dd HH:mm:ss') as gmtCreate,
+ date_format(ctr."gmt_create",'%Y-%m-%d %H:%i:%s') as gmtCreate,
ctr."calling_number" as callingNumber,
ctr."callee_number" as calleeNumber,
ctr."task_id" as taskId,
ctr."call_start_time" as callStartTime,
- ctr."call_end_time" as callEndTime,
+ date_format(ctr."call_end_time",'%Y-%m-%d %H:%i:%s') as callEndTime,
ctr."call_record_file" as callRecordFile,
ctr."intention_customer_flag" as intentionCustomerFlag,
ctr."is_deleted" as isDeleted,
- ctc."call_task_callee_content" as callTaskCalleeContent
+ ctc.waterCode,
+ aab."ad_name" as areaName,
+ cas."tag_title" as tagTitle,
+ ctc.userName,
+ arb."name" as waterName,
+ arb."res_reg_code" resRegCode,
+ arb."eng_scal" engScal,
+ arb."res_type" resType,
+ arb."rv_name" rvName,
+ REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,2) as cityName,
+ REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,3) as countyName,
+ if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'未发现险情')>0,1,if(instr(cas."tag_title",'发现险情')>0,2,0)),0) isDange,
+ if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查责任人-未识别')>0,0,if(instr(cas."tag_title",'不是巡查责任人')>0,1,if(instr(cas."tag_title",'是巡查责任人')>0,2,0))),0) isMan,
+ if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查-未识别')>0,0,if(instr(cas."tag_title",'未巡查')>0,1,if(instr(cas."tag_title",'已巡查')>0,2,0))),0) isPatrol,
+ if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否超汛限-未识别')>0,0,if(instr(cas."tag_title",'未超汛限')>0,1,if(instr(cas."tag_title",'超汛限')>0,2,0))),0) isOver
from "SJZT_ODS"."call_task_result" ctr
- left join "SJZT_ODS"."call_task_callee" ctc on ctr."task_id" = ctc."task_id"
+ left join
+ (
+ select "callee_number",
+ "call_id",
+ "task_id",
+ JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode,
+ JSON_VALUE("call_task_callee_content",'$."$用户名$"') as userName from "SJZT_ODS"."call_task_callee"
+ ) ctc
+ on ctr."call_id" = ctc."call_id"
+ left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
+ left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000')
+ left join
+ (
+ SELECT ctra."call_id", replace(WM_CONCAT(ctag."tag_title"),',', ',') as "tag_title" from "SJZT_ODS"."call_tag" ctag
+ left join "SJZT_ODS"."call_task_result_attribute" ctra on ctag."id" = ctra."attribute_value"
+ GROUP BY ctra."call_id"
+ ) cas
+ on cas."call_id" = ctr."call_id"
+ left join "SJZT_ODS"."call_task" ct on ct."id" = ctr."task_id"
where 1=1
<if test="callTaskResult.taskId!=null and callTaskResult.taskId!=''">
and ctr."task_id" = #{callTaskResult.taskId}
+ </if>
+ <if test="list != null and list.size()>0">
+ and aab."ad_code" in
+ <foreach collection="list" item="adCode" separator ="," open="(" close=")">
+ #{adCode}
+ </foreach>
+ </if>
+ <if test="idsList != null and idsList.size()>0">
+ and ct."id" in
+ <foreach collection="idsList" item="id" separator ="," open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="callTaskResult.waterName!=null and callTaskResult.waterName!=''">
+ and arb."name" like concat('%',#{callTaskResult.waterName},'%')
+ </if>
+ <if test="callTaskResult.userName!=null and callTaskResult.userName!=''">
+ and ctc.userName like concat('%',#{callTaskResult.userName},'%')
+ </if>
+ <if test="callTaskResult.taskName!=null and callTaskResult.taskName!=''">
+ and ct."task_name" like concat(concat('%',#{callTaskResult.taskName}),'%')
+ </if>
+ <if test="callTaskResult.taskStatus!=null">
+ and ct."task_status" = #{callTaskResult.taskStatus}
+ </if>
+ <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}
+ </if>
+ <if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskResult.endTime}
</if>
order by ctr."gmt_create" desc
</select>
@@ -71,4 +132,16 @@
left join SJZT_MD."att_res_base" arb on aab."guid" = concat(arb."ad_guid",'000000')
where arb."code" = #{adCode}
</select>
+
+ <!--通过行政区编号获取水库名称-->
+ <select id="getWaterNameByAreaCode" resultType="java.lang.String">
+ select "name" from SJZT_MD."att_res_base" where concat("ad_guid",'000000') = #{adCode}
+ </select>
+
+ <!--查询所有下级区域-->
+ <select id="getAllChildrenAreaByAreaCode" resultType="java.lang.String">
+ select "ad_code" from SJZT_MD."att_ad_base"
+ start with "ad_code" = #{areaCode}
+ CONNECT BY PRIOR "ad_code" = "p_ad_code"
+ </select>
</mapper>
--
Gitblit v1.9.3