From 0d7ee6c72d6003ea85ca7199b863c6d4f632ef88 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 10 Jul 2024 16:51:26 +0800
Subject: [PATCH] fixbug

---
 .../mapper/datacollection/EmployMapper.java       |  2 +-
 .../salary/mapper/datacollection/EmployMapper.xml |  4 ++--
 .../mapper/salarysob/SalarySobRangeMapper.xml     |  2 +-
 .../service/impl/SalaryAcctResultServiceImpl.java | 15 ++++++++-------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java
index c0ca64451..18bee1822 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java
@@ -19,7 +19,7 @@ public interface EmployMapper {
      * 只查人力资源表
      * @return
      */
-    List<DataCollectionEmployee> listAll(int yggx);
+    List<DataCollectionEmployee> listAll(@Param("yggx")int yggx);
 
     /**
      * 获取所有员工，关联部门
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index 7cab4fe26..8410b3ff1 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -116,7 +116,7 @@
                 </if>
 
                 <if test="param.targetType == 'YGGX'">
-                    f.field#{param.yggxfeildId} IN
+                    f.field${param.yggxfeildId} IN
                     <foreach collection="param.targetIds" open="(" item="targetId" separator="," close=")">
                         #{targetId}
                     </foreach>
@@ -294,7 +294,7 @@
                d.DEPARTMENTNAME   as departmentName,
                e.jobtitle         as jobtitleId,
                e.managerid        as managerid,
-               f.field#{yggx}     as yggx
+               f.field${yggx}     as yggx
         from hrmresource e
         left join hrmdepartment d on e.departmentid = d.id
         left join cus_fielddata f on f.id = e.id and f.SCOPEID=3
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
index c43c21813..271aee118 100644
--- a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
@@ -424,7 +424,7 @@
                     </foreach>
                 </if>
                 <if test="param.targetType == 'YGGX'">
-                    f.field#{param.yggxfeildId} IN
+                    f.field${param.yggxfeildId} IN
                     <foreach collection="param.targetIds" open="(" item="targetId" separator="," close=")">
                         #{targetId}
                     </foreach>
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index d74ac8b8f..a56c898f5 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -1617,17 +1617,18 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
      */
     private List<GwSalaryItemRelation> getGwReportItems(RecordSet rs) {
         List<GwSalaryItemRelation> resultList = new ArrayList<>();
-        rs.execute("select item.id,item.name,xsmc,px from uf_fygsdxzxm a " +
-                "left join hrsa_salary_item item on a.xzxm=item.name " +
-                "where item.delete_type=0 order by px");
+        List<SalaryItemPO> salaryItemPOList = getSalaryItemService(user).listAll();
+        Map<String, Long> salaryItemMap = SalaryEntityUtil.convert2Map(salaryItemPOList, item -> Util.formatMultiLang(item.getName(), "7"), item -> item.getId());
+        rs.execute("select xzxm,xsmc,px from uf_fygsdxzxm a order by px");
         while (rs.next()) {
-            String itemStr = rs.getString(1);
-            if (NumberUtils.isCreatable(itemStr)) {
+            String itemName = rs.getString(1);
+            Long itemId = salaryItemMap.get(itemName);
+            if (itemId != null) {
                 GwSalaryItemRelation itemRelation = new GwSalaryItemRelation();
-                itemRelation.setSalaryItemId(Long.valueOf(itemStr));
-                itemRelation.setSalaryItemName(rs.getString(2));
+                itemRelation.setSalaryItemName(rs.getString(1));
                 itemRelation.setSalaryItemShowName(rs.getString("xsmc"));
                 itemRelation.setSortedId(rs.getInt("px"));
+                itemRelation.setSalaryItemId(itemId);
                 resultList.add(itemRelation);
             }
         }