审核bug修复

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringCivilBo.java

@@ -90,6 +90,14 @@ public class  ZEngineeringCivilBo extends BaseEntity {
      * 审核时间
      */
     private String reviewTime;
+    /**
+     * 开始时间
+     */
+    private List beginTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
 
     private ZEngineeringNodeBo zEngineeringNodeBo;
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringInfoBo.java

@@ -128,6 +128,8 @@ public class ZEngineeringInfoBo extends BaseEntity {
     public List<String> video;
     @NotNull(message = "管道施工记录不能为空", groups = { AddGroup.class, EditGroup.class })
     public List<String> constructionRecords;
+    @NotNull(message = "沟上部分不能为空", groups = { AddGroup.class, EditGroup.class })
+    public List<String> onTheDitch;
 
 
     public List<String> getBeforeBottom() {

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/enums/photoType.java

@@ -52,7 +52,11 @@ public enum photoType {
     /**
      * 管道施工记录
      */
-    constructionRecords
+    constructionRecords,
+    /**
+     * 沟上部分
+     */
+    onTheDitch
     ;
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringCivilMapper.java

@@ -1,14 +1,14 @@
 package com.ruoyi.zdsz.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -31,6 +31,6 @@ public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivi
     areaMessageVo getHouseMessage(String Id);
     areaMessageVo getAreaMessage(String Id);
     areaMessageVo getAreaName(String Id);
-    List<String> getTableNames(String tableName);
-
+    LinkedList<String> getTableNames(String tableName);
+    List<ZEngineeringInfoBo> getsumId(@Param("tableNames") List tableNames, @Param("createTime")List createTime, @Param("UserName") String UserName);
 }

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

@@ -83,7 +83,7 @@ public interface IZEngineeringNodeService {
     Boolean update(ZEngineeringNodeBo bo);
     Boolean updateMuch(ZEngineeringNodeBo bo);
     Boolean delete(ZEngineeringNodeBo bo);
-    List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state);
+    List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state,ZEngineeringCivilBo bo);
     Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList);
 
     /**

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

@@ -14,12 +14,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.system.service.ISysDictTypeService;
-import com.ruoyi.zdsz.domain.ZArea;
-import com.ruoyi.zdsz.domain.ZEngineeringNode;
-import com.ruoyi.zdsz.domain.ZHouse;
-import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
+import com.ruoyi.zdsz.domain.*;
+import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.mapper.ZAreaMapper;
 import com.ruoyi.zdsz.mapper.ZEngineeringNodeMapper;
@@ -32,8 +28,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -183,7 +177,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         Page<ZEngineeringCivilVo> result=new Page<>();
         if (!"".equals(bo.getType())&&!ObjectUtils.isEmpty(bo.getType()))
         {
-            List IDList=zEngineeringNodeService.nodeTypeList(baseMapper.selectList(lqw),bo.getType(),bo.getCompletionStatus());
+            List IDList=zEngineeringNodeService.nodeTypeList(baseMapper.selectList(lqw),bo.getType(),bo.getCompletionStatus(),bo);
 
             if (IDList.size()==0)
             {
@@ -197,13 +191,28 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
             return TableDataInfo.build(result);
         }
+        if((!"".equals(bo.getBeginTime())&&!ObjectUtils.isEmpty(bo.getBeginTime()))||(!"".equals(bo.getCreateBy())&&!ObjectUtils.isEmpty(bo.getCreateBy())))
+        {
+            List<String> a= zEngineeringCivilList(bo.getBeginTime(),bo.getCreateBy(),bo);
+            if (a.size()==0)
+            {
+                return TableDataInfo.build(result);
+            }
+            result = baseMapper.queryPageIdList( a, Long.parseLong(String.valueOf(a.size())), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
+            result.getRecords().forEach(item->{
+                item.setNodeReViewStateList(ReviewList.get(item.getId()));
+            });
+            page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
+            return TableDataInfo.build(result);
+        }
         result = baseMapper.queryPageList(bo, page, (pageQuery.getPageNum()-1)*pageQuery.getPageSize() , pageQuery.getPageSize());
         Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
         result.getRecords().forEach(item->{
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });
         page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
-        //zEngineeringCivilList("1","2");
+
         return TableDataInfo.build(result);
     }
 
@@ -231,9 +240,41 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), ZEngineeringCivil::getImgUrl, bo.getImgUrl());
         return lqw;
     }
-    private List<String> zEngineeringCivilList(String createTime,String UserName){
-
-        return baseMapper.getTableNames("z_engineering_info");
+    private List<String> zEngineeringCivilList(List createTime, String UserName,ZEngineeringCivilBo bo){
+        MonthTableNameHandler.removeData();
+        LinkedList <String>list=baseMapper.getTableNames("z_engineering_info");
+        list.removeLast();
+        List<ZEngineeringInfoBo> mapList= baseMapper.getsumId(list,createTime,UserName);
+        List<String> zEngineeringNodeList=new ArrayList<>();
+        mapList.stream().forEach(item->{
+            String date=  new SimpleDateFormat("yyyy_MM").format(item.getUpdateInfoTime());
+            MonthTableNameHandler.setData(date);
+            LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+            lqw.eq(StringUtils.isNotBlank(item.getEngInfoId()),ZEngineeringNode::getId,item.getEngInfoId());
+           ZEngineeringNode zEngineeringNode=  zEngineeringNodeMapper.selectOne(lqw);
+           if (!ObjectUtils.isEmpty(zEngineeringNode))
+            zEngineeringNodeList.add(zEngineeringNode.getCivliId());
+            MonthTableNameHandler.removeData();
+        });
+        List newList = zEngineeringNodeList.stream().distinct().collect(Collectors.toList());
+        List CivilList=new ArrayList();
+        newList.stream().forEach(item2->{
+            LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+            lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
+            lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
+            lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+            lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
+            lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+            lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+            lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
+            lqw.eq(ZEngineeringCivil::getId,item2);
+            ZEngineeringCivil zEngineeringCivil= baseMapper.selectOne(lqw);
+            if (!ObjectUtils.isEmpty(zEngineeringCivil))
+            {
+                CivilList.add(zEngineeringCivil.getId());
+            }
+        });
+        return CivilList;
     };
 
     @Autowired

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

@@ -94,6 +94,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngineeringInfoBo1.setLegBackfilling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.legBackfilling.name()));
             zEngineeringInfoBo1.setInferiorSulcus(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.inferiorSulcus.name()));
             zEngineeringInfoBo1.setConstructionRecords(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.constructionRecords.name()));
+            zEngineeringInfoBo1.setOnTheDitch(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.onTheDitch.name()));
             // bo.setId(item.getId());
             ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
             zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
@@ -196,6 +197,20 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
 
         }
+        if (!ObjectUtils.isEmpty(bo.getOnTheDitch()))
+        {
+            bo.getOnTheDitch().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.onTheDitch.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
         if (!ObjectUtils.isEmpty(bo.getBeforeBottom()))
         {
             bo.getBeforeBottom().forEach(item -> {
@@ -381,7 +396,18 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 zEngiineeringPhoto.setType(photoType.constructionRecords.name().toString());
                 photoList2.add(zEngiineeringPhoto);
             });
-
+            if (!ObjectUtils.isEmpty(bo.getOnTheDitch()))
+            {
+                bo.getOnTheDitch().forEach(item -> {
+                    ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                    zEngiineeringPhoto.setParentId(bo.getId());
+                    zEngiineeringPhoto.setPicUrl(item);
+                    zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                    zEngiineeringPhoto.setUpdateTime(new Date());
+                    zEngiineeringPhoto.setType(photoType.onTheDitch.name().toString());
+                    photoList2.add(zEngiineeringPhoto);
+                });
+            }
 
         }
         if (!ObjectUtils.isEmpty(bo.getInferiorSulcus()))

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

@@ -13,18 +13,12 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.framework.handler.MonthTableNameHandler;
-import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.domain.ZEngineeringNode;
-import com.ruoyi.zdsz.domain.ZEngineeringReview;
-import com.ruoyi.zdsz.domain.ZHouse;
+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.areaMessageVo;
-import com.ruoyi.zdsz.mapper.ZComprehensiveMapper;
-import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
-import com.ruoyi.zdsz.mapper.ZEngineeringNodeMapper;
-import com.ruoyi.zdsz.mapper.ZEngineeringReviewMapper;
+import com.ruoyi.zdsz.mapper.*;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import com.ruoyi.zdsz.service.IZEngineeringInfoService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
@@ -73,6 +67,8 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     private  ZEngineeringReviewMapper zEngineeringReviewMapper;
     @Resource
     private ZComprehensiveMapper zComprehensiveMapper;
+    @Resource
+    private ZEngineeringInfoMapper zEngineeringInfoMapper;
 
 
     /**
@@ -601,7 +597,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
-    public List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state) {
+    public List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state,ZEngineeringCivilBo bo) {
         List<ZEngineeringNode> nodeTypeList=new ArrayList<>();
         zEngineeringCivilList.forEach(item->{
             String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
@@ -636,6 +632,23 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             }
             MonthTableNameHandler.removeData();
         });
+        if((!"".equals(bo.getBeginTime())&&!ObjectUtils.isEmpty(bo.getBeginTime()))||(!"".equals(bo.getCreateBy())&&!ObjectUtils.isEmpty(bo.getCreateBy())))
+        {
+            nodeTypeList.stream().forEach(item->{
+                String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+                MonthTableNameHandler.setData(date);
+                LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
+                lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getId, item.getId());
+                lqw.like(ZEngineeringInfo::getCreateBy, bo.getCreateBy()+"%");
+//                lqw.eq(ZEngineeringInfo::getUpdateInfoTime, bo.getReviewTime());
+                lqw.between(ZEngineeringInfo::getUpdateInfoTime,bo.getBeginTime().get(0),bo.getBeginTime().get(1));
+
+                if (zEngineeringInfoMapper.selectCount(lqw)==0)
+                {
+                    nodeTypeList.remove(item);
+                }
+            });
+        }
         List<String>IDList=new ArrayList<>();
         if (!ObjectUtils.isEmpty(nodeTypeList))
         {

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

@@ -101,10 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.enginCycle != null and p.enginCycle != ''">
             and engin_cycle = 0
         </if>
-        order by a.create_time desc
+        order by a.update_info_time desc
         LIMIT #{page},#{size}
         ) AS at)
-        order by a.create_time desc
+        order by a.update_info_time desc
     </select>
     <select id="queryPageIdList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo">
        select
@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id in  <foreach collection="idList" item="name" open="(" separator="," close=")">
         #{name}
     </foreach>
-        order by a.create_time desc
+        order by a.update_info_time desc
     </select>
 <select id="getObtainRoomcCompletionInformationList" resultType="com.ruoyi.zdsz.domain.vo.roomStatusVo">
     select
@@ -246,4 +246,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.id = #{id}
     </select>
+    <select id="getTableNames" resultType="String">
+        SELECT
+            table_name as tableName
+        FROM
+            information_schema.TABLES
+        WHERE
+            table_name like CONCAT(#{tableName},'%')
+    </select>
+    <select id="getsumId" resultType="com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo">
+        SELECT
+        *
+        FROM
+        z_engineering_info
+        WHERE
+            1=1
+
+        <if test="createTime != null and createTime != ''">
+            and update_info_time between #{createTime[0]} and #{createTime[1]}
+        </if>
+        <if test="UserName != null and UserName != ''">
+        and create_by like CONCAT(#{UserName},'%')
+        </if>
+        <foreach collection="tableNames" item="name">
+            union
+            SELECT
+            *
+            FROM
+            ${name}
+            WHERE
+            1=1
+            <if test="createTime != null and createTime != ''">
+              and  update_info_time between #{createTime[0]} and #{createTime[1]}
+            </if>
+            <if test="UserName != null and UserName != ''">
+                and create_by like CONCAT(#{UserName},'%')
+            </if>
+        </foreach>
+
+    </select>
 </mapper>