From 808208472e2e2214231892f1442e0b8e0b6999f9 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Wed, 15 Oct 2025 01:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=9C=9F=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ClzSltAgreementInfoController.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java
index 4822639c..48ce6668 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java
@@ -442,6 +442,8 @@ public class ClzSltAgreementInfoController extends BaseController {
 
                     List<MaterialSltAgreementInfo> leaseList = new ArrayList<>(oneOfListLease);
 
+
+
                     for (MaterialSltAgreementInfo bean : leaseList) {
                         // 数据安全检查
                         if (null == bean.getLeasePrice()) {
@@ -455,13 +457,22 @@ public class ClzSltAgreementInfoController extends BaseController {
                         if (Objects.isNull(bean.getLeaseDays())) {
                             bean.setLeaseDay(0L);
                         }
+
+                        String date = null ;
+                        //先判断是否在场
+                        String exitTime1= clzSltAgreementInfoMapper.getTeamSjOutTime(bean);
+                        if( exitTime1!=null && !exitTime1.isEmpty() ){
+
+                        }else{
+                            date = clzSltAgreementInfoMapper.getTeamOutTime(bean);
+                        }
                         // 物资已退还，按照天数来计算费用
                         Date materialReturnTime = bean.getEndTime();
 
                         if(materialReturnTime == null){
                             materialReturnTime = DateTime.now();
                         }
-                        String teamExitTime = bean.getActualExitTime();
+                        String teamExitTime =date;
                         if (teamExitTime == null) {
                             teamExitTime = DateTime.now().toString("yyyy-MM-dd");
                         }