Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -50,7 +50,8 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public ZEngineeringPipeJackingVo queryById(String id){
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
-        bo.setCreateTime(new Date());
+        bo.setCreateTime(jackingVo.getCreateTime());
+        bo.setCivliId(jackingVo.getId());
         jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
         return jackingVo;
     }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringPipeJackingMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 COALESCE ( unit.NAME, '无' ),
                 '-',
                 COALESCE ( house.NAME, '无' )
-            ) AS NAME
+            ) AS name
         FROM
             z_engineering_civil as m
                 left join z_area as area on area.del_flag = '0' and area.id = m.area_id