From 7f50080a3b3b130e7d5ca46c4ba4750e8305a6dd Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Sun, 7 Sep 2025 13:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=BB=93=E6=9D=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java | 2 +-
 .../src/main/resources/mapper/orders/ZcOrderMainMapper.xml    | 4 ++--
 .../src/main/resources/templates/operation/car/car.html       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
index cf3f8ac..26fed0f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
@@ -265,7 +265,7 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
         zcOrderMain.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
         zcOrderMain.setUpdateTime(DateUtils.getNowDate());
         zcOrderMain.setEndOrderTime(DateUtils.getNowDate());
-
+        zcOrderMain.setActEndRentTime(DateUtils.getNowDate());
         // 计算逾期费用
         long overdueDays = DateUtils.daysBetween(queryOrder.getEndRentTime(), DateUtils.getNowDate());
         if (overdueDays > 0) {
diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
index 72dfe06..202e626 100644
--- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
@@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDepositFree != null">is_deposit_free = #{isDepositFree},</if>
             <if test="isAutoDeduct != null">is_auto_deduct = #{isAutoDeduct},</if>
             <if test="firstOrderTime != null">first_order_time = #{firstOrderTime},</if>
-            <if test="startRentTime != null">start_rent_time = #{startRentTime},</if>
+            <if test="startRentTime != null and startRentTime != ''">start_rent_time = #{startRentTime},</if>
             <if test="overdueDays != null">overdue_days = #{overdueDays},</if>
             <if test="renewalTimes != null">renewal_times = #{renewalTimes},</if>
             <if test="chargeTimes != null">charge_times = #{chargeTimes},</if>
@@ -244,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rentBatteyRuleId != null">rent_battey_rule_id = #{rentBatteyRuleId},</if>
             <if test="orderAmount != null">order_amount = #{orderAmount},</if>
             <if test="overdueAmount != null">overdue_amount = #{overdueAmount},</if>
-            <if test="endOrderTime != null">end_order_time = #{endOrderTime},</if>
+            <if test="endOrderTime != null and endOrderTime != ''">end_order_time = #{endOrderTime},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/car.html b/ruoyi-admin/src/main/resources/templates/operation/car/car.html
index c66a607..e0cf346 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/car/car.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/car/car.html
@@ -160,7 +160,7 @@
                 },
                 {
                     field: 'status',
-                    title: '状态',
+                    title: '车辆状态',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(statusDatas, value);
                     }