工程审核照片及顶管工程变更

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

@@ -112,7 +112,6 @@ public class ZEngineeringPipeJackingController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
-        bo.setCreateTime(new Date());
         return toAjax(iZEngineeringPipeJackingService.insertByBo(bo));
     }
     @Value("${filePath}")

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

@@ -75,4 +75,7 @@ public class ZEngineeringPipeJacking extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    private Double pePreset;
+    private Double gcPreset;
+
 }

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

@@ -87,6 +87,9 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private Double pePreset;
+    private Double gcPreset;
+
     //单表单
     private ZEngineeringNodeBo zEngineeringNodeBo;
 

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

@@ -58,6 +58,7 @@ public class ZEngineeringReviewBo extends BaseEntity {
      */
     @NotBlank(message = "节点ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private String engInfoId;
+    private String engInfoName;
 
     /**
      * 备注

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

@@ -81,6 +81,11 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private Double pePreset;
+    private Double gcPreset;
+    private Double pesj=0.0;
+    private Double gsj=0.0;
+
     @JsonProperty("zEngineeringNodeBoList")
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
     @JsonProperty("pics")

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

@@ -84,5 +84,5 @@ public interface IZEngiineeringPhotoService {
     Boolean deleteWithValidByurls(String url);
     Boolean deleteWithValid(ZEngiineeringPhoto bo);
     void write(ZEngineeringCivilBo zEngineeringCivilBo);
-    void writeImg(List<ZEngineeringInfoBo> infoIdList, ZEngineeringInfoBo bo);
+    void writeImg(List<ZEngineeringInfoBo> infoIdList, ZEngineeringInfoBo bo,String engInfoName);
 }

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

@@ -315,14 +315,11 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Async
-    public void writeImg(List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
+    public void writeImg(List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo,String engInfoName) {
         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("--------------------------------");
         infoIdList.forEach(item -> {
             item.getzEngiineeringPhotoBoList().forEach(photo -> {
                 if (StringUtils.isNotBlank(photo)) {
@@ -334,39 +331,36 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
                         if (!file.exists()) {
                             file.mkdirs();
                         }
+                        // 第二程文件夹名称(工程大类：工业工程、市政工程等)
                        byte[] typeFileNameBytes = (file.getPath() + "/" + objInfo.get("type")).getBytes("UTF-8");
                         // 使用UTF-8编码创建文件
                         File typeFile = new File(new String(typeFileNameBytes, "UTF-8"));
                         if (!typeFile.exists()) {
                             typeFile.mkdirs();
                         }
+                        // 第二程文件夹名称（工程名称）
                         byte[] enginNameFileNameBytes = (typeFile.getPath() + "/" + objInfo.get("engin_name")).getBytes("UTF-8");
                         // 使用UTF-8编码创建文件
                         File enginNameFile = new File(new String(enginNameFileNameBytes, "UTF-8"));
                         if (!enginNameFile.exists()) {
                             enginNameFile.mkdirs();
                         }
-                        byte[] CreateTimeFileNameBytes;
-                       if (StringUtils.isNotBlank(item.getNodeName())){
-                           //节点类型
-                           byte[] nodeType = (enginNameFile.getPath() + "/" + item.getNodeName()).getBytes("UTF-8");
-                           // 使用UTF-8编码创建文件
-                           File f = new File(new String(nodeType, "UTF-8"));
-                           if (!f.exists()) {
-                               f.mkdirs();
-                           }
-                           CreateTimeFileNameBytes = (f.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
-                       }else {
-                           CreateTimeFileNameBytes = (enginNameFile.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
-                       }
+                        //节点
+                        byte[] TypeNameBytes = (enginNameFile.getPath() + "/" + engInfoName).getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File Type = new File(new String(TypeNameBytes, "UTF-8"));
+                        if (!Type.exists()) {
+                            Type.mkdirs();
+                        }
+
                         // 时间
-                        //                        File CreateTimeFile = new File(Type.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(zEngineeringInfoBo.getCreateTime()) );
+                        byte[] CreateTimeFileNameBytes = (Type.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
                         // 使用UTF-8编码创建文件
                         File CreateTimeFile = new File(new String(CreateTimeFileNameBytes, "UTF-8"));
                         if (!CreateTimeFile.exists()) {
                             CreateTimeFile.mkdirs();
                         }
-                        //                        File CreateByFile = new File(CreateTimeFile.getPath() + "/" + zEngineeringInfoBo.getConstructUser());
+                        // 人名
                         byte[] CreateByFileNameBytes = (CreateTimeFile.getPath() + "/" + item.getConstructUser()).getBytes("UTF-8");
                         // 使用UTF-8编码创建文件
                         File CreateByFile = new File(new String(CreateByFileNameBytes, "UTF-8"));

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

@@ -1113,7 +1113,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 MonthTableNameHandler.setData(format.format(item.getCreateTime()));
                 zEngineeringInfoMapper.update(lqw);
                 MonthTableNameHandler.removeData();
-                izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item);
+                izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item,zEngineeringReviewBo.getEngInfoName());
             });
             izEngineeringReviewService.insert(zEngineeringReviewBo);
         } catch (Exception e) {

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

@@ -804,7 +804,24 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (ReviewList.size() > 0) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-
+                if("回拖".equals(item2.getType())){
+                    LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
+                    lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
+                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3->{
+                        LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
+                        lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
+                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4->{
+                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                            if("0".equals(type)){
+                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }else if("1".equals(type)){
+                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }
+                        });
+                    });
+                }
             });
             System.out.println(nodeList.toString());
             System.out.println(nodeTypeList.toString());

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

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.framework.obs.ObsService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
@@ -136,73 +135,62 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean insertByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
-        LambdaQueryWrapper<ZEngineeringPipeJacking> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(StringUtils.isNotEmpty(bo.getEnginName()),ZEngineeringPipeJacking::getEnginName,bo.getEnginName());
-        List<ZEngineeringPipeJacking> zEngineeringPipeJackings = baseMapper.selectList(wrapper);
-        if (zEngineeringPipeJackings.size() > 0){
-            return false;
-        }
-        LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
-        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
-        boolean flag = false;
-        if (ObjectUtil.isEmpty(jackingVo)) {
-            //不存在工程
-            flag = baseMapper.insert(add) > 0;
+        if (StringUtils.isEmpty(bo.getId())){
+            boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());
-                //多表单
-                if (bo.getzEngineeringNodeBoList() != null && !bo.getzEngineeringNodeBoList().isEmpty()) {
-                    for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
-                        bo.getzEngineeringNodeBoList().get(i).setCivliId(add.getId());
-                        bo.getzEngineeringNodeBoList().get(i).setCreateTime(add.getCreateTime());
-                        nodeService.insert(bo.getzEngineeringNodeBoList().get(i));
-                    }
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                bo.getFiles().forEach(o -> {
+                    ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                    pic.setParentId(bo.getId());
+                    pic.setPicUrl(o.getUrl());
+                    pic.setFileName(o.getName());
+                    pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    pic.setCreateTime(new Date());
+                    list.add(pic);
+                });
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
                 }
             }
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+                bo.getzEngineeringNodeBo().setCivliId(add.getId());
+                bo.getzEngineeringNodeBo().setCreateTime(new Date());
+                nodeService.insert(bo.getzEngineeringNodeBo());
+            }
+            return flag;
         }
-        else {
-            //多表单
-            if (bo.getzEngineeringNodeBoList() != null && !bo.getzEngineeringNodeBoList().isEmpty()) {
-                for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
-                    ZEngineeringNodeBo bo1 = bo.getzEngineeringNodeBoList().get(i);
-                    bo1.setCivliId(jackingVo.getId());
-                    bo1.setType(bo1.getType());
-                    bo1.setCreateTime(jackingVo.getCreateTime());
-                    ZEngineeringNodeBo query = nodeService.query(bo1);
-                    if (!ObjectUtils.isEmpty(query)){
-                        bo1.setId(query.getId());
+        else if (StringUtils.isNotBlank(bo.getId())){
+            ZEngineeringPipeJackingVo voById = baseMapper.selectVoById(bo.getId());
+            List<ZEngineeringNodeBo> zEngineeringNodeBoList = bo.getzEngineeringNodeBoList();
+            ZEngineeringNodeBo entity = bo.getzEngineeringNodeBo();
+            //pc
+            if (!ObjectUtils.isEmpty(zEngineeringNodeBoList)) {
+                for (ZEngineeringNodeBo zEngineeringNodeBo : zEngineeringNodeBoList) {
+                    zEngineeringNodeBo.setCivliId(voById.getId());
+                    zEngineeringNodeBo.setCreateTime(voById.getCreateTime());
+                    ZEngineeringNodeBo query = nodeService.query(zEngineeringNodeBo);
+                    if (!ObjectUtils.isEmpty(query)) {
+                        zEngineeringNodeBo.setId(query.getId());
                     }
-                    nodeService.insert(bo1);
+                    nodeService.insert(zEngineeringNodeBo);
                 }
             }
-            flag = true;
-        }
-        //文件集合
-        if (bo.getFiles()!=null&&!bo.getFiles().isEmpty()){
-            List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getFiles().forEach(o->{
-                ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
-                pic.setParentId(bo.getId());
-                pic.setPicUrl(o.getUrl());
-                pic.setFileName(o.getName());
-                pic.setCreateBy(String.valueOf(LoginHelper.getUsername()));
-                pic.setCreateTime(new Date());
-                pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
-                pic.setUpdateTime(new Date());
-                list.add(pic);
-            });
-            if (!list.isEmpty()) {
-                photoService.insertBatch(list);
+            //uniapp
+            if (!ObjectUtils.isEmpty(entity)) {
+                entity.setCivliId(voById.getId());
+                entity.setCreateTime(voById.getCreateTime());
+                ZEngineeringNodeBo query = nodeService.query(entity);
+                if (!ObjectUtils.isEmpty(query)) {
+                    entity.setId(query.getId());
+                }
+                nodeService.insert(entity);
             }
+            return true;
         }
-        return flag;
+        return false;
     }
 
-
-
-
     @Transactional(rollbackFor=Exception.class)
     @Override
     public Boolean insertByBoApp(ZEngineeringPipeJackingBo bo) {