薪资管理调整

hx-oa/src/main/java/com/fjhx/oa/entity/user/po/UserSalaryManage.java

@@ -35,7 +35,7 @@ public class UserSalaryManage {
     /**
      * 实习期薪资比例
      */
-    private Integer InternshipRatio;
+    private Integer internshipRatio;
     /**
      * 薪资合计
      */

hx-oa/src/main/java/com/fjhx/oa/entity/user/vo/UserSalaryManageVo.java

@@ -20,6 +20,7 @@ public class UserSalaryManageVo extends UserSalaryManage {
 
     private String companyName;
     private String deptName;
+    private String deptNames;
 
     /**
      * 薪资明细

hx-oa/src/main/java/com/fjhx/oa/entity/user/vo/UserSalaryVo.java

@@ -16,6 +16,8 @@ import java.util.List;
 @Setter
 public class UserSalaryVo extends UserSalary {
 
-    List<UserSalaryDetailVo> userSalaryDetailList;
+    private String userName;
+
+    private List<UserSalaryDetailVo> userSalaryDetailList;
 
 }

hx-oa/src/main/java/com/fjhx/oa/service/user/impl/UserSalaryManageServiceImpl.java

@@ -23,6 +23,7 @@ import com.fjhx.oa.service.user.UserSalaryService;
 import com.fjhx.tenant.utils.DeptUstil;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -139,6 +140,8 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
             userSalary.setUserSalaryDetailList(collect.getOrDefault(userSalary.getId(), new ArrayList<>()));
         }
 
+        UserUtil.assignmentNickName(list, UserSalary::getUserId, UserSalaryVo::setUserName);
+
         return list;
     }
 
@@ -161,6 +164,11 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
             userSalaryManageVo.setDeptName(deptNameMap.get(userSalaryManageVo.getDeptId()));
         }
 
+        //赋值部门名称树
+        DeptUstil.assignmentDeptNames(list, UserSalaryManageVo::getDeptId, (item, nameList) -> {
+            item.setDeptNames(nameList.stream().collect(Collectors.joining("=>")));
+        });
+
     }
 
 }