diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java index 08c1cd2..ebccf2b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/controller/MaLeaseInfoController.java @@ -9,6 +9,8 @@ import com.bonus.material.lease.domain.MaLeaseDto; import com.bonus.material.lease.domain.MaLeaseInfo; import com.bonus.material.lease.domain.vo.MaLeaseVo; import com.bonus.material.lease.service.MaLeaseInfoService; +import com.bonus.material.order.domain.OrderDetailDto; +import com.bonus.material.order.domain.OrderInfoDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -55,6 +57,13 @@ public class MaLeaseInfoController extends BaseController { return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } + @ApiOperation(value = "获取单个订单详情") + @GetMapping("/getLeaseStatusCount") + public AjaxResult getOrderStatusCount(MaLeaseInfo dto) { + List list = leaseInfoService.getLeaseStatusCount(dto); + return success(list); + } + /** * 查询出租方需求列表 * @param dto 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 2e13db7..1b1eb7c 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 @@ -30,6 +30,9 @@ public class MaLeaseInfo extends BaseEntity implements Serializable { */ private Boolean isSubmit; + @ApiModelProperty(value = "true:出租方 false:承租方") + private boolean flag; + /** * 主键ID */ @@ -153,5 +156,7 @@ public class MaLeaseInfo extends BaseEntity implements Serializable { @ApiModelProperty(value = "需求详情") private List detailsList; + + private Integer leaseCount; } 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 68951e7..a3af2f8 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 @@ -125,4 +125,6 @@ public interface MaLeaseInfoMapper { Integer getTodayLeaseOrderCount(); MaLeaseInfo getDevInfoById(Integer id); + + List getLeaseStatusCount(MaLeaseInfo info); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/MaLeaseInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/MaLeaseInfoService.java index eab20c7..59c857f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/MaLeaseInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/MaLeaseInfoService.java @@ -57,6 +57,8 @@ public interface MaLeaseInfoService { */ List leaseList(MaLease maLease); + List getLeaseStatusCount(MaLeaseInfo info); + /** * 出租方立即接单 * @param maLeaseInfo 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 a5c814b..5d2ea5c 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 @@ -366,6 +366,16 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { return list; } + public List getLeaseStatusCount(MaLeaseInfo info) { + //true:出租方 false:承租方 + if (info.isFlag()) { + info.setOrderCompany(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); + } else { + info.setPublishCompany(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getCompanyId())); + } + return leaseInfoMapper.getLeaseStatusCount(info); + } + /** * 出租方立即接单 * 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 e60b22f..ece0e15 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 @@ -466,4 +466,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE mli.id = #{id} + + \ No newline at end of file