修复数据推送查询问题

# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java

src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java

@@ -1,11 +1,13 @@
 package com.engine.salary.entity.taxdeclaration.param;
 
 import com.engine.salary.common.BaseQueryParam;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+
 import java.util.Date;
 
 /**
@@ -22,7 +24,14 @@ import java.util.Date;
 @AllArgsConstructor
 public class TaxDeclarationListQueryParam extends BaseQueryParam {
 
+    //薪资所属月范围起点
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date fromSalaryMonth;
 
+    //薪资所属月范围终点
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endSalaryMonth;
+
+    //个税扣缴义务人菜单")
+    private String taxAgentName;
 }

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

@@ -112,16 +112,16 @@ public class PushServiceImpl extends Service implements PushService {
         Map<Long, SalarySobPO> sobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId);
 
         List<PushSettingDTO> list = pushSettingPOS.stream()
-                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName())).map(
-                        po -> PushSettingDTO.builder()
-                                .id(po.getId())
-                                .name(po.getName())
-                                .tableName(po.getTableName())
-                                .modeName(po.getModeName())
-                                .modeId(po.getModeId())
-                                .able(po.getAble())
-                                .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
-                                .build()).collect(Collectors.toList());
+                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
+                .map(po -> PushSettingDTO.builder()
+                        .id(po.getId())
+                        .name(po.getName())
+                        .tableName(po.getTableName())
+                        .modeName(po.getModeName())
+                        .modeId(po.getModeId())
+                        .able(po.getAble())
+                        .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
+                        .build()).collect(Collectors.toList());
         return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, PushSettingDTO.class);
     }
 
@@ -526,8 +526,9 @@ public class PushServiceImpl extends Service implements PushService {
     @Override
     public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) {
         List<PushRecordPO> pushRecordPOS = getPushRecordMapper().listAll();
-        List<PushRecordDTO> listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordPOS)
+        List<PushRecordDTO> listDTOS = pushRecordPOS
                 .stream()
+                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
                 .map(po -> PushRecordDTO.builder()
                         .id(po.getId())
                         .name(po.getName())
@@ -544,7 +545,6 @@ public class PushServiceImpl extends Service implements PushService {
                 .collect(Collectors.toList());
 
         PageInfo<PushRecordDTO> pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDTO.class);
-        pageInfo.setTotal(pushRecordPOS.size());
         return pageInfo;
     }
 

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

@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
@@ -128,9 +129,15 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
 
         // 查询个税申报表
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
-
         taxDeclarationPOS = getAuthService(user).auth(taxDeclarationPOS, AuthFilterTypeEnum.DATA_OPT, TaxDeclarationPO.class);
 
+        if (StrUtil.isNotBlank(queryParam.getTaxAgentName())) {
+            List<TaxAgentPO> taxAgentPOs = getTaxAgentService(user).list(TaxAgentQueryParam.builder().name(queryParam.getTaxAgentName()).build());
+            Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOs, TaxAgentPO::getId);
+            taxDeclarationPOS = taxDeclarationPOS.stream().filter(tax -> taxAgentIds.contains(tax.getTaxAgentId())).collect(Collectors.toList());
+        }
+
+
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 taxDeclarationPOS, TaxDeclarationPO.class);