节点详情1对多

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringNodeBo.java

@@ -8,6 +8,7 @@ import lombok.*;
 import javax.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -59,4 +60,15 @@ public class ZEngineeringNodeBo extends BaseEntity {
      * 工程详情
      */
     private ZEngineeringInfoBo zEngineeringInfoBo;
+
+
+    public List<ZEngineeringInfoBo> getzEngineeringInfoBoList() {
+        return zEngineeringInfoBoList;
+    }
+
+    public void setzEngineeringInfoBoList(List<ZEngineeringInfoBo> zEngineeringInfoBoList) {
+        this.zEngineeringInfoBoList = zEngineeringInfoBoList;
+    }
+
+    private List<ZEngineeringInfoBo> zEngineeringInfoBoList;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringInfoService.java

@@ -28,7 +28,7 @@ public interface IZEngineeringInfoService {
      * @param id
      * @return
      */
-    ZEngineeringInfoBo query(ZEngineeringNodeBo bo);
+    List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo);
 
     /**
      * 查询工程详情列表

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringInfoServiceImpl.java

@@ -64,22 +64,27 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     @Override
     @DynamicName(spel = "#bo.createTime")
 
-    public ZEngineeringInfoBo query(ZEngineeringNodeBo bo) {
+    public List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
-        ZEngineeringInfo zEngineeringInfoVo= baseMapper.selectOne(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
-        ZEngineeringInfoBo zEngineeringInfoBo1 = BeanUtil.toBean(zEngineeringInfoVo, ZEngineeringInfoBo.class);
-        SysUser sysUser=sysUserService.selectUserByUserName(zEngineeringInfoVo.getCreateBy());
-        zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
-        zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
-        zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
-        zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
-        List<String> photoList=izEngiineeringPhotoService.queryList(zEngineeringInfoBo1);
-        List<ZEngineeringMaterialBo> zEngineeringMaterialBo=izEngineeringMaterialService.query(zEngineeringInfoBo1);
-        zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
-        zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
-        ZEngineeringReviewBo zEngineeringReviewbo=izEngineeringReviewService.query(bo);
-        zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
-        return zEngineeringInfoBo1;
+        List<ZEngineeringInfo> zEngineeringInfoVoList= baseMapper.selectList(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
+        List<ZEngineeringInfoBo> zEngineeringInfoBoList=new ArrayList<>();
+        zEngineeringInfoVoList.stream().forEach(item->{
+            ZEngineeringInfoBo zEngineeringInfoBo1 = BeanUtil.toBean(item, ZEngineeringInfoBo.class);
+            SysUser sysUser=sysUserService.selectUserByUserName(item.getCreateBy());
+            zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
+            zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
+            zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
+            zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
+            List<String> photoList=izEngiineeringPhotoService.queryList(zEngineeringInfoBo1);
+            List<ZEngineeringMaterialBo> zEngineeringMaterialBo=izEngineeringMaterialService.query(zEngineeringInfoBo1);
+            zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
+            zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+            ZEngineeringReviewBo zEngineeringReviewbo=izEngineeringReviewService.query(bo);
+            zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
+            zEngineeringInfoBoList.add(zEngineeringInfoBo1);
+        });
+
+        return zEngineeringInfoBoList;
     }
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -68,14 +68,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
         ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
 //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
-
         if (zEngineeringNode==null)
         {
              return  null;
         }
         ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
-        ZEngineeringInfoBo zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
-        zEngineeringNodeBo.setzEngineeringInfoBo(zEngineeringInfoBo);
+        List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+        zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
     }
 
@@ -86,9 +85,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         List<ZEngineeringNode> zEngineeringNode=baseMapper.selectList(lqw);
         List<ZEngineeringNodeBo> zEngineeringNodeBoList=new ArrayList<>();
         zEngineeringNode.stream().forEach(item->{
-            ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(item, ZEngineeringNodeBo.class);
-            ZEngineeringInfoBo zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
-            zEngineeringNodeBo.setzEngineeringInfoBo(zEngineeringInfoBo);
+            ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+           List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+            zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
             zEngineeringNodeBoList.add(zEngineeringNodeBo);
         });
         return zEngineeringNodeBoList;