From b37bdc2060e6bd7bf8cb2b2d844fe45a549d210a Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 21 Jun 2023 12:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java | 7 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java | 2 ++
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java | 18 ++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 3 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml | 13 ++++++++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml | 3 +--
6 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java
index ccb9ef9..5b4626b 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java
@@ -11,5 +11,23 @@
*/
@Data
public class CallNotFillRecordVO extends CallNotFillRecord {
+ /**
+ * 水库名称
+ */
+ private String waterName;
+ /**
+ * 姓名
+ */
+ private String realName;
+
+ /**
+ * 呼叫时间
+ */
+ private String callTime;
+
+ /**
+ * 用户账号
+ */
+ private String account;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml
index 6ad1a81..c712d5a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml
@@ -4,8 +4,19 @@
<!--自定义分页列表查询-->
<select id="selectCallNotFillRecordPage" resultType="cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO">
- select * from sm_call_not_fill_record
+ select
+ scnfr.*,
+ arb."name" as waterName,
+ bu.real_name as realName,
+ ctr."gmt_create" as callTime
+ from YWXT.sm_call_not_fill_record scnfr
+ left join SJZT_MD."att_res_base" arb on scnfr.water_guid = arb."code"
+ left join YWXT.blade_user bu on bu.phone = scnfr.tel and bu.is_deleted = 0
+ left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = scnfr.call_id
where 1=1
+ <if test="callNotFillRecord.account!=null and callNotFillRecord.account!=''">
+ and bu.account = #{callNotFillRecord.account}
+ </if>
order by id desc
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
index 1820d00..4cf34b4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
@@ -107,6 +107,8 @@
obj.put("code",code.substring(0,2));
} else if (code.substring(0,6).indexOf("00") > -1) {
obj.put("code",code.substring(0,4));
+ } else if (code.substring(0,8).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,6));
}
}
List<AttAdBaseVO> list = attAdBaseService.lazyTreeAll(parentCode, obj);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
index 1c4908a..08fdc5c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -66,6 +66,13 @@
@ApiModelProperty(value = "注册登记码")
@TableField("\"res_reg_code\"")
private String resRegCode;
+
+ /**
+ * 注册登记码
+ */
+ @ApiModelProperty(value = "标签")
+ @TableField("\"label\"")
+ private String label;
//
// /**
// * 其他行业注册号
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index c7628a7..178a0a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -122,6 +122,9 @@
<if test="attResBase.interiorAdGuid !=null and attResBase.interiorAdGuid != ''">
"interior_ad_guid" = #{attResBase.interiorAdGuid},
</if>
+ <if test="attResBase.label !=null and attResBase.label != ''">
+ "label" = #{attResBase.label},
+ </if>
"update_time" = #{attResBase.updateTime}
WHERE "guid" = #{attResBase.guid}
</update>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
index 57dcd86..9cf0ffc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -150,8 +150,7 @@
order by "user_phone") a) a
) b
set
- a.role_id = b.role_id,
- -- a.dept_id = case b.role_id when '1642713427301355522' then cast(b."ad_code" as bigint) + 1 else b."ad_code" end
+ a.role_id = b.role_id
where a.phone = b."user_phone" and a.role_id <> b.role_id
</update>
--
Gitblit v1.9.3