提交代码

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

@@ -230,6 +230,11 @@ public class ZEngineeringCivilController extends BaseController {
     public R Civilinsert(@RequestBody ZEngineeringReviewBo zEngineeringReviewBo, @RequestBody infoIdList infoIdList) {
         return R.ok(iZEngineeringCivilService.Civilinsert(zEngineeringReviewBo, infoIdList));
     }
+    @Log(title = "工程审核", businessType = BusinessType.OTHER)
+    @PostMapping("/insertReview")
+    public R insertReview(@RequestBody ZEngineeringReviewBo zEngineeringReviewBo, @RequestBody infoIdList infoIdList) {
+        return R.ok(iZEngineeringCivilService.insertReview(zEngineeringReviewBo, infoIdList));
+    }
 
     /**
      * 民用获取各个节点状态

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

@@ -24,7 +24,7 @@ import java.util.List;
 public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    private Object nodeReViewStateList;
     /**
      *
      */
@@ -87,4 +87,12 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     private List<ZEngiineeringPhotoVo> pics;
     @JsonProperty("zEngineeringNodeBo")
     private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    public Object getNodeReViewStateList() {
+        return nodeReViewStateList;
+    }
+
+    public void setNodeReViewStateList(Object nodeReViewStateList) {
+        this.nodeReViewStateList = nodeReViewStateList;
+    }
 }

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

@@ -73,6 +73,7 @@ public interface IZEngineeringCivilService {
      * @return
      */
     int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList);
+    int insertReview(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList);
 
     /**
      * 根据工程id获取所有节点审核状态

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

@@ -12,6 +12,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.bo.switchBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -86,6 +87,7 @@ public interface IZEngineeringNodeService {
     Boolean delete(ZEngineeringNodeBo bo);
     List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state,ZEngineeringCivilBo bo);
     Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList);
+    Map<String,Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list);
 
     /**
      * 校验并批量删除工程节点信息

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

@@ -1037,6 +1037,32 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return 0;
     }
 
+    @Override
+    @DynamicName(spel = "#zEngineeringReviewBo.createTime")
+    public int insertReview(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList) {
+        ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
+//        if (zEngineeringReviewBo.getReviewStatus().equals("1"))
+//        {
+//        infoIdList.getDelInfoIdList().stream().forEach(item -> {
+//            ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
+//            zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
+//            zEngineeringInfoBo.setId(item);
+//            izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
+//        });
+//        }
+        infoIdList.getInfoIdList().stream().forEach(item -> {
+            item.setState(zEngineeringReviewBo.getReviewStatus());
+            SimpleDateFormat format=new SimpleDateFormat("yyyy_MM");
+            UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
+            lqw.eq("id",item.getId()).set("state",zEngineeringReviewBo.getReviewStatus());
+            MonthTableNameHandler.setData(format.format(item.getCreateTime()));
+            zEngineeringInfoMapper.update(lqw);
+            MonthTableNameHandler.removeData();
+        });
+        izEngineeringReviewService.insert(zEngineeringReviewBo);
+        return 0;
+    }
+
 
     @Override
     public List<ZEngineeringNodeBo> getRivewStatus(String Id) {

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

@@ -17,6 +17,7 @@ import com.ruoyi.zdsz.domain.*;
 import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 import com.ruoyi.zdsz.domain.vo.areaMessageVo;
 import com.ruoyi.zdsz.mapper.*;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
@@ -699,6 +700,53 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
+    public Map<String, Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list) {
+        Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
+        List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
+        Map<String,Object> statemap=new HashMap<>();
+        AtomicReference<List<Map<String, Object>>> ReViewStateMap= new AtomicReference<>(new ArrayList<>());
+        list.stream().forEach(item->{
+            String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+            MonthTableNameHandler.setData(date);
+            LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+            lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
+            // lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
+            List <ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
+            nodeList.stream().forEach(item2->{
+                LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
+                lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
+                List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
+                if (ReviewList.size()>0)
+                {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
+
+            });
+            System.out.println(nodeList.toString());
+            System.out.println(nodeTypeList.toString());
+            List stateList=new ArrayList();
+            sysDictMap.get("pipe_jack").stream().forEach(item3 -> {
+                Map<String,Object> map=new HashMap<>();
+                if (nodeList.size()>0&&nodeList.stream().anyMatch(x->x.getType().equals(item3.getDictValue()))){
+                    map.put("Type",item3.getDictValue());
+                    map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewStatus():"0");
+                    map.put("content",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent():"暂未审核");
+                }else {
+                    map.put("Type",item3.getDictValue());
+                    map.put("state","0");
+                    map.put("content","暂未审核");
+                }
+                stateList.add(map);
+                ReViewStateMap.set(stateList);;
+            });
+            statemap.put(item.getId(),ReViewStateMap.get());
+
+            MonthTableNameHandler.removeData();
+        });
+        return statemap;
+    }
+
+    @Override
     public Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringReview> nodeTypeList=new ArrayList<>();

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

@@ -97,6 +97,10 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public TableDataInfo<ZEngineeringPipeJackingVo> queryPageList(ZEngineeringPipeJackingBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringPipeJackingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Map<String, Object> ReviewList = nodeService.ReViewPipeJackingList(result.getRecords());
+        result.getRecords().forEach(item -> {
+            item.setNodeReViewStateList(ReviewList.get(item.getId()));
+        });
         return TableDataInfo.build(result);
     }