Merge branch 'bug-fix' into 'main'

修改岗位名称修改岗位名称 See merge request !619

Merge branch 'bug-fix' into 'main'
修改岗位名称修改岗位名称 See merge request !619
姜超
2 parents b9d58053 a8d6f43c
Showing 5 changed files with 9 additions and 5 deletions
fw-morax-rpc/src/main/java/cn/fw/morax/rpc/ehr/EhrRpcService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiPoolCommonService.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/SalaryPoolCommonService.java
@@ -471,7 +471,7 @@ public class EhrRpcService {
         try {
             log.info("StaffApi.getStaffByPostShopList: 开始进行请求。groupId:[{}]，queryDate:[{}]，time:[{}] ",
                     groupId, queryDate, queryDateTime);
-            final Message<List<StaffSimpleInfoVo>> msg = staffApi.getPointTimeStaffList(groupId, queryDate.getTime());
+            final Message<List<StaffSimpleInfoVo>> msg = staffApi.getPointTimeStaffList(groupId, queryDate.getTime(), null);
             log.info("StaffApi.getPointTimeStaffList: groupId:[{}]，queryDate:[{}]，time:[{}]， msg.code={}, msg.result={}, msg.data={}",
                     groupId, queryDate, queryDateTime, msg.getCode(), JSON.toJSONString(msg.getResult()), JSON.toJSONString(msg.getData()));
             if (msg.isSuccess() && !Objects.isNull(msg.getData())) {
@@ -156,6 +156,7 @@ public class EvalPoolCommonService {
                 , Boolean.FALSE);
         if (PublicUtil.isNotEmpty(evalUserPool)) {
             evalUserPool.setShopName(user.getShopName());
+            evalUserPool.setPostName(user.getPostName());
             return evalUserPool;
         }
         //同一个考评组的  调岗员工 修改调岗数据
@@ -221,6 +221,7 @@ public class KpiPoolCommonService {
         }
         //2024年4月25日处理门店数据
         kpiPool.setShopName(user.getShopName());
+        kpiPool.setPostName(user.getPostName());
     }
  
  
@@ -533,11 +533,12 @@ 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);
-        }
+//        SalaryUnitEnum salaryUnit = salarySettingCommonService.getSalaryUnit(pool.getGroupId());
+//        if (SalaryUnitEnum.YUAN.equals(salaryUnit)) {
+//            total = total.setScale(0, BigDecimal.ROUND_HALF_UP);
+//        }
         pool.setReward(total);
     }
  
@@ -88,6 +88,7 @@ public class SalaryPoolCommonService {
         salaryPool.setLeaveDate(user.getLeaveDate());
         //2024年4月25日处理门店数据
         salaryPool.setShopName(user.getShopName());
+        salaryPool.setPostName(user.getPostName());
         return salaryPool;
     }