市政工程

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

@@ -12,6 +12,7 @@ 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.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import lombok.RequiredArgsConstructor;
@@ -103,4 +104,11 @@ public class ZEngineeringIndustryController extends BaseController {
     public R<Void> remove(@NotEmpty(message = "主键不能为空")@PathVariable String[] ids) {
         return toAjax(iZEngineeringIndustryService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    @GetMapping("/audit/{id}")
+    @SaCheckPermission("zdsz:engineeringIndustry:audit")
+    @Log(title = "工业工程|市政工程", businessType = BusinessType.INSERT)
+    public R<Void> audit(@Validated(AddGroup.class) @RequestBody ZEngineeringReviewBo bo) {
+        return toAjax(iZEngineeringIndustryService.auditById(bo));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.service;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 
 import java.util.Collection;
@@ -49,5 +50,5 @@ public interface IZEngineeringIndustryService {
     /**
      * 审核工业工程|市政工程
      */
-    Boolean auditById(String id);
+    Boolean auditById(ZEngineeringReviewBo zEngineeringReviewBo);
 }

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

@@ -2,16 +2,19 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.ZEngineeringReview;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
@@ -162,23 +165,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
 
     //审核工业工程|市政工程
     @Override
-    public Boolean auditById(String id) {
-        Boolean flag = false;
-        ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
-        bo.setCivliId(id);
-        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(bo);
-        //根据节点的id查询审核状态
-        zEngineeringNodeBos.stream().forEach(item -> {
-            ZEngineeringReviewBo zEngineeringReviewBo = new ZEngineeringReviewBo();
-            zEngineeringReviewBo.setEngInfoId(item.getId());
-            List<ZEngineeringReviewVo> vos = izEngineeringReviewService.queryList(zEngineeringReviewBo);
-            //判断审核状态
-            vos.stream().forEach(item1 -> {
-                if (item1.getReviewStatus().equals("0")) {
-                }
-            });
-        });
-        return null;
+    public Boolean auditById(ZEngineeringReviewBo zEngineeringReviewBo) {
+        Boolean insert = izEngineeringReviewService.insert(zEngineeringReviewBo);
+        return insert;
     }