节点 删除以及审核

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

@@ -66,10 +66,9 @@ public class ZEngineeringNodeController extends BaseController {
      * @param id 主键
      */
    // @SaCheckPermission("zdsz:engineeringNode:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringNodeBo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringNodeService.query(id,new Date()));
+    @GetMapping()
+    public R<ZEngineeringNodeBo> getInfo( @RequestBody ZEngineeringNodeBo bo) {
+        return R.ok(iZEngineeringNodeService.query(bo));
     }
 
     /**
@@ -100,11 +99,11 @@ public class ZEngineeringNodeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringNode:remove")
+   // @SaCheckPermission("zdsz:engineeringNode:remove")
     @Log(title = "工程节点", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringNodeService.deleteWithValidByIds(Arrays.asList(ids), true));
+    @DeleteMapping("")
+    public R<Void> remove(
+                          @RequestBody ZEngineeringNodeBo bo) {
+        return toAjax(iZEngineeringNodeService.delete(bo));
     }
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -64,22 +65,21 @@ public class ZEngineeringReviewController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringReview:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringReviewVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringReviewService.queryById(id));
+//    @SaCheckPermission("zdsz:engineeringReview:query")
+    @GetMapping()
+    public R getInfo( @RequestBody ZEngineeringNodeBo bo) {
+        return R.ok(iZEngineeringReviewService.query(bo));
     }
 
     /**
      * 新增工程审核
      */
-    @SaCheckPermission("zdsz:engineeringReview:add")
+    //@SaCheckPermission("zdsz:engineeringReview:add")
     @Log(title = "工程审核", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringReviewBo bo) {
-        return toAjax(iZEngineeringReviewService.insertByBo(bo));
+        return toAjax(iZEngineeringReviewService.insert(bo));
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/handler/MonthTableNameHandler.java

@@ -31,6 +31,9 @@ public class MonthTableNameHandler implements TableNameHandler {
     public static void setData(String month) {
         MONTH_DATA.set(month);
     }
+    public static void getData() {
+        MONTH_DATA.get();
+    }
 
     //删除当前请求线程的month数据
     public static void removeData() {

ruoyi-zdsz/pom.xml

@@ -27,5 +27,9 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
     </dependencies>
 </project>

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

@@ -70,13 +70,13 @@ public class ZEngineeringInfoBo extends BaseEntity {
     /**
      * 施工人电话
      */
-    @NotBlank(message = "施工人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "施工人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructPhone;
 
     /**
      * 施工人
      */
-    @NotBlank(message = "施工人不能为空", groups = { AddGroup.class, EditGroup.class })
+    /*@NotBlank(message = "施工人不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String constructUser;
 
     /**
@@ -88,13 +88,13 @@ public class ZEngineeringInfoBo extends BaseEntity {
     /**
      * 负责人名称
      */
-    @NotBlank(message = "负责人名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "负责人名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String headName;
 
     /**
      * 负责人电话
      */
-    @NotBlank(message = "负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String headPhone;
 
     /**
@@ -144,4 +144,17 @@ public class ZEngineeringInfoBo extends BaseEntity {
 
     private  ZEngineeringMaterialBo zEngineeringMaterialBo;
 
+    public ZEngineeringReviewBo getzEngineeringReviewBo() {
+        return zEngineeringReviewBo;
+    }
+
+    public void setzEngineeringReviewBo(ZEngineeringReviewBo zEngineeringReviewBo) {
+        this.zEngineeringReviewBo = zEngineeringReviewBo;
+    }
+
+    /**
+     * 审核信息
+     */
+    private  ZEngineeringReviewBo zEngineeringReviewBo;
+
 }

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

@@ -32,13 +32,13 @@ public class ZEngineeringReviewBo extends BaseEntity {
     /**
      * 审核时间
      */
-    @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date reviewTime;
 
     /**
      * 审核人
      */
-    @NotBlank(message = "审核人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "审核人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String reviewUser;
 
     /**

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

@@ -3,6 +3,9 @@ package com.ruoyi.zdsz.mapper;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 照片Mapper接口
@@ -11,5 +14,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZEngiineeringPhotoMapper extends BaseMapperPlus<ZEngiineeringPhotoMapper, ZEngiineeringPhoto, ZEngiineeringPhotoVo> {
-
+    int deleteByUrl( @Param("list") List<String> list);
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -63,5 +64,6 @@ public interface IZEngiineeringPhotoService {
     /**
      * 校验并批量删除照片信息
      */
+    Boolean delete(ZEngineeringInfoBo bo);
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

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

@@ -68,4 +68,5 @@ public interface IZEngineeringInfoService {
      * 校验并批量删除工程详情信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+    Boolean delete(ZEngineeringNodeBo bo);
 }

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

@@ -57,7 +57,9 @@ public interface IZEngineeringMaterialService {
     /**
      * 修改工程用料(节点用)
      */
+
     Boolean update(ZEngineeringMaterialBo bo);
+    Boolean delete(ZEngineeringInfoBo bo);
 
     /**
      * 校验并批量删除工程用料信息

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

@@ -22,7 +22,21 @@ public interface IZEngineeringNodeService {
      * 查询工程节点
      */
     ZEngineeringNodeVo queryById(String id);
-    ZEngineeringNodeBo query(String id, Date createTime);
+
+    /**
+     * 获取工程节点
+     * @param id
+     * @param createTime
+     * @return
+     */
+    ZEngineeringNodeBo query(ZEngineeringNodeBo bo);
+    /**
+     * 获取工程节点列表
+     * @param id
+     * @param createTime
+     * @return
+     */
+    List<ZEngineeringNodeBo> queryListDetails(ZEngineeringNodeBo bo);
 
     /**
      * 查询工程节点列表
@@ -58,6 +72,7 @@ public interface IZEngineeringNodeService {
      * @return
      */
     Boolean update(ZEngineeringNodeBo bo);
+    Boolean delete(ZEngineeringNodeBo bo);
 
     /**
      * 校验并批量删除工程节点信息

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZEngineeringReview;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,7 +22,10 @@ public interface IZEngineeringReviewService {
      * 查询工程审核
      */
     ZEngineeringReviewVo queryById(String id);
-
+    /**
+     * 查询工程审核(节点使用)
+     */
+    ZEngineeringReviewBo query(ZEngineeringNodeBo bo);
     /**
      * 查询工程审核列表
      */
@@ -36,7 +40,7 @@ public interface IZEngineeringReviewService {
      * 新增工程审核
      */
     Boolean insertByBo(ZEngineeringReviewBo bo);
-    ZEngineeringReview insert(ZEngineeringReviewBo bo);
+    Boolean insert(ZEngineeringReviewBo bo);
 
     /**
      * 修改工程审核

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

@@ -8,7 +8,9 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.framework.obs.ObsService;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
@@ -51,7 +53,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     public List<String> queryList(String id) {
         List<String> list =new ArrayList<>();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(id), ZEngiineeringPhoto::getParentId, id);
+        lqw.eq(StringUtils.isNotBlank(id), ZEngiineeringPhoto::getParentId, id).orderByDesc(ZEngiineeringPhoto::getCreateTime);
         List<ZEngiineeringPhoto> zEngiineeringPhotoList= baseMapper.selectList(lqw);
         zEngiineeringPhotoList.stream().forEach( item->{
             list.add(item.getPicUrl());
@@ -108,7 +110,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     @Transactional(rollbackFor=Exception.class)
     @DynamicName(spel = "#bo[0].createTime")
-    public Boolean insertBatch( List<ZEngiineeringPhoto> bo) {
+    public Boolean insertBatch(List<ZEngiineeringPhoto> bo) {
         boolean flag = baseMapper.insertBatch(bo);
         return flag;
     }
@@ -125,28 +127,66 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
 
     @Override
     @DynamicName(spel = "#bo[0].createTime")
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateBatch(List<ZEngiineeringPhoto> bo) {
         ZEngiineeringPhoto zEngiineeringPhoto = bo.get(0);
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(zEngiineeringPhoto.getParentId()), ZEngiineeringPhoto::getParentId, zEngiineeringPhoto.getParentId());
-        List<ZEngiineeringPhotoVo> zEngiineeringPhotoList=  baseMapper.selectVoList(lqw);
-        List<String> dlList=new ArrayList<>();
-        List<String> dlIdList=new ArrayList<>();
-        List<ZEngiineeringPhoto> instList=new ArrayList<>();
-         zEngiineeringPhotoList.stream().forEach(item->{
-           bo.stream().forEach(boitem->{
-               if(item.getPicUrl()!= boitem.getPicUrl())
-               {
-                   dlList.add(item.getPicUrl());
-                   dlIdList.add(item.getId());
-                   instList.add(boitem);
-               }
-           });
-
+        List<ZEngiineeringPhoto> zEngiineeringPhotoList=  baseMapper.selectList(lqw);
+        List<String> list=new ArrayList<>();
+        zEngiineeringPhotoList.stream().forEach(item->{
+            list.add(item.getPicUrl());
         });
+        List<String> bolist=new ArrayList<>();
+        bo.stream().forEach(item->{
+            bolist.add(item.getPicUrl());
+        });
+        List dlList= list.stream().filter(i->!bolist.contains(i)).collect(Collectors.toList());
+        List<String> inList= bolist.stream().filter(i->!list.contains(i)).collect(Collectors.toList());
         obsService.deleteFiles(dlList);
-        baseMapper.deleteBatchIds(dlIdList);
-        return  insertBatch(instList);
+        List dlIdList=new ArrayList();
+        dlList.stream().forEach(item->{
+            zEngiineeringPhotoList.stream().forEach(Photoitem->{
+                if (Photoitem.getPicUrl()==item)
+                {
+                    dlIdList.add(Photoitem);
+                }
+            });
+
+        });
+        if (dlList.size()!=0)
+        {
+            baseMapper.deleteBatchIds(dlIdList);
+
+        }else if (inList.size()!=0)
+        {
+            List <ZEngiineeringPhoto> photoList=new ArrayList();
+            inList.stream().forEach(item->{
+                    ZEngiineeringPhoto zEngiineeringPhoto1=new ZEngiineeringPhoto();
+                    zEngiineeringPhoto1.setParentId(zEngiineeringPhoto.getParentId());
+                     zEngiineeringPhoto1.setPicUrl(item);
+                zEngiineeringPhoto1.setCreateTime(zEngiineeringPhoto.getCreateTime());
+                    photoList.add(zEngiineeringPhoto1);
+            });
+            insertBatch(photoList);
+        }
+        return null;
+
+
+    }
+
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(ZEngineeringInfoBo bo) {
+        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngiineeringPhoto::getParentId, bo.getId());
+        List<ZEngiineeringPhoto> zEngiineeringPhoto= baseMapper.selectList(lqw);
+        List IdList=new ArrayList();
+        zEngiineeringPhoto.stream().forEach(item->{
+            IdList.add(item.getId());
+        });
+        return baseMapper.deleteBatchIds(IdList)>0;
     }
 
     /**

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

@@ -2,21 +2,23 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.DynamicName;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import com.ruoyi.zdsz.service.IZEngineeringMaterialService;
+import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
 import com.ruoyi.zdsz.domain.ZEngineeringInfo;
 import com.ruoyi.zdsz.mapper.ZEngineeringInfoMapper;
@@ -44,7 +46,10 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     private IZEngineeringMaterialService izEngineeringMaterialService;
     @Resource
     private IZEngiineeringPhotoService izEngiineeringPhotoService;
-
+    @Resource
+    private ISysUserService sysUserService;
+    @Resource
+    private IZEngineeringReviewService izEngineeringReviewService;
     /**
      * 查询工程详情
      */
@@ -59,10 +64,17 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
         ZEngineeringInfo zEngineeringInfoVo= baseMapper.selectOne(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
         ZEngineeringInfoBo zEngineeringInfoBo1 = BeanUtil.toBean(zEngineeringInfoVo, ZEngineeringInfoBo.class);
+        SysUser sysUser=sysUserService.selectUserById(Long.valueOf(zEngineeringInfoVo.getConstructUser()));
+        zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
+        zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
+        zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
+        zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
         List<String> photoList=izEngiineeringPhotoService.queryList(zEngineeringInfoBo1.getId());
         ZEngineeringMaterialBo zEngineeringMaterialBo=izEngineeringMaterialService.query(zEngineeringInfoBo1);
         zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
         zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+        ZEngineeringReviewBo zEngineeringReviewbo=izEngineeringReviewService.query(bo);
+        zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
         return zEngineeringInfoBo1;
     }
 
@@ -127,6 +139,8 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     public ZEngineeringInfo insert(ZEngineeringInfoBo bo) {
         ZEngineeringInfo add = BeanUtil.toBean(bo, ZEngineeringInfo.class);
         validEntityBeforeSave(add);
+        add.setConstructUser(String.valueOf(LoginHelper.getLoginUser().getUserId()));
+        add.setHeadName(String.valueOf(LoginHelper.getLoginUser().getUserId()));
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -157,6 +171,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     }
 
     @Override
+    @DynamicName(spel = "#bo.createTime")
     public Boolean update(ZEngineeringInfoBo bo) {
         ZEngineeringInfo update = BeanUtil.toBean(bo, ZEngineeringInfo.class);
         validEntityBeforeSave(update);
@@ -165,9 +180,11 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
             zEngiineeringPhoto.setParentId(update.getId());
             zEngiineeringPhoto.setPicUrl(item);
+            zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
             photoList.add(zEngiineeringPhoto);
         });
         izEngiineeringPhotoService.updateBatch(photoList);
+        izEngineeringMaterialService.update(bo.getzEngineeringMaterialBo());
         return baseMapper.updateById(update) > 0;
     }
 
@@ -188,4 +205,17 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId());
+        ZEngineeringInfo zEngineeringInfo= baseMapper.selectOne(lqw);
+        ZEngineeringInfoBo zEngineeringInfobo = BeanUtil.toBean(zEngineeringInfo, ZEngineeringInfoBo.class);
+        izEngiineeringPhotoService.delete(zEngineeringInfobo);
+        izEngineeringMaterialService.delete(zEngineeringInfobo);
+        return baseMapper.deleteById(zEngineeringInfo.getId())>0;
+    }
 }

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

@@ -122,12 +122,24 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
     }
 
     @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
     public Boolean update(ZEngineeringMaterialBo bo) {
         ZEngineeringMaterial update = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(ZEngineeringInfoBo bo) {
+        LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
+        ZEngineeringMaterial zEngineeringMaterial= baseMapper.selectOne(lqw);
+        return baseMapper.deleteById(zEngineeringMaterial.getId()) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */

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

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -9,6 +10,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZEngineeringInfo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.service.IZEngineeringInfoService;
 import lombok.RequiredArgsConstructor;
@@ -22,10 +24,7 @@ import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 工程节点Service业务层处理
@@ -49,15 +48,30 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
-    @DynamicName(spel = "#createTime")
-    public ZEngineeringNodeBo query(String id,Date createTime) {
-        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(id);
+    @DynamicName(spel = "#bo.createTime")
+    public ZEngineeringNodeBo query(ZEngineeringNodeBo bo) {
+        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
         ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNodeVo, ZEngineeringNodeBo.class);
        ZEngineeringInfoBo zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
        zEngineeringNodeBo.setzEngineeringInfoBo(zEngineeringInfoBo);
         return zEngineeringNodeBo;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public List<ZEngineeringNodeBo> queryListDetails(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringNode> lqw = buildQueryWrapper(bo);
+          List<ZEngineeringNode> zEngineeringNode=baseMapper.selectList(lqw);
+          List<ZEngineeringNodeBo> zEngineeringNodeBoList=new ArrayList<>();
+        zEngineeringNode.stream().forEach(item->{
+            ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(item, ZEngineeringNodeBo.class);
+            ZEngineeringInfoBo zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+            zEngineeringNodeBo.setzEngineeringInfoBo(zEngineeringInfoBo);
+            zEngineeringNodeBoList.add(zEngineeringNodeBo);
+        });
+        return zEngineeringNodeBoList;
+    }
+
     /**
      * 查询工程节点列表
      */
@@ -135,10 +149,22 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     public Boolean update(ZEngineeringNodeBo bo) {
         ZEngineeringNode update = BeanUtil.toBean(bo, ZEngineeringNode.class);
         validEntityBeforeSave(update);
-        izEngineeringInfoService.updateByBo(bo.getzEngineeringInfoBo());
+        izEngineeringInfoService.update(bo.getzEngineeringInfoBo());
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringNode::getId,bo.getId());
+        ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
+        ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        izEngineeringInfoService.delete(zEngineeringNodeBo);
+        return baseMapper.deleteById(bo.getId()) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */

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

@@ -2,12 +2,15 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.DynamicName;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
@@ -17,6 +20,7 @@ import com.ruoyi.zdsz.mapper.ZEngineeringReviewMapper;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -41,6 +45,23 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
         return baseMapper.selectVoById(id);
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public ZEngineeringReviewBo query(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringReview> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringReview::getEngInfoId, bo.getId()).orderByDesc(ZEngineeringReview::getCreateTime);
+        List<ZEngineeringReview> zEngineeringReviewList=baseMapper.selectList(lqw);
+        if (zEngineeringReviewList.size()==0)
+        {
+            return null;
+        }else
+        {
+            ZEngineeringReviewBo zEngineeringReviewbo = BeanUtil.toBean(zEngineeringReviewList.get(0), ZEngineeringReviewBo.class);
+           return zEngineeringReviewbo;
+        }
+
+    }
+
     /**
      * 查询工程审核列表
      */
@@ -88,14 +109,16 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor = Exception.class)
-    public ZEngineeringReview insert(ZEngineeringReviewBo bo) {
+    public Boolean insert(ZEngineeringReviewBo bo) {
+        bo.setReviewTime(new Date());
+        bo.setReviewUser(String.valueOf(LoginHelper.getLoginUser().getUserId()));
         ZEngineeringReview add = BeanUtil.toBean(bo, ZEngineeringReview.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
-        return add;
+        return flag;
     }
 
     /**

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

@@ -17,4 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <delete id="deleteByUrl" parameterType="String">
+        delete from g_emergency_repair_photo where
+         pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>