人事绩效

airport-personnel/src/main/java/com/sundot/airport/personnel/domain/PersonnelMonthlyAssessmentIndicatorDetail.java

@@ -87,10 +87,6 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
     @Excel(name = "奖罚类型")
     private String rewardPunishmentType;
 
-    /** 检查部门类型 */
-    @Excel(name = "检查部门类型")
-    private String qcDeptType;
-
     /** 发生次数 */
     @Excel(name = "发生次数")
     private Integer occurCount;
@@ -235,14 +231,6 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
         return rewardPunishmentType;
     }
 
-    public void setQcDeptType(String qcDeptType) {
-        this.qcDeptType = qcDeptType;
-    }
-
-    public String getQcDeptType() {
-        return qcDeptType;
-    }
-
     public void setOccurCount(Integer occurCount) {
         this.occurCount = occurCount;
     }
@@ -299,7 +287,6 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
                 .append("unit", getUnit())
                 .append("leaveType", getLeaveType())
                 .append("rewardPunishmentType", getRewardPunishmentType())
-                .append("qcDeptType", getQcDeptType())
                 .append("occurCount", getOccurCount())
                 .append("scoreResult", getScoreResult())
                 .append("amountResult", getAmountResult())

airport-personnel/src/main/java/com/sundot/airport/personnel/domain/PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail.java

@@ -38,6 +38,14 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
     @Excel(name = "来源ID")
     private Long sourceId;
 
+    /** 检查部门类型 */
+    @Excel(name = "检查部门类型")
+    private String qcDeptType;
+
+    /** 分值 */
+    @Excel(name = "分值")
+    private BigDecimal score;
+
     /** 奖罚类型 */
     @Excel(name = "奖罚类型")
     private String rewardPunishmentType;
@@ -90,6 +98,22 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
         return sourceId;
     }
 
+    public String getQcDeptType() {
+        return qcDeptType;
+    }
+
+    public void setQcDeptType(String qcDeptType) {
+        this.qcDeptType = qcDeptType;
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
     public void setRewardPunishmentType(String rewardPunishmentType) {
         this.rewardPunishmentType = rewardPunishmentType;
     }
@@ -127,6 +151,8 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
                 .append("id", getId())
                 .append("sourceType", getSourceType())
                 .append("sourceId", getSourceId())
+                .append("qcDeptType", getQcDeptType())
+                .append("score", getScore())
                 .append("rewardPunishmentType", getRewardPunishmentType())
                 .append("rewardPunishmentDetail", getRewardPunishmentDetail())
                 .append("amount", getAmount())

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

@@ -7,6 +7,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
@@ -297,19 +298,45 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         // 其他指标-安全-仅含SOC/站品控检查扣分
         List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
                 .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode()))
                 .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
                 .collect(Collectors.toList());
-        BigDecimal otherIndexSafetyScoreWithSocStationQcDeduction = otherIndexWithSocStationQcAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        otherIndexWithSocStationQcAccordList = otherIndexWithSocStationQcAccordList.stream()
+                .peek(personnelMonthlyAssessmentIndicatorDetail -> {
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream()
+                            .filter(item -> StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getQcDeptType()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getQcDeptType()))
+                            .collect(Collectors.toList());
+                    personnelMonthlyAssessmentIndicatorDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                })
+                .filter(item -> CollUtil.isNotEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()))
+                .collect(Collectors.toList());
+        BigDecimal otherIndexSafetyScoreWithSocStationQcDeduction = CollUtil.isEmpty(otherIndexWithSocStationQcAccordList) ? BigDecimal.ZERO :
+                otherIndexWithSocStationQcAccordList.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);
         // 其他指标-安全-不仅含SOC/站品控检查扣分
         List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithoutSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
                 .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode())))
                 .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
                 .collect(Collectors.toList());
-        BigDecimal otherIndexSafetyScoreWithoutSocStationQcDeduction = otherIndexWithoutSocStationQcAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        otherIndexWithoutSocStationQcAccordList = otherIndexWithoutSocStationQcAccordList.stream()
+                .peek(personnelMonthlyAssessmentIndicatorDetail -> {
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream()
+                            .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getQcDeptType()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getQcDeptType())))
+                            .collect(Collectors.toList());
+                    personnelMonthlyAssessmentIndicatorDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                })
+                .filter(item -> CollUtil.isNotEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()))
+                .collect(Collectors.toList());
+        BigDecimal otherIndexSafetyScoreWithoutSocStationQcDeduction = CollUtil.isEmpty(otherIndexWithoutSocStationQcAccordList) ? BigDecimal.ZERO :
+                otherIndexWithoutSocStationQcAccordList.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);
         // 其他指标-非安全
@@ -331,10 +358,23 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         socStationQcInvolvedCoreSafetyCodeList.addAll(otherIndexSafetyCategoryCodeList);
         List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
                 .filter(item -> socStationQcInvolvedCoreSafetyCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode())))
                 .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
                 .collect(Collectors.toList());
-        BigDecimal socStationQcInvolvedCoreSafetyDeduction = socStationQcInvolvedCoreSafetyAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        socStationQcInvolvedCoreSafetyAccordList = socStationQcInvolvedCoreSafetyAccordList.stream()
+                .peek(personnelMonthlyAssessmentIndicatorDetail -> {
+                    List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> filteredItemList = personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().stream()
+                            .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getQcDeptType()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getQcDeptType())))
+                            .collect(Collectors.toList());
+                    personnelMonthlyAssessmentIndicatorDetail.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(filteredItemList);
+                })
+                .filter(item -> CollUtil.isNotEmpty(item.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList()))
+                .collect(Collectors.toList());
+        BigDecimal socStationQcInvolvedCoreSafetyDeduction = CollUtil.isEmpty(socStationQcInvolvedCoreSafetyAccordList) ? BigDecimal.ZERO :
+                socStationQcInvolvedCoreSafetyAccordList.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);
         // 分管员工数量+扣分平均值

airport-personnel/src/main/resources/mapper/personnel/PersonnelMonthlyAssessmentIndicatorDetailMapper.xml

@@ -26,7 +26,6 @@
         <result property="unit" column="unit"/>
         <result property="leaveType" column="leave_type"/>
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
-        <result property="qcDeptType" column="qc_dept_type"/>
         <result property="occurCount" column="occur_count"/>
         <result property="scoreResult" column="score_result"/>
         <result property="amountResult" column="amount_result"/>
@@ -54,7 +53,6 @@
                unit,
                leave_type,
                reward_punishment_type,
-               qc_dept_type,
                occur_count,
                score_result,
                amount_result
@@ -90,7 +88,6 @@
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
                 #{rewardPunishmentType}
             </if>
-            <if test="qcDeptType != null  and qcDeptType != ''">and qc_dept_type = #{qcDeptType}</if>
             <if test="occurCount != null ">and occur_count = #{occurCount}</if>
             <if test="scoreResult != null ">and score_result = #{scoreResult}</if>
             <if test="amountResult != null ">and amount_result = #{amountResult}</if>
@@ -128,7 +125,6 @@
             <if test="unit != null">unit,</if>
             <if test="leaveType != null">leave_type,</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
-            <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type,</if>
             <if test="occurCount != null">occur_count,</if>
             <if test="scoreResult != null">score_result,</if>
             <if test="amountResult != null">amount_result,</if>
@@ -154,7 +150,6 @@
             <if test="unit != null">#{unit},</if>
             <if test="leaveType != null">#{leaveType},</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
-            <if test="qcDeptType != null and qcDeptType != ''">#{qcDeptType},</if>
             <if test="occurCount != null">#{occurCount},</if>
             <if test="scoreResult != null">#{scoreResult},</if>
             <if test="amountResult != null">#{amountResult},</if>
@@ -187,7 +182,6 @@
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type =
                 #{rewardPunishmentType},
             </if>
-            <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type = #{qcDeptType},</if>
             <if test="occurCount != null">occur_count = #{occurCount},</if>
             <if test="scoreResult != null">score_result = #{scoreResult},</if>
             <if test="amountResult != null">amount_result = #{amountResult},</if>

airport-personnel/src/main/resources/mapper/personnel/PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailMapper.xml

@@ -16,6 +16,8 @@
         <result property="id" column="id"/>
         <result property="sourceType" column="source_type"/>
         <result property="sourceId" column="source_id"/>
+        <result property="qcDeptType" column="qc_dept_type"/>
+        <result property="score" column="score"/>
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
         <result property="rewardPunishmentDetail" column="reward_punishment_detail"/>
         <result property="amount" column="amount"/>
@@ -32,6 +34,8 @@
                id,
                source_type,
                source_id,
+               qc_dept_type,
+               score,
                reward_punishment_type,
                reward_punishment_detail,
                amount
@@ -47,6 +51,10 @@
             <if test="revision != null ">and revision = #{revision}</if>
             <if test="sourceType != null  and sourceType != ''">and source_type = #{sourceType}</if>
             <if test="sourceId != null ">and source_id = #{sourceId}</if>
+            <if test="qcDeptType != null  and qcDeptType != ''">and qc_dept_type =
+                #{qcDeptType}
+            </if>
+            <if test="score != null ">and score = #{score}</if>
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
                 #{rewardPunishmentType}
             </if>
@@ -78,6 +86,8 @@
             <if test="remark != null">remark,</if>
             <if test="sourceType != null and sourceType != ''">source_type,</if>
             <if test="sourceId != null">source_id,</if>
+            <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type,</if>
+            <if test="score != null">score,</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">reward_punishment_detail,</if>
             <if test="amount != null">amount,</if>
@@ -92,6 +102,8 @@
             <if test="remark != null">#{remark},</if>
             <if test="sourceType != null and sourceType != ''">#{sourceType},</if>
             <if test="sourceId != null">#{sourceId},</if>
+            <if test="qcDeptType != null and qcDeptType != ''">#{qcDeptType},</if>
+            <if test="score != null">#{score},</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">#{rewardPunishmentDetail},</if>
             <if test="amount != null">#{amount},</if>
@@ -111,6 +123,10 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="sourceType != null and sourceType != ''">source_type = #{sourceType},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
+            <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type =
+                #{qcDeptType},
+            </if>
+            <if test="score != null">score = #{score},</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type =
                 #{rewardPunishmentType},
             </if>