bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加校验日期，校验周期

This commit is contained in:
liang.chao 2024-12-05 16:24:47 +08:00
parent 1fe09a7839
commit a12636fe37
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
View File

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import java.util.Date;
import java.util.List; import java.util.List;

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -82,7 +82,7 @@ public class OrderController extends BaseController {
return error("参数错误"); return error("参数错误");
} }
// 退租 // 退租
if (orderInfoDto.getOrderStatus().equals("5")) { /* if (orderInfoDto.getOrderStatus().equals("5")) {
List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
if (dtos.size() > 0) { if (dtos.size() > 0) {
for (OrderDetailDto dto : dtos) { for (OrderDetailDto dto : dtos) {
@ -96,7 +96,7 @@ public class OrderController extends BaseController {
} }
} }
} }
} }*/
// 取消 // 取消
if (orderInfoDto.getOrderStatus().equals("7")) { if (orderInfoDto.getOrderStatus().equals("7")) {
List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());

2
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
View File

@ -219,6 +219,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_weight as deviceWeight, d.device_weight as deviceWeight,
d.device_count as deviceCount, d.device_count as deviceCount,
d.type_id as typeId, d.type_id as typeId,
d.check_date as checkDate,
d.check_cycle as checkCycle,
mt4.type_name as typeName, mt4.type_name as typeName,
mt4.unit_name as unitName, mt4.unit_name as unitName,
mt4.manage_type as manageType, mt4.manage_type as manageType,