人事绩效

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

@@ -44,6 +44,14 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @Excel(name = "用户名称")
     private String userName;
 
+    /** 大队ID */
+    @Excel(name = "大队ID")
+    private Long brigadeId;
+
+    /** 大队名称 */
+    @Excel(name = "大队名称")
+    private String brigadeName;
+
     /** 角色ID */
     @Excel(name = "角色ID")
     private Long roleId;
@@ -264,6 +272,22 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
         return userName;
     }
 
+    public Long getBrigadeId() {
+        return brigadeId;
+    }
+
+    public void setBrigadeId(Long brigadeId) {
+        this.brigadeId = brigadeId;
+    }
+
+    public String getBrigadeName() {
+        return brigadeName;
+    }
+
+    public void setBrigadeName(String brigadeName) {
+        this.brigadeName = brigadeName;
+    }
+
     public Long getRoleId() {
         return roleId;
     }
@@ -622,6 +646,8 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
                 .append("assessmentMonth", getAssessmentMonth())
                 .append("userId", getUserId())
                 .append("userName", getUserName())
+                .append("brigadeId", getBrigadeId())
+                .append("brigadeName", getBrigadeName())
                 .append("roleId", getRoleId())
                 .append("roleKey", getRoleKey())
                 .append("roleName", getRoleName())

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -14,6 +15,7 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.dto.SysPersonnelUserConditionDto;
 import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
@@ -24,6 +26,7 @@ import com.sundot.airport.common.enums.BasePerformanceIndicatorExemptionRuleEnum
 import com.sundot.airport.common.enums.BasePerformanceIndicatorLeaveTypeEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorQcDeptTypeEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorRewardPunishmentTypeTypeEnum;
+import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.event.PersonnelEvent;
 import com.sundot.airport.common.exception.ServiceException;
@@ -36,6 +39,7 @@ import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicator
 import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailService;
 import com.sundot.airport.system.domain.BasePerformanceIndicatorCategory;
 import com.sundot.airport.system.service.IBasePerformanceIndicatorCategoryService;
+import com.sundot.airport.system.service.ISysDeptService;
 import com.sundot.airport.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -69,6 +73,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
     private ApplicationEventPublisher eventPublisher;
 
     /**
@@ -267,6 +273,20 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      */
     @Override
     public void doImprove(PersonnelNonCadreMonthlyAssessment result) {
+        // 大队
+        Map<Long, Long> userBrigadeIdMap = new HashMap<>();
+        SysDept brigadeQuery = new SysDept();
+        brigadeQuery.setDeptType(DeptTypeEnum.BRIGADE.getCode());
+        List<SysDept> brigadeList = sysDeptService.selectDeptInfoAll(brigadeQuery);
+        Map<Long, String> brigadeMap = brigadeList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+        brigadeList.forEach(brigade -> {
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(brigade.getDeptId());
+            sysUserList.forEach(sysUser -> {
+                userBrigadeIdMap.put(sysUser.getUserId(), brigade.getDeptId());
+            });
+        });
+        result.setBrigadeId(userBrigadeIdMap.get(result.getUserId()));
+        result.setBrigadeName(brigadeMap.get(result.getBrigadeId()));
         List<BasePerformanceIndicatorCategory> indicatorCategoryyList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(new BasePerformanceIndicatorCategory());
         // 红线指标
         BasePerformanceIndicatorCategory redLineIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("红线指标", item.getName())).findFirst().orElse(null);

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

@@ -16,6 +16,8 @@
         <result property="assessmentMonth" column="assessment_month"/>
         <result property="userId" column="user_id"/>
         <result property="userName" column="user_name"/>
+        <result property="brigadeId" column="brigade_id"/>
+        <result property="brigadeName" column="brigade_name"/>
         <result property="roleId" column="role_id"/>
         <result property="roleKey" column="role_key"/>
         <result property="roleName" column="role_name"/>
@@ -64,6 +66,8 @@
                assessment_month,
                user_id,
                user_name,
+               brigade_id,
+               brigade_name,
                role_id,
                role_key,
                role_name,
@@ -107,6 +111,10 @@
             <if test="assessmentMonth != null  and assessmentMonth != ''">and assessment_month = #{assessmentMonth}</if>
             <if test="userId != null ">and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
+            <if test="brigadeId != null ">and brigade_id = #{brigadeId}</if>
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%', #{brigadeName},
+                '%')
+            </if>
             <if test="roleId != null ">and role_id = #{roleId}</if>
             <if test="roleKey != null  and roleKey != ''">and role_key = #{roleKey}</if>
             <if test="roleName != null  and roleName != ''">and role_name like concat('%', #{roleName}, '%')</if>
@@ -198,6 +206,8 @@
             <if test="assessmentMonth != null and assessmentMonth != ''">assessment_month,</if>
             <if test="userId != null">user_id,</if>
             <if test="userName != null and userName != ''">user_name,</if>
+            <if test="brigadeId != null">brigade_id,</if>
+            <if test="brigadeName != null and brigadeName != ''">brigade_name,</if>
             <if test="roleId != null">role_id,</if>
             <if test="roleKey != null and roleKey != ''">role_key,</if>
             <if test="roleName != null and roleName != ''">role_name,</if>
@@ -246,6 +256,8 @@
             <if test="assessmentMonth != null and assessmentMonth != ''">#{assessmentMonth},</if>
             <if test="userId != null">#{userId},</if>
             <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="brigadeId != null">#{brigadeId},</if>
+            <if test="brigadeName != null and brigadeName != ''">#{brigadeName},</if>
             <if test="roleId != null">#{roleId},</if>
             <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
             <if test="roleName != null and roleName != ''">#{roleName},</if>
@@ -297,6 +309,8 @@
             <if test="assessmentMonth != null and assessmentMonth != ''">assessment_month = #{assessmentMonth},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="brigadeId != null">brigade_id = #{brigadeId},</if>
+            <if test="brigadeName != null and brigadeName != ''">brigade_name = #{brigadeName},</if>
             <if test="roleId != null">role_id = #{roleId},</if>
             <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
             <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>