From 4a59859fa86595f8cb0d1dc89aabda2da9c806f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 12 Oct 2023 17:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sql/删除档案.txt | 7 +--- .../SalaryArchiveAdjustRecordTypeEnum.java | 26 +++++++++++++ .../impl/SalaryArchiveItemServiceImpl.java | 1 + .../engine/salary/web/SIReportController.java | 2 +- .../wrapper/SalaryArchiveItemWrapper.java | 37 +++++++++++++++++++ 5 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 src/com/engine/salary/enums/salaryarchive/SalaryArchiveAdjustRecordTypeEnum.java diff --git a/resource/sql/删除档案.txt b/resource/sql/删除档案.txt index 2c4fa7372..1668c51f4 100644 --- a/resource/sql/删除档案.txt +++ b/resource/sql/删除档案.txt @@ -1,6 +1,6 @@ -一、删除指定扣缴义务人下的档案 操作前做好数据备份 +一、删除指定扣缴义务人下的档案 删除扣缴义务人下的档案（注意删除后，再添加进扣缴义务人，不会自动生成档案） 1、查询hrsa_tax_agent表对应扣缴义务人id @@ -19,8 +19,3 @@ update hrsa_salary_archive set delete_type=3 where tax_agent_id=扣缴义务人 二、删除停薪员工档案 update hrsa_salary_archive set delete_type=3 where run_status in ('STOP_FROM_PENDING','STOP_FROM_SUSPEND') - - - - -.\wkhtmltopdf.exe http://127.0.0.1:8080/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=1694053661638&recipient=92&type=phone C:\baidu.pdf \ No newline at end of file diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAdjustRecordTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAdjustRecordTypeEnum.java new file mode 100644 index 000000000..6fd513664 --- /dev/null +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAdjustRecordTypeEnum.java @@ -0,0 +1,26 @@ +package com.engine.salary.enums.salaryarchive; + +/** + * 薪资档案调薪记录列表类型 + *

Copyright: Copyright (c) 2023

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +public enum SalaryArchiveAdjustRecordTypeEnum { + + MYADJUSTRECORD("myAdjustRecordList"), + ADJUSTRECORD("adjustRecordList"), + ADJUSTRECORDFORDELETE("adjustRecordForDeleteList"); + + private String pageUid; + + SalaryArchiveAdjustRecordTypeEnum(String pageUid) { + this.pageUid = pageUid; + } + + public String getPageUid() { + return pageUid; + } +} diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index 080b330fe..270f26294 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -632,6 +632,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi }); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List> rows = new ArrayList<>(); + rows.add(headerList); for (SalaryItemAdjustRecordListDTO dto : list) { List row = new ArrayList<>(); row.add(dto.getUsername()); diff --git a/src/com/engine/salary/web/SIReportController.java b/src/com/engine/salary/web/SIReportController.java index 55b602525..ceeb545ba 100644 --- a/src/com/engine/salary/web/SIReportController.java +++ b/src/com/engine/salary/web/SIReportController.java @@ -67,6 +67,6 @@ public class SIReportController { String pageSize = Optional.ofNullable(request.getParameter("pageSize")).orElse("10"); salaryItemAdjustRecordQueryParam.setCurrent(Integer.valueOf(current)); salaryItemAdjustRecordQueryParam.setPageSize(Integer.valueOf(pageSize)); - return new ResponseResult>(user).run(getSalaryArchiveItemWrapper(user)::adjustRecordList, salaryItemAdjustRecordQueryParam); + return new ResponseResult>(user).run(getSalaryArchiveItemWrapper(user)::myAdjustRecordList, salaryItemAdjustRecordQueryParam); } } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 0f03e2906..4f711d32e 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -14,10 +14,12 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; +import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; +import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.proxy.SalaryArchiveItemWrapperProxy; @@ -223,6 +225,40 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt List salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems(); List salaryItemIds = salaryItemList.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); + List employeeList = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ALL); + Map employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId); + + List listAll = getSalaryArchiveItemService(user).salaryItemAdjustRecordList(SalaryItemAdjustRecordQueryParam.builder().build(), salaryItemIds); + PageInfo list = getSalaryArchiveItemService(user).salaryItemAdjustRecordListPage(queryParam, salaryItemIds); + List listResult = list.getList(); + //获取上次更改的记录 + listResult.forEach(m -> { + if (!CollectionUtils.isEmpty(listAll)) { + listAll.removeIf(a -> a.getId().equals(m.getId())); + } + Optional optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst(); + m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : ""); + DataCollectionEmployee employee = employeeMap.getOrDefault(m.getEmployeeId(), new DataCollectionEmployee()); + m.setUsername(employee.getUsername()); + m.setDepartmentName(employee.getDepartmentName()); + m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(employee.getStatus()))); + m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + }); + + return list; + } + + + /** + * 我的调薪记录 + * @param queryParam + * @return + */ + public PageInfo myAdjustRecordList(SalaryItemAdjustRecordQueryParam queryParam) { + // 获取所有可被引用的薪资项目 + List salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems(); + List salaryItemIds = salaryItemList.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); + DataCollectionEmployee employee = getSalaryEmployeeService(user).getEmployeeById(queryParam.getEmployeeId()); List listAll = getSalaryArchiveItemService(user).salaryItemAdjustRecordList(SalaryItemAdjustRecordQueryParam.builder().build(), salaryItemIds); @@ -245,6 +281,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt return list; } + /** * 单个档案的薪资项目调整记录列表 *