qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

上海港湾 下级工资单树

This commit is contained in:
Harryxzy 2023-11-29 15:18:20 +08:00
parent 2fd1ef78f5
commit b6f0c4a0b3
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/salaryBill/dto/SalaryMySalaryBillListDTO.java
View File

@ -61,5 +61,9 @@ public class SalaryMySalaryBillListDTO {
private String userName;
private Long managerId;
private String managerName;
}

3
src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
View File

@ -581,7 +581,8 @@
t3.acct_times,
t1.send_time,
t1.send_status,
h.lastname as userName
h.lastname as userName,
h.MANAGERId as managerId
FROM
hrsa_salary_send_info t1
LEFT JOIN hrsa_tax_agent t2 ON t2.id = t1.tax_agent_id

4
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -751,6 +751,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
queryParam.setStartSalaryMonth(getLimitMonth());
List<SalaryMySalaryBillListDTO> list = salarySendInfoMapper.mySalaryBillList(queryParam);
// 封装直接上级名字
List<DataCollectionEmployee> managerEmployees = getSalaryEmployeeService(user).listByIds(list.stream().map(SalaryMySalaryBillListDTO::getManagerId).distinct().collect(Collectors.toList()));
Map<Long, String> managerMap = SalaryEntityUtil.convert2Map(managerEmployees, DataCollectionEmployee::getEmployeeId, DataCollectionEmployee::getUsername);
list.stream().forEach(dto -> dto.setManagerName(managerMap.getOrDefault(ObjectUtils.isEmpty(dto.getManagerId()) ? -1L : dto.getManagerId(), "")));
PageInfo<SalaryMySalaryBillListDTO> pageInfo = new PageInfo<>(list, SalaryMySalaryBillListDTO.class);
pageInfo.setTotal(list.size());

9
src/com/engine/salary/wrapper/SalarySendWrapper.java
View File

@ -579,7 +579,7 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy
*/
public Map<String, Object> mySalaryBillList(SalaryBillQueryParam queryParam) {
Map<String, Object> datas = new HashMap<>();
if (ObjectUtil.isNotEmpty(queryParam.getEmployeeId())) {
if (ObjectUtil.isNotEmpty(queryParam.getEmployeeId()) && user.getUID()!= queryParam.getEmployeeId().intValue()) {
// 判断是否是下属
Set<Long> juniorEmpIds = myJuniorMap(Long.valueOf(user.getUID())).keySet();
if (!juniorEmpIds.contains(queryParam.getEmployeeId())) {
@ -633,9 +633,10 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy
WeaTableColumn idColumn = new WeaTableColumn("0px", "id", "id");
idColumn.setDisplay(WeaBoolAttr.TRUE);
list.add(new WeaTableColumn("20%", "薪资所属月", "salaryYearMonth"));
list.add(new WeaTableColumn("40%", "个税扣缴义务人", "taxAgent"));
list.add(new WeaTableColumn("40%", "姓名", "userName"));
list.add(new WeaTableColumn("40%", "发放时间", "sendTime"));
list.add(new WeaTableColumn("20%", "个税扣缴义务人", "taxAgent"));
list.add(new WeaTableColumn("20%", "姓名", "userName"));
list.add(new WeaTableColumn("20%", "直接上级", "managerName"));
list.add(new WeaTableColumn("20%", "发放时间", "sendTime"));
return list;
}