diff --git a/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.java b/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.java index bb158b987..bd982759e 100644 --- a/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.java +++ b/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.java @@ -79,5 +79,5 @@ public interface SalaryStatisticsPushMapper { * @param reportId * @return */ - List listListReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List ids); + List listByReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List ids); } diff --git a/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.xml b/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.xml index 3288080c1..faebe7b3d 100644 --- a/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.xml +++ b/src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.xml @@ -124,7 +124,7 @@ ORDER BY create_time DESC - SELECT FROM hrsa_report_push t @@ -140,7 +140,7 @@ - SELECT FROM hrsa_report_push t @@ -156,7 +156,7 @@ - SELECT FROM hrsa_report_push t diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java index cf75ed363..101c2ca42 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java @@ -83,9 +83,9 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt data.put("pushTitle", pushPO.getPushTitle()); data.put("mark", pushPO.getMark()); if (pushPO.getRemind() == null) { - data.put("remind", 1); + data.put("remind", "1"); } else { - data.put("remind", pushPO.getRemind()); + data.put("remind", pushPO.getRemind().toString()); } return data; } @@ -107,7 +107,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt po.getCreator().compareTo(employeeId) == 0 ).forEach( po -> { Map option = new HashMap<>(); - option.put("id", po.getId()); + option.put("id", po.getId().toString()); option.put("reportName", po.getReportName()); reportIdsOptions.add(option); }); @@ -718,7 +718,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt @Override public List getPushListByReportIdAndIds(Long reportId, List ids) { - List pushList = getSalaryStatisticsPushMapper().listListReportIdAndIds(reportId, ids); + List pushList = getSalaryStatisticsPushMapper().listByReportIdAndIds(reportId, ids); pushList = pushList.stream().filter( push -> { return Arrays.asList(push.getReportIds().split(",")).contains(reportId.toString()); }).collect(Collectors.toList());