feature(*): 根据配置算法计算最终薪酬，单位是元就四舍五入

根据配置算法计算最终薪酬，单位是元就四舍五入

feature(*): 根据配置算法计算最终薪酬，单位是元就四舍五入
根据配置算法计算最终薪酬，单位是元就四舍五入
姜超
1 parent bc486aa0
Showing 8 changed files with 76 additions and 3 deletions
doc/2023-05-18_update.sql
fw-morax-dao/src/main/resources/mapper/kpi/IndicatorsMapper.xml
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/Indicators.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/kpi/IndicatorsDTO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/IndicatorsVO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/QueryConditionIndicatorsListVO.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalarySettingCommonService.java
+-- 2024年4月18日
+ALTER TABLE `fw_morax`.`indicators`
+    ADD COLUMN `business_origin_name` varchar(255) NULL COMMENT '业务系统计算目标前名称' AFTER `business_unit`,
+ADD COLUMN `business_origin_unit` varchar(255) NULL COMMENT '业务系统计算目标前单位' AFTER `business_origin_name`;
+
 -- 2024年4月11日
 ALTER TABLE `fw_morax`.`eval_pool_indicator_detail`
     ADD INDEX `query_index`(`pool_id`, `scope_type`, `stage_dim`, `eval_group_id`, `data_date`, `yn`) USING BTREE;
@@ -48,6 +48,8 @@
         <result column="apply_types" property="applyTypes" typeHandler="cn.fw.common.data.mybatis.handler.IntegerListTypeHandler"/>
         <result column="data_scope_types" property="dataScopeTypes" typeHandler="cn.fw.common.data.mybatis.handler.IntegerListTypeHandler"/>
         <result column="enable" property="enable"/>
+        <result column="business_origin_name" property="businessOriginName"/>
+        <result column="business_origin_unit" property="businessOriginUnit"/>
     </resultMap>
  
  
@@ -65,6 +67,8 @@
         <result column="report_path" property="reportPath"/>
         <result column="origin_indicator_code" property="originIndicatorCode"/>
         <result column="stage_target_type" property="stageTargetType"/>
+        <result column="business_origin_name" property="businessOriginName"/>
+        <result column="business_origin_unit" property="businessOriginUnit"/>
         <result column="unit" property="unit"/>
         <result column="role_codes" property="roleCodes" typeHandler="cn.fw.common.data.mybatis.handler.StringListTypeHandler"/>
         <result column="role_names" property="roleNames" typeHandler="cn.fw.common.data.mybatis.handler.StringListTypeHandler"/>
@@ -76,7 +80,7 @@
     <sql id="all_columns">
         id, indicator_code, indicator_name,business_name, sys_id, sys_name, sys_prefix, role_type, target_type, role_codes,data_type,
         apply_types,data_scope_types,inner_indicator,role_names, enable, report_path, stage_target_type, origin_indicator_code, unit,
-        create_time, update_time, yn
+        business_origin_name,business_origin_unit,create_time, update_time, yn
     </sql>
  
     <!--            <foreach collection="dto.roleCodes" item="roleCode" separator=" OR " open="(" close=")">-->
@@ -122,7 +122,16 @@ public class Indicators extends BaseAuditableTimeEntity&lt;Indicators, Long&gt; {
     /**
      * 业务报表单位
      */
-//    @NotNull(message = "业务报表单位不能为空")
     private String businessUnit;
  
+    /**
+     * 业务系统计算目标前名称
+     */
+    private String businessOriginName;
+
+    /**
+     * 业务系统计算目标前单位
+     */
+    private String businessOriginUnit;
+
 }
 \ No newline at end of file
@@ -141,6 +141,16 @@ public class IndicatorsDTO {
     private String businessUnit;
  
     /**
+     * 业务系统计算目标前名称
+     */
+    private String businessOriginName;
+
+    /**
+     * 业务系统计算目标前目标
+     */
+    private String businessOriginUnit;
+
+    /**
      * 转换为db对象
      * @return
      */
@@ -183,6 +193,12 @@ public class IndicatorsDTO {
         if (PublicUtil.isNotEmpty(this.getBusinessUnit())) {
             indicators.setBusinessUnit(this.getBusinessUnit());
         }
+        if (PublicUtil.isNotEmpty(this.getBusinessOriginName())) {
+            indicators.setBusinessOriginName(this.getBusinessOriginName());
+        }
+        if (PublicUtil.isNotEmpty(this.getBusinessOriginUnit())) {
+            indicators.setBusinessOriginUnit(this.getBusinessOriginUnit());
+        }
         return indicators;
     }
  
@@ -153,6 +153,16 @@ public class IndicatorsVO {
     private Boolean hasStageTarget;
  
     /**
+     * 业务系统计算目标前名称
+     */
+    private String businessOriginName;
+
+    /**
+     * 业务系统计算目标前单位
+     */
+    private String businessOriginUnit;
+
+    /**
      * 组合指标
      */
     private List<IndicatorsVO> combines;
@@ -109,6 +109,16 @@ public class QueryConditionIndicatorsListVO {
      */
     private TargetTypeEnum stageTargetType;
  
+    /**
+     * 业务系统计算目标前名称
+     */
+    private String businessOriginName;
+
+    /**
+     * 业务系统计算目标前单位
+     */
+    private String businessOriginUnit;
+
     ///**
     // * 台阶数据类型；1:数量 2:百分比 3:金额
     // */
@@ -533,10 +533,14 @@ public class SalaryCalcBizService {
  
     private  void setTotal(SalaryPool pool, List<SalaryPoolDetail> detailList) {
         BigDecimal total = calSalaryTotal(detailList);
+        //根据配置算法计算最终薪酬，单位是元就四舍五入
+        SalaryUnitEnum salaryUnit = salarySettingCommonService.getSalaryUnit(pool.getGroupId());
+        if (SalaryUnitEnum.YUAN.equals(salaryUnit)) {
+            total = total.setScale(0, BigDecimal.ROUND_HALF_UP);
+        }
         pool.setReward(total);
     }
  
-
     /**
      * 计算总薪酬++
      * @param detailList
@@ -3,7 +3,10 @@ package cn.fw.morax.service.biz.salary;
 import cn.fw.morax.common.utils.MessageFormatUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.domain.db.salary.SalaryClosure;
+import cn.fw.morax.domain.db.salary.SalaryGeneralSettin;
+import cn.fw.morax.domain.enums.SalaryUnitEnum;
 import cn.fw.morax.service.data.salary.SalaryClosureService;
+import cn.fw.morax.service.data.salary.SalaryGeneralSettinService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -30,6 +33,7 @@ import java.util.List;
 @AllArgsConstructor
 public class SalarySettingCommonService {
  
+    private SalaryGeneralSettinService salaryGeneralSettinService;
     private SalaryClosureService salaryClosureService;
  
     /**
@@ -250,4 +254,15 @@ public class SalarySettingCommonService {
         salaryClosureService.updateById(salaryClosure);
     }
  
+    /**
+     * 获取集团薪酬单位
+     */
+    public SalaryUnitEnum getSalaryUnit(Long groupId) {
+        SalaryGeneralSettin setting = salaryGeneralSettinService.getByGroup(groupId);
+        if (PublicUtil.isEmpty(setting) || PublicUtil.isEmpty(setting.getSalaryUnit())) {
+            return SalaryUnitEnum.FEN;
+        }
+        return setting.getSalaryUnit();
+    }
+
 }