From 6587008d07dec7232cbbe77dc15a7bf25c8855e0 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 1 Dec 2024 13:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/domain/vo/AreaVo.java | 22 +++++++++++++++++++ .../book/service/impl/BookCarServiceImpl.java | 8 +++++++ .../home/controller/MaTypeInfoController.java | 13 +++++++++++ .../home/mapper/MaTypeInfoMapper.java | 8 +++++++ .../home/service/MaTypeInfoSevice.java | 8 +++++++ .../service/impl/MaTypeInfoServiceImpl.java | 13 +++++++++-- .../bonus/material/lease/domain/MaLease.java | 6 +++++ .../material/lease/domain/MaLeaseInfo.java | 6 +++++ .../mapper/material/device/DevInfoMapper.xml | 2 +- .../mapper/material/home/MaTypeInfoMapper.xml | 13 +++++++++++ .../material/lease/MaLeaseInfoMapper.xml | 14 ++++++++++-- 11 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/AreaVo.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/AreaVo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/AreaVo.java new file mode 100644 index 0000000..31fd516 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/vo/AreaVo.java @@ -0,0 +1,22 @@ +package com.bonus.common.biz.domain.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author ma_sh + * @create 2024/12/1 12:29 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AreaVo { + + @ApiModelProperty(value = "区域id") + private Long areaId; + + @ApiModelProperty(value = "区域名称") + private String areaName; +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java index e70e84a..c89f518 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java @@ -123,6 +123,14 @@ public class BookCarServiceImpl implements BookCarService { Long userId = SecurityUtils.getLoginUser().getUserid(); devInfo.setOrderUser(userId); List bookCarDetails = bookCarMapper.getBookCarDetails(devInfo); + BmFileInfo bmFileInfo = new BmFileInfo(); + bmFileInfo.setModelId(Long.parseLong(devInfo.getMaId())); + bmFileInfo.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE); + bmFileInfo.setFileType(0L); + List mainFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); + if (CollectionUtils.isNotEmpty(mainFileInfoList) && CollectionUtils.isNotEmpty(bookCarDetails)) { + bookCarDetails.get(0).setPicUrl(mainFileInfoList.get(0).getFileUrl()); + } return AjaxResult.success(bookCarDetails); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/controller/MaTypeInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/controller/MaTypeInfoController.java index ddf7bd0..fb939d6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/controller/MaTypeInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/controller/MaTypeInfoController.java @@ -1,6 +1,7 @@ package com.bonus.material.home.controller; import com.bonus.common.biz.domain.TypeInfo; +import com.bonus.common.biz.domain.vo.AreaVo; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.device.domain.vo.DevInfoVo; @@ -60,4 +61,16 @@ public class MaTypeInfoController extends BaseController { return AjaxResult.success(list); } + /** + * 租用需求大厅区域 + * @param areaVo + * @return + */ + @ApiOperation("租赁需求大厅区域") + @GetMapping("/getArea") + public AjaxResult getArea(AreaVo areaVo) { + List list = maTypeInfoSevice.getArea(areaVo); + return AjaxResult.success(list); + } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java index 5e8c071..62bf2be 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/mapper/MaTypeInfoMapper.java @@ -3,6 +3,7 @@ package com.bonus.material.home.mapper; import com.bonus.common.biz.domain.TreeNode; import com.bonus.common.biz.domain.TypeInfo; +import com.bonus.common.biz.domain.vo.AreaVo; import com.bonus.material.device.domain.vo.DevInfoVo; import java.util.List; @@ -32,4 +33,11 @@ public interface MaTypeInfoMapper { * @return */ List getTypeList(TypeInfo typeInfo); + + /** + * 租用需求大厅区域 + * @param areaVo + * @return + */ + List getArea(AreaVo areaVo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/MaTypeInfoSevice.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/MaTypeInfoSevice.java index 49b40bf..be12bcc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/MaTypeInfoSevice.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/MaTypeInfoSevice.java @@ -1,6 +1,7 @@ package com.bonus.material.home.service; import com.bonus.common.biz.domain.TypeInfo; +import com.bonus.common.biz.domain.vo.AreaVo; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.device.domain.vo.DevInfoVo; @@ -30,4 +31,11 @@ public interface MaTypeInfoSevice { */ List getTypeList(TypeInfo typeInfo); + /** + * 租用需求大厅区域 + * @param areaVo + * @return + */ + List getArea(AreaVo areaVo); + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java index dcd3537..8f6b137 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.material.home.service.impl; import com.bonus.common.biz.domain.TreeBuild; import com.bonus.common.biz.domain.TreeNode; import com.bonus.common.biz.domain.TypeInfo; +import com.bonus.common.biz.domain.vo.AreaVo; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.home.mapper.MaTypeInfoMapper; @@ -14,8 +15,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; @Service @Slf4j @@ -66,4 +65,14 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { return maTypeInfoMapper.getTypeList(typeInfo); } + /** + * 租用需求大厅区域 + * @param areaVo + * @return + */ + @Override + public List getArea(AreaVo areaVo) { + return maTypeInfoMapper.getArea(areaVo); + } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java index 9756858..9d55418 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLease.java @@ -60,4 +60,10 @@ public class MaLease { @ApiModelProperty("关键字") private String keyWord; + @ApiModelProperty(value = "区域id") + private Long areaId; + + @ApiModelProperty(value = "区域名称") + private String areaName; + } 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 282f16a..aa85da4 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 @@ -113,6 +113,12 @@ public class MaLeaseInfo extends BaseEntity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date orderTime; + @ApiModelProperty(value = "区域id") + private Long areaId; + + @ApiModelProperty(value = "区域名称") + private String areaName; + @ApiModelProperty(value = "文件信息") private List fileInfoList; } 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 ecdd8dc..1608b9e 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 @@ -239,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_id as firstId, mt1.type_name as firstName, GROUP_CONCAT(CONCAT(mt1.type_name, '/', mt2.type_name, '/', mt3.type_name)) AS groupName, - h.search_num as searchNum, + IFNULL(h.search_num, 0) as searchNum, d.create_time as createTime, d.update_time as updateTime FROM diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml index 181c96b..b3133c1 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml @@ -75,5 +75,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' + \ No newline at end of file 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 94b4554..a23e450 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 @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lease_code, type_id, company_id, + area_id, lease_status, lease_day, lease_num, @@ -27,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{leaseCode}, #{typeId}, #{companyId}, + #{areaId}, #{leaseStatus}, #{leaseDay}, #{leaseNum}, @@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lease_name = #{leaseName}, type_id = #{typeId}, company_id = #{companyId}, + area_id = #{areaId}, lease_day = #{leaseDay}, lease_status = #{leaseStatus}, lease_num = #{leaseNum}, @@ -106,10 +109,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_id as firstId, mt1.type_name as firstName, GROUP_CONCAT(CONCAT(mt1.type_name, '/', mt2.type_name, '/', mt3.type_name)) AS groupName, - m.publish_user as publishUser + m.publish_user as publishUser, + m.area_id as areaId, + b.name as areaName FROM ma_lease_info m LEFT JOIN bm_company_info c ON m.company_id = c.company_id + LEFT JOIN base_address b ON b.id = m.area_id LEFT JOIN ma_hot_search h ON h.lease_id = m.id LEFT JOIN ma_type mt4 ON mt4.type_id = m.type_id and mt4.del_flag = '0' LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0' @@ -207,10 +213,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_id as firstId, mt1.type_name as firstName, GROUP_CONCAT(CONCAT(mt1.type_name, '/', mt2.type_name, '/', mt3.type_name)) AS groupName, - m.publish_user as publishUser + m.publish_user as publishUser, + b.id as areaId, + b.name as areaName FROM ma_lease_info m LEFT JOIN bm_company_info c ON m.company_id = c.company_id + LEFT JOIN base_address b ON b.id = m.area_id LEFT JOIN sys_user su ON m.publish_user = su.user_id LEFT JOIN ma_type mt4 ON mt4.type_id = m.type_id and mt4.del_flag = '0' LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0' @@ -234,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and m.company_id = #{companyId} + and m.area_id = #{areaId} and ( locate(#{keyWord},mt1.type_name) > 0