From ff3d569e1d284f74f780941e4ed5f95b9e79a277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 29 Nov 2024 09:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/push/dto/PushRecordDTO.java | 123 ++++++++++++++++ .../entity/push/dto/PushRecordDetailDTO.java | 90 ++++++++++++ .../param/RecordDetailListQueryParam.java | 22 +++ .../push/param/RecordListQueryParam.java | 17 +++ .../entity/push/po/PushRecordDetailPO.java | 1 + .../salary/entity/push/po/PushRecordPO.java | 8 +- .../push/PushRecordDetailStatusEnum.java | 7 +- .../salaryformula/SalarySQLReferenceEnum.java | 2 +- .../salary/mapper/push/PushRecordMapper.xml | 1 + .../engine/salary/service/PushService.java | 11 +- .../salary/service/impl/PushServiceImpl.java | 137 ++++++++++++------ src/com/engine/salary/web/PushController.java | 14 +- .../engine/salary/wrapper/PushWrapper.java | 10 ++ 13 files changed, 383 insertions(+), 60 deletions(-) create mode 100644 src/com/engine/salary/entity/push/dto/PushRecordDTO.java create mode 100644 src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java create mode 100644 src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java create mode 100644 src/com/engine/salary/entity/push/param/RecordListQueryParam.java diff --git a/src/com/engine/salary/entity/push/dto/PushRecordDTO.java b/src/com/engine/salary/entity/push/dto/PushRecordDTO.java new file mode 100644 index 000000000..ec4c74557 --- /dev/null +++ b/src/com/engine/salary/entity/push/dto/PushRecordDTO.java @@ -0,0 +1,123 @@ +package com.engine.salary.entity.push.dto; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +import com.engine.salary.enums.push.PushRecordStatusEnum; +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 PushRecordDTO { + + @ElogTransform(name = "") + private Long id; + + /** + * 批次号 + */ + private Long batchId; + + + /** + * 记录名 + */ + @TableTitle(title = "记录名", dataIndex = "name", key = "name") + private String name; + + + /** + * 核算记录id + */ + private Long acctRecordId; + + + /** + * 推送配置id + */ + private Long settingId; + + /** + * 建模id + */ + private Integer modeId; + + /** + * 数据库表名 + */ + @TableTitle(title = "记录名", dataIndex = "name", key = "name") + private String tableName; + + + /** + * 推送状态 + * + * @see PushRecordStatusEnum + */ + @TableTitle(title = "推送状态", dataIndex = "status", key = "status") + private Integer status; + + /** + * 执行时间 + */ + @TableTitle(title = "执行时间", dataIndex = "startTime", key = "startTime") + private Date startTime; + + /** + * 结束时间 + */ + @ElogTransform(name = "结束时间") + private Date endTime; + + + /** + * 推送类型，0推送，1撤回 + */ + @ElogTransform(name = "推送类型") + private Integer type; + + /** + * 创建时间 + */ + @ElogTransform(name = "创建时间") + private Date createTime; + + /** + * 创建人 + */ + @ElogTransform(name = "创建人") + private Long creator; + + /** + * 是否已删除。0：未删除、1：已删除 + */ + @ElogTransform(name = "是否已删除。0：未删除、1：已删除") + private Integer deleteType; + + /** + * 租户ID + */ + @ElogTransform(name = "租户ID") + private String tenantKey; + + /** + * 更新时间 + */ + @ElogTransform(name = "更新时间") + private Date updateTime; + + + //主键id集合 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java b/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java new file mode 100644 index 000000000..2807eaf69 --- /dev/null +++ b/src/com/engine/salary/entity/push/dto/PushRecordDetailDTO.java @@ -0,0 +1,90 @@ +package com.engine.salary.entity.push.dto; + +import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.TableTitle; +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 PushRecordDetailDTO { + + + @ElogTransform(name = "id") + private Long id; + + /** + * 推送记录id + */ + private Long recordId; + + /** + * 核算人员id + */ + private Long acctEmpId; + + /** + * 执行状态 + * @see com.engine.salary.enums.push.PushRecordDetailStatusEnum + */ + @TableTitle(title = "执行状态", dataIndex = "status",key = "status") + private Integer status; + + /** + * 失败原因 + */ + @TableTitle(title = "失败原因", dataIndex = "fail_reason",key = "status") + private String fail_reason; + + /** + * 执行sql + */ + @ElogTransform(name = "执行sql") + private String execute; + + /** + * 创建时间 + */ + @ElogTransform(name = "创建时间") + private Date createTime; + + /** + * 创建人 + */ + @ElogTransform(name = "创建人") + private Long creator; + + /** + * 是否已删除。0：未删除、1：已删除 + */ + @ElogTransform(name = "是否已删除。0：未删除、1：已删除") + private Integer deleteType; + + + /** + * 租户ID + */ + @ElogTransform(name = "租户ID") + private String tenantKey; + + /** + * 更新时间 + */ + @ElogTransform(name = "更新时间") + private Date updateTime; + + + //主键id集合 + private Collection ids; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java b/src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java new file mode 100644 index 000000000..7a4619d2d --- /dev/null +++ b/src/com/engine/salary/entity/push/param/RecordDetailListQueryParam.java @@ -0,0 +1,22 @@ +package com.engine.salary.entity.push.param; + +import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RecordDetailListQueryParam extends BaseQueryParam { + + @DataCheck(require = true, message = "推送记录id不能为空") + private Long recordId; + + private String name; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/param/RecordListQueryParam.java b/src/com/engine/salary/entity/push/param/RecordListQueryParam.java new file mode 100644 index 000000000..0dfe41108 --- /dev/null +++ b/src/com/engine/salary/entity/push/param/RecordListQueryParam.java @@ -0,0 +1,17 @@ +package com.engine.salary.entity.push.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 RecordListQueryParam extends BaseQueryParam { + private String name; + +} \ No newline at end of file diff --git a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java index 07afb3c17..64e27ed08 100644 --- a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java +++ b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java @@ -36,6 +36,7 @@ public class PushRecordDetailPO { /** * 执行状态 + * @see com.engine.salary.enums.push.PushRecordDetailStatusEnum */ @ElogTransform(name = "执行状态") private Integer status; diff --git a/src/com/engine/salary/entity/push/po/PushRecordPO.java b/src/com/engine/salary/entity/push/po/PushRecordPO.java index db196919a..68f133904 100644 --- a/src/com/engine/salary/entity/push/po/PushRecordPO.java +++ b/src/com/engine/salary/entity/push/po/PushRecordPO.java @@ -19,7 +19,7 @@ import java.util.Date; @AllArgsConstructor public class PushRecordPO { - @ElogTransform(name = "") + @ElogTransform(name = "id") private Long id; /** @@ -66,6 +66,12 @@ public class PushRecordPO { @ElogTransform(name = "推送状态") private Integer status; + /** + * 失败原因 + */ + @ElogTransform(name = "失败原因") + private String fail_reason; + /** * 开始时间 */ diff --git a/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java index b4e881541..47245a544 100644 --- a/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java +++ b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java @@ -14,9 +14,10 @@ import java.util.Objects; * @version 1.0 **/ public enum PushRecordDetailStatusEnum implements BaseEnum { - PREPARE(0, "待执行", 87625), - SUCCESS(1, "执行成功", 85393), - FAIL(2, "执行失败", 85393); + PREPARE(0, "待推送", 87625), + SUCCESS(1, "推送成功", 85393), + FAIL(2, "推送失败", 85393), + WITHDRAW(3, "已撤回", 85393); private int value; diff --git a/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java b/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java index 79a99b1f9..72d3e6dfe 100644 --- a/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java +++ b/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java @@ -52,6 +52,6 @@ public enum SalarySQLReferenceEnum implements BaseEnum { return referenceEnum; } } - return null; + return EMPLOYEE_INFO; } } diff --git a/src/com/engine/salary/mapper/push/PushRecordMapper.xml b/src/com/engine/salary/mapper/push/PushRecordMapper.xml index 932cd68c2..24443a68e 100644 --- a/src/com/engine/salary/mapper/push/PushRecordMapper.xml +++ b/src/com/engine/salary/mapper/push/PushRecordMapper.xml @@ -44,6 +44,7 @@ FROM hrsa_push_record t WHERE delete_type = 0 + ORDER BY id DESC diff --git a/src/com/engine/salary/service/PushService.java b/src/com/engine/salary/service/PushService.java index 3deb75ad3..6511aeef8 100644 --- a/src/com/engine/salary/service/PushService.java +++ b/src/com/engine/salary/service/PushService.java @@ -1,11 +1,10 @@ package com.engine.salary.service; +import com.engine.salary.entity.push.dto.PushRecordDTO; +import com.engine.salary.entity.push.dto.PushRecordDetailDTO; import com.engine.salary.entity.push.dto.PushSettingDTO; import com.engine.salary.entity.push.dto.PushSettingItemDTO; -import com.engine.salary.entity.push.param.PushSettingItemQueryParam; -import com.engine.salary.entity.push.param.PushSettingItemSaveParam; -import com.engine.salary.entity.push.param.PushSettingQueryParam; -import com.engine.salary.entity.push.param.PushSettingSaveParam; +import com.engine.salary.entity.push.param.*; import com.engine.salary.entity.push.po.PushSettingItemPO; import com.engine.salary.entity.push.po.PushSettingPO; import com.engine.salary.util.page.PageInfo; @@ -68,4 +67,8 @@ public interface PushService { void createPushRecord(Long salaryAcctRecordId); void removeBatch(Long batchId); + + PageInfo recordList(RecordListQueryParam param); + + PageInfo recordDetailList(RecordDetailListQueryParam param); } diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java index 1427d6cfe..efe2e9bc8 100644 --- a/src/com/engine/salary/service/impl/PushServiceImpl.java +++ b/src/com/engine/salary/service/impl/PushServiceImpl.java @@ -5,12 +5,11 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.push.dto.PushRecordDTO; +import com.engine.salary.entity.push.dto.PushRecordDetailDTO; import com.engine.salary.entity.push.dto.PushSettingDTO; import com.engine.salary.entity.push.dto.PushSettingItemDTO; -import com.engine.salary.entity.push.param.PushSettingItemQueryParam; -import com.engine.salary.entity.push.param.PushSettingItemSaveParam; -import com.engine.salary.entity.push.param.PushSettingQueryParam; -import com.engine.salary.entity.push.param.PushSettingSaveParam; +import com.engine.salary.entity.push.param.*; import com.engine.salary.entity.push.po.PushRecordDetailPO; import com.engine.salary.entity.push.po.PushRecordPO; import com.engine.salary.entity.push.po.PushSettingItemPO; @@ -368,6 +367,45 @@ public class PushServiceImpl extends Service implements PushService { if (salaryAcctRecordPO == null) { throw new SalaryRunTimeException("核算记录不存在！"); } + + //查询核算人员 + List salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salaryAcctRecordPO.getId()); + + //薪资项目 + List salaryItemPOS = getSalaryItemService(user).listAll(); + //查询薪资核算记录的薪资周期、考勤周期等 + SalarySobCycleDTO salarySobCycleDTO = getSalaryAcctRecordService(user).getSalarySobCycleById(salaryAcctRecordPO.getId()); + + SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO() + .setSalaryAcctRecordPO(salaryAcctRecordPO) + .setSalarySobPO(new SalarySobPO()) + .setSalarySobCycleDTO(salarySobCycleDTO) + .setOtherSalaryAcctRecordPOS(new ArrayList<>()) + .setSalarySobItemPOS(new ArrayList<>()) + .setSalaryItemIdWithPriorityList(new ArrayList<>()) + .setExpressFormulas(new ArrayList<>()) + .setSalaryItemPOS(salaryItemPOS) + .setSalarySobAdjustRulePOS(new ArrayList<>()) + .setWelfareColumns(new HashMap<>()) + .setAttendQuoteFieldListDTOS(new ArrayList<>()) + .setSalaryAcctEmployeePOS(salaryAcctEmployeePOS) + .setIssuedFieldIds(new HashSet<>()) + .setChildMonitor(null) + .setResults(null) + .setCalculateKey(null) + .setVariableItems(new ArrayList<>()) + .setTaxDeclarationFunction(TaxDeclarationFunctionEnum.OPEN); + + + List employeeIds = SalaryEntityUtil.properties(salaryAcctCalculateBO.getSalaryAcctEmployeePOS(), SalaryAcctEmployeePO::getEmployeeId, Collectors.toList()); + List simpleEmployees = getSalaryEmployeeService(user).getEmployeeByIdsAll(employeeIds); + + List salaryAcctEmployeeIds = SalaryEntityUtil.properties(salaryAcctCalculateBO.getSalaryAcctEmployeePOS(), SalaryAcctEmployeePO::getId, Collectors.toList()); + List salaryAcctResultPOS = getSalaryAcctResultService(user).listBySalaryAcctEmployeeIds(salaryAcctEmployeeIds); + + CalculateFormulaVarBO calculateFormulaVarBO = new CalculateFormulaVarBO(simpleEmployees, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), salaryAcctResultPOS, new ArrayList<>()); + Map> formulaVarMap = calculateFormulaVarBO.convert2FormulaVar(salaryAcctCalculateBO); + List pushSettingPOS = getPushSettingMapper().listSome(PushSettingPO.builder().able(1).build()); //批次号 @@ -399,47 +437,8 @@ public class PushServiceImpl extends Service implements PushService { Long id = setting.getId(); List pushSettingItemPOS = getPushSettingItemMapper().listSome(PushSettingItemPO.builder().settingId(id).build()); - - //查询核算人员 - List salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salaryAcctRecordPO.getId()); - - //薪资项目 - List salaryItemPOS = getSalaryItemService(user).listAll(); - //查询薪资核算记录的薪资周期、考勤周期等 - SalarySobCycleDTO salarySobCycleDTO = getSalaryAcctRecordService(user).getSalarySobCycleById(salaryAcctRecordPO.getId()); - - SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO() - .setSalaryAcctRecordPO(salaryAcctRecordPO) - .setSalarySobPO(new SalarySobPO()) - .setSalarySobCycleDTO(salarySobCycleDTO) - .setOtherSalaryAcctRecordPOS(new ArrayList<>()) - .setSalarySobItemPOS(new ArrayList<>()) - .setSalaryItemIdWithPriorityList(new ArrayList<>()) - .setExpressFormulas(new ArrayList<>()) - .setSalaryItemPOS(salaryItemPOS) - .setSalarySobAdjustRulePOS(new ArrayList<>()) - .setWelfareColumns(new HashMap<>()) - .setAttendQuoteFieldListDTOS(new ArrayList<>()) - .setSalaryAcctEmployeePOS(salaryAcctEmployeePOS) - .setIssuedFieldIds(new HashSet<>()) - .setChildMonitor(null) - .setResults(null) - .setCalculateKey(null) - .setVariableItems(new ArrayList<>()) - .setTaxDeclarationFunction(TaxDeclarationFunctionEnum.OPEN); - - - List employeeIds = SalaryEntityUtil.properties(salaryAcctCalculateBO.getSalaryAcctEmployeePOS(), SalaryAcctEmployeePO::getEmployeeId, Collectors.toList()); - List simpleEmployees = getSalaryEmployeeService(user).getEmployeeByIdsAll(employeeIds); - - List salaryAcctEmployeeIds = SalaryEntityUtil.properties(salaryAcctCalculateBO.getSalaryAcctEmployeePOS(), SalaryAcctEmployeePO::getId, Collectors.toList()); - List salaryAcctResultPOS = getSalaryAcctResultService(user).listBySalaryAcctEmployeeIds(salaryAcctEmployeeIds); - - CalculateFormulaVarBO calculateFormulaVarBO = new CalculateFormulaVarBO(simpleEmployees, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), salaryAcctResultPOS, new ArrayList<>()); - Map> formulaVarMap = calculateFormulaVarBO.convert2FormulaVar(salaryAcctCalculateBO); - + //每个人员生成一天明细 salaryAcctEmployeePOS.forEach(emp -> { - //1 获取当前薪资核算人员的公式中的变量的值 List formulaVarValues = formulaVarMap.get(emp.getEmployeeId() + "_" + emp.getTaxAgentId()); //2 人员信息 @@ -564,7 +563,7 @@ public class PushServiceImpl extends Service implements PushService { } pushRecordDetailPO.setStatus(PushRecordDetailStatusEnum.SUCCESS.getValue()); - }catch (Exception e){ + } catch (Exception e) { pushRecordDetailPO.setFail_reason(e.getMessage()); pushRecordDetailPO.setStatus(PushRecordDetailStatusEnum.FAIL.getValue()); } @@ -591,4 +590,52 @@ public class PushServiceImpl extends Service implements PushService { getPushRecordMapper().delete(pushRecordPO); }); } + + @Override + public PageInfo recordList(RecordListQueryParam param) { + List pushRecordPOS = getPushRecordMapper().listAll(); + List listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordPOS) + .stream() + .map(po -> PushRecordDTO.builder() + .id(po.getId()) + .batchId(po.getBatchId()) + .name(po.getName()) + .settingId(po.getId()) + .modeId(po.getModeId()) + .tableName(po.getTableName()) + .acctRecordId(po.getAcctRecordId()) + .type(PushRecordTypeEnum.PUSH.getValue()) + .status(PushRecordStatusEnum.PREPARE.getValue()) + .startTime(po.getStartTime()) + .endTime(po.getEndTime()) + .build()) + .collect(Collectors.toList()); + + PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDTO.class); + pageInfo.setTotal(pushRecordPOS.size()); + return pageInfo; + } + + @Override + public PageInfo recordDetailList(RecordDetailListQueryParam param) { + ValidUtil.doValidator(param); + + List pushRecordDetailPOS = getPushRecordDetailMapper().listSome(PushRecordDetailPO.builder().recordId(param.getRecordId()).build()); + List listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordDetailPOS) + .stream() + .map(po -> PushRecordDetailDTO.builder() + .id(po.getId()) + .recordId(po.getRecordId()) + .acctEmpId(po.getAcctEmpId()) + .status(po.getStatus()) + .fail_reason(po.getFail_reason()) + .execute(po.getExecute()) + .createTime(po.getCreateTime()) + .creator(po.getCreator()) + .build()) + .collect(Collectors.toList()); + PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDetailDTO.class); + pageInfo.setTotal(pushRecordDetailPOS.size()); + return null; + } } diff --git a/src/com/engine/salary/web/PushController.java b/src/com/engine/salary/web/PushController.java index d42e3b222..b36c06ed2 100644 --- a/src/com/engine/salary/web/PushController.java +++ b/src/com/engine/salary/web/PushController.java @@ -1,6 +1,8 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.push.dto.PushRecordDTO; +import com.engine.salary.entity.push.dto.PushRecordDetailDTO; import com.engine.salary.entity.push.dto.PushSettingDTO; import com.engine.salary.entity.push.dto.PushSettingItemDTO; import com.engine.salary.entity.push.param.*; @@ -99,18 +101,18 @@ public class PushController { } @POST - @Path("/push/list") + @Path("/record/list") @Produces(MediaType.APPLICATION_JSON) - public String pushList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PushParam param) { + public String recordList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody RecordListQueryParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getPushWrapper(user)::push, param); + return new ResponseResult>(user).run(getPushWrapper(user)::recordList, param); } @POST - @Path("/push/detail") + @Path("/record/detail") @Produces(MediaType.APPLICATION_JSON) - public String pushDetail(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PushParam param) { + public String recordDetail(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody RecordDetailListQueryParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getPushWrapper(user)::push, param); + return new ResponseResult>(user).run(getPushWrapper(user)::recordDetailList, param); } } diff --git a/src/com/engine/salary/wrapper/PushWrapper.java b/src/com/engine/salary/wrapper/PushWrapper.java index 3e521bae0..f59d1c934 100644 --- a/src/com/engine/salary/wrapper/PushWrapper.java +++ b/src/com/engine/salary/wrapper/PushWrapper.java @@ -2,6 +2,8 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.entity.push.dto.PushRecordDTO; +import com.engine.salary.entity.push.dto.PushRecordDetailDTO; import com.engine.salary.entity.push.dto.PushSettingDTO; import com.engine.salary.entity.push.dto.PushSettingItemDTO; import com.engine.salary.entity.push.param.*; @@ -63,4 +65,12 @@ public class PushWrapper extends Service { getPushService(user).createPushRecord(pushParam.getSalaryAcctRecordId()); } + public PageInfo recordList(RecordListQueryParam param) { + + return getPushService(user).recordList(param); + } + + public PageInfo recordDetailList(RecordDetailListQueryParam param) { + return getPushService(user).recordDetailList(param); + } }