Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-common/src/main/java/com/sundot/airport/common/enums/BasePerformanceIndicatorLeaveTypeEnum.java

@@ -11,7 +11,8 @@ import lombok.Getter;
 public enum BasePerformanceIndicatorLeaveTypeEnum {
 
     PERSONAL_LEAVE("PERSONAL_LEAVE", "事假"),
-    SICK_LEAVE("SICK_LEAVE", "病假");
+    SICK_LEAVE("SICK_LEAVE", "病假"),
+    PERSONAL_SICK_LEAVE("PERSONAL_SICK_LEAVE", "事/病假");
 
     private final String code;
     private final String desc;

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

@@ -59,6 +59,13 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
     @Excel(name = "单位")
     private String unit;
 
+    /** 事/病假 */
+    @Excel(name = "事/病假",
+            readConverterExp = "PERSONAL_LEAVE=事假," +
+                    "SICK_LEAVE=病假,",
+            combo = "事假,病假")
+    private String leaveType;
+
     /** 奖罚类型 */
     @Excel(name = "奖罚类型")
     private String rewardPunishmentType;
@@ -162,6 +169,14 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
         return unit;
     }
 
+    public String getLeaveType() {
+        return leaveType;
+    }
+
+    public void setLeaveType(String leaveType) {
+        this.leaveType = leaveType;
+    }
+
     public void setRewardPunishmentType(String rewardPunishmentType) {
         this.rewardPunishmentType = rewardPunishmentType;
     }
@@ -228,6 +243,7 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
                 .append("indicatorName", getIndicatorName())
                 .append("score", getScore())
                 .append("unit", getUnit())
+                .append("leaveType", getLeaveType())
                 .append("rewardPunishmentType", getRewardPunishmentType())
                 .append("qcDeptType", getQcDeptType())
                 .append("occurCount", getOccurCount())

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

@@ -160,8 +160,8 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @Excel(name = "应用方式备注")
     private String applicationMethodRemark;
 
-    /** 是否豁免（N=否;Y=是） */
-    @Excel(name = "是否豁免（N=否;Y=是）")
+    /** 是否豁免 */
+    @Excel(name = "是否豁免")
     private String exemption;
 
     /** 豁免原因备注 */
@@ -200,6 +200,22 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @TableField(exist = false)
     private List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordList;
 
+    /** 奖励明细 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> rewardAccordList;
+
+    /** 惩罚明细 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList;
+
+    /** 查询开始考核月份（格式:YYYYMM） */
+    @TableField(exist = false)
+    private String assessmentMonthStart;
+
+    /** 查询结束考核月份（格式:YYYYMM） */
+    @TableField(exist = false)
+    private String assessmentMonthEnd;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -560,6 +576,38 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
         this.socStationQcInvolvedCoreSafetyAccordList = socStationQcInvolvedCoreSafetyAccordList;
     }
 
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getRewardAccordList() {
+        return rewardAccordList;
+    }
+
+    public void setRewardAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> rewardAccordList) {
+        this.rewardAccordList = rewardAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getPunishmentAccordList() {
+        return punishmentAccordList;
+    }
+
+    public void setPunishmentAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList) {
+        this.punishmentAccordList = punishmentAccordList;
+    }
+
+    public String getAssessmentMonthStart() {
+        return assessmentMonthStart;
+    }
+
+    public void setAssessmentMonthStart(String assessmentMonthStart) {
+        this.assessmentMonthStart = assessmentMonthStart;
+    }
+
+    public String getAssessmentMonthEnd() {
+        return assessmentMonthEnd;
+    }
+
+    public void setAssessmentMonthEnd(String assessmentMonthEnd) {
+        this.assessmentMonthEnd = assessmentMonthEnd;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -613,6 +661,8 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
                 .append("otherIndexSafetyScoreWithoutSocStationQcAccordList", getOtherIndexSafetyScoreWithoutSocStationQcAccordList())
                 .append("otherIndexNonSafetyAccordList", getOtherIndexNonSafetyAccordList())
                 .append("socStationQcInvolvedCoreSafetyAccordList", getSocStationQcInvolvedCoreSafetyAccordList())
+                .append("rewardAccordList", getRewardAccordList())
+                .append("punishmentAccordList", getPunishmentAccordList())
                 .toString();
     }
 }

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

@@ -1,10 +1,10 @@
 package com.sundot.airport.personnel.service.impl;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
@@ -14,6 +14,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorQcDeptTypeEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorRewardPunishmentTypeTypeEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorDetail;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail;
@@ -36,6 +38,11 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<PersonnelNonCadreMonthlyAssessmentMapper, PersonnelNonCadreMonthlyAssessment> implements IPersonnelNonCadreMonthlyAssessmentService {
+    // 基础分
+    private static final BigDecimal BASE_SCORE = new BigDecimal(80);
+    // 红线分
+    private static final BigDecimal RED_LINE_SCORE = new BigDecimal(69);
+
     @Autowired
     private PersonnelNonCadreMonthlyAssessmentMapper personnelNonCadreMonthlyAssessmentMapper;
     @Autowired
@@ -148,6 +155,49 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         BigDecimal socStationQcInvolvedCoreSafetyDeduction = socStationQcInvolvedCoreSafetyAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         result.setSocStationQcInvolvedCoreSafetyDeduction(socStationQcInvolvedCoreSafetyDeduction);
         result.setSocStationQcInvolvedCoreSafetyAccordList(socStationQcInvolvedCoreSafetyAccordList);
+        // 分管员工数量+扣分平均值
+        if (StrUtil.equals(RoleTypeEnum.kezhang.getCode(), result.getRoleKey())) {
+            PersonnelNonCadreMonthlyAssessment queryKeZhang = new PersonnelNonCadreMonthlyAssessment();
+            queryKeZhang.setAssessmentMonth(result.getAssessmentMonth());
+            queryKeZhang.setDeputySupervisorId(result.getUserId());
+            List<PersonnelNonCadreMonthlyAssessment> personnelNonCadreMonthlyAssessmentKeZhangList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(queryKeZhang);
+            result.setInChargeEmployeeCount(personnelNonCadreMonthlyAssessmentKeZhangList.size());
+            result.setDeductionAverage(CollUtil.isEmpty(personnelNonCadreMonthlyAssessmentKeZhangList) ? BigDecimal.ZERO : result.getSocStationQcInvolvedCoreSafetyDeduction().divide(BigDecimal.valueOf(personnelNonCadreMonthlyAssessmentKeZhangList.size()), 2, RoundingMode.HALF_UP));
+        }
+        // 总分
+        BigDecimal totalScore = BASE_SCORE.add(result.getCoreIndexScore()).add(result.getOtherIndexScore());
+        if (result.getRedLineIndexTriggerCount() > 0) {
+            totalScore = RED_LINE_SCORE;
+        }
+        result.setTotalScore(totalScore);
+        // 奖励明细+惩罚明细
+        List<String> coreAndOtherCategoryCodeList = new ArrayList<>();
+        coreAndOtherCategoryCodeList.addAll(coreIndexCategoryCodeList);
+        coreAndOtherCategoryCodeList.addAll(otherIndexCategoryCodeList);
+        List<PersonnelMonthlyAssessmentIndicatorDetail> rewardAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> coreAndOtherCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        result.setRewardAccordList(rewardAccordList);
+        List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> coreAndOtherCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        punishmentAccordList.addAll(result.getRedLineIndexAccordList());
+        result.setPunishmentAccordList(punishmentAccordList);
+        // 奖励金额+惩罚金额
+        BigDecimal rewardAmount = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode(), item.getRewardPunishmentType()))
+                .map(PersonnelMonthlyAssessmentIndicatorDetail::getAmountResult)
+                .filter(ObjUtil::isNotNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setRewardAmount(rewardAmount);
+        BigDecimal punishmentAmount = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .map(PersonnelMonthlyAssessmentIndicatorDetail::getAmountResult)
+                .filter(ObjUtil::isNotNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setPunishmentAmount(punishmentAmount);
         return result;
     }
 
@@ -171,6 +221,13 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int insertPersonnelNonCadreMonthlyAssessment(PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessment) {
+        PersonnelNonCadreMonthlyAssessment temp = new PersonnelNonCadreMonthlyAssessment();
+        temp.setAssessmentMonth(personnelNonCadreMonthlyAssessment.getAssessmentMonth());
+        temp.setUserId(personnelNonCadreMonthlyAssessment.getUserId());
+        List<PersonnelNonCadreMonthlyAssessment> tempList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(temp);
+        if (CollUtil.isNotEmpty(tempList)) {
+            throw new ServiceException("该用户已存在该考核月份的考核记录");
+        }
         personnelNonCadreMonthlyAssessment.setCreateTime(DateUtils.getNowDate());
         int result = personnelNonCadreMonthlyAssessmentMapper.insertPersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
         if (CollUtil.isNotEmpty(personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList())) {

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

@@ -20,6 +20,7 @@
         <result property="indicatorName" column="indicator_name"/>
         <result property="score" column="score"/>
         <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"/>
@@ -43,6 +44,7 @@
                indicator_name,
                score,
                unit,
+               leave_type,
                reward_punishment_type,
                qc_dept_type,
                occur_count,
@@ -67,6 +69,7 @@
             </if>
             <if test="score != null ">and score = #{score}</if>
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
+            <if test="leaveType != null  and leaveType != ''">and leave_type = #{leaveType}</if>
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
                 #{rewardPunishmentType}
             </if>
@@ -75,6 +78,7 @@
             <if test="scoreResult != null ">and score_result = #{scoreResult}</if>
             <if test="amountResult != null ">and amount_result = #{amountResult}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPersonnelMonthlyAssessmentIndicatorDetailById" parameterType="Long"
@@ -101,6 +105,7 @@
             <if test="indicatorName != null and indicatorName != ''">indicator_name,</if>
             <if test="score != null">score,</if>
             <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>
@@ -122,6 +127,7 @@
             <if test="indicatorName != null and indicatorName != ''">#{indicatorName},</if>
             <if test="score != null">#{score},</if>
             <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>
@@ -148,6 +154,7 @@
             <if test="indicatorName != null and indicatorName != ''">indicator_name = #{indicatorName},</if>
             <if test="score != null">score = #{score},</if>
             <if test="unit != null">unit = #{unit},</if>
+            <if test="leaveType != null">leave_type = #{leaveType},</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type =
                 #{rewardPunishmentType},
             </if>

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

@@ -55,6 +55,7 @@
             </if>
             <if test="amount != null ">and amount = #{amount}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailById" parameterType="Long"

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

@@ -168,7 +168,12 @@
             <if test="exemptionReasonRemark != null  and exemptionReasonRemark != ''">and exemption_reason_remark =
                 #{exemptionReasonRemark}
             </if>
+            <if test="assessmentMonthStart != null and assessmentMonthEnd != null">
+                and (assessment_month >= #{assessmentMonthStart}
+                and assessment_month <![CDATA[ <= ]]> #{assessmentMonthEnd})
+            </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPersonnelNonCadreMonthlyAssessmentById" parameterType="Long"