From 07c341f1f756cf82b838c7c75a67c51be6377d59 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 14 Nov 2024 13:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/material/lease/LeaseApplyInfoMapper.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index 9bc5c16c..c0ceac6a 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark,
lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party,
- bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus
--- IFNULL(sum(lad.pre_num),0) as preCountNum,
--- IFNULL(sum(lad.al_num),0) as alNum
+ bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus,
+ IFNULL(sum(lad.pre_num),0) as preCountNum,
+ IFNULL(sum(lad.al_num),0) as alNum
from
lease_apply_info lai
left join tm_task tt on lai.task_id = tt.task_id
@@ -85,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and lai.estimate_lease_time = #{estimateLeaseTime}
and lai.cost_bearing_party = #{costBearingParty}
+ GROUP BY lai.id
+ ORDER BY tt.task_status,tt.create_time desc