From e4f5084289fe7b3f308798a1b489892fba0f9cdb Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Fri, 30 Jun 2023 09:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bir/service/impl/BirBaseActivityServiceImpl.java | 1 + src/main/resources/mapper/bir/BirBaseActivityMapper.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index d2681a09..9e59affb 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java @@ -54,6 +54,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl birBaseActivityLqw = new LambdaQueryWrapper<>(); birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids); + birBaseActivityLqw.eq(BirBaseActivity::getKeyNum,yearMonth); this.remove(birBaseActivityLqw); List birBaseActivities = new ArrayList<>(); diff --git a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml index a0db4772..513647c6 100644 --- a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml +++ b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml @@ -98,6 +98,8 @@ (tbs_activity.act_start_date between #{startDate} and #{endDate}) or (tbs_activity.act_end_date between #{startDate} and #{endDate}) + or + (tbs_activity.act_end_date >= #{endDate} and tbs_activity.act_start_date <= #{startDate}) )