202406市政审核

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

@@ -2,14 +2,17 @@ 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.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.framework.obs.ObsService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
+import com.ruoyi.zdsz.domain.ZEngineeringInfo;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
@@ -313,7 +316,10 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @DynamicName(spel = "#bo.createTime")
     @Async
     public void writeImg(List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");
+        MonthTableNameHandler.setData(format.format(bo.getCreateTime()));
         Map<String, String> objInfo = baseMapper.getObjInfo(bo.getEngInfoId());
+        MonthTableNameHandler.removeData();
         System.out.println("-------------节点信息-------------");
         System.out.println(objInfo);
         System.out.println("--------------------------------");

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

@@ -1041,16 +1041,6 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @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());

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -454,12 +455,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 }
             }
         }
-        //节点表与info表List
+        //节点表与info表
         if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
-            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList())) {
-                bo.getzEngineeringNodeBo().setCreateTime(voById.getCreateTime());
-                izEngineeringNodeService.updateMuch(bo.getzEngineeringNodeBo());
-            }
+            bo.getzEngineeringNodeBo().setCreateTime(voById.getCreateTime());
+            izEngineeringNodeService.updateMuch(bo.getzEngineeringNodeBo());
         }
         return flag;
     }

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

@@ -889,7 +889,6 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             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();
@@ -901,10 +900,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 }
 
             });
-            System.out.println(nodeList.toString());
-            System.out.println(nodeTypeList.toString());
             List stateList=new ArrayList();
-            sysDictMap.get("municipal_engineering_node").stream().forEach(item3 -> {
+            sysDictMap.get("municipal_node_types").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());

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

@@ -40,7 +40,7 @@
         SELECT
             IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name) AS engin_name,
             IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',IF(zein.type = '1','工业工程','市政工程')),'危险工程'),'基建工程'),'顶管工程') AS type
-        FROM z_engineering_node_2024_05 ze
+        FROM z_engineering_node ze
                  LEFT JOIN z_engineering_pipe_jacking zepj ON zepj.id = ze.civli_id
                  LEFT JOIN z_engineering_infrastructure zei ON zei.id = ze.civli_id
                  LEFT JOIN z_engineering_dangerous zed ON zed.id = ze.civli_id