diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java index deaa3f1..2e13db7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java @@ -50,6 +50,12 @@ public class MaLeaseInfo extends BaseEntity implements Serializable { */ private Integer leaseStatus; + @ApiModelProperty(value = "需求租赁总数量") + private Integer leaseTotalNum; + + @ApiModelProperty(value = "需求总天数") + private Integer leaseDay; + @ApiModelProperty(value = "租赁开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date leaseStartTime; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index bfe6e54..a5c814b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -195,6 +195,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { if (CollectionUtil.isNotEmpty(leaseDetailsList)) { // 处理每个租赁详情 processLeaseDetails(leaseDetailsList, maLeaseVo.getId()); + maLeaseVo.setLeaseTotalNum(leaseDetailsList.stream().mapToInt(MaLeaseDetails::getLeaseNum).sum()); } // 4. 更新浏览量(仅在待接单状态时) 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 1690008..e60b22f 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 @@ -141,7 +141,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" m.area_code as areaCode, b.name as areaName, m.address as address, - sd.dept_name as companyName + sd.dept_name as companyName, + CASE + WHEN DATE(m.lease_end_time) = DATE(m.lease_start_time) THEN 1 + ELSE TIMESTAMPDIFF(DAY, m.lease_start_time, m.lease_end_time) + 1 + END AS leaseDay FROM ma_lease_info m LEFT JOIN base_address b ON b.code = m.area_code