From 113ed727af00b02df071891a275899ba14f6187d Mon Sep 17 00:00:00 2001
From: csyue <1203338439@qq.com>
Date: Mon, 17 Jun 2024 16:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/app/TmTaskMapper.xml     | 96 ++++++++++---------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index efb6bb48..5963c453 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -1026,52 +1026,56 @@
       lad.id
   </select>
   <select id="getLeaseOutListByUser" resultType="com.bonus.sgzb.app.domain.TmTask">
-      SELECT
-      tt.*,
-      lai.id AS id,
-      bpl.lot_id AS proId,
-      bpl.lot_name AS proName,
-      bui.unit_id AS unitId,
-      bui.unit_name AS unitName,
-      lai.lease_person AS leasePerson,
-      lai.phone AS leasePhone,
-      tt.create_by AS applyFor,
-      d.`name` AS taskName,
-      lai.lease_type AS leaseType,
-      d.id AS examineStatusId,
-      bai.agreement_code AS agreementCode,
-      tt.create_time AS createTimes,
-      IFNULL(sum(lad.pre_num),0) as preCountNum,
-      IFNULL(sum(lad.al_num),0) as alNum,
-      tt.update_time AS updateTimes
-      from
-      lease_apply_info lai
-      LEFT JOIN tm_task tt on lai.task_id = tt.task_id
-      LEFT JOIN sys_dic d ON d.id = tt.task_status
-      LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
-      LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
-      LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
-      LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
-      LEFT JOIN lease_apply_details lad on lai.id = lad.parennt_id
-      LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
-      WHERE tt.task_status in(33,34,35)
-      <if test="userId != 1">
-          and mtk.user_id = #{userId}
-      </if>
-      <if test="code != null and code != ''">
-          and tt.code like concat('%', #{code}, '%')
-      </if>
-      <if test="unitId != null">
-        and bui.unit_id = #{unitId}
-      </if>
-      <if test="proId != null">
-        and bpl.lot_id = #{proId}
-      </if>
-      <if test="taskStatus != null">
-        and tt.task_status = #{taskStatus}
-      </if>
-      GROUP BY lai.id
-      ORDER BY tt.task_status,tt.create_time desc
+    SELECT
+    tt.*,
+    lai.id AS id,
+    bpl.lot_id AS proId,
+    bpl.lot_name AS proName,
+    bui.unit_id AS unitId,
+    bui.unit_name AS unitName,
+    lai.lease_person AS leasePerson,
+    lai.phone AS leasePhone,
+    tt.create_by AS applyFor,
+    d.`name` AS taskName,
+    lai.lease_type AS leaseType,
+    d.id AS examineStatusId,
+    bai.agreement_code AS agreementCode,
+    tt.create_time AS createTimes,
+    IFNULL( sum( lad.pre_num ), 0 ) AS preCountNum,
+    IFNULL( sum( lad.al_num ), 0 ) AS alNum,
+    tt.update_time AS updateTimes
+    FROM
+    lease_apply_info lai
+    LEFT JOIN tm_task tt ON lai.task_id = tt.task_id
+    LEFT JOIN sys_dic d ON d.id = tt.task_status
+    LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
+    LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
+    LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
+    LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
+    LEFT JOIN lease_apply_details lad ON lai.id = lad.parennt_id
+    LEFT JOIN ( SELECT mtk.type_id, mtk.user_id FROM ma_type_keeper mtk LEFT JOIN lease_apply_details lad1 ON lad1.type_id = mtk.type_id LIMIT 1 ) aa ON lad.type_id = aa.type_id
+    WHERE
+    tt.task_status IN ( 33, 34, 35 )
+    <if test="userId != 1">
+      and aa.user_id = #{userId}
+    </if>
+    <if test="code != null and code != ''">
+      and tt.code like concat('%', #{code}, '%')
+    </if>
+    <if test="unitId != null">
+      and bui.unit_id = #{unitId}
+    </if>
+    <if test="proId != null">
+      and bpl.lot_id = #{proId}
+    </if>
+    <if test="taskStatus != null">
+      and tt.task_status = #{taskStatus}
+    </if>
+    GROUP BY
+    lai.id
+    ORDER BY
+    tt.task_status,
+    tt.create_time DESC
   </select>
   <select id="getLeaseDetailByParentId" resultType="com.bonus.sgzb.app.domain.TmTask">
     SELECT