批量审核

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 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;
@@ -190,6 +191,16 @@ public class ZEngineeringCivilController extends BaseController {
     public R Civilinsert( @RequestBody ZEngineeringReviewBo zEngineeringReviewBo) {
         return R.ok(iZEngineeringCivilService.Civilinsert(zEngineeringReviewBo));
     }
+    /**
+     *民用获取各个节点状态
+     * @param zEngineeringReviewBo
+     * @return
+     */
+    @Log(title = "民用工程", businessType = BusinessType.OTHER)
+    @PostMapping("/getRivewStatus/{Id}")
+    public R getRivewStatus( @PathVariable("Id")  String Id) {
+        return R.ok(iZEngineeringCivilService.getRivewStatus(Id));
+    }
 
 
 }

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

@@ -70,4 +70,11 @@ public interface IZEngineeringCivilService {
      * @return
      */
     int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo);
+
+    /**
+     * 根据工程id获取所有节点审核状态
+     * @param Id
+     * @return
+     */
+    List<ZEngineeringNodeBo> getRivewStatus(String Id);
 }

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

@@ -51,6 +51,7 @@ public interface IZEngineeringNodeService {
      * 查询工程节点列表
      */
     List<ZEngineeringNodeVo> queryList(ZEngineeringNodeBo bo);
+    List<ZEngineeringNodeBo> queryNodeList(ZEngineeringCivil bo);
 
     /**
      * 新增工程节点

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

@@ -25,10 +25,12 @@ public interface IZEngineeringReviewService {
      * 查询工程审核
      */
     ZEngineeringReviewVo queryById(String id);
+
     /**
      * 查询工程审核(节点使用)
      */
     ZEngineeringReviewBo query(ZEngineeringNodeBo bo);
+
     /**
      * 查询工程审核列表
      */
@@ -43,11 +45,14 @@ public interface IZEngineeringReviewService {
      * 新增工程审核
      */
     Boolean insertByBo(ZEngineeringReviewBo bo);
+
     Boolean insert(ZEngineeringReviewBo bo);
-    Boolean Civilinsert(ZEngineeringCivil zEngineeringCivil,ZEngineeringReviewBo bo);
+
+    Boolean Civilinsert(ZEngineeringCivil zEngineeringCivil, ZEngineeringReviewBo bo);
 
     /**
      * 批量插入
+     *
      * @param bo
      * @return
      */
@@ -55,6 +60,7 @@ public interface IZEngineeringReviewService {
 
     /**
      * 批量审核
+     *
      * @param bo
      * @return
      */
@@ -71,5 +77,5 @@ public interface IZEngineeringReviewService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    Boolean  updateCivilStatus(ZEngineeringCivil zEngineeringCivil);
+    Boolean updateCivilStatus(ZEngineeringCivil zEngineeringCivil);
 }

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

@@ -461,7 +461,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return 0;
     }
 
+    @Override
+    public List<ZEngineeringNodeBo> getRivewStatus(String Id) {
+        ZEngineeringCivil zEngineeringCivil1= baseMapper.selectById(Id);
+        if(!ObjectUtils.isEmpty(zEngineeringCivil1))
+        {
+
+            return izEngineeringNodeService.queryNodeList(zEngineeringCivil1);
+        }else
+        {
+            return null;
+        }
 
+    }
 }
 
 

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

@@ -163,6 +163,22 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         return baseMapper.selectVoList(lqw);
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public List<ZEngineeringNodeBo> queryNodeList(ZEngineeringCivil bo) {
+        LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringNode::getCivliId, bo.getId());
+         List<ZEngineeringNode> zEngineeringNodeList= baseMapper.selectList(lqw);
+         List<ZEngineeringNodeBo>zEngineeringNodeBoList=new ArrayList<>();
+         zEngineeringNodeList.stream().forEach(item->{
+             ZEngineeringNodeBo zEngineeringNodeBo=BeanUtil.copyProperties(item,ZEngineeringNodeBo.class);
+              ZEngineeringReviewBo zEngineeringReviewBo=izEngineeringReviewService.query(zEngineeringNodeBo);
+             zEngineeringNodeBo.setReviewStatus(!ObjectUtils.isEmpty(zEngineeringReviewBo)?"未审核":zEngineeringReviewBo.getReviewStatus().equals("1")?"通过":"未通过");
+             zEngineeringNodeBoList.add(zEngineeringNodeBo);
+         });
+        return zEngineeringNodeBoList;
+    }
+
     private LambdaQueryWrapper<ZEngineeringNode> buildQueryWrapper(ZEngineeringNodeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();

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

@@ -279,4 +279,6 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
 
     }
 
+
+
 }