From 6ad07bc0ea2f00bc676fd6a724de630760544a50 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 二月 2025 11:41:21 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java
index 22b0839..a434cd2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java
@@ -59,7 +59,6 @@
//TODO rk 鎵�灞為」鐩�/鎴块棿闇�姹傞棶棰�
if(Objects.isNull(ywMaterial)
|| StringUtils.isBlank(ywMaterial.getName())
- || StringUtils.isBlank(ywMaterial.getCode())
|| StringUtils.isBlank(ywMaterial.getQrcode())
|| Objects.isNull(ywMaterial.getCateId())
){
@@ -104,7 +103,7 @@
@Override
public void deleteById(Integer id) {
if(ywOutinboundRecordMapper.selectCount(new QueryWrapper<YwOutinboundRecord>().lambda().eq(YwOutinboundRecord::getMaterialId,id))>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璧勪骇宸叉湁鍑哄叆搴撹褰曪紝涓嶅彲鍒犻櫎");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐗╂枡宸叉湁鍑哄叆搴撹褰曪紝涓嶅彲鍒犻櫎");
}
ywMaterialMapper.update(new UpdateWrapper<YwMaterial>().lambda().set(YwMaterial::getIsdeleted,Constants.ONE).eq(YwMaterial::getId,id));
}
@@ -190,7 +189,7 @@
Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey()));
if(Objects.nonNull(multifile)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_CONTRACT_BILL).getCode();
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode();
multifile.setFileurlFull(path + multifile.getFileurl());
ywMaterial.setMultifile(multifile);
}
@@ -220,14 +219,26 @@
.and(StringUtils.isNotBlank(model.getCode()),i->i.like(YwMaterial::getCode,model.getCode()).or().like(YwMaterial::getName,model.getCode()))
.like(StringUtils.isNotBlank(model.getAttr()),YwMaterial::getAttr,model.getAttr())
.eq(Objects.nonNull(model.getProjectId()),YwRoom::getProjectId,model.getProjectId())
+ .eq(Objects.nonNull(model.getStatus()),YwMaterial::getStatus,model.getStatus())
.eq(Objects.nonNull(model.getRoomId()),YwMaterial::getRoomId,model.getRoomId())
+ .eq(Objects.nonNull(model.getCateId()),YwMaterial::getCateId,model.getCateId())
+ .eq(Objects.nonNull(model.getParentCateId()),YwMaterial::getParentCateId,model.getParentCateId())
.eq(Objects.nonNull(model.getFloorId()),YwRoom::getFloor,model.getFloorId())
.eq(Objects.nonNull(model.getBuildingId()),YwRoom::getBuildingId,model.getBuildingId())
.eq(YwMaterial::getIsdeleted,Constants.ZERO)
.orderByAsc(YwMaterial::getCode)
;
- IPage iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper);
+ IPage<YwMaterial> iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper);
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode();
+ for (YwMaterial ywMaterial:iPage.getRecords()) {
+ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,ywMaterial.getId()).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey()));
+ if(Objects.nonNull(multifile)){
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ ywMaterial.setMultifile(multifile);
+ }
+ }
return PageData.from(iPage);
}
--
Gitblit v1.9.3