From c63ff56235423f2bc1a9956fa675fec443174d8f Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 12 Dec 2024 13:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=A7=9F=E6=A3=80=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lease/mapper/LeaseRepairRecordMapper.java | 2 ++
.../impl/LeaseRepairRecordServiceImpl.java | 16 +++++++++++-----
.../material/lease/LeaseRepairRecordMapper.xml | 6 ++++++
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
index 40c810a..e417c2e 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
@@ -34,6 +34,8 @@ public interface LeaseRepairRecordMapper {
*/
int insert(LeaseRepairRecord leaseRepairRecord);
+ int deleteLeaseRepairRecord(LeaseRepairRecord leaseRepairRecord);
+
/**
* 查询列表
* @param dto
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
index 245a741..13bd32f 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
@@ -336,14 +336,17 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
result += insertRepairScrapLossRecords(scrapRecordList, leaseRepairRecord);
result += insertRepairScrapLossRecords(lossRecordList, leaseRepairRecord);
+ // 插入前删掉旧的维修记录
+ mapper.deleteLeaseRepairRecord(leaseRepairRecord);
+
// 执行插入操作
result += mapper.insert(leaseRepairRecord);
}
- LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord();
- leaseRepairRecord.setOrderId(leaseRecordDto.getOrderId());
- leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_REPAIRED.getStatus());
- leaseRepairRecord.setMaIds(maIdList);
- result += orderMapper.updateOrder(leaseRepairRecord);
+// LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord();
+// leaseRepairRecord.setOrderId(leaseRecordDto.getOrderId());
+// leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_REPAIRED.getStatus());
+// leaseRepairRecord.setMaIds(maIdList);
+// result += orderMapper.updateOrder(leaseRepairRecord);
// 返回结果
return result > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg())
: AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
@@ -446,6 +449,9 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
leaseRepairRecord.setLossNum(record.getLossNum());
leaseRepairRecord.setLossPrice(record.getLossPrice());
if (CollectionUtils.isNotEmpty(record.getFileInfoList())) {
+ for (BmFileInfo bmFileInfo : record.getFileInfoList()) {
+ bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfo);
+ }
bmFileInfoMapper.insertBmFileInfos(record.getFileInfoList());
}
result++;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml
index 425adbc..07d59eb 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/LeaseRepairRecordMapper.xml
@@ -49,6 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+ delete from lease_repair_record
+ where
+ code = #{code} and order_id = #{orderId} and ma_id = #{maId}
+
+
insert into ma_hot_search(lease_id, lease_num, create_time)
values(#{id}, 1, now())