From 8c0b9038d695bdeeff4d5c554b6c3ffe60eb40fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 14 Sep 2022 11:28:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=202=E3=80=81=E4=BF=AE=E5=A4=8D=E8=B0=83?= =?UTF-8?q?=E8=96=AA=E5=91=A8=E6=9C=9F=E5=AF=B9=E4=BA=8E=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9E=9C=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryarchive/bo/SalaryArchiveBO.java | 16 +++++---- .../salary/mapper/sys/SalarySysConfMapper.xml | 2 +- .../entity/param/SalarySysConfQueryParam.java | 29 ++++++++++++++++ .../sys/entity/param/SalarySysQueryParam.java | 33 ------------------- .../salary/sys/entity/po/SalarySysConfPO.java | 12 +++++-- .../sys/service/SalarySysConfService.java | 4 +++ .../impl/SalarySysConfServiceImpl.java | 6 ++++ .../web/SalarySystemConfigController.java | 19 +++++++++++ .../wrapper/SalarySystemConfigWrapper.java | 15 +++++++-- 9 files changed, 92 insertions(+), 44 deletions(-) create mode 100644 src/com/engine/salary/sys/entity/param/SalarySysConfQueryParam.java delete mode 100644 src/com/engine/salary/sys/entity/param/SalarySysQueryParam.java diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java index 123318ebd..4788c451c 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java @@ -97,12 +97,12 @@ public class SalaryArchiveBO { Date end = localDateRange.getEndDate(); List list = new ArrayList<>(); - allEmployeeIds.forEach(e->{ + allEmployeeIds.forEach(e -> { // 同一个人的档案数据 - List salaryArchives = salaryArchiveList.stream().filter(f->f.getEmployeeId().equals(e)).collect(Collectors.toList()); + List salaryArchives = salaryArchiveList.stream().filter(f -> f.getEmployeeId().equals(e)).collect(Collectors.toList()); List salaryArchiveIds = salaryArchives.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()); // 同一个人的薪资项目调整历史数据 - List salaryArchiveItems = salaryArchiveItemDataList.stream().filter(d->salaryArchiveIds.contains(d.getSalaryArchiveId())).collect(Collectors.toList()); + List salaryArchiveItems = salaryArchiveItemDataList.stream().filter(d -> salaryArchiveIds.contains(d.getSalaryArchiveId())).collect(Collectors.toList()); List salaryArchiveItemIds = salaryArchiveItems.stream().map(SalaryArchiveItemPO::getSalaryItemId).distinct().collect(Collectors.toList()); SalaryArchiveDataDTO salaryArchiveData = new SalaryArchiveDataDTO(); @@ -118,7 +118,7 @@ public class SalaryArchiveBO { SalaryArchiveTaxAgentDataDTO taxAgent = new SalaryArchiveTaxAgentDataDTO(); taxAgent.setTaxAgentId(salaryArchive.getTaxAgentId()); // taxAgent.setIncomeCategory(salaryArchive.getIncomeCategory()); - taxAgent.setEffectiveDateRange(LocalDateRange.builder().fromDate((fromDate.before(start)?start:fromDate)).endDate(endDate == null || endDate.after(end)?end:endDate).build()); + taxAgent.setEffectiveDateRange(LocalDateRange.builder().fromDate((fromDate.before(start) ? start : fromDate)).endDate(endDate == null || endDate.after(end) ? end : endDate).build()); // 薪资项目数据按个税扣缴义务人切割 if (!isOnlyTaxAgent) { // 开始日期 @@ -133,11 +133,15 @@ public class SalaryArchiveBO { continue; } Date fromDateItem = salaryArchiveItem.getEffectiveTime(); - if (fromDateItem.after(endTempItem) || (!endTempItem.after(startItem) && !endTempItem.equals(startItem) ) ) { + if (fromDateItem.after(endTempItem) || (!endTempItem.after(startItem) && !endTempItem.equals(startItem))) { continue; } SalaryArchiveItemDataDTO salaryArchiveItemData = new SalaryArchiveItemDataDTO(); - salaryArchiveItemData.setEffectiveDateRange(LocalDateRange.builder().fromDate((fromDateItem.before(startItem)?startItem:fromDateItem)).endDate(endTempItem).build()); + salaryArchiveItemData.setEffectiveDateRange(LocalDateRange.builder().fromDate((fromDateItem.before(startItem) ? startItem : fromDateItem)).endDate(endTempItem).build()); + //排除1号调薪，之前的历史周期为2022-01-01-2022-01-01这种情况 + if (!salaryArchiveItemData.getEffectiveDateRange().getFromDate().before(salaryArchiveItemData.getEffectiveDateRange().getEndDate())) { + continue; + } salaryArchiveItemData.setSalaryItemId(salaryArchiveItem.getSalaryItemId()); salaryArchiveItemData.setValue(salaryArchiveItem.getItemValue()); salaryItemValues.add(salaryArchiveItemData); diff --git a/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml b/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml index e2f6a19be..221900da7 100644 --- a/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml +++ b/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml @@ -82,7 +82,7 @@ AND update_time = #{updateTime} - ORDER BY order_weight DESC + ORDER BY create_time,order_weight DESC diff --git a/src/com/engine/salary/sys/entity/param/SalarySysConfQueryParam.java b/src/com/engine/salary/sys/entity/param/SalarySysConfQueryParam.java new file mode 100644 index 000000000..79501579b --- /dev/null +++ b/src/com/engine/salary/sys/entity/param/SalarySysConfQueryParam.java @@ -0,0 +1,29 @@ +package com.engine.salary.sys.entity.param; + +import com.engine.salary.common.BaseQueryParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SalarySysConfQueryParam extends BaseQueryParam { + + /** + * 标识 + */ + private String confKey; + + /** + * 值 + */ + private String confValue; + + /** + * 所属模块 + */ + private String module; +} diff --git a/src/com/engine/salary/sys/entity/param/SalarySysQueryParam.java b/src/com/engine/salary/sys/entity/param/SalarySysQueryParam.java deleted file mode 100644 index 4f2cf48ad..000000000 --- a/src/com/engine/salary/sys/entity/param/SalarySysQueryParam.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.engine.salary.sys.entity.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Collection; -import java.util.Date; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class SalarySysQueryParam { - - Collection ids; - - /** - * 生效时间 - */ - private Date effectiveTime; - - Collection salaryItemIds; - - Collection salaryArchivesIds; - - Collection employeeIds; - - Long salaryArchiveId; - - Long salaryItemId; -} diff --git a/src/com/engine/salary/sys/entity/po/SalarySysConfPO.java b/src/com/engine/salary/sys/entity/po/SalarySysConfPO.java index 6403c646e..965928588 100644 --- a/src/com/engine/salary/sys/entity/po/SalarySysConfPO.java +++ b/src/com/engine/salary/sys/entity/po/SalarySysConfPO.java @@ -1,6 +1,7 @@ package com.engine.salary.sys.entity.po; +import com.engine.salary.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,14 +19,17 @@ public class SalarySysConfPO { /** * 标识 */ + @TableTitle(title = "标识", dataIndex = "confKey", key = "confKey") private String confKey; /** * 值 */ + @TableTitle(title = "值", dataIndex = "confValue", key = "confValue") private String confValue; /** * 标题 */ + @TableTitle(title = "标题", dataIndex = "title", key = "title") private String title; /** * 所属模块 @@ -44,8 +48,12 @@ public class SalarySysConfPO { */ private Integer deleteType; - /** 创建时间 */ + /** + * 创建时间 + */ private Date createTime; - /** 修改时间 */ + /** + * 修改时间 + */ private Date updateTime; } \ No newline at end of file diff --git a/src/com/engine/salary/sys/service/SalarySysConfService.java b/src/com/engine/salary/sys/service/SalarySysConfService.java index 3f8a9ecff..0d351d32a 100644 --- a/src/com/engine/salary/sys/service/SalarySysConfService.java +++ b/src/com/engine/salary/sys/service/SalarySysConfService.java @@ -3,6 +3,8 @@ package com.engine.salary.sys.service; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum; +import java.util.List; + /** * 薪酬系统配置类 *

Copyright: Copyright (c) 2022

@@ -23,4 +25,6 @@ public interface SalarySysConfService { boolean operateTaxDeclarationFunction(TaxDeclarationFunctionEnum flag); SalarySysConfPO getOneByCode(String code); + + List listSome(SalarySysConfPO build); } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index a949bf57c..08e8a689c 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -9,6 +9,7 @@ import com.engine.salary.sys.service.SalarySysConfService; import dm.jdbc.util.IdGenerator; import java.util.Date; +import java.util.List; /** * 薪酬系统配置类 @@ -64,4 +65,9 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe public SalarySysConfPO getOneByCode(String code) { return getSalarySysConfMapper().getOneByCode(code); } + + @Override + public List listSome(SalarySysConfPO po) { + return getSalarySysConfMapper().listSome(po); + } } diff --git a/src/com/engine/salary/web/SalarySystemConfigController.java b/src/com/engine/salary/web/SalarySystemConfigController.java index d679392c1..cbaab3c1c 100644 --- a/src/com/engine/salary/web/SalarySystemConfigController.java +++ b/src/com/engine/salary/web/SalarySystemConfigController.java @@ -1,8 +1,11 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; +import com.engine.salary.sys.entity.param.SalarySysConfQueryParam; +import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum; import com.engine.salary.util.ResponseResult; +import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.SalarySystemConfigWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; import lombok.extern.slf4j.Slf4j; @@ -57,6 +60,7 @@ public class SalarySystemConfigController { /** * 获取系统配置 + * * @param request * @param response * @param code @@ -70,5 +74,20 @@ public class SalarySystemConfigController { return new ResponseResult(user).run(getSalarySystemConfigWrapper(user)::getOneByCode, code); } + /** + * 获取系统配置 + * + * @param request + * @param response + * @return + */ + @POST + @Path("/list") + @Produces(MediaType.APPLICATION_JSON) + public String info(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySysConfQueryParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>(user).run(getSalarySystemConfigWrapper(user)::list, param); + } + } diff --git a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java index 5b6e1ccb7..6a59947d9 100644 --- a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java @@ -2,16 +2,19 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.sys.entity.param.SalarySysConfQueryParam; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.page.PageInfo; +import com.engine.salary.util.page.SalaryPageUtil; import org.apache.commons.lang3.StringUtils; import weaver.general.BaseBean; import weaver.hrm.User; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -67,7 +70,15 @@ public class SalarySystemConfigWrapper extends Service { } - public PageInfo list() { - return null; + public PageInfo list(SalarySysConfQueryParam param) { + List salarySysConfPOS = getSalarySysConfService(user).listSome(SalarySysConfPO.builder().build()); + + List list = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), salarySysConfPOS); + PageInfo page = new PageInfo<>(list, SalarySysConfPO.class); + + page.setTotal(salarySysConfPOS.size()); + page.setPageNum(param.getCurrent()); + page.setPageSize(param.getPageSize()); + return page; } }