From 16aa4dedd8cb2e1e4f8bc3673312f861ff65c348 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 2 Dec 2024 11:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/device/mapper/DevInfoMapper.java | 9 ++++++++- .../service/impl/DevInfoServiceImpl.java | 5 +++-- .../material/lease/domain/MaLeaseDto.java | 12 +++++++++++ .../mapper/material/device/DevInfoMapper.xml | 20 ++++++++++++------- .../material/lease/MaLeaseInfoMapper.xml | 17 +++++++++------- 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index d5a366e..83bd228 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -54,7 +54,7 @@ public interface DevInfoMapper { * @param companyId * @return */ - DevInfoVo getCompanyUpNum(String companyId); + int getCompanyUpNum(String companyId); /** * 查询设备信息列表 @@ -158,5 +158,12 @@ public interface DevInfoMapper { String selectTaskNumByMonth(@Param("date") Date nowDate); Integer upMaStatus(DevInfoVo devInfoVo); + + /** + * 查询企业信息 + * @param companyId + * @return + */ + DevInfoVo selectCompanyById(String companyId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 4fa9194..3c6a2d1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -100,8 +100,9 @@ public class DevInfoServiceImpl implements DevInfoService { //根据设备id查询所属公司上架装备数以及公司访问量 if (StringUtils.isNotBlank(devInfoVo.getCompanyId())) { int devNum = devInfoMapper.selectCompany(devInfoVo.getCompanyId()); - DevInfoVo infoVo = devInfoMapper.getCompanyUpNum(devInfoVo.getCompanyId()); - devInfoVo.setCompanyVisitNum(infoVo.getCompanyVisitNum()); + int companyVisitNum = devInfoMapper.getCompanyUpNum(devInfoVo.getCompanyId()); + DevInfoVo infoVo = devInfoMapper.selectCompanyById(devInfoVo.getCompanyId()); + devInfoVo.setCompanyVisitNum(companyVisitNum); devInfoVo.setCompanyCreateTime(infoVo.getCompanyCreateTime()); devInfoVo.setDevUapNum(devNum); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java index fb40e2c..eadebb4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDto.java @@ -57,6 +57,18 @@ public class MaLeaseDto extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private String finishEndTime; + /** + * 需求接单开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private String orderStartTime; + + /** + * 需求接单结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private String orderEndTime; + private String orderUser; } 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 64f530a..f2695a6 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 @@ -656,26 +656,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ma_order_details m LEFT JOIN ma_order_info m1 ON m.order_id = m1.order_id - LEFT JOIN sys_user su ON m1.order_user = su.user_id + LEFT JOIN sys_user su ON m1.buyer_id = su.user_id WHERE m.ma_id = #{maId} - SELECT - SUM( h.search_num ) AS companyVisitNum, - c.create_time as companyCreateTime + IFNULL(SUM( h.search_num ), 0) AS companyVisitNum FROM ma_hot_search h LEFT JOIN ma_dev_info m ON h.ma_id = m.ma_id AND m.is_active = '1' - LEFT JOIN bm_company_info c ON m.own_co = c.company_id WHERE m.ma_status = '2' AND m.own_co = #{companyId} - GROUP BY - m.own_co + + + 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 796f9c6..7c01ecc 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 @@ -203,10 +203,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and m.lease_status = #{leaseStatus} - + and DATE_FORMAT(m.start_time,'%Y-%m-%d') between #{publishStartTime} and #{publishEndTime} - + and DATE_FORMAT(m.end_time,'%Y-%m-%d') between #{finishStartTime} and #{finishEndTime} GROUP BY m.lease_code @@ -363,10 +363,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" m.description as description, su.nick_name as publishUser, su1.nick_name as orderUser, - m.order_time as orderTime + m.order_time as orderTime, + 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 sys_user su1 ON m.order_user = su1.user_id WHERE 1 = 1 and m.order_user = #{orderUser} and m.lease_status = '1' @@ -376,12 +379,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and m.lease_name like concat('%',#{leaseName},'%') - - and DATE_FORMAT(m.start_time,'%Y-%m-%d') between #{publishStartTime} and #{publishEndTime} - - + and DATE_FORMAT(m.end_time,'%Y-%m-%d') between #{finishStartTime} and #{finishEndTime} + + and DATE_FORMAT(m.order_time,'%Y-%m-%d') between #{orderStartTime} and #{orderEndTime} + GROUP BY m.lease_code \ No newline at end of file