From ba817cfc024b69f624fb1f95521169ff3791d3ba Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Mon, 25 Dec 2023 11:54:12 +0800
Subject: [PATCH] =?UTF-8?q?app-=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/BackApplyMapper.xml       | 1 +
 .../src/main/resources/mapper/app/BackReceiveMapper.xml     | 1 +
 .../src/main/resources/mapper/base/RepairMapper.xml         | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index 73b4ed01..e03c573f 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -344,6 +344,7 @@
 #     WHERE
 #       bai.company_id=#{companyId}
     GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
+    ORDER BY bai.create_time desc
   </select>
 
   <select id="materialList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index bdf6106d..c9462190 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -593,6 +593,7 @@
     WHERE
           tt.task_status>='38'
     GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
+    ORDER BY bai.create_time desc
   </select>
 
   <select id="receiveView" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
index 2ab9db73..d145fe9b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
@@ -69,7 +69,7 @@
         rd.task_id,
         tt.CODE AS repairCode,
         bui.unit_name AS backUnit,
-        bpi.pro_name AS backPro,
+        bpi.lot_name AS backPro,
         su.user_name AS createName,
         tt.create_time AS createTime,
         bai.CODE AS backCode,
@@ -86,7 +86,7 @@
         LEFT JOIN tm_task_agreement tta ON bai.task_id = tta.task_id
         LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id
         LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id
-        LEFT JOIN bm_project_info bpi ON bai2.project_id = bpi.pro_id and bpi.status = '0' and bpi.del_flag = '0'
+        LEFT JOIN bm_project_lot bpi ON bai2.project_id = bpi.lot_id and bpi.status = '0' and bpi.del_flag = '0'
         left join sys_user su on rd.create_by = su.user_id
         left join sys_dic sd on sd.id = tt.task_status
         where 1=1
@@ -112,7 +112,7 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND ts.create_time between #{startTime} and #{endTime}
         </if>
-        GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.user_name
+        GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.user_name
         order by tt.create_time desc
     </select>