Browse Source

审核添加状态

wangtong 1 year ago
parent
commit
bbae66368d

+ 2 - 1
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringNodeService.java

@@ -8,6 +8,7 @@ import com.ruoyi.zdsz.domain.ZEngineeringReview;
 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.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 
 import java.util.Collection;
@@ -81,7 +82,7 @@ public interface IZEngineeringNodeService {
     Boolean updateMuch(ZEngineeringNodeBo bo);
     Boolean delete(ZEngineeringNodeBo bo);
     List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type);
-    Map<String,Object> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList);
+    Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList);
 
     /**
      * 校验并批量删除工程节点信息

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

@@ -170,14 +170,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 return TableDataInfo.build(result);
             }
           result = baseMapper.queryPageIdList(IDList, IDList.size(), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectList(lqw));
+            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectVoList(lqw));
             result.getRecords().forEach(item->{
                     item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });
             return TableDataInfo.build(result);
         }
         result = baseMapper.queryPageList(bo, page, pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-        Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectList(lqw));
+        Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
         result.getRecords().forEach(item->{
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });

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

@@ -19,6 +19,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.areaMessageVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
@@ -475,7 +476,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
-    public Map<String,Object> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList) {
+    public Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringNode> nodeTypeList=new ArrayList<>();
         Map<String,Object> statemap=new HashMap<>();