人事绩效

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

@@ -1,6 +1,7 @@
 package com.sundot.airport.personnel.domain;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -78,6 +79,9 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
     @Excel(name = "奖罚金额（元）")
     private BigDecimal amountResult;
 
+    /** 奖罚明细列表 */
+    private List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -198,6 +202,14 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
         return amountResult;
     }
 
+    public List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList() {
+        return personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList;
+    }
+
+    public void setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList) {
+        this.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -221,6 +233,7 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
                 .append("occurCount", getOccurCount())
                 .append("scoreResult", getScoreResult())
                 .append("amountResult", getAmountResult())
+                .append("personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList", getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList())
                 .toString();
     }
 }

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

@@ -1,8 +1,10 @@
 package com.sundot.airport.personnel.domain;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -154,6 +156,10 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @Excel(name = "豁免原因备注")
     private String exemptionReasonRemark;
 
+    /** 指标明细列表 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailList;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -426,6 +432,14 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
         return exemptionReasonRemark;
     }
 
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getPersonnelMonthlyAssessmentIndicatorDetailList() {
+        return personnelMonthlyAssessmentIndicatorDetailList;
+    }
+
+    public void setPersonnelMonthlyAssessmentIndicatorDetailList(List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailList) {
+        this.personnelMonthlyAssessmentIndicatorDetailList = personnelMonthlyAssessmentIndicatorDetailList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -468,6 +482,7 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
                 .append("applicationMethodRemark", getApplicationMethodRemark())
                 .append("exemption", getExemption())
                 .append("exemptionReasonRemark", getExemptionReasonRemark())
+                .append("personnelMonthlyAssessmentIndicatorDetailList", getPersonnelMonthlyAssessmentIndicatorDetailList())
                 .toString();
     }
 }

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

@@ -1,14 +1,24 @@
 package com.sundot.airport.personnel.service.impl;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorDetail;
+import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail;
+import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorDetailService;
+import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.personnel.mapper.PersonnelNonCadreMonthlyAssessmentMapper;
 import com.sundot.airport.personnel.domain.PersonnelNonCadreMonthlyAssessment;
 import com.sundot.airport.personnel.service.IPersonnelNonCadreMonthlyAssessmentService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 非干部月度考核Service业务层处理
@@ -20,6 +30,10 @@ import com.sundot.airport.personnel.service.IPersonnelNonCadreMonthlyAssessmentS
 public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<PersonnelNonCadreMonthlyAssessmentMapper, PersonnelNonCadreMonthlyAssessment> implements IPersonnelNonCadreMonthlyAssessmentService {
     @Autowired
     private PersonnelNonCadreMonthlyAssessmentMapper personnelNonCadreMonthlyAssessmentMapper;
+    @Autowired
+    private IPersonnelMonthlyAssessmentIndicatorDetailService personnelMonthlyAssessmentIndicatorDetailService;
+    @Autowired
+    private IPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailService personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService;
 
     /**
      * 查询非干部月度考核
@@ -29,7 +43,30 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      */
     @Override
     public PersonnelNonCadreMonthlyAssessment selectPersonnelNonCadreMonthlyAssessmentById(Long id) {
-        return personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentById(id);
+        PersonnelNonCadreMonthlyAssessment result = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentById(id);
+        if (ObjUtil.isNull(result)) {
+            return result;
+        }
+        // 指标明细列表
+        LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorDetail> detailQueryWrapper = new LambdaQueryWrapper<>();
+        detailQueryWrapper.eq(PersonnelMonthlyAssessmentIndicatorDetail::getSourceId, result.getId());
+        List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailList = personnelMonthlyAssessmentIndicatorDetailService.getBaseMapper().selectList(detailQueryWrapper);
+        if (CollUtil.isEmpty(personnelMonthlyAssessmentIndicatorDetailList)) {
+            return result;
+        }
+        result.setPersonnelMonthlyAssessmentIndicatorDetailList(personnelMonthlyAssessmentIndicatorDetailList);
+        // 奖罚明细列表
+        LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> rewardPunishmentDetailQueryWrapper = new LambdaQueryWrapper<>();
+        rewardPunishmentDetailQueryWrapper.in(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId, personnelMonthlyAssessmentIndicatorDetailList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getId).toArray());
+        List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.getBaseMapper().selectList(rewardPunishmentDetailQueryWrapper);
+        if (CollUtil.isEmpty(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList)) {
+            return result;
+        }
+        Map<Long, List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail>> rewardPunishmentDetailMap = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList.stream().collect(Collectors.groupingBy(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId));
+        personnelMonthlyAssessmentIndicatorDetailList.forEach(item -> {
+            item.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(rewardPunishmentDetailMap.get(item.getId()));
+        });
+        return result;
     }
 
     /**
@@ -49,10 +86,28 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      * @param personnelNonCadreMonthlyAssessment 非干部月度考核
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int insertPersonnelNonCadreMonthlyAssessment(PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessment) {
         personnelNonCadreMonthlyAssessment.setCreateTime(DateUtils.getNowDate());
-        return personnelNonCadreMonthlyAssessmentMapper.insertPersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
+        int result = personnelNonCadreMonthlyAssessmentMapper.insertPersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
+        if (CollUtil.isNotEmpty(personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList())) {
+            personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList().forEach(personnelMonthlyAssessmentIndicatorDetail -> {
+                personnelMonthlyAssessmentIndicatorDetail.setSourceId(personnelNonCadreMonthlyAssessment.getId());
+                personnelMonthlyAssessmentIndicatorDetail.setCreateBy(personnelNonCadreMonthlyAssessment.getCreateBy());
+                personnelMonthlyAssessmentIndicatorDetail.setCreateTime(DateUtils.getNowDate());
+                personnelMonthlyAssessmentIndicatorDetailService.insertPersonnelMonthlyAssessmentIndicatorDetail(personnelMonthlyAssessmentIndicatorDetail);
+                if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList())) {
+                    personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().forEach(personnelMonthlyAssessmentIndicatorRewardPunishmentDetail -> {
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setSourceId(personnelMonthlyAssessmentIndicatorDetail.getId());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setCreateBy(personnelMonthlyAssessmentIndicatorDetail.getCreateBy());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setCreateTime(DateUtils.getNowDate());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.insertPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail(personnelMonthlyAssessmentIndicatorRewardPunishmentDetail);
+                    });
+                }
+            });
+        }
+        return result;
     }
 
     /**
@@ -61,10 +116,46 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      * @param personnelNonCadreMonthlyAssessment 非干部月度考核
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int updatePersonnelNonCadreMonthlyAssessment(PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessment) {
         personnelNonCadreMonthlyAssessment.setUpdateTime(DateUtils.getNowDate());
-        return personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
+        int result = personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
+        // 删除旧数据
+        LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorDetail> detailQueryWrapper = new LambdaQueryWrapper<>();
+        detailQueryWrapper.eq(PersonnelMonthlyAssessmentIndicatorDetail::getSourceId, personnelNonCadreMonthlyAssessment.getId());
+        List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailListOld = personnelMonthlyAssessmentIndicatorDetailService.getBaseMapper().selectList(detailQueryWrapper);
+        if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorDetailListOld)) {
+            personnelMonthlyAssessmentIndicatorDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorDetailListOld);
+            LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> rewardPunishmentDetailQueryWrapper = new LambdaQueryWrapper<>();
+            rewardPunishmentDetailQueryWrapper.in(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId, personnelMonthlyAssessmentIndicatorDetailListOld.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getId).toArray());
+            List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.getBaseMapper().selectList(rewardPunishmentDetailQueryWrapper);
+            if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld)) {
+                personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld);
+            }
+        }
+        // 新增新数据
+        if (CollUtil.isNotEmpty(personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList())) {
+            personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList().forEach(personnelMonthlyAssessmentIndicatorDetail -> {
+                personnelMonthlyAssessmentIndicatorDetail.setSourceId(personnelNonCadreMonthlyAssessment.getId());
+                personnelMonthlyAssessmentIndicatorDetail.setCreateBy(personnelNonCadreMonthlyAssessment.getCreateBy());
+                personnelMonthlyAssessmentIndicatorDetail.setCreateTime(DateUtils.getNowDate());
+                personnelMonthlyAssessmentIndicatorDetail.setUpdateBy(personnelNonCadreMonthlyAssessment.getCreateBy());
+                personnelMonthlyAssessmentIndicatorDetail.setUpdateTime(DateUtils.getNowDate());
+                personnelMonthlyAssessmentIndicatorDetailService.insertPersonnelMonthlyAssessmentIndicatorDetail(personnelMonthlyAssessmentIndicatorDetail);
+                if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList())) {
+                    personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().forEach(personnelMonthlyAssessmentIndicatorRewardPunishmentDetail -> {
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setSourceId(personnelMonthlyAssessmentIndicatorDetail.getId());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setCreateBy(personnelMonthlyAssessmentIndicatorDetail.getCreateBy());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setCreateTime(DateUtils.getNowDate());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setUpdateBy(personnelMonthlyAssessmentIndicatorDetail.getCreateBy());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setUpdateTime(DateUtils.getNowDate());
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.insertPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail(personnelMonthlyAssessmentIndicatorRewardPunishmentDetail);
+                    });
+                }
+            });
+        }
+        return result;
     }
 
     /**
@@ -73,9 +164,25 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      * @param ids 需要删除的非干部月度考核主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deletePersonnelNonCadreMonthlyAssessmentByIds(Long[] ids) {
-        return personnelNonCadreMonthlyAssessmentMapper.deletePersonnelNonCadreMonthlyAssessmentByIds(ids);
+        int result = personnelNonCadreMonthlyAssessmentMapper.deletePersonnelNonCadreMonthlyAssessmentByIds(ids);
+        for (Long id : ids) {
+            LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorDetail> detailQueryWrapper = new LambdaQueryWrapper<>();
+            detailQueryWrapper.eq(PersonnelMonthlyAssessmentIndicatorDetail::getSourceId, id);
+            List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailListOld = personnelMonthlyAssessmentIndicatorDetailService.getBaseMapper().selectList(detailQueryWrapper);
+            if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorDetailListOld)) {
+                personnelMonthlyAssessmentIndicatorDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorDetailListOld);
+                LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> rewardPunishmentDetailQueryWrapper = new LambdaQueryWrapper<>();
+                rewardPunishmentDetailQueryWrapper.in(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId, personnelMonthlyAssessmentIndicatorDetailListOld.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getId).toArray());
+                List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.getBaseMapper().selectList(rewardPunishmentDetailQueryWrapper);
+                if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld)) {
+                    personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld);
+                }
+            }
+        }
+        return result;
     }
 
     /**
@@ -84,8 +191,22 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      * @param id 非干部月度考核主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deletePersonnelNonCadreMonthlyAssessmentById(Long id) {
-        return personnelNonCadreMonthlyAssessmentMapper.deletePersonnelNonCadreMonthlyAssessmentById(id);
+        int result = personnelNonCadreMonthlyAssessmentMapper.deletePersonnelNonCadreMonthlyAssessmentById(id);
+        LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorDetail> detailQueryWrapper = new LambdaQueryWrapper<>();
+        detailQueryWrapper.eq(PersonnelMonthlyAssessmentIndicatorDetail::getSourceId, id);
+        List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailListOld = personnelMonthlyAssessmentIndicatorDetailService.getBaseMapper().selectList(detailQueryWrapper);
+        if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorDetailListOld)) {
+            personnelMonthlyAssessmentIndicatorDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorDetailListOld);
+            LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> rewardPunishmentDetailQueryWrapper = new LambdaQueryWrapper<>();
+            rewardPunishmentDetailQueryWrapper.in(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId, personnelMonthlyAssessmentIndicatorDetailListOld.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getId).toArray());
+            List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.getBaseMapper().selectList(rewardPunishmentDetailQueryWrapper);
+            if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld)) {
+                personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld);
+            }
+        }
+        return result;
     }
 }