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-18 16:01:23 +08:00
parent 05f6a6f9a0
commit ee5eed0a59
2 changed files with 7 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/service/impl/DevInfoServiceImpl.java
View File

@ -761,12 +761,16 @@ public class DevInfoServiceImpl implements DevInfoService {
@Override @Override
public List<DevInfoVo> getDevList(DevInfoVo devInfo) { public List<DevInfoVo> getDevList(DevInfoVo devInfo) {
Integer rentNum = devInfo.getRentNum();
List<DevInfoVo> devList = devInfoMapper.getDevList(devInfo); List<DevInfoVo> devList = devInfoMapper.getDevList(devInfo);
for (DevInfoVo devInfoVo : devList) { for (DevInfoVo devInfoVo : devList) {
DevInfo devInfo1 = devInfoMapper.getDevStatus(devInfoVo); DevInfo devInfo1 = devInfoMapper.getDevStatus(devInfoVo);
devInfoVo.setRentNum(devInfo1.getRentNum()); devInfoVo.setRentNum(devInfo1.getRentNum());
devInfoVo.setMaStatus(devInfo1.getMaStatus()); devInfoVo.setMaStatus(devInfo1.getMaStatus());
} }
if (rentNum != null){
devList = devList.stream().filter(devInfoVo -> devInfoVo.getRentNum().equals(rentNum)).collect(Collectors.toList());
}
return devList; return devList;
} }

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

@ -849,6 +849,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId != null"> <if test="typeId != null">
AND d.type_id = #{typeId} AND d.type_id = #{typeId}
</if> </if>
<if test="maStatus != null">
AND d.ma_status = #{maStatus}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND d.update_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') AND d.update_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if> </if>