添加审核删除施工信息功能

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfo.java

@@ -84,5 +84,9 @@ public class ZEngineeringInfo extends BaseEntity {
      */
     @TableLogic
     private String delFlag;
+    /**
+     * 状态
+     */
+    private String state;
 
 }

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

@@ -93,6 +93,10 @@ public class ZEngineeringInfoBo extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 状态
+     */
+    private String state;
 
     public List<String> getzEngiineeringPhotoBoList() {
         return zEngiineeringPhotoBoList;

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

@@ -7,7 +7,7 @@ import java.util.List;
 @Data
 public class infoIdList {
     //审核通过节点列表
-    private List<String> infoIdList;
+    private List<ZEngineeringInfoBo> infoIdList;
     //删除节点列表
     private List<String> delInfoIdList;
 }

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

@@ -24,7 +24,7 @@ public class ZEngineeringInfoVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -95,6 +95,9 @@ public class ZEngineeringInfoVo implements Serializable {
      */
     @ExcelProperty(value = "备注")
     private String remark;
-
+    /**
+     * 状态
+     */
+    private String state;
 
 }

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

@@ -27,6 +27,7 @@ public interface IZEngiineeringPhotoService {
      * 查询照片列表
      */
     List<String> queryList(ZEngineeringInfoBo bo);
+    List<String> queryInsertList(ZEngineeringInfoBo bo);
 
     /**
      * 根据类型查询照片

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

@@ -30,6 +30,7 @@ public interface IZEngineeringInfoService {
      * @return
      */
     List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo);
+    List<ZEngineeringInfoBo> queryInsert(ZEngineeringNodeBo bo);
 
     /**
      * 查询工程详情列表

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

@@ -37,6 +37,7 @@ public interface IZEngineeringNodeService {
      * @return
      */
     ZEngineeringNodeBo query(ZEngineeringNodeBo bo) ;
+    ZEngineeringNodeBo queryInsert(ZEngineeringNodeBo bo) ;
     ZEngineeringNodeBo Userquery(ZEngineeringNodeBo bo,String username);
     /**
      * 获取工程节点列表

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

@@ -70,6 +70,22 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     }
     @Override
     @DynamicName(spel = "#bo.createTime")
+//    @Async("threadPoolTaskExecutor")
+    public List<String> queryInsertList(ZEngineeringInfoBo bo) {
+        List<String> list = new ArrayList<>();
+        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngiineeringPhoto::getUpdateTime);
+        //lqw.isNull(ZEngiineeringPhoto::getType);
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngiineeringPhoto::getParentId, bo.getId()).orderByDesc(ZEngiineeringPhoto::getCreateTime);
+        List<ZEngiineeringPhoto> zEngiineeringPhotoList = baseMapper.selectList(lqw);
+        zEngiineeringPhotoList.stream().forEach(item -> {
+            list.add(item.getPicUrl());
+        });
+        return list;
+    }
+
+    @Override
+    @DynamicName(spel = "#bo.createTime")
     public List<String> queryTypeList(ZEngineeringInfoBo bo,String Type) {
         List<String> list = new ArrayList<>();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();

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

@@ -649,10 +649,14 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             zEngineeringInfoBo.setId(item);
             izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
         });
+        infoIdList.getInfoIdList().stream().forEach(item->{
+            item.setState("1");
+            izEngineeringInfoService.update(item);
+        });
         ZEngineeringCivil zEngineeringCivil = baseMapper.selectById(zEngineeringNode.getCivliId());
         ZEngineeringCivilBo zEngineeringCivilBo = BeanUtil.copyProperties(zEngineeringCivil, ZEngineeringCivilBo.class);
         ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.copyProperties(zEngineeringNode, ZEngineeringNodeBo.class);
-        zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.queryInsert(zEngineeringNodeBo));
         zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
         izEngineeringReviewService.Civilinsert(zEngineeringCivil, zEngineeringReviewBo);
         areaMessageVo areaMessageVo=new areaMessageVo();

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

@@ -110,6 +110,45 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
         return zEngineeringInfoBoList;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public List<ZEngineeringInfoBo> queryInsert(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringInfo::getUpdateTime);
+        List<ZEngineeringInfo> zEngineeringInfoVoList = baseMapper.selectList(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
+        List<ZEngineeringInfoBo> zEngineeringInfoBoList = new ArrayList<>();
+        zEngineeringInfoVoList.stream().forEach(item -> {
+            ZEngineeringInfoBo zEngineeringInfoBo1 = BeanUtil.toBean(item, ZEngineeringInfoBo.class);
+            SysUser sysUser = sysUserService.selectUserById(Long.parseLong(item.getConstructUser()));
+            if (!ObjectUtils.isEmpty(sysUser)) {
+                zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
+                zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
+                zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
+                zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
+            }
+            List<String> photoList = izEngiineeringPhotoService.queryInsertList(zEngineeringInfoBo1);
+            List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
+            zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
+            zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+            zEngineeringInfoBo1.setPhotosAfter(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.photosAfter.name()));
+            zEngineeringInfoBo1.setStonePowder(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.stonePowder.name()));
+            zEngineeringInfoBo1.setDuctalEpithelium(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.ductalEpithelium.name()));
+            zEngineeringInfoBo1.setWarningtTape(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.warningtTape.name()));
+            zEngineeringInfoBo1.setVideo(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.Video.name()));
+            zEngineeringInfoBo1.setTrenchProspect(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.trenchProspect.name()));
+            zEngineeringInfoBo1.setBeforeBottom(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.beforeBottom.name()));
+            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);
+            zEngineeringInfoBoList.add(zEngineeringInfoBo1);
+        });
+
+        return zEngineeringInfoBoList;
+    }
 
     /**
      *
@@ -547,7 +586,11 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         }
         izEngineeringMaterialService.updateList(bo);
        // update.setUpdateTime(new Date());
-        return baseMapper.updateById(update) > 0;
+        SimpleDateFormat format =new SimpleDateFormat("yyyy_MM");
+        MonthTableNameHandler.setData(format.format(bo.getCreateTime()));
+     Boolean FLAG=  baseMapper.updateById(update) > 0;
+        MonthTableNameHandler.removeData();
+        return FLAG;
     }
 
     /**

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

@@ -109,6 +109,34 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    //    @Async("threadPoolTaskExecutor")
+    public ZEngineeringNodeBo queryInsert(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getCivliId()), ZEngineeringNode::getCivliId, bo.getCivliId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
+        System.out.println(LoginHelper.getUserType());
+        System.out.println(UserType.SYS_USER);
+//        if (!LoginHelper.getUserType().equals(UserType.SYS_USER))
+//            lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
+        ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
+        //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
+        if (zEngineeringNode == null) {
+            return null;
+        }
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        //        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        BeanUtil.copyProperties(zEngineeringNode, zEngineeringNodeBo, "id");
+        zEngineeringNodeBo.setId(zEngineeringNode.getId());
+        List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.queryInsert(zEngineeringNodeBo);
+        ZEngineeringReviewBo zEngineeringReview=  izEngineeringReviewService.query(zEngineeringNodeBo);
+        zEngineeringNodeBo.setReviewStatus(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewStatus());
+        zEngineeringNodeBo.setReviewContent(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewContent());
+        zEngineeringNodeBo.setId(zEngineeringNode.getId());
+        zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
+        return zEngineeringNodeBo;
+    }
 
     @Override
     @DynamicName(spel = "#bo.createTime")