From 784551dd0bea5bd687eabb06a5972aff888afcd3 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 6 Apr 2023 14:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:1.ic=5Fevent=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E5=88=86=E6=9E=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=AD=EF=BC=8C=E7=BC=BA=E5=B0=91del=5Fflag=3D'0'?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcEventDao.xml                  | 4 +++-
 .../com/epmet/processor/YanTaiTripReportSyncProcessor.java    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index bd7853c4e0..d7e0d5ff39 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -28,6 +28,7 @@
           <if test="orgType == 'grid'">
               and e.GRID_ID=#{orgId}
           </if>
+          and e.DEL_FLAG = '0'
           and CUSTOMER_ID = #{customerId}
           and HAPPEN_TIME >= #{queryStartTime}
           and HAPPEN_TIME <![CDATA[<=]]> #{queryEndTime}
@@ -81,7 +82,8 @@
             select date_format(e.HAPPEN_TIME, '%Y-%m') monthName
             from ic_event e
             <where>
-                      e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
+                e.DEL_FLAG = '0'
+                and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
                 and e.HAPPEN_TIME <![CDATA[ <= ]]> date_format(#{queryEndTime}, '%Y-%m')
                 <if test="orgType == 'grid'">
                     and e.GRID_ID =#{orgId}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java
index 6b1d4a028d..e6a1995948 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java
@@ -16,7 +16,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE;
  * @Author zxc
  * @Date 2022/11/22 14:08
  */
-@Component
+// @Component
 @Slf4j
 public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor {