人事绩效

airport-personnel/src/main/java/com/sundot/airport/personnel/service/impl/PersonnelNonCadreMonthlyAssessmentServiceImpl.java

@@ -33,6 +33,7 @@ import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.common.utils.MonthUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.utils.bean.BeanUtils;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorDetail;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail;
 import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorDetailService;
@@ -332,45 +333,61 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
                 .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
                 .collect(Collectors.toList());
-        otherIndexWithSocStationQcAccordList = otherIndexWithSocStationQcAccordList.stream()
-                .peek(personnelMonthlyAssessmentIndicatorDetail -> {
-                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream()
+        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithSocStationQcAccordListFiltered = otherIndexWithSocStationQcAccordList.stream()
+                .map(personnelMonthlyAssessmentIndicatorDetail -> {
+                    PersonnelMonthlyAssessmentIndicatorDetail newDetail = new PersonnelMonthlyAssessmentIndicatorDetail();
+                    BeanUtils.copyProperties(personnelMonthlyAssessmentIndicatorDetail, newDetail);
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> originalList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList();
+                    if (CollUtil.isEmpty(originalList)) {
+                        newDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(new ArrayList<>());
+                        return newDetail;
+                    }
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = originalList.stream()
                             .filter(item -> StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getQcDeptType()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getQcDeptType()))
                             .collect(Collectors.toList());
-                    personnelMonthlyAssessmentIndicatorDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                    newDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                    return newDetail;
                 })
                 .filter(item -> CollUtil.isNotEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()))
                 .collect(Collectors.toList());
-        BigDecimal otherIndexSafetyScoreWithSocStationQcDeduction = CollUtil.isEmpty(otherIndexWithSocStationQcAccordList) ? BigDecimal.ZERO :
-                otherIndexWithSocStationQcAccordList.stream()
+        BigDecimal otherIndexSafetyScoreWithSocStationQcDeduction = CollUtil.isEmpty(otherIndexWithSocStationQcAccordListFiltered) ? BigDecimal.ZERO :
+                otherIndexWithSocStationQcAccordListFiltered.stream()
                         .flatMap(item -> CollUtil.isEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()) ? Stream.empty() : item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream())
                         .map(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getScore)
                         .filter(ObjUtil::isNotNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
         result.setOtherIndexSafetyScoreWithSocStationQcDeduction(otherIndexSafetyScoreWithSocStationQcDeduction);
-        result.setOtherIndexSafetyScoreWithSocStationQcAccordList(otherIndexWithSocStationQcAccordList);
+        result.setOtherIndexSafetyScoreWithSocStationQcAccordList(otherIndexWithSocStationQcAccordListFiltered);
         // 其他指标-安全-不仅含SOC/站品控检查扣分
         List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithoutSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
                 .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
                 .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
                 .collect(Collectors.toList());
-        otherIndexWithoutSocStationQcAccordList = otherIndexWithoutSocStationQcAccordList.stream()
-                .peek(personnelMonthlyAssessmentIndicatorDetail -> {
-                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream()
+        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithoutSocStationQcAccordListFiltered = otherIndexWithoutSocStationQcAccordList.stream()
+                .map(personnelMonthlyAssessmentIndicatorDetail -> {
+                    PersonnelMonthlyAssessmentIndicatorDetail newDetail = new PersonnelMonthlyAssessmentIndicatorDetail();
+                    BeanUtils.copyProperties(personnelMonthlyAssessmentIndicatorDetail, newDetail);
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> originalList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList();
+                    if (CollUtil.isEmpty(originalList)) {
+                        newDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(new ArrayList<>());
+                        return newDetail;
+                    }
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = originalList.stream()
                             .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getQcDeptType()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getQcDeptType())))
                             .collect(Collectors.toList());
-                    personnelMonthlyAssessmentIndicatorDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                    newDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                    return newDetail;
                 })
                 .filter(item -> CollUtil.isNotEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()))
                 .collect(Collectors.toList());
-        BigDecimal otherIndexSafetyScoreWithoutSocStationQcDeduction = CollUtil.isEmpty(otherIndexWithoutSocStationQcAccordList) ? BigDecimal.ZERO :
-                otherIndexWithoutSocStationQcAccordList.stream()
+        BigDecimal otherIndexSafetyScoreWithoutSocStationQcDeduction = CollUtil.isEmpty(otherIndexWithoutSocStationQcAccordListFiltered) ? BigDecimal.ZERO :
+                otherIndexWithoutSocStationQcAccordListFiltered.stream()
                         .flatMap(item -> CollUtil.isEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()) ? Stream.empty() : item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream())
                         .map(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getScore)
                         .filter(ObjUtil::isNotNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
         result.setOtherIndexSafetyScoreWithoutSocStationQcDeduction(otherIndexSafetyScoreWithoutSocStationQcDeduction);
-        result.setOtherIndexSafetyScoreWithoutSocStationQcAccordList(otherIndexWithoutSocStationQcAccordList);
+        result.setOtherIndexSafetyScoreWithoutSocStationQcAccordList(otherIndexWithoutSocStationQcAccordListFiltered);
         // 其他指标-非安全
         List<BasePerformanceIndicatorCategory> otherIndexNonSafetyCategory = otherIndexCategoryChildren.stream().filter(item -> !StrUtil.equals("安全", item.getName())).collect(Collectors.toList());
         List<String> otherIndexNonSafetyCategoryCodeList = getIndicatorCodeList(otherIndexNonSafetyCategory.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList()));
@@ -392,23 +409,31 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 .filter(item -> socStationQcInvolvedCoreSafetyCodeList.contains(item.getIndicatorCode()))
                 .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
                 .collect(Collectors.toList());
-        socStationQcInvolvedCoreSafetyAccordList = socStationQcInvolvedCoreSafetyAccordList.stream()
-                .peek(personnelMonthlyAssessmentIndicatorDetail -> {
-                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream()
+        List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordListFiltered = socStationQcInvolvedCoreSafetyAccordList.stream()
+                .map(personnelMonthlyAssessmentIndicatorDetail -> {
+                    PersonnelMonthlyAssessmentIndicatorDetail newDetail = new PersonnelMonthlyAssessmentIndicatorDetail();
+                    BeanUtils.copyProperties(personnelMonthlyAssessmentIndicatorDetail, newDetail);
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> originalList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList();
+                    if (CollUtil.isEmpty(originalList)) {
+                        newDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(new ArrayList<>());
+                        return newDetail;
+                    }
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = originalList.stream()
                             .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getQcDeptType()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getQcDeptType())))
                             .collect(Collectors.toList());
-                    personnelMonthlyAssessmentIndicatorDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                    newDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                    return newDetail;
                 })
                 .filter(item -> CollUtil.isNotEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()))
                 .collect(Collectors.toList());
-        BigDecimal socStationQcInvolvedCoreSafetyDeduction = CollUtil.isEmpty(socStationQcInvolvedCoreSafetyAccordList) ? BigDecimal.ZERO :
-                socStationQcInvolvedCoreSafetyAccordList.stream()
+        BigDecimal socStationQcInvolvedCoreSafetyDeduction = CollUtil.isEmpty(socStationQcInvolvedCoreSafetyAccordListFiltered) ? BigDecimal.ZERO :
+                socStationQcInvolvedCoreSafetyAccordListFiltered.stream()
                         .flatMap(item -> CollUtil.isEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()) ? Stream.empty() : item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream())
                         .map(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getScore)
                         .filter(ObjUtil::isNotNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
         result.setSocStationQcInvolvedCoreSafetyDeduction(socStationQcInvolvedCoreSafetyDeduction);
-        result.setSocStationQcInvolvedCoreSafetyAccordList(socStationQcInvolvedCoreSafetyAccordList);
+        result.setSocStationQcInvolvedCoreSafetyAccordList(socStationQcInvolvedCoreSafetyAccordListFiltered);
         // 分管员工数量+扣分平均值
         if (StrUtil.equals(RoleTypeEnum.kezhang.getCode(), result.getRoleKey())) {
             PersonnelNonCadreMonthlyAssessment queryKeZhang = new PersonnelNonCadreMonthlyAssessment();
@@ -460,6 +485,13 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         } else if (StrUtil.equals(RoleTypeEnum.kezhang.getCode(), result.getRoleKey())) {
             doSupervisor(result);
         }
+        if (CollUtil.isNotEmpty(result.getPersonnelMonthlyAssessmentIndicatorDetailList())) {
+            result.getPersonnelMonthlyAssessmentIndicatorDetailList().forEach(personnelMonthlyAssessmentIndicatorDetail -> {
+                if (CollUtil.isEmpty(personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList())) {
+                    throw new ServiceException("奖罚明细列表为空");
+                }
+            });
+        }
     }
 
     /**