bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

装备详情增加质检记录

This commit is contained in:
liang.chao 2024-12-20 10:47:36 +08:00
parent 1d3d486961
commit c2a39013a4
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
View File

@ -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<LeaseVo> leaseList;
@ApiModelProperty(value = "出租记录信息")
private List<MaDevQc> qcList;
@ApiModelProperty(value = "公司上架装备数量")
private Integer devUapNum;

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java
View File

@ -43,4 +43,6 @@ public interface MaDevQcMapper {
String selectTaskNumByMonth(Date nowDate);
List<MaDevQc> selectQcList(MaDevQc maDevQc);
List<MaDevQc> getQcList(Long maId);
}

9
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
View File

@ -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<DevInfoPropertyVo> properties = devInfoMapper.selectDevInfoProperties(maId);
devInfoVo.setDevInfoProperties(properties);
//查询质检记录
List<MaDevQc> qcList = maDevQcMapper.getQcList(maId);
devInfoVo.setQcList(qcList);
}
return devInfoVo;
}

3
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml
View File

@ -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}
</if>
</select>
<select id="getQcList" resultType="com.bonus.material.device.domain.MaDevQc">
select * from ma_dev_qc where ma_id = #{maId} limit 10
</select>
</mapper>