feature(salaryGroup): 薪酬组添加名称

薪酬组添加名称

feature(salaryGroup): 薪酬组添加名称
薪酬组添加名称
姜超
1 parent 477ad267
Showing 8 changed files with 58 additions and 11 deletions
doc/ddl.sql
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/salary/SalaryGroup.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/SalaryGroupDTO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/KpiGroupRankVO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/salary/SalaryGroupVO.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiGroupBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiGroupRankBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryGroupBizService.java
@@ -641,4 +641,7 @@ ALTER TABLE `fw_morax`.`kpi_pool`
 ALTER TABLE `fw_morax`.`kpi_group`
     ADD COLUMN `name` varchar(255) NULL COMMENT '绩效组名称' AFTER `id`,
-ADD COLUMN `revoked_score_ratio` decimal(10, 4) NULL COMMENT '人员百分比，撤销D级得分率' AFTER `star_evaluation_type`;
 \ No newline at end of file
+ADD COLUMN `revoked_score_ratio` decimal(10, 4) NULL COMMENT '人员百分比，撤销D级得分率' AFTER `star_evaluation_type`;
+
+ALTER TABLE `fw_morax`.`salary_group`
+    ADD COLUMN `name` varchar(255) NULL COMMENT '薪酬组名称' AFTER `id`;
 \ No newline at end of file
@@ -22,6 +22,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class SalaryGroup extends BaseAuditableTimeEntity<SalaryGroup, Long> {
     /**
+     * 名称
+     */
+    private String name;
+    /**
      * 薪酬组编码
      */
     private String sgc;
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.YearMonthDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.YearMonthSerializer;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -28,6 +29,12 @@ import java.util.List;
 public class SalaryGroupDTO {
     private Long id;
     /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空")
+    @Length(max = 255, message = "名称超出最大限制")
+    private String name;
+    /**
      * 薪酬组编码
      */
     private String sgc;
@@ -5,6 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Set;
 /**
  * @author : kurisu
@@ -30,7 +31,7 @@ public class KpiGroupRankVO {
     /**
      * 岗位名称
      */
-    private List<String> postNames;
+    private Set<String> postNames;
     /**
      * 适用门店ids
      */
@@ -38,13 +39,18 @@ public class KpiGroupRankVO {
     /**
      * 适用门店名称
      */
-    private List<String> shopNames;
+    private Set<String> shopNames;
     /**
      * 绩效组编码
      */
     private List<String> kgcs;
     /**
+     * 绩效组名称
+     */
+    private List<String> kpiGroupNames;
+
+    /**
      * 星级评定方式;1:绩效得分率 2:人员百分比
      */
     private StarEvaluationEnum starEvaluationType;
@@ -20,6 +20,10 @@ public class SalaryGroupVO {
      */
     private Long id;
     /**
+     * 名称
+     */
+    private String name;
+    /**
      * 岗位id
      */
     private Long postId;
@@ -68,6 +72,7 @@ public class SalaryGroupVO {
     public static SalaryGroupVO convertSalaryGroup(SalaryGroup salaryGroup) {
         SalaryGroupVO salaryGroupVo = new SalaryGroupVO();
         salaryGroupVo.setId(salaryGroup.getId());
+        salaryGroupVo.setName(salaryGroup.getName());
         salaryGroupVo.setPostId(salaryGroup.getPostId());
         salaryGroupVo.setPostName(salaryGroup.getPostName());
         salaryGroupVo.setShopIds(salaryGroup.getShopIds());
@@ -164,7 +164,7 @@ public class KpiGroupBizService {
      * @param dto
      */
     public void checkKpi(KpiGroupDTO dto) {
-        checkNameRepetition(dto.getName(), dto.getId());
+        checkNameRepetition(dto.getId(), dto.getName());
         Long postId = dto.getPostId();
         List<Long> shopIds = dto.getShopIds();
         List<KpiGroup> effectKpis = kpiGroupService.getApprovingKpis(postId, shopIds, dto.getId(), dto.getBeginTime());
@@ -214,10 +214,10 @@ public class KpiGroupBizService {
     /**
      * 检查绩效组排名名称是否重复
      *
-     * @param name
      * @param id
+     * @param name
      */
-    public void checkNameRepetition(String name, Long id) {
+    public void checkNameRepetition(Long id, String name) {
         int count = kpiGroupService.count(Wrappers.<KpiGroup>lambdaQuery()
                 .eq(KpiGroup::getName, name)
                 .ne(PublicUtil.isNotEmpty(id), KpiGroup::getId, id)
@@ -82,10 +82,10 @@ public class KpiGroupRankBizService {
         Map<String, KpiGroup> kgcKpiGroupMap = kpiGroups.stream().collect(Collectors.toMap(KpiGroup::getKgc, Function.identity(), (v1, v2) -> v1));
         for (KpiGroupRankVO kpiGroupRankVO : kpiGroupRankVOS) {
             kpiGroupRankVO.setPostIds(new ArrayList<>());
-            kpiGroupRankVO.setPostNames(new ArrayList<>());
+            kpiGroupRankVO.setPostNames(new HashSet<>());
             kpiGroupRankVO.setShopIds(new ArrayList<>());
-            kpiGroupRankVO.setShopNames(new ArrayList<>());
-            kpiGroupRankVO.setKgcs(new ArrayList<>());
+            kpiGroupRankVO.setShopNames(new HashSet<>());
+            kpiGroupRankVO.setKpiGroupNames(new ArrayList<>());
             for (String kgc : kpiGroupRankVO.getKgcs()) {
                 if (kgcKpiGroupMap.containsKey(kgc)) {
                     KpiGroup kpiGroup = kgcKpiGroupMap.get(kgc);
@@ -93,7 +93,9 @@ public class KpiGroupRankBizService {
                     kpiGroupRankVO.getPostNames().add(kpiGroup.getPostName());
                     kpiGroupRankVO.getShopIds().addAll(kpiGroup.getShopIds());
                     kpiGroupRankVO.getShopNames().addAll(kpiGroup.getShopNames());
-                    kpiGroupRankVO.getKgcs().add(kpiGroup.getKgc());
+                    if (PublicUtil.isNotEmpty(kpiGroup.getName())) {
+                        kpiGroupRankVO.getKpiGroupNames().add(kpiGroup.getName());
+                    }
                 }
             }
         }
@@ -174,7 +176,7 @@ public class KpiGroupRankBizService {
         }
         kpiGroupRankVO.setStarLadders(starLaddersVOS);
         if (PublicUtil.isNotEmpty(kpiGroupRankVO.getRevokedScoreRatio())) {
-            kpiGroupRank.setRevokedScoreRatio(kpiGroupRankVO.getRevokedScoreRatio().multiply(Constant.ONE_HUNDRED));
+            kpiGroupRankVO.setRevokedScoreRatio(kpiGroupRankVO.getRevokedScoreRatio().multiply(Constant.ONE_HUNDRED));
         }
         return kpiGroupRankVO;
     }
@@ -245,6 +247,9 @@ public class KpiGroupRankBizService {
     public void checkKgcRepetition(Long id, List<String> kgcs) {
         List<KpiGroupRankVO> kpiGroupRankVOS = kpiGroupRankService.queryByKgcs(kgcs, id);
         List<String> allKgcs = kpiGroupRankVOS.stream().map(KpiGroupRankVO::getKgcs).collect(ArrayList::new, List::addAll, List::addAll);
+        if (PublicUtil.isEmpty(allKgcs)) {
+            return;
+        }
         allKgcs.retainAll(kgcs);
         List<KpiGroup> repetitionKpis = kpiGroupService.list(Wrappers.<KpiGroup>lambdaQuery()
                 .eq(KpiGroup::getStatus, SettingStatusEnum.BE_EFFECTIVE)
@@ -11,6 +11,7 @@ import cn.fw.morax.common.utils.EventBusUtil;
 import cn.fw.morax.common.utils.MessageFormatUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.domain.db.ApprovalRecord;
+import cn.fw.morax.domain.db.kpi.KpiGroup;
 import cn.fw.morax.domain.db.salary.SalaryGroup;
 import cn.fw.morax.domain.db.salary.SalaryGroupProject;
 import cn.fw.morax.domain.db.salary.SalaryGroupProjectSettin;
@@ -170,6 +171,7 @@ public class SalaryGroupBizService {
      * @param dto
      */
     public void checkSalaryGroup(SalaryGroupDTO dto) {
+        checkNameRepetition(dto.getId(), dto.getName());
         //原来的绩效组配置不能在审批中
         if (PublicUtil.isNotEmpty(dto.getId())) {
             SalaryGroup salaryGroup = salaryGroupService.getById(dto.getId());
@@ -191,6 +193,21 @@ public class SalaryGroupBizService {
     }
     /**
+     * 检查薪酬组名称是否重复
+     *
+     * @param id
+     * @param name
+     */
+    public void checkNameRepetition(Long id, String name) {
+        int count = salaryGroupService.count(Wrappers.<SalaryGroup>lambdaQuery()
+                .eq(SalaryGroup::getName, name)
+                .ne(PublicUtil.isNotEmpty(id), SalaryGroup::getId, id)
+                .eq(SalaryGroup::getYn, Boolean.TRUE)
+        );
+        BV.isTrue(count <= 0, "薪酬组名称重复，请重新输入");
+    }
+
+    /**
      * 检查指标修改的权限
      *
      * @param dto