基建工程 - 历史

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

@@ -42,7 +42,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 查询基建工程列表
      */
-    @SaCheckPermission("system:engineeringInfrastructure:list")
+    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringInfrastructureVo> list(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
         return iZEngineeringInfrastructureService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 导出基建工程列表
      */
-    @SaCheckPermission("system:engineeringInfrastructure:export")
+    @SaCheckPermission("zdsz:engineeringInfrastructure:export")
     @Log(title = "基建工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringInfrastructureBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:engineeringInfrastructure:query")
+    @SaCheckPermission("zdsz:engineeringInfrastructure:query")
     @GetMapping("/{id}")
     public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -72,9 +72,20 @@ public class ZEngineeringInfrastructureController extends BaseController {
     }
 
     /**
+     * 获取基建工程历史信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
+        return R.ok(iZEngineeringInfrastructureService.queryByIdType(id,type));
+    }
+
+    /**
      * 新增基建工程
      */
-    @SaCheckPermission("system:engineeringInfrastructure:add")
+    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
     @Log(title = "基建工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +96,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 修改基建工程
      */
-    @SaCheckPermission("system:engineeringInfrastructure:edit")
+    @SaCheckPermission("zdsz:engineeringInfrastructure:edit")
     @Log(title = "基建工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +109,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:engineeringInfrastructure:remove")
+    @SaCheckPermission("zdsz:engineeringInfrastructure:remove")
     @Log(title = "基建工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringInfrastructureVo.java

@@ -27,7 +27,7 @@ public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializ
     private static final long serialVersionUID = 1L;
 
     /**
-     *
+     * ID
      */
     @ExcelProperty(value = "")
     private String id;
@@ -89,4 +89,17 @@ public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializ
     public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
         this.zEngineeringNodeBoList = zEngineeringNodeBoList;
     }
+
+    /**
+     *
+     */
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
 }

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

@@ -22,6 +22,11 @@ public interface IZEngineeringInfrastructureService {
     ZEngineeringInfrastructureVo queryById(String id);
 
     /**
+     * 查询基建工程历史
+     */
+    ZEngineeringInfrastructureVo queryByIdType(String id, String type);
+
+    /**
      * 查询基建工程列表
      */
     TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery);

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

@@ -54,6 +54,20 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     }
 
     /**
+     * 查询基建工程历史
+     */
+    @Override
+    public ZEngineeringInfrastructureVo queryByIdType(String id, String type){
+        ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(vo.getId());
+        zEngineeringNodeBo.setType(type);
+        vo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return vo;
+    }
+
+    /**
      * 查询基建工程列表
      */
     @Override