修改奖金不分摊相关,固定2025-01-27日期期限

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/BonusExcludeProjectServiceImpl.java

@@ -1,7 +1,6 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.BonusExcludeProject;
 import com.management.platform.entity.Project;
@@ -21,7 +20,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 public class BonusExcludeProjectServiceImpl extends ServiceImpl<BonusExcludeProjectMapper, BonusExcludeProject> implements BonusExcludeProjectService {
@@ -44,17 +42,18 @@ public class BonusExcludeProjectServiceImpl extends ServiceImpl<BonusExcludeProj
             return httpRespMsg;
         }
         List<BonusExcludeProject> resList = new ArrayList<BonusExcludeProject>();
-        if(1==addBO.getIsAll()){
-            List<Project> allProjects = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
-            List<BonusExcludeProject> collect = allProjects.stream().map(t -> {
-                BonusExcludeProject project = new BonusExcludeProject();
-                project.setProjectId(t.getId());
-                project.setCompanyId(user.getCompanyId());
-                project.setCreateBy(user.getId());
-                return project;
-            }).collect(Collectors.toList());
-            resList = collect;
-        }else {
+//        if(1==addBO.getIsAll()){
+//            List<Project> allProjects = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
+//            List<BonusExcludeProject> collect = allProjects.stream().map(t -> {
+//                BonusExcludeProject project = new BonusExcludeProject();
+//                project.setProjectId(t.getId());
+//                project.setCompanyId(user.getCompanyId());
+//                project.setCreateBy(user.getId());
+//                return project;
+//            }).collect(Collectors.toList());
+//            resList = collect;
+//        }else {
+        if(null != addBO.getProjects()){
             for (int i = 0; i < addBO.getProjects().length; i++) {
                 BonusExcludeProject project = new BonusExcludeProject();
                 project.setProjectId(Integer.parseInt(addBO.getProjects()[i]));
@@ -63,6 +62,8 @@ public class BonusExcludeProjectServiceImpl extends ServiceImpl<BonusExcludeProj
                 resList.add(project);
             }
         }
+
+//        }
         bonusExcludeProjectMapper.delete(new LambdaQueryWrapper<BonusExcludeProject>()
                 .eq(BonusExcludeProject::getCompanyId,user.getCompanyId()));
         if(CollectionUtils.isNotEmpty(resList)){

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -8736,6 +8736,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 //                firstDayOfWeek = firstDayOfWeek.plusDays(1);
 //            }
 //        }
+        //死代码 2025-01-27 周一 合并到1-26号那一周
+        LocalDate specialDate = LocalDate.of(2025, 1, 27);
+        if(lastDayOfWeek.plusDays(1).isEqual(specialDate)){
+            lastDayOfWeek = specialDate;
+        }
+
 
 
         //再按照当前用户的入职离职日期进行过滤

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1525,7 +1525,7 @@
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
             #{userId}
         </foreach>
-        not exists(
+        and not exists(
         select 1 from bonus_exclude_project where bonus_exclude_project.company_id = report.company_id and bonus_exclude_project.project_id = report.project_id
         )
         group by creator_id,substr(create_date,1,7),project_id