From 897a7731bf75f36ec1e8b03393b1785763a2eb7d Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Tue, 19 Sep 2023 13:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8fixbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/report/SalaryStatisticsPushMapper.java  | 2 +-
 .../salary/mapper/report/SalaryStatisticsPushMapper.xml   | 6 +++---
 .../service/impl/SalaryStatisticsPushServiceImpl.java     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

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<SalaryStatisticsPushPO> listListReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List<Long> ids);
+    List<SalaryStatisticsPushPO> listByReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List<Long> 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>
 
-    <select id="listListReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO">
+    <select id="listByReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO">
         SELECT
         <include refid="baseColumns" />
         FROM hrsa_report_push t
@@ -140,7 +140,7 @@
         </if>
     </select>
 
-    <select id="listListReportId" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="oracle">
+    <select id="listByReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="oracle">
         SELECT
         <include refid="baseColumns" />
         FROM hrsa_report_push t
@@ -156,7 +156,7 @@
         </if>
     </select>
 
-    <select id="listListReportId" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="sqlserver">
+    <select id="listByReportIdAndIds" resultType="com.engine.salary.report.entity.po.SalaryStatisticsPushPO" databaseId="sqlserver">
         SELECT
         <include refid="baseColumns" />
         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<String, Object> 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<SalaryStatisticsPushPO> getPushListByReportIdAndIds(Long reportId, List<Long> ids) {
-        List<SalaryStatisticsPushPO> pushList = getSalaryStatisticsPushMapper().listListReportIdAndIds(reportId, ids);
+        List<SalaryStatisticsPushPO> pushList = getSalaryStatisticsPushMapper().listByReportIdAndIds(reportId, ids);
         pushList = pushList.stream().filter( push -> {
             return Arrays.asList(push.getReportIds().split(",")).contains(reportId.toString());
         }).collect(Collectors.toList());