From a12636fe37ce9a3566f010e9856a8509afd26292 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 5 Dec 2024 16:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/device/domain/vo/DevInfoVo.java | 1 + .../com/bonus/material/order/controller/OrderController.java | 4 ++-- .../main/resources/mapper/material/device/DevInfoMapper.xml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 0f92e65..45c1dce 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; import java.util.List; 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 7e01433..5b2330f 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 @@ -82,7 +82,7 @@ public class OrderController extends BaseController { return error("参数错误"); } // 退租 - if (orderInfoDto.getOrderStatus().equals("5")) { + /* if (orderInfoDto.getOrderStatus().equals("5")) { List dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); if (dtos.size() > 0) { for (OrderDetailDto dto : dtos) { @@ -96,7 +96,7 @@ public class OrderController extends BaseController { } } } - } + }*/ // 取消 if (orderInfoDto.getOrderStatus().equals("7")) { List dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 01a4410..51244f9 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -219,6 +219,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.device_weight as deviceWeight, d.device_count as deviceCount, d.type_id as typeId, + d.check_date as checkDate, + d.check_cycle as checkCycle, mt4.type_name as typeName, mt4.unit_name as unitName, mt4.manage_type as manageType,