From 34359bca8e66ea875710b3c54762b8b887953110 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 18 Dec 2024 10:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lease/mapper/LeaseRepairRecordMapper.java | 2 ++
.../order/controller/OrderController.java | 17 +++++++++++++++++
.../material/order/domain/OrderDetailDto.java | 3 +++
.../material/lease/LeaseRepairRecordMapper.xml | 5 +++++
.../mapper/material/order/OrderInfoMapper.xml | 1 +
5 files changed, 28 insertions(+)
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 e417c2e..59b419e 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 getCountByOrderId(Integer orderId);
+
int deleteLeaseRepairRecord(LeaseRepairRecord leaseRepairRecord);
/**
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
index 2484b61..39848a3 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.text.StrBuilder;
import com.bonus.common.biz.enums.MaStatusEnum;
import com.bonus.common.biz.enums.OrderStatusEnum;
+import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
@@ -12,6 +13,8 @@ import com.bonus.material.book.domain.BookCarInfoDto;
import com.bonus.material.contract.domain.BmContract;
import com.bonus.material.contract.service.BmContractService;
import com.bonus.material.device.domain.vo.DevInfoVo;
+import com.bonus.material.lease.domain.LeaseRepairRecord;
+import com.bonus.material.lease.mapper.LeaseRepairRecordMapper;
import com.bonus.material.order.domain.OrderDetailCostReliefDto;
import com.bonus.material.order.domain.OrderDetailDto;
import com.bonus.material.order.domain.OrderInfoDto;
@@ -64,6 +67,9 @@ public class OrderController extends BaseController {
@Resource
private OrderMapper orderMapper;
+ @Resource
+ private LeaseRepairRecordMapper leaseRepairRecordMapper;
+
@Resource
private BmContractService bmContractService;
@@ -153,6 +159,17 @@ public class OrderController extends BaseController {
}
}
}
+ // 检修完结，如果没有记录需要新加一条记录
+// if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_REPAIRED.getStatus().toString())) {
+// if (leaseRepairRecordMapper.getCountByOrderId(orderInfoDto.getOrderId()) == 0) {
+// LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord();
+// leaseRepairRecord.setOrderId(String.valueOf(orderInfoDto.getOrderId()));
+// leaseRepairRecord.setCode(orderInfoDto.getOrderCode());
+// leaseRepairRecord.setCreateBy(SecurityUtils.getUserId().toString());
+// leaseRepairRecord.setCreateTime(DateUtils.getNowDate());
+// leaseRepairRecordMapper.insert(leaseRepairRecord);
+// }
+// }
Integer i = orderMapper.updateOrderStatus(orderInfoDto.getOrderId(), orderInfoDto.getMaIds(), orderInfoDto.getOrderStatus(), userName);
if (i > 0) {
return success();
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
index 2684a72..7ab7c4e 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
@@ -28,6 +28,9 @@ public class OrderDetailDto {
@ApiModelProperty(value = "订单id")
private Integer orderId;
+ @ApiModelProperty(value = "订单code")
+ private String orderCode;
+
@ApiModelProperty(value = "设备id")
private Integer maId;
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 07d59eb..e8351d6 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
@@ -490,4 +490,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
lr.order_id = #{orderId}
+
+
\ No newline at end of file
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 64f8e01..fc69813 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -230,6 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"