bean

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

@@ -65,6 +65,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     @DynamicName(spel = "#bo.createTime")
     public List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringInfo::getUpdateTime);
         List<ZEngineeringInfo> zEngineeringInfoVoList = baseMapper.selectList(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
         List<ZEngineeringInfoBo> zEngineeringInfoBoList = new ArrayList<>();
         zEngineeringInfoVoList.stream().forEach(item -> {

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

@@ -74,10 +74,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
         if (zEngineeringNode==null)
         {
-             return  null;
+            return  null;
         }
-        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+//        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        BeanUtil.copyProperties(zEngineeringNode,zEngineeringNodeBo,"id");
         List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+        zEngineeringNodeBo.setId(zEngineeringNode.getId());
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
     }
@@ -89,8 +92,10 @@ 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);
-           List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            BeanUtil.copyProperties(item,zEngineeringNodeBo,"id");
+            List<ZEngineeringInfoBo> zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+            zEngineeringNodeBo.setId(item.getId());
             zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
             zEngineeringNodeBoList.add(zEngineeringNodeBo);
         });