Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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/mapper/ZEngiineeringPhotoMapper.java

@@ -19,5 +19,8 @@ public interface ZEngiineeringPhotoMapper extends BaseMapperPlus<ZEngiineeringPh
     int deleteByUrl( @Param("list") List<String> list);
 
     List<Map<String,Object>> getlist(String id);
+
+    Map<String,String> getObjInfo(String nodeId);
+
     int deleteByUrls(String url);
 }

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

@@ -6,9 +6,11 @@ import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -82,4 +84,5 @@ public interface IZEngiineeringPhotoService {
     Boolean deleteWithValidByurls(String url);
     Boolean deleteWithValid(ZEngiineeringPhoto bo);
     void write(ZEngineeringCivilBo zEngineeringCivilBo);
+    void writeImg(String id, List<ZEngineeringInfoBo> infoIdList, ZEngineeringInfoBo bo);
 }

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/ZEngiineeringPhotoServiceImpl.java

@@ -13,6 +13,7 @@ import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.mapper.ZEngiineeringPhotoMapper;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
@@ -307,6 +308,15 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     }
 
     @Override
+    @DynamicName(spel = "#bo.createTime")
+    public void writeImg(String id, List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
+        Map<String, String> objInfo = baseMapper.getObjInfo(id);
+        System.out.println("-------------节点信息-------------");
+        System.out.println(objInfo);
+        System.out.println("--------------------------------");
+    }
+
+    @Override
     @Async
     public void write(ZEngineeringCivilBo zEngineeringCivilBo) {
         zEngineeringCivilBo.getzEngineeringNodeBo().getzEngineeringInfoBoList().forEach(zEngineeringInfoBo -> {

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

@@ -274,7 +274,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getCorrosionLevel())) {
                     zEngineeringCivilExportVos.setCorrosionLevel("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType())&& zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
+                if ("".equals(zEngineeringCivilExportVos.getCorrosionLevel()) && "拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVo.getCorrosionLevel());
                 else if ("拆旧管".equals(zEngineeringCivilExportVo.getType()) && zEngineeringCivilExportVo.getCorrosionLevel() != null && !zEngineeringCivilExportVo.getCorrosionLevel().matches("-?\\d+(\\.\\d+)?"))
                     zEngineeringCivilExportVos.setCorrosionLevel(zEngineeringCivilExportVos.getCorrosionLevel() + "/" + zEngineeringCivilExportVo.getCorrosionLevel());
@@ -304,7 +304,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 if (ObjectUtils.isEmpty(zEngineeringCivilExportVos.getQDFmaterialQuality())) {
                     zEngineeringCivilExportVos.setQDFmaterialQuality("");
                 }
-                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality())&&"切断阀".equals(zEngineeringCivilExportVo.getType()))
+                if ("".equals(zEngineeringCivilExportVos.getQDFmaterialQuality()) && "切断阀".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVo.getBrand());
                 else if ("切断阀".equals(zEngineeringCivilExportVo.getType()))
                     zEngineeringCivilExportVos.setQDFmaterialQuality(zEngineeringCivilExportVos.getQDFmaterialQuality() + "/" + zEngineeringCivilExportVo.getBrand());
@@ -658,7 +658,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
         if ("indoor_engin".equals(bo.getEnginClassification()) || "courtyard".equals(bo.getEnginClassification()) || "overhead".equals(bo.getEnginClassification())) {
-           if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
                 izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
@@ -852,7 +852,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         IdList.stream().forEach(item -> {
             Id.add(item.getId());
         });
-        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList(Id, bo.getEnginCycle(),bo.getEnginType());
+        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList(Id, bo.getEnginCycle(), bo.getEnginType());
         Map<String, List<areaWillDoneVo>> stringListMap = hourseList.stream().collect(Collectors.groupingBy(item -> item.getAreaId()));
         List<areaStatusVo> areaList = new ArrayList<>();
         stringListMap.forEach((key, value) -> {
@@ -878,7 +878,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     @Override
     public List<areaStatusVo> getAreaCompletionInformationList2(ZEngineeringCivilBo bo) {
-        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList2( bo.getEnginCycle(),bo.getEnginType());
+        List<areaWillDoneVo> hourseList = baseMapper.getAreaCompletionInformationList2(bo.getEnginCycle(), bo.getEnginType());
         Map<String, List<areaWillDoneVo>> stringListMap = hourseList.stream().collect(Collectors.groupingBy(item -> item.getAreaId()));
         List<areaStatusVo> areaList = new ArrayList<>();
         stringListMap.forEach((key, value) -> {
@@ -967,19 +967,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
     public int Civilinsert(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);
-        });}
+        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");
+            SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
             UpdateWrapper<ZEngineeringInfo> lqw = new UpdateWrapper();
-            lqw.eq("id",item.getId()).set("state",zEngineeringReviewBo.getReviewStatus());
+            lqw.eq("id", item.getId()).set("state", zEngineeringReviewBo.getReviewStatus());
             MonthTableNameHandler.setData(format.format(item.getCreateTime()));
             zEngineeringInfoMapper.update(lqw);
             MonthTableNameHandler.removeData();
@@ -1037,6 +1037,38 @@ 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);
+        //        });
+        //        }
+        try {
+            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();
+                izEngiineeringPhotoService.writeImg(zEngineeringReviewBo.getEngInfoId(),infoIdList.getInfoIdList(), item);
+            });
+
+            izEngineeringReviewService.insert(zEngineeringReviewBo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        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);
     }
 

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngiineeringPhotoMapper.xml

@@ -36,4 +36,8 @@
         select id,parent_id as parentId,pic_url as url ,del_flag as delFlag,create_by as creatBy,create_time as createTime from z_engiineering_photo where del_flag = '0' and parent_id = #{id}
     </select>
 
+    <select id="getObjInfo" resultType="java.util.Map">
+        SELECT * FROM `z_engineering_node` WHERE id = #{nodeId}
+    </select>
+
 </mapper>