费用率

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -54,6 +54,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
                 .map(TbsActivity::getId).collect(Collectors.toList());
         LambdaQueryWrapper<BirBaseActivity> birBaseActivityLqw = new LambdaQueryWrapper<>();
         birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids);
+        birBaseActivityLqw.eq(BirBaseActivity::getKeyNum,yearMonth);
         this.remove(birBaseActivityLqw);
 
         List<BirBaseActivity> birBaseActivities = new ArrayList<>();

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})
             )
     </select>