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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
15856 2024-11-26 11:16:18 +08:00
parent eb96ef8093 6eea48f7a9
commit c862054a42
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
View File

@ -62,4 +62,7 @@ public class MaterialConstants {
/** 文件类型：设备附件 */ /** 文件类型：设备附件 */
public static final Integer MATERIAL_FILE_TYPE_CODE = 17; public static final Integer MATERIAL_FILE_TYPE_CODE = 17;
/** 文件类型：租赁需求附件 */
public static final Integer LEASE_FILE_TYPE_CODE = 18;
} }

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.bonus.material.book.service.impl; package com.bonus.material.book.service.impl;
import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.CollectionUtils;
import com.bonus.common.biz.constant.MaterialConstants;
import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.domain.BmFileInfo;
import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
@ -63,7 +64,7 @@ public class BookCarServiceImpl implements BookCarService {
for (DevInfoVo bookCarDetail : bookCarDetails) { for (DevInfoVo bookCarDetail : bookCarDetails) {
BmFileInfo bmFileInfo = new BmFileInfo(); BmFileInfo bmFileInfo = new BmFileInfo();
bmFileInfo.setModelId(bookCarDetail.getMaId()); bmFileInfo.setModelId(bookCarDetail.getMaId());
bmFileInfo.setTaskType(17); bmFileInfo.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE);
List<BmFileInfo> fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); List<BmFileInfo> fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
bookCarDetail.setBmFileInfoList(fileList); bookCarDetail.setBmFileInfoList(fileList);
} }

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

@ -174,7 +174,7 @@ public class DevInfoServiceImpl implements DevInfoService {
for (DevInfoVo devInfoVo : hotList) { for (DevInfoVo devInfoVo : hotList) {
BmFileInfo bmFileInfo = new BmFileInfo(); BmFileInfo bmFileInfo = new BmFileInfo();
bmFileInfo.setModelId(devInfoVo.getMaId()); bmFileInfo.setModelId(devInfoVo.getMaId());
bmFileInfo.setTaskType(17); bmFileInfo.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE);
bmFileInfo.setFileType(0L); bmFileInfo.setFileType(0L);
List<BmFileInfo> mainFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); List<BmFileInfo> mainFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
if (!CollectionUtils.isEmpty(mainFileInfoList)) { if (!CollectionUtils.isEmpty(mainFileInfoList)) {