From 61beec603e7f0d81e9edadee2522893fa0435dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 14 Apr 2025 17:00:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/push/param/PushParam.java | 7 ++--- .../entity/push/param/WithdrawParam.java | 20 +++++++++++++ .../entity/push/param/WithdrawPushParam.java | 29 +++++++++++++++++++ src/com/engine/salary/web/PushController.java | 8 +++++ .../engine/salary/wrapper/PushWrapper.java | 21 ++++++++++++-- 5 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 src/com/engine/salary/entity/push/param/WithdrawParam.java create mode 100644 src/com/engine/salary/entity/push/param/WithdrawPushParam.java diff --git a/src/com/engine/salary/entity/push/param/PushParam.java b/src/com/engine/salary/entity/push/param/PushParam.java index f653c639b..36aefd747 100644 --- a/src/com/engine/salary/entity/push/param/PushParam.java +++ b/src/com/engine/salary/entity/push/param/PushParam.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @Builder @@ -13,9 +15,6 @@ import lombok.NoArgsConstructor; public class PushParam { - private Long id; - - private Long salaryAcctRecordId; - + private List ids; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/WithdrawParam.java b/src/com/engine/salary/entity/push/param/WithdrawParam.java new file mode 100644 index 000000000..2535db525 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/WithdrawParam.java @@ -0,0 +1,20 @@ +package com.engine.salary.entity.push.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WithdrawParam { + + + private List ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/WithdrawPushParam.java b/src/com/engine/salary/entity/push/param/WithdrawPushParam.java new file mode 100644 index 000000000..cc0915bc2 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/WithdrawPushParam.java @@ -0,0 +1,29 @@ +package com.engine.salary.entity.push.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +/** + * 创建推送记录 + *

Copyright: Copyright (c) 2024

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WithdrawPushParam { + + + private List ids; + + +} \ No newline at end of file diff --git a/src/com/engine/salary/web/PushController.java b/src/com/engine/salary/web/PushController.java index 1ad8fe061..1b3340469 100644 --- a/src/com/engine/salary/web/PushController.java +++ b/src/com/engine/salary/web/PushController.java @@ -123,4 +123,12 @@ public class PushController { User user = HrmUserVarify.getUser(request, response); return new ResponseResult(user).run(getPushWrapper(user)::push, param); } + + @POST + @Path("/record/withdraw") + @Produces(MediaType.APPLICATION_JSON) + public String push(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody WithdrawParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getPushWrapper(user)::withdraw, param); + } } diff --git a/src/com/engine/salary/wrapper/PushWrapper.java b/src/com/engine/salary/wrapper/PushWrapper.java index 6d557ba8f..0950f19e3 100644 --- a/src/com/engine/salary/wrapper/PushWrapper.java +++ b/src/com/engine/salary/wrapper/PushWrapper.java @@ -1,5 +1,6 @@ package com.engine.salary.wrapper; +import cn.hutool.core.collection.CollUtil; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.entity.push.dto.PushRecordDTO; @@ -16,6 +17,7 @@ import com.engine.salary.util.page.PageInfo; import weaver.hrm.User; import java.util.HashMap; +import java.util.List; import java.util.Map; @@ -67,10 +69,25 @@ public class PushWrapper extends Service { }); } - public void push(PushParam pushParam) { - getPushService(user).push(pushParam.getId()); + public void push(PushParam param) { + List ids = param.getIds(); + if (CollUtil.isEmpty(ids)) { + return; + } + ids.forEach(id -> { + getPushService(user).push(id); + }); } + public void withdraw(WithdrawParam param) { + List ids = param.getIds(); + if (CollUtil.isEmpty(ids)) { + return; + } + ids.forEach(id -> { + getPushService(user).withdraw(id); + }); + } public PageInfo recordList(RecordListQueryParam param) { From 6e366bed5a0654f065a916028c0bb5eddbdda6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 17 Apr 2025 14:20:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=E8=B4=A6=E5=A5=97=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SalarySobServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index ac2c94e36..e25f15343 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -268,7 +268,7 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { } if (queryParam.getTaxAgentId() != null) { List sobTaxLinkPOS = getSobTaxLinkMapper().listSome(SobTaxLinkPO.builder().taxAgentId(queryParam.getTaxAgentId()).build()); - build.setIds(sobTaxLinkPOS.stream().map(SobTaxLinkPO::getTaxAgentId).collect(Collectors.toList())); + build.setIds(sobTaxLinkPOS.stream().map(SobTaxLinkPO::getSobId).collect(Collectors.toList())); } List list = getSalarySobMapper().listSome(build); From 4d56cde7a92ad8b36541548f48ebf5369b95227e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 17 Apr 2025 15:34:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalary.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index 55360c99a..24be7d7cc 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=3.0.1.2503.01 +version=3.0.2.2504.01 openFormulaForcedEditing=false \ No newline at end of file