危险工程

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -108,4 +109,14 @@ public class ZEngineeringDangerousController extends BaseController {
                           @PathVariable String[] ids) {
         return toAjax(iZEngineeringDangerousService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    /**
+     * 危险工程历史
+     *
+     */
+    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringDangerousVo> queryEngineeringDangerous(@NotNull(message = "主键不能为空") @PathVariable String id) {
+        return R.ok(iZEngineeringDangerousService.queryEngineeringDangerous(id));
+    }
 }

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

@@ -50,4 +50,6 @@ public interface IZEngineeringDangerousService {
      * 校验并批量删除危险工程信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    ZEngineeringDangerousVo queryEngineeringDangerous(String id);
 }

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

@@ -17,6 +17,7 @@ import com.ruoyi.zdsz.domain.ZEngineeringInfo;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
@@ -215,4 +216,15 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         });
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+
+    @Override
+    public ZEngineeringDangerousVo queryEngineeringDangerous(String id) {
+        ZEngineeringDangerousVo vo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(vo.getId());
+        vo.setzEngineeringNodeBos(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
+        return vo;
+    }
 }