节点修改 新增

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -66,7 +66,6 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:list")
     @GetMapping("/list")
     public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
-        user.setCreateTime(new Date());
         return userService.selectPageUserList(user, pageQuery);
     }
 

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.zdsz;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -64,33 +65,34 @@ public class ZEngineeringNodeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringNode:query")
+   // @SaCheckPermission("zdsz:engineeringNode:query")
     @GetMapping("/{id}")
-    public R<ZEngineeringNodeVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<ZEngineeringNodeBo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
-        return R.ok(iZEngineeringNodeService.queryById(id));
+        return R.ok(iZEngineeringNodeService.query(id,new Date()));
     }
 
     /**
      * 新增工程节点
      */
-    @SaCheckPermission("zdsz:engineeringNode:add")
+   // @SaCheckPermission("zdsz:engineeringNode:add")
     @Log(title = "工程节点", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringNodeBo bo) {
-        return toAjax(iZEngineeringNodeService.insertByBo(bo));
+    public R add(@Validated(AddGroup.class) @RequestBody ZEngineeringNodeBo bo) {
+        bo.setCreateTime(new Date());
+        return R.ok(iZEngineeringNodeService.insert(bo));
     }
 
     /**
      * 修改工程节点
      */
-    @SaCheckPermission("zdsz:engineeringNode:edit")
+    //@SaCheckPermission("zdsz:engineeringNode:edit")
     @Log(title = "工程节点", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringNodeBo bo) {
-        return toAjax(iZEngineeringNodeService.updateByBo(bo));
+    public R<Void> edit( @RequestBody ZEngineeringNodeBo bo) {
+        return toAjax(iZEngineeringNodeService.update(bo));
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -39,6 +39,7 @@ public class BaseEntity implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
+
     private Date createTime;
 
     /**
@@ -60,4 +61,5 @@ public class BaseEntity implements Serializable {
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java

@@ -20,7 +20,7 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SysOssConfigBo extends BaseEntity {
+public class  SysOssConfigBo extends BaseEntity {
 
     /**
      * 主建

ruoyi-zdsz/pom.xml

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

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

@@ -2,15 +2,22 @@ package com.ruoyi.zdsz.domain.bo;
 
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 import java.util.Date;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.NoArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 
 /**
  * 工程详情业务对象 z_engineering_info
@@ -21,10 +28,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class ZEngineeringInfoBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
@@ -107,5 +115,33 @@ public class ZEngineeringInfoBo extends BaseEntity {
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    public List<String> getzEngiineeringPhotoBoList() {
+        return zEngiineeringPhotoBoList;
+    }
+
+    public void setzEngiineeringPhotoBoList(List<String> zEngiineeringPhotoBoList) {
+        this.zEngiineeringPhotoBoList = zEngiineeringPhotoBoList;
+    }
+
+    /**
+     * 照片
+     */
+    @Valid
+    @NotNull(message = "照片不能为空", groups = { AddGroup.class, EditGroup.class })
+    private List<String> zEngiineeringPhotoBoList;
+
+    public ZEngineeringMaterialBo getzEngineeringMaterialBo() {
+        return zEngineeringMaterialBo;
+    }
+
+    public void setzEngineeringMaterialBo(ZEngineeringMaterialBo zEngineeringMaterialBo) {
+        this.zEngineeringMaterialBo = zEngineeringMaterialBo;
+    }
+
+    /**
+     * 工程用料
+     */
+
+    private  ZEngineeringMaterialBo zEngineeringMaterialBo;
 
 }

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

@@ -1,9 +1,10 @@
 package com.ruoyi.zdsz.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.Version;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+
 import javax.validation.constraints.*;
 
 import java.util.Date;
@@ -18,11 +19,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 
 @Data
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class ZEngineeringNodeBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
@@ -45,5 +47,16 @@ public class ZEngineeringNodeBo extends BaseEntity {
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    public ZEngineeringInfoBo getzEngineeringInfoBo() {
+        return zEngineeringInfoBo;
+    }
+
+    public void setzEngineeringInfoBo(ZEngineeringInfoBo zEngineeringInfoBo) {
+        this.zEngineeringInfoBo = zEngineeringInfoBo;
+    }
 
+    /**
+     * 工程详情
+     */
+    private  ZEngineeringInfoBo zEngineeringInfoBo;
 }

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

@@ -21,6 +21,10 @@ public interface IZEngiineeringPhotoService {
      * 查询照片
      */
     ZEngiineeringPhotoVo queryById(String id);
+    /**
+     * 查询照片列表
+     */
+    List<String> queryList(String id);
 
     /**
      * 查询照片列表
@@ -38,11 +42,25 @@ public interface IZEngiineeringPhotoService {
     Boolean insertByBo(ZEngiineeringPhotoBo bo);
 
     /**
+     * 批量插入并返回id集合
+     * @param bo
+     * @return
+     */
+    Boolean insertBatch(List<ZEngiineeringPhoto> bo);
+
+    /**
      * 修改照片
      */
     Boolean updateByBo(ZEngiineeringPhotoBo bo);
 
     /**
+     * 批量修改照片并删除obs信息
+     * @param bo
+     * @return
+     */
+    Boolean updateBatch(List<ZEngiineeringPhoto> bo);
+
+    /**
      * 校验并批量删除照片信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZEngineeringInfo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,6 +24,13 @@ public interface IZEngineeringInfoService {
     ZEngineeringInfoVo queryById(String id);
 
     /**
+     * 查询工程详情(节点使用)
+     * @param id
+     * @return
+     */
+    ZEngineeringInfoBo query(ZEngineeringNodeBo bo);
+
+    /**
      * 查询工程详情列表
      */
     TableDataInfo<ZEngineeringInfoVo> queryPageList(ZEngineeringInfoBo bo, PageQuery pageQuery);
@@ -38,11 +46,25 @@ public interface IZEngineeringInfoService {
     Boolean insertByBo(ZEngineeringInfoBo bo);
 
     /**
+     *  新增工程详情(节点使用)
+     * @param bo
+     * @return ZEngineeringInfo
+     */
+    ZEngineeringInfo insert(ZEngineeringInfoBo bo);
+
+    /**
      * 修改工程详情
      */
     Boolean updateByBo(ZEngineeringInfoBo bo);
 
     /**
+     * 修改工程详情(节点使用）
+     * @param bo
+     * @return
+     */
+    Boolean update(ZEngineeringInfoBo bo);
+
+    /**
      * 校验并批量删除工程详情信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);

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

@@ -1,6 +1,8 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,6 +23,10 @@ public interface IZEngineeringMaterialService {
      * 查询工程用料
      */
     ZEngineeringMaterialVo queryById(String id);
+    /**
+     * 查询工程用料
+     */
+    ZEngineeringMaterialBo query(ZEngineeringInfoBo bo);
 
     /**
      * 查询工程用料列表
@@ -38,9 +44,20 @@ public interface IZEngineeringMaterialService {
     Boolean insertByBo(ZEngineeringMaterialBo bo);
 
     /**
+     * 新增工程用料(节点用)
+     * @param bo
+     * @return
+     */
+    ZEngineeringMaterial insert(ZEngineeringMaterialBo bo);
+
+    /**
      * 修改工程用料
      */
     Boolean updateByBo(ZEngineeringMaterialBo bo);
+    /**
+     * 修改工程用料(节点用)
+     */
+    Boolean update(ZEngineeringMaterialBo bo);
 
     /**
      * 校验并批量删除工程用料信息

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,6 +22,7 @@ public interface IZEngineeringNodeService {
      * 查询工程节点
      */
     ZEngineeringNodeVo queryById(String id);
+    ZEngineeringNodeBo query(String id, Date createTime);
 
     /**
      * 查询工程节点列表
@@ -38,11 +40,26 @@ public interface IZEngineeringNodeService {
     Boolean insertByBo(ZEngineeringNodeBo bo);
 
     /**
+     * 新增工程节点
+     * @param bo
+     * @return ZEngineeringNode
+     */
+    ZEngineeringNode insert(ZEngineeringNodeBo bo);
+
+
+    /**
      * 修改工程节点
      */
     Boolean updateByBo(ZEngineeringNodeBo bo);
 
     /**
+     * 修改
+     * @param bo
+     * @return
+     */
+    Boolean update(ZEngineeringNodeBo bo);
+
+    /**
      * 校验并批量删除工程节点信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);

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

@@ -36,6 +36,7 @@ public interface IZEngineeringReviewService {
      * 新增工程审核
      */
     Boolean insertByBo(ZEngineeringReviewBo bo);
+    ZEngineeringReview insert(ZEngineeringReviewBo bo);
 
     /**
      * 修改工程审核

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

@@ -1,12 +1,14 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.DynamicName;
 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.framework.obs.ObsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
@@ -14,10 +16,14 @@ import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.mapper.ZEngiineeringPhotoMapper;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 照片Service业务层处理
@@ -30,6 +36,8 @@ import java.util.Collection;
 public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService {
 
     private final ZEngiineeringPhotoMapper baseMapper;
+    @Resource
+   private ObsService obsService;
 
     /**
      * 查询照片
@@ -39,6 +47,18 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
         return baseMapper.selectVoById(id);
     }
 
+    @Override
+    public List<String> queryList(String id) {
+        List<String> list =new ArrayList<>();
+        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(id), ZEngiineeringPhoto::getParentId, id);
+        List<ZEngiineeringPhoto> zEngiineeringPhotoList= baseMapper.selectList(lqw);
+        zEngiineeringPhotoList.stream().forEach( item->{
+            list.add(item.getPicUrl());
+        });
+        return list;
+    }
+
     /**
      * 查询照片列表
      */
@@ -81,6 +101,19 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     }
 
     /**
+     * 批量插入
+     * @param bo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor=Exception.class)
+    @DynamicName(spel = "#bo[0].createTime")
+    public Boolean insertBatch( List<ZEngiineeringPhoto> bo) {
+        boolean flag = baseMapper.insertBatch(bo);
+        return flag;
+    }
+
+    /**
      * 修改照片
      */
     @Override
@@ -90,6 +123,32 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    @DynamicName(spel = "#bo[0].createTime")
+    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);
+               }
+           });
+
+        });
+        obsService.deleteFiles(dlList);
+        baseMapper.deleteBatchIds(dlIdList);
+        return  insertBatch(instList);
+    }
+
     /**
      * 保存前的数据校验
      */

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

@@ -1,12 +1,19 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.DynamicName;
 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.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.service.IZEngiineeringPhotoService;
+import com.ruoyi.zdsz.service.IZEngineeringMaterialService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
@@ -14,7 +21,10 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
 import com.ruoyi.zdsz.domain.ZEngineeringInfo;
 import com.ruoyi.zdsz.mapper.ZEngineeringInfoMapper;
 import com.ruoyi.zdsz.service.IZEngineeringInfoService;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -30,6 +40,10 @@ import java.util.Collection;
 public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
     private final ZEngineeringInfoMapper baseMapper;
+    @Resource
+    private IZEngineeringMaterialService izEngineeringMaterialService;
+    @Resource
+    private IZEngiineeringPhotoService izEngiineeringPhotoService;
 
     /**
      * 查询工程详情
@@ -39,6 +53,19 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         return baseMapper.selectVoById(id);
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public ZEngineeringInfoBo query(ZEngineeringNodeBo bo) {
+        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);
+        List<String> photoList=izEngiineeringPhotoService.queryList(zEngineeringInfoBo1.getId());
+        ZEngineeringMaterialBo zEngineeringMaterialBo=izEngineeringMaterialService.query(zEngineeringInfoBo1);
+        zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
+        zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+        return zEngineeringInfoBo1;
+    }
+
     /**
      * 查询工程详情列表
      */
@@ -89,6 +116,35 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         }
         return flag;
     }
+    /**
+     *  新增工程详情(节点使用)
+     * @param bo
+     * @return ZEngineeringInfo
+     */
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor=Exception.class)
+    public ZEngineeringInfo insert(ZEngineeringInfoBo bo) {
+        ZEngineeringInfo add = BeanUtil.toBean(bo, ZEngineeringInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        bo.getzEngineeringMaterialBo().setDetailsId(add.getId());
+        bo.getzEngineeringMaterialBo().setCreateTime(bo.getCreateTime());
+        izEngineeringMaterialService.insert( bo.getzEngineeringMaterialBo());
+        List <ZEngiineeringPhoto> photoList=new ArrayList();
+            bo.getzEngiineeringPhotoBoList().stream().forEach(item->{
+            ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+            zEngiineeringPhoto.setParentId(add.getId());
+            zEngiineeringPhoto.setPicUrl(item);
+            zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                photoList.add(zEngiineeringPhoto);
+        });
+        izEngiineeringPhotoService.insertBatch(photoList);
+        return add;
+    }
 
     /**
      * 修改工程详情
@@ -100,6 +156,21 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    public Boolean update(ZEngineeringInfoBo bo) {
+        ZEngineeringInfo update = BeanUtil.toBean(bo, ZEngineeringInfo.class);
+        validEntityBeforeSave(update);
+        List <ZEngiineeringPhoto> photoList=new ArrayList();
+        bo.getzEngiineeringPhotoBoList().stream().forEach(item->{
+            ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+            zEngiineeringPhoto.setParentId(update.getId());
+            zEngiineeringPhoto.setPicUrl(item);
+            photoList.add(zEngiineeringPhoto);
+        });
+        izEngiineeringPhotoService.updateBatch(photoList);
+        return baseMapper.updateById(update) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */

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

@@ -1,12 +1,15 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.DynamicName;
 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.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
@@ -14,6 +17,7 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
 import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
 import com.ruoyi.zdsz.mapper.ZEngineeringMaterialMapper;
 import com.ruoyi.zdsz.service.IZEngineeringMaterialService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -39,6 +43,16 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
         return baseMapper.selectVoById(id);
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public ZEngineeringMaterialBo query(ZEngineeringInfoBo bo) {
+        LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
+        ZEngineeringMaterial zEngineeringMaterialVo= baseMapper.selectOne(lqw);
+        ZEngineeringMaterialBo zEngineeringMaterialBo = BeanUtil.toBean(zEngineeringMaterialVo, ZEngineeringMaterialBo.class);
+        return zEngineeringMaterialBo;
+    }
+
     /**
      * 查询工程用料列表
      */
@@ -84,6 +98,19 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
         return flag;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor=Exception.class)
+    public ZEngineeringMaterial insert(ZEngineeringMaterialBo bo) {
+        ZEngineeringMaterial add = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return add;
+    }
+
     /**
      * 修改工程用料
      */
@@ -94,6 +121,13 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    public Boolean update(ZEngineeringMaterialBo bo) {
+        ZEngineeringMaterial update = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */

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

@@ -1,20 +1,28 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.annotation.DynamicName;
 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.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.service.IZEngineeringInfoService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.mapper.ZEngineeringNodeMapper;
 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;
@@ -30,7 +38,8 @@ import java.util.Collection;
 public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 
     private final ZEngineeringNodeMapper baseMapper;
-
+    @Resource
+    private IZEngineeringInfoService izEngineeringInfoService;
     /**
      * 查询工程节点
      */
@@ -39,6 +48,16 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         return baseMapper.selectVoById(id);
     }
 
+    @Override
+    @DynamicName(spel = "#createTime")
+    public ZEngineeringNodeBo query(String id,Date createTime) {
+        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNodeVo, ZEngineeringNodeBo.class);
+       ZEngineeringInfoBo zEngineeringInfoBo= izEngineeringInfoService.query(zEngineeringNodeBo);
+       zEngineeringNodeBo.setzEngineeringInfoBo(zEngineeringInfoBo);
+        return zEngineeringNodeBo;
+    }
+
     /**
      * 查询工程节点列表
      */
@@ -70,6 +89,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
      * 新增工程节点
      */
     @Override
+
     public Boolean insertByBo(ZEngineeringNodeBo bo) {
         ZEngineeringNode add = BeanUtil.toBean(bo, ZEngineeringNode.class);
         validEntityBeforeSave(add);
@@ -79,7 +99,26 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         }
         return flag;
     }
-
+    /**
+     * 新增工程节点
+     * @param bo
+     * @return ZEngineeringNode
+     */
+    @Override
+    @Transactional(rollbackFor=Exception.class)
+    @DynamicName(spel = "#bo.createTime")
+    public ZEngineeringNode insert(ZEngineeringNodeBo bo) {
+        ZEngineeringNode add = BeanUtil.toBean(bo, ZEngineeringNode.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        bo.getzEngineeringInfoBo().setEngInfoId(add.getId());
+        bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
+        izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
+        return add;
+    }
     /**
      * 修改工程节点
      */
@@ -90,6 +129,16 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(ZEngineeringNodeBo bo) {
+        ZEngineeringNode update = BeanUtil.toBean(bo, ZEngineeringNode.class);
+        validEntityBeforeSave(update);
+        izEngineeringInfoService.updateByBo(bo.getzEngineeringInfoBo());
+        return baseMapper.updateById(update) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */

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

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -14,6 +15,7 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.domain.ZEngineeringReview;
 import com.ruoyi.zdsz.mapper.ZEngineeringReviewMapper;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -83,6 +85,19 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
         return flag;
     }
 
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public ZEngineeringReview insert(ZEngineeringReviewBo bo) {
+        ZEngineeringReview add = BeanUtil.toBean(bo, ZEngineeringReview.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return add;
+    }
+
     /**
      * 修改工程审核
      */