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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -78,10 +78,10 @@ public class ZEngineeringDangerousController extends BaseController {
      * @param
      */
     @SaCheckPermission("system:engineeringDangerous:query")
-    @GetMapping("/query")
-    public R<ZEngineeringDangerousBo> query(ZEngineeringDangerousBo bo) {
-        bo.setCreateTime(new Date());
-        return R.ok(iZEngineeringDangerousService.query(bo));
+    @GetMapping("/query/{id}")
+    public R<ZEngineeringDangerousBo> query(@NotNull(message = "主键不能为空")
+                                                @PathVariable String id) {
+        return R.ok(iZEngineeringDangerousService.query(id));
     }
 
     /**

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

@@ -27,7 +27,7 @@ public interface IZEngineeringDangerousService {
      */
     TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
 
-     ZEngineeringDangerousBo query(ZEngineeringDangerousBo bo);
+     ZEngineeringDangerousBo query(String id);
 
     /**
      * 查询危险工程列表

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

@@ -65,12 +65,12 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      * 查询危险工程详情
      */
     @Override
-    public ZEngineeringDangerousBo query(ZEngineeringDangerousBo bo) {
-        ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(bo.getId());
+    public ZEngineeringDangerousBo query(String id) {
+        ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(id);
         ZEngineeringDangerousBo zEngineeringDangerousBo = BeanUtil.toBean(zEngineeringDangerousVo, ZEngineeringDangerousBo.class);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(bo.getId());
-        zEngineeringNodeBo.setCreateTime(bo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringDangerousBo.getId());
+        zEngineeringNodeBo.setCreateTime(zEngineeringDangerousBo.getCreateTime());
         ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
         zEngineeringDangerousBo.setzEngineeringNodeBo(query);
         return zEngineeringDangerousBo;