Merge branch 'release/3.0.2.2504.01' into custom/联特

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

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 List<Long> ids;
-
-    private Long salaryAcctRecordId;
-
 
 }

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<Long> ids;
+
+}

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;
+
+
+/**
+ * 创建推送记录
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WithdrawPushParam {
+
+
+    private List<Long> ids;
+
+
+}

src/com/engine/salary/service/impl/SalarySobServiceImpl.java

@@ -284,7 +284,7 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
         }
         if (queryParam.getTaxAgentId() != null) {
             List<SobTaxLinkPO> 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<SalarySobPO> list = getSalarySobMapper().listSome(build);

src/com/engine/salary/web/PushController.java

@@ -123,4 +123,12 @@ public class PushController {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<PushParam, String>(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<WithdrawParam, String>(user).run(getPushWrapper(user)::withdraw, param);
+    }
 }

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) {
+    public void push(PushParam param) {
-        getPushService(user).push(pushParam.getId());
+        List<Long> ids = param.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        ids.forEach(id -> {
+            getPushService(user).push(id);
+        });
     }
 
+    public void withdraw(WithdrawParam param) {
+        List<Long> ids = param.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        ids.forEach(id -> {
+            getPushService(user).withdraw(id);
+        });
+    }
 
 
     public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) {