From c2a39013a45d8d84a6cf2ebfa6bc3f32f66cbedd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 20 Dec 2024 10:47:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B4=A8=E6=A3=80=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/device/domain/vo/DevInfoVo.java | 4 ++++ .../com/bonus/material/device/mapper/MaDevQcMapper.java | 2 ++ .../material/device/service/impl/DevInfoServiceImpl.java | 9 +++++++++ .../resources/mapper/material/device/MaDevQcMapper.xml | 3 +++ 4 files changed, 18 insertions(+) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 3652230..25f484e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -1,6 +1,7 @@ package com.bonus.material.device.domain.vo; import com.bonus.material.device.domain.DevInfo; +import com.bonus.material.device.domain.MaDevQc; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -136,6 +137,9 @@ public class DevInfoVo extends DevInfo { @ApiModelProperty(value = "出租记录信息") private List leaseList; + @ApiModelProperty(value = "出租记录信息") + private List qcList; + @ApiModelProperty(value = "公司上架装备数量") private Integer devUapNum; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java index 89702ca..408c511 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java @@ -43,4 +43,6 @@ public interface MaDevQcMapper { String selectTaskNumByMonth(Date nowDate); List selectQcList(MaDevQc maDevQc); + + List getQcList(Long maId); } 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 0173642..91d9de8 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 @@ -13,6 +13,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.book.domain.BookCarInfoDto; import com.bonus.material.device.domain.DevInfo; +import com.bonus.material.device.domain.MaDevQc; import com.bonus.material.device.domain.dto.DevInfoImpDto; import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.vo.DevInfoPropertyVo; @@ -21,6 +22,7 @@ import com.bonus.material.device.domain.vo.DevNameVo; import com.bonus.material.device.domain.vo.LeaseVo; import com.bonus.material.device.mapper.BmFileInfoMapper; import com.bonus.material.device.mapper.DevInfoMapper; +import com.bonus.material.device.mapper.MaDevQcMapper; import com.bonus.material.device.service.DevInfoService; import com.bonus.system.api.model.LoginUser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -74,6 +76,9 @@ public class DevInfoServiceImpl implements DevInfoService { @Resource protected Validator validator; + @Resource + private MaDevQcMapper maDevQcMapper; + /** * 查询设备信息 * @@ -140,6 +145,10 @@ public class DevInfoServiceImpl implements DevInfoService { //查询自定义属性 List properties = devInfoMapper.selectDevInfoProperties(maId); devInfoVo.setDevInfoProperties(properties); + + //查询质检记录 + List qcList = maDevQcMapper.getQcList(maId); + devInfoVo.setQcList(qcList); } return devInfoVo; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index ede06ec..4cc0931 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -108,5 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(mdq.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime} +