From bbd5f4980c83ed563cf75c4308de38d40689b67a Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 13 Mar 2025 18:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/fbs/FbsProjectTaskMapper.xml          | 16 ++++++++--------
 .../mapper/wgz/WgzReissueacardMapper.xml         |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml
index 1adb5b4..82dd2fb 100644
--- a/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml
@@ -50,17 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE(wage.taskReceiveAmount, 0) as taskReceiveAmount
         FROM fbs_project_task fpt
         LEFT JOIN zbf_project zp ON fpt.project_id = zp.id
-        LEFT JOIN (
-        SELECT task_id, COUNT(*) as applyNum
+        LEFT JOIN
+        (SELECT task_id, COUNT(*) as applyNum
         FROM fbs_project_task_apply
-        GROUP BY task_id
-        ) apply ON fpt.id = apply.task_id
-        LEFT JOIN (
-        SELECT task_id, SUM(applicant_amount) as taskReceiveAmount
+        GROUP BY task_id)
+         apply ON fpt.id = apply.task_id
+        LEFT JOIN
+        (SELECT task_id, SUM(applicant_amount) as taskReceiveAmount
         FROM bgt_wage_application
         WHERE audit_status = '2'
-        GROUP BY task_id
-        ) wage ON fpt.id = wage.task_id
+        GROUP BY task_id)
+         wage ON fpt.id = wage.task_id
         <where>
             <if test='!dto.myTask and dto.status != null and dto.status == "0"'>
                 AND NOT EXISTS (
diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml
index f698887..a6f938b 100644
--- a/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzReissueacardMapper.xml
@@ -29,9 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="userReplacementCardRecordListPage" resultType="com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes">
         SELECT
             a.*,
-            b.username,
-            b.avatar_name,
-            c.username as userName
+            b.username as auditorname,
+            b.avatar_name as auditorHead,
+            c.username as userName,
+            c.avatar_name
         FROM
             wgz_reissueacard a
                 LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0)