From 56ce9e8f12f6abd66e5d727695bda244af018704 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 18 Mar 2025 12:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=8C=E7=BA=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LargeScreenController.java | 27 +++++++ .../largeScreen/entity/MaDevRateInfo.java | 70 +++++++++++++++++++ .../lease/mapper/MaLeaseInfoMapper.java | 15 ++++ .../material/lease/MaLeaseInfoMapper.xml | 59 ++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/MaDevRateInfo.java diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java index fca25d5..6908f8b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java @@ -9,6 +9,7 @@ import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.device.mapper.DevInfoMapper; import com.bonus.material.device.service.DevInfoService; +import com.bonus.material.largeScreen.entity.MaDevRateInfo; import com.bonus.material.largeScreen.entity.MaLeaseAnswerInfo; import com.bonus.material.largeScreen.entity.MaLeaseOnlyInfo; import com.bonus.material.largeScreen.entity.OrderData; @@ -374,4 +375,30 @@ public class LargeScreenController extends BaseController { .atZone(ZoneId.systemDefault()) .toLocalDate(); } + + /** + * 装备利用率 + * @param dto + * @return + */ + @ApiOperation("装备利用率") + @GetMapping("/getDevRate") + public AjaxResult getDevRate(MaDevRateInfo dto) { + startPage(); + List list = leaseInfoMapper.getDevRate(dto); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 退租装备 + * @param dto + * @return + */ + @ApiOperation("退租装备") + @GetMapping("/getReturnDev") + public AjaxResult getReturnDev(MaDevRateInfo dto) { + startPage(); + List list = leaseInfoMapper.getReturnDev(dto); + return AjaxResult.success(getDataTable(list)); + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/MaDevRateInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/MaDevRateInfo.java new file mode 100644 index 0000000..cfcc5cd --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/MaDevRateInfo.java @@ -0,0 +1,70 @@ +package com.bonus.material.largeScreen.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 装备利用率 + * @Author ma_sh + * @create 2025/3/18 11:05 + */ +@Data +public class MaDevRateInfo { + + /** + * 装备类型 + */ + private String typeName; + + /** + * 装备名称 + */ + private String deviceName; + + /** + * 装备规格型号 + */ + private String modelCode; + + /** + * 装备上架时长 + */ + private Integer upTotal; + + /** + * 装备租赁时长 + */ + private Integer leaseTotal; + + /** + * 利用率 + */ + private String rate; + + /** + * 关键字 + */ + private String keyWord; + + @ApiModelProperty(value = "唯一标识符") + private String identifyCode; + + /** + * 订单号 + */ + private String orderCode; + + /** + * 退租人 + */ + private String returnUser; + + /** + * 退租时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date returnTime; +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java index 4682a0b..d8739f9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.lease.mapper; +import com.bonus.material.largeScreen.entity.MaDevRateInfo; import com.bonus.material.largeScreen.entity.MaLeaseAnswerInfo; import com.bonus.material.largeScreen.entity.MaLeaseOnlyInfo; import com.bonus.material.lease.domain.MaLease; @@ -168,4 +169,18 @@ public interface MaLeaseInfoMapper { * @return */ List getLeaseTypeList(MaLeaseOnlyInfo dto); + + /** + * 装备利用率 + * @param dto + * @return + */ + List getDevRate(MaDevRateInfo dto); + + /** + * 退租装备 + * @param dto + * @return + */ + List getReturnDev(MaDevRateInfo dto); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index aebde6a..489113a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -591,6 +591,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY ml.id + ORDER BY + ml.start_time DESC + + + +