From b760db71c9564cb1f41dd5f0be0b913a96b97e68 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Sat, 24 Aug 2024 17:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=91=E6=8F=B4=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/RescueInfoSystem.java    |  8 +++---
 .../impl/RescueRefuelRecordServiceImpl.java   | 26 +++++++------------
 .../rescue/RescueRefuelRecordMapper.xml       |  2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java
index a76eddac..97ea866c 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java
@@ -68,9 +68,11 @@ public class RescueInfoSystem extends BaseController {
 
     @PostMapping("/update")
     public CommonResult update(@RequestBody RescueInfo rescueInfo) {
-        RescueOrderInfo orderInfo = infoService.getById(rescueInfo.getRescueOrderId());
-        orderInfo.setSetMoney(rescueInfo.getSetMoney());
-        infoService.updateById(orderInfo);
+        if (ObjectUtil.isNotEmpty(rescueInfo.getSetMoney())){
+            RescueOrderInfo orderInfo = infoService.getById(rescueInfo.getRescueOrderId());
+            orderInfo.setSetMoney(rescueInfo.getSetMoney());
+            infoService.updateById(orderInfo);
+        }
         rescueInfoService.updateById(rescueInfo);
         return CommonResult.ok();
     }
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueRefuelRecordServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueRefuelRecordServiceImpl.java
index 5ec04fca..07b69a72 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueRefuelRecordServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueRefuelRecordServiceImpl.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.module.rescue.mapper.RescueRefuelRecordMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -19,8 +20,7 @@ import java.util.List;
  * @date 2023-09-26
  */
 @Service
-public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecordMapper, RescueRefuelRecord> implements IRescueRefuelRecordService
-{
+public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecordMapper, RescueRefuelRecord> implements IRescueRefuelRecordService {
 
     /**
      * 查询加油记录
@@ -29,8 +29,7 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
      * @return 加油记录
      */
     @Override
-    public RescueRefuelRecord selectRescueRefuelRecordById(Long id)
-    {
+    public RescueRefuelRecord selectRescueRefuelRecordById(Long id) {
         return baseMapper.selectRescueRefuelRecordById(id);
     }
 
@@ -41,8 +40,7 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
      * @return 加油记录
      */
     @Override
-    public IPage<RescueRefuelRecord> selectRescueRefuelRecordList(RescueRefuelRecord rescueRefuelRecord, Page<RescueRefuelRecord> page)
-    {
+    public IPage<RescueRefuelRecord> selectRescueRefuelRecordList(RescueRefuelRecord rescueRefuelRecord, Page<RescueRefuelRecord> page) {
         return baseMapper.selectRescueRefuelRecordList(rescueRefuelRecord, page);
     }
 
@@ -53,8 +51,7 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
      * @return 结果
      */
     @Override
-    public int insertRescueRefuelRecord(RescueRefuelRecord rescueRefuelRecord)
-    {
+    public int insertRescueRefuelRecord(RescueRefuelRecord rescueRefuelRecord) {
         return baseMapper.insert(rescueRefuelRecord);
     }
 
@@ -65,8 +62,7 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
      * @return 结果
      */
     @Override
-    public int updateRescueRefuelRecord(RescueRefuelRecord rescueRefuelRecord)
-    {
+    public int updateRescueRefuelRecord(RescueRefuelRecord rescueRefuelRecord) {
         return baseMapper.updateById(rescueRefuelRecord);
     }
 
@@ -77,9 +73,8 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
      * @return 结果
      */
     @Override
-    public int deleteRescueRefuelRecordByIds(Long[] ids)
-    {
-        return baseMapper.deleteRescueRefuelRecordByIds(ids);
+    public int deleteRescueRefuelRecordByIds(Long[] ids) {
+        return baseMapper.deleteByIds(Arrays.asList(ids));
     }
 
     /**
@@ -89,8 +84,7 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
      * @return 结果
      */
     @Override
-    public int deleteRescueRefuelRecordById(Long id)
-    {
+    public int deleteRescueRefuelRecordById(Long id) {
         return baseMapper.deleteRescueRefuelRecordById(id);
     }
 
@@ -98,7 +92,7 @@ public class RescueRefuelRecordServiceImpl extends ServiceImpl<RescueRefuelRecor
     //通过司机主键和时间计算该月的加油总数和行驶总公里数
     @Override
     public JSONObject getMonthRescueRefuelRecord(Long driverId, String time, Long carId) {
-        return baseMapper.getMonthRescueRefuelRecord(driverId,time,carId);
+        return baseMapper.getMonthRescueRefuelRecord(driverId, time, carId);
 
     }
 
diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml
index 2e3f4060..76864cb9 100644
--- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml
+++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml
@@ -28,7 +28,7 @@
         INNER JOIN system_users su ON su.id = di.user_id
         left join rescue_car_info rci on di.id = rci.possessor_id
         where rrc.deleted = '0'
-        <if test="map.realName != null ">and su.real_name like concat('%',#{map.realName},'%')</if>
+        <if test="map.realName != null ">and su.nickname like concat('%',#{map.realName},'%')</if>
         <if test="map.rescueCarNum != null ">and rci.rescue_car_num like concat('%',#{map.rescueCarNum},'%')</if>
         order by rrc.record_time desc
     </select>