绩效汇总数据初始化时不生成已离职员工数据

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/StaffPerformInitDataTaskImpl.java

@@ -4,6 +4,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.framework.util.DateUtils;
+import com.mortals.xhx.common.code.StaffSatusEnum;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
 import com.mortals.xhx.module.holiday.model.HolidayQuery;
 import com.mortals.xhx.module.holiday.service.HolidayService;
@@ -70,6 +71,17 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
             if(CollectionUtils.isNotEmpty(allStaff)) {
                 List<StaffPerformStatEntity> list = new ArrayList<>();
                 allStaff.stream().forEach(item -> {
+                    boolean flag = true;
+                    if(item.getStatus() == StaffSatusEnum.离职.getValue()) {
+                        if(item.getLeaveDate()!=null){
+                            String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate());
+                            if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(dateStr)) < 0){
+                                //离职日期在统计日期之前不统计
+                                flag = false;
+                            }
+                        }
+                    }
+                    if(flag){
                         StaffPerformStatEntity statEntity = new StaffPerformStatEntity();
                         statEntity.initAttrValue();
                         statEntity.setStaffId(item.getId());
@@ -86,9 +98,10 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
                         tempQuery.setMonth(statEntity.getMonth());
                         tempQuery.setDay(statEntity.getDay());
                         StaffPerformStatEntity temp = staffPerformStatService.selectOne(tempQuery);
-                    if(temp==null) {
+                        if (temp == null) {
                             list.add(statEntity);
                         }
+                    }
                 });
                 staffPerformStatService.save(list);
             }
@@ -99,6 +112,17 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
             if(CollectionUtils.isNotEmpty(allStaff)) {
                 List<StaffPerformSummaryEntity> summaryList = new ArrayList<>();
                 allStaff.stream().forEach(item -> {
+                    boolean flag = true;
+                    if(item.getStatus() == StaffSatusEnum.离职.getValue()) {
+                        if(item.getLeaveDate()!=null){
+                            String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate());
+                            if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(dateStr)) < 0){
+                                //离职日期在统计日期之前不统计
+                                flag = false;
+                            }
+                        }
+                    }
+                    if(flag) {
                         StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
                         staffPerformSummaryEntity.initAttrValue();
                         staffPerformSummaryEntity.setStaffId(item.getId());
@@ -115,9 +139,10 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
                         summaryQuery.setYear(staffPerformSummaryEntity.getYear());
                         summaryQuery.setMonth(staffPerformSummaryEntity.getMonth());
                         StaffPerformSummaryEntity tempSummary = staffPerformSummaryService.selectOne(summaryQuery);
-                    if(tempSummary==null){
+                        if (tempSummary == null) {
                             summaryList.add(staffPerformSummaryEntity);
                         }
+                    }
                 });
                 staffPerformSummaryService.save(summaryList);
             }