From 5115b6f8b9862750e024192962f7ae344aa0080e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 10 Apr 2024 15:48:16 +0800
Subject: [PATCH] e 呼同步圈子数据调整
---
src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java | 1 +
src/main/java/org/springblade/modules/circle/entity/CircleEntity.java | 4 ++--
src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml | 7 +++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/circle/entity/CircleEntity.java b/src/main/java/org/springblade/modules/circle/entity/CircleEntity.java
index 24255a7..b6f4994 100644
--- a/src/main/java/org/springblade/modules/circle/entity/CircleEntity.java
+++ b/src/main/java/org/springblade/modules/circle/entity/CircleEntity.java
@@ -85,8 +85,8 @@
@TableField("event_id")
private Long eventId;
- /** 事件类型：1：报事报修 */
- @ApiModelProperty(value = "事件类型：1：报事报修", example = "")
+ /** 事件类型：1：报事报修 2:E呼即办*/
+ @ApiModelProperty(value = "事件类型：1：报事报修 2:E呼即办", example = "")
@TableField("even_type")
private Integer evenType;
diff --git a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
index 9420808..fe20d64 100644
--- a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
@@ -64,11 +64,10 @@
<!--查询未分享到圈子的内容-->
<select id="getNotShareCircleList" resultType="org.springblade.modules.task.entity.ECallEventEntity">
select
- jece.*,
- br.name as communityName
+ jece.*
from jczz_e_call_event jece
- left join blade_region br on br.code = jece.community_code
- where jece.is_deleted = 0
+ left join jczz_circle jc on jc.event_id = jece.id and jc.even_type = 2 and jc.deleted_falg =0
+ where jece.is_deleted = 0 and jc.id is null
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
index 950a7a1..f9b0423 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
@@ -88,6 +88,7 @@
for (ECallEventEntity callEventEntity : list) {
CircleEntity circleEntity = new CircleEntity();
circleEntity.setEventId(callEventEntity.getId());
+ circleEntity.setEvenType(2);
circleEntity.setCommunityCode(callEventEntity.getCommunityCode());
circleEntity.setCircleType(type);
circleEntity.setCircleText(callEventEntity.getRemark());
--
Gitblit v1.9.3