提交代码

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

@@ -12,14 +12,8 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
-import com.ruoyi.zdsz.domain.bo.switchBo;
-import com.ruoyi.zdsz.domain.vo.BulidingStatusVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.vo.areaStatusVo;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.service.IZEngineeringCivilService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
@@ -93,7 +87,6 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 获取民用工程详细信息
      *
-     * @param id 主键
      */
 //    @SaCheckPermission("zdsz:engineeringCivil:query")
     @PostMapping("/query")
@@ -195,7 +188,6 @@ public class ZEngineeringCivilController extends BaseController {
 
     /**
      * 审核
-     * @param bo
      * @return
      */
     @Log(title = "通用审核", businessType = BusinessType.OTHER)
@@ -216,7 +208,6 @@ public class ZEngineeringCivilController extends BaseController {
     }
     /**
      *民用获取各个节点状态
-     * @param zEngineeringReviewBo
      * @return
      */
     @Log(title = "民用工程", businessType = BusinessType.OTHER)

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

@@ -2,16 +2,10 @@ package com.ruoyi.zdsz.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
-import com.ruoyi.zdsz.domain.bo.switchBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.zdsz.domain.vo.areaStatusVo;
-import com.ruoyi.zdsz.domain.vo.roomStatusVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +33,7 @@ public interface IZEngineeringCivilService {
      * 查询民用工程列表
      */
     TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
-    List<ZEngineeringCivilExportVo> exportList(ZEngineeringCivilBo bo);
+    List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo);
 
     /**
      * 查询民用工程列表
@@ -75,7 +69,7 @@ public interface IZEngineeringCivilService {
      * @param zEngineeringReviewBo
      * @return
      */
-    int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo);
+    int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList);
 
     /**
      * 根据工程id获取所有节点审核状态