From 50b984ba3befff82c4967a35b99aef894b62a43b Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 25 Feb 2025 16:50:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/mapper/BmFileInfoMapper.java | 4 +-- .../service/impl/DevInfoServiceImpl.java | 9 +++--- .../material/lease/domain/MaLeaseDetails.java | 3 ++ .../service/impl/MaLeaseInfoServiceImpl.java | 29 +++++++++++++++++++ .../order/controller/OrderController.java | 2 -- .../mapper/material/order/OrderInfoMapper.xml | 1 + 6 files changed, 40 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java index 93c1bfe..c905c02 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/BmFileInfoMapper.java @@ -28,7 +28,7 @@ public interface BmFileInfoMapper { * @return 附件集合 */ List selectBmFileInfoList(BmFileInfo bmFileInfo); - BmFileInfo selectBmFileInfo(BmFileInfo bmFileInfo); + List selectBmFileInfo(BmFileInfo bmFileInfo); /** * 新增附件 @@ -85,5 +85,5 @@ public interface BmFileInfoMapper { Integer deleteBmFileInfoByFileId(@Param("fileId") Integer fileId, @Param("fileType") Integer fileType); - BmFileInfo getInfoByMaIdAndTaskId(MaDevQc qc); + List getInfoByMaIdAndTaskId(MaDevQc qc); } 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 bd86cf6..a40ad6c 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 @@ -133,7 +133,8 @@ public class DevInfoServiceImpl implements DevInfoService { table.setId(qc.getId()); table.setCheckDate(qc.getQcTime()); table.setNextCheckDate(qc.getNextCheckTime()); - devInfoVo.getExaminationPdf().add(bmFileInfoMapper.getInfoByMaIdAndTaskId(qc)); + List info = bmFileInfoMapper.getInfoByMaIdAndTaskId(qc); + devInfoVo.getExaminationPdf().addAll(info); } tableList.add(table); devInfoVo.setTableList(tableList); @@ -148,7 +149,7 @@ public class DevInfoServiceImpl implements DevInfoService { int companyVisitNum = devInfoMapper.getCompanyUpNum(devInfoVo.getCompanyId()); DevInfoVo infoVo = devInfoMapper.selectCompanyById(devInfoVo.getCompanyId()); devInfoVo.setCompanyVisitNum(companyVisitNum); - devInfoVo.setCompanyCreateTime(infoVo.getCompanyCreateTime()); + devInfoVo.setCompanyCreateTime(devInfoVo.getCreateTime()); devInfoVo.setDevUapNum(devNum); } //根据设备id及用户id去预约表中查询是否已经加入预约车 @@ -175,8 +176,8 @@ public class DevInfoServiceImpl implements DevInfoService { fileInfo.setModelId(Long.valueOf(maDevQc.getMaId())); fileInfo.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE); fileInfo.setFileType(4L); - BmFileInfo bmFileInfos = bmFileInfoMapper.selectBmFileInfo(fileInfo); - maDevQc.setFileInfo(bmFileInfos); + List bmFileInfos = bmFileInfoMapper.selectBmFileInfo(fileInfo); + maDevQc.setFileInfoList(bmFileInfos); } devInfoVo.setQcList(qcList); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDetails.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDetails.java index d081aa3..95aaa89 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDetails.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseDetails.java @@ -42,6 +42,9 @@ public class MaLeaseDetails { @ApiModelProperty(value = "所属三级类目合集") private String groupName; + @ApiModelProperty(value = "所属总类目") + private String firstGroupName; + @ApiModelProperty(value = "装备一级类目Id") private String firstId; 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 a87e34f..42b8ad0 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 @@ -362,6 +362,35 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { if (result > 0) { list = leaseInfoMapper.leaseList(maLease); } + if (CollectionUtils.isNotEmpty(list)) { + for (MaLeaseVo maLeaseVo : list) { + MaLeaseInfo maLeaseInfo = new MaLeaseInfo(); + maLeaseInfo.setId(maLeaseVo.getId()); + List leaseDetailsList = leaseInfoMapper.selectDetailsById(maLeaseInfo); + if (CollectionUtils.isNotEmpty(leaseDetailsList)) { + // 使用 StringBuilder 来拼接 firstGroupName，避免最后一个逗号 + StringBuilder firstGroupNameBuilder = new StringBuilder(); + for (MaLeaseDetails maLeaseDetails : leaseDetailsList) { + if (StringUtils.isNotBlank(maLeaseDetails.getGroupName())) { + // 截取 groupName 中第一个 / 之前的数据 + String[] split = maLeaseDetails.getGroupName().split("/"); + if (split.length > 0) { + maLeaseDetails.setFirstGroupName(split[0]); + } + } + // 拼接 firstGroupName，避免最后一个逗号 + if (StringUtils.isNotBlank(maLeaseDetails.getFirstGroupName())) { + if (firstGroupNameBuilder.length() > 0) { + firstGroupNameBuilder.append("、"); + } + firstGroupNameBuilder.append(maLeaseDetails.getFirstGroupName()); + } + } + // 设置拼接后的 firstGroupName + maLeaseVo.setGroupName(firstGroupNameBuilder.toString()); + } + } + } return list; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 1f418bb..2742c9c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -91,8 +91,6 @@ public class OrderController extends BaseController { @ApiOperation(value = "获取订单详情") @GetMapping("/getOrderDetails") public AjaxResult getOrderDetails(OrderInfoDto orderInfoDto) throws Exception { - /*startPage(); - return getDataTable(orderService.getOrderDetails(orderInfoDto));*/ Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = orderService.getOrderDetails(orderInfoDto); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index fe5d12f..b4b1f24 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -130,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" moi.order_time, mdi.own_co as sellerCompany, up.dept_name AS czcompanyName, + mdi.person AS person, mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, su.nick_name as buyerName,