202406工业

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

@@ -0,0 +1,144 @@
+package com.ruoyi.web.controller.zdsz;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.ZEngineeringGY;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryGYBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.service.IZEngineeringGYService;
+import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 工业工程
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringGY")
+public class ZEngineeringGYController extends BaseController {
+
+    private final IZEngineeringGYService iZEngineeringIndustryService;
+
+
+    /**
+     * 查询工业工程
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringGYVo> list(ZEngineeringIndustryGYBo bo, PageQuery pageQuery) {
+        return iZEngineeringIndustryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工业工程列表
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:export")
+    @Log(title = "工业工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringIndustryGYBo bo, HttpServletResponse response) {
+        List<ZEngineeringGYVo> list = iZEngineeringIndustryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工业工程", ZEngineeringGYVo.class, response);
+    }
+
+    /**
+     * 获取工业工程详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringGYVo> getInfo(@NotNull(message = "主键不能为空")@PathVariable String id) {
+        return R.ok(iZEngineeringIndustryService.queryById(id));
+    }
+
+    /**
+     * 新增工业工程
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:add")
+    @Log(title = "工业工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringIndustryGYBo bo) {
+        return toAjax(iZEngineeringIndustryService.insertByBo(bo));
+    }
+
+    @GetMapping("query/{id}/{type}")
+    public R<ZEngineeringGYVo> querys(@NotNull(message = "主键不能为空") @PathVariable String id) {
+        return R.ok(iZEngineeringIndustryService.query(id));
+    }
+    /**
+     * 修改工业工程
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:edit")
+    @Log(title = "工业工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryGYBo bo) {
+        return toAjax(iZEngineeringIndustryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工业工程
+     *
+     * @param ids 主键串
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:remove")
+    @Log(title = "工业工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")@PathVariable String[] ids) {
+        return toAjax(iZEngineeringIndustryService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 工业工程历史
+     *
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringGYVo> query(@PathVariable String id, @PathVariable String type) {
+        return R.ok(iZEngineeringIndustryService.query(id, type));
+    }
+
+    /**
+     * 工程分类与工程类型查询工业工程
+     */
+    @GetMapping("/queryByType")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
+    public R<List<?>> queryNameByType(ZEngineeringIndustryGYBo bo) {
+        return R.ok(iZEngineeringIndustryService.queryByType(bo));
+    }
+
+    /**
+     * 工业工程修改工程
+     */
+    @PutMapping("/updateNodeByBo")
+    @Log(title = "工业工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    public R<Void> updateNodeByBo(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryGYBo bo) {
+        return toAjax(iZEngineeringIndustryService.updateNodeByBo(bo));
+    }
+
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工业工程对象 z_engineering_gy
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_gy")
+public class ZEngineeringGY extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 工程类型
+     */
+    private String enginType;
+    /**
+     * 建筑单位
+     */
+    private String constructUnit;
+    /**
+     * 项目负责人
+     */
+    private String projectHead;
+    /**
+     * 现场负责人
+     */
+    private String sceneHead;
+    /**
+     * 设计单位
+     */
+    private String designUnit;
+    /**
+     * 设计负责人
+     */
+    private String designHead;
+    /**
+     * 设计联系电话
+     */
+    private String designPhone;
+    /**
+     * 监理单位
+     */
+    private String supervisionUnit;
+    /**
+     * 监理负责人
+     */
+    private String supervisionHead;
+    /**
+     * 监理联系电话
+     */
+    private String supervisionPhone;
+
+    /**
+     * 工程名称
+     */
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    private String enginClassification;
+
+    /**
+     * 乐观锁
+     */
+    @Version
+    private  Long version;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+
+
+}

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

@@ -0,0 +1,115 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 工业工程业务对象 z_engineering_gy
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringIndustryGYBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private String id;
+
+    /**
+     * 施工内容
+     */
+    private String remark;
+
+    /**
+     * 工程类型
+     */
+    private String enginType;
+
+    /**
+     * 建筑单位
+     */
+    private String constructUnit;
+
+    /**
+     * 项目负责人
+     */
+    private String projectHead;
+
+    /**
+     * 现场负责人
+     */
+    private String sceneHead;
+
+    /**
+     * 设计单位
+     */
+    private String designUnit;
+
+    /**
+     * 设计负责人
+     */
+    private String designHead;
+
+    /**
+     * 设计联系电话
+     */
+    private String designPhone;
+
+    /**
+     * 监理单位
+     */
+    private String supervisionUnit;
+
+    /**
+     * 监理负责人
+     */
+    private String supervisionHead;
+
+    /**
+     * 监理联系电话
+     */
+    private String supervisionPhone;
+
+    /**
+     * 工程名称
+     */
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    private String enginClassification;
+
+
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    /**
+     * 附件
+     */
+    private List<ZFileBo> files;
+
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
+
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
+
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
+}

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

@@ -0,0 +1,128 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 工业工程视图对象 z_engineering_gy
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringGYVo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String id;
+    /**
+     * 施工内容
+     */
+    private String remark;
+    /**
+     * 工程类型
+     */
+    @ExcelProperty(value = "工程类型")
+    private String enginType;
+
+    /**
+     * 建筑单位
+     */
+    @ExcelProperty(value = "建筑单位")
+    private String constructUnit;
+
+    /**
+     * 项目负责人
+     */
+    @ExcelProperty(value = "项目负责人")
+    private String projectHead;
+
+    /**
+     * 现场负责人
+     */
+    @ExcelProperty(value = "现场负责人")
+    private String sceneHead;
+
+    /**
+     * 设计单位
+     */
+    @ExcelProperty(value = "设计单位")
+    private String designUnit;
+
+    /**
+     * 设计负责人
+     */
+    @ExcelProperty(value = "设计负责人")
+    private String designHead;
+
+    /**
+     * 设计联系电话
+     */
+    @ExcelProperty(value = "设计联系电话")
+    private String designPhone;
+
+    /**
+     * 监理单位
+     */
+    @ExcelProperty(value = "监理单位")
+    private String supervisionUnit;
+
+    /**
+     * 监理负责人
+     */
+    @ExcelProperty(value = "监理负责人")
+    private String supervisionHead;
+
+    /**
+     * 监理联系电话
+     */
+    @ExcelProperty(value = "监理联系电话")
+    private String supervisionPhone;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    @ExcelProperty(value = "工程分类")
+    private String enginClassification;
+
+    /**
+     * 字典项
+     * municipal_engineering_node
+     * 市政工程节点类型(沟上施工|沟下施工)
+     */
+    private String municipalEngineeringNode;
+
+    @JsonProperty("zEngineeringNodeBo")
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    @JsonProperty("zEngineeringNodeBoList")
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+
+    private List<ZEngiineeringPhotoVo> pics;
+    private Object nodeReViewStateList;
+    public Object getNodeReViewStateList() {
+        return nodeReViewStateList;
+    }
+
+    public void setNodeReViewStateList(Object nodeReViewStateList) {
+        this.nodeReViewStateList = nodeReViewStateList;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.ZEngineeringGY;
+import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+
+/**
+ * 工业工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+public interface ZEngineeringGYMapper extends BaseMapperPlus<ZEngineeringGYMapper, ZEngineeringGY, ZEngineeringGYVo> {
+
+
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.zdsz.domain.ZEngineeringGY;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryGYBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工业工程Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface IZEngineeringGYService {
+
+
+    /**
+     * 查询工业工程
+     */
+    ZEngineeringGYVo queryById(String id);
+
+    /**
+     * 查询工业工程
+     */
+    TableDataInfo<ZEngineeringGYVo> queryPageList(ZEngineeringIndustryGYBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询工业工程
+     */
+    List<ZEngineeringGYVo> queryList(ZEngineeringIndustryGYBo bo);
+
+    /**
+     * 新增工业工程
+     */
+    Boolean insertByBo(ZEngineeringIndustryGYBo bo);
+
+    /**
+     * 修改工业工程
+     */
+    Boolean updateByBo(ZEngineeringIndustryGYBo bo);
+
+    Boolean updateNodeByBo(ZEngineeringIndustryGYBo bo);
+
+    /**
+     * 校验并批量删除工业工程
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    ZEngineeringGYVo query(String id, String type);
+
+    ZEngineeringGYVo query(String id);
+    List<?> queryByType(ZEngineeringIndustryGYBo bo);
+
+}

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

@@ -0,0 +1,386 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.page.TableDataInfo;
+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.ZEngiineeringPhoto;
+import com.ruoyi.zdsz.domain.ZEngineeringGY;
+import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
+import com.ruoyi.zdsz.mapper.ZEngineeringGYMapper;
+import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
+import com.ruoyi.zdsz.service.IZEngineeringGYService;
+import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 工业工程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
+
+    @Resource
+    private final ZEngineeringGYMapper baseMapper;
+
+    @Resource
+    private IZEngineeringNodeService izEngineeringNodeService;
+
+    @Resource
+    private IZEngineeringNodeService nodeService;
+
+    @Resource
+    private IZEngiineeringPhotoService photoService;
+
+
+    /**
+     * 查询工业工程
+     */
+    @Override
+    public ZEngineeringGYVo queryById(String id) {
+        ZEngineeringGYVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+        zEngiineeringPhotoBo.setParentId(zEngineeringIndustryVo.getId());
+        zEngiineeringPhotoBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        zEngineeringIndustryVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(id);
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        return zEngineeringIndustryVo;
+    }
+
+    /**
+     * 查询工业工程列表
+     */
+    @Override
+    public TableDataInfo<ZEngineeringGYVo> queryPageList(ZEngineeringIndustryGYBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringGY> lqw = buildQueryWrapper(bo);
+        Page<ZEngineeringGYVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Map<String, Object> ReviewList;
+//        ReviewList = nodeService.ReViewSZList(result.getRecords());
+//        result.getRecords().forEach(item -> {
+//            item.setNodeReViewStateList(ReviewList.get(item.getId()));
+//        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询工业工程列表
+     */
+    @Override
+    public List<ZEngineeringGYVo> queryList(ZEngineeringIndustryGYBo bo) {
+        LambdaQueryWrapper<ZEngineeringGY> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEngineeringGY> buildQueryWrapper(ZEngineeringIndustryGYBo bo) {
+        LambdaQueryWrapper<ZEngineeringGY> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringGY::getCreateTime);
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGY::getEnginName, bo.getEnginName());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringGY::getEnginClassification, bo.getEnginClassification());
+        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringGY::getConstructUnit, bo.getConstructUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringGY::getProjectHead, bo.getProjectHead());
+        lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringGY::getSceneHead, bo.getSceneHead());
+        lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringGY::getDesignUnit, bo.getDesignUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getDesignHead()), ZEngineeringGY::getDesignHead, bo.getDesignHead());
+        lqw.eq(StringUtils.isNotBlank(bo.getDesignPhone()), ZEngineeringGY::getDesignPhone, bo.getDesignPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionUnit()), ZEngineeringGY::getSupervisionUnit, bo.getSupervisionUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionHead()), ZEngineeringGY::getSupervisionHead, bo.getSupervisionHead());
+        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionPhone()), ZEngineeringGY::getSupervisionPhone, bo.getSupervisionPhone());
+        return lqw;
+    }
+
+    /**
+     * 新增工业工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(ZEngineeringIndustryGYBo bo) {
+        ZEngineeringGY add = BeanUtil.toBean(bo, ZEngineeringGY.class);
+        validEntityBeforeSave(add);
+        if (StringUtils.isEmpty(bo.getId())){
+            boolean flag = baseMapper.insert(add) > 0;
+            if (flag) {
+                bo.setId(add.getId());
+                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());
+                izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+            }
+            return flag;
+        }
+        else if (StringUtils.isNotBlank(bo.getId())){
+            ZEngineeringGYVo 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 = izEngineeringNodeService.query(zEngineeringNodeBo);
+                    if (!ObjectUtils.isEmpty(query)) {
+                        zEngineeringNodeBo.setId(query.getId());
+                    }
+                    izEngineeringNodeService.insert(zEngineeringNodeBo);
+                }
+            }
+            //uniapp
+            if (!ObjectUtils.isEmpty(entity)) {
+                entity.setCivliId(voById.getId());
+                entity.setCreateTime(voById.getCreateTime());
+                ZEngineeringNodeBo query = izEngineeringNodeService.query(entity);
+                if (!ObjectUtils.isEmpty(query)) {
+                    entity.setId(query.getId());
+                }
+                izEngineeringNodeService.insert(entity);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 修改工业工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(ZEngineeringIndustryGYBo bo) {
+        ZEngineeringGY update = BeanUtil.toBean(bo, ZEngineeringGY.class);
+        validEntityBeforeSave(update);
+        //工程表
+        boolean flag = baseMapper.updateById(update) > 0;
+        ZEngineeringGYVo voById = baseMapper.selectVoById(bo.getId());
+        bo.setCreateTime(voById.getCreateTime());
+        if (flag) {
+            List<ZEngiineeringPhoto> list = new ArrayList<>();
+            // 查询数据库中已存在的文件列表
+            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+            zEngiineeringPhotoBo.setParentId(update.getId());
+            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
+            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+            // 插入前端传来的新文件
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
+                for (ZFileBo pic : bo.getFiles()) {
+                    if (!existingPhotos.contains(pic.getUrl())) {
+                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
+                        newPhoto.setParentId(bo.getId());
+                        newPhoto.setPicUrl(pic.getUrl());
+                        newPhoto.setFileName(pic.getName());
+                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setUpdateTime(new Date());
+                        list.add(newPhoto);
+                    }
+                }
+                // 删除数据库中多余的文件
+                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
+                if (!photosToDelete.isEmpty()) {
+                    photosToDelete.forEach(item -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
+                // 批量插入新图片
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }
+        }
+        //节点表与info表
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+            bo.getzEngineeringNodeBo().setCreateTime(voById.getCreateTime());
+            izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+        }
+        return flag;
+    }
+
+
+    /**
+     * 修改工业工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateNodeByBo(ZEngineeringIndustryGYBo bo) {
+        ZEngineeringGY update = BeanUtil.toBean(bo, ZEngineeringGY.class);
+        boolean flag = baseMapper.updateById(update) > 0;
+        ZEngineeringGYVo voById = baseMapper.selectVoById(bo.getId());
+        bo.setCreateTime(voById.getCreateTime());
+        if (flag) {
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                // 查询数据库中已存在的文件列表
+                ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+                zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhotoBo.setParentId(update.getId());
+                List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+                // 插入前端传来的新文件
+                for (ZFileBo pic : bo.getFiles()) {
+                    if (!existingPhotos.contains(pic.getUrl())) {
+                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
+                        newPhoto.setParentId(bo.getId());
+                        newPhoto.setPicUrl(pic.getUrl());
+                        newPhoto.setFileName(pic.getName());
+                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
+                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setUpdateTime(new Date());
+                        list.add(newPhoto);
+                    }
+                }
+                // 删除数据库中多余的文件
+                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
+                if (!photosToDelete.isEmpty()) {
+                    photosToDelete.forEach(item -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
+                // 批量插入新图片
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }
+        }
+        return flag;
+    }
+
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEngineeringGY entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除工业工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+
+        ids.forEach(item -> {
+            ZEngineeringGYVo vo = baseMapper.selectVoById(item);
+            // 查询数据库中已存在的文件列表
+            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+            zEngiineeringPhotoBo.setParentId(item);
+            zEngiineeringPhotoBo.setCreateTime(vo.getCreateTime());
+            // 将查询出的url放入existingPhotos
+            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+            // 若存在 则进行删除
+            if (!existingPhotos.isEmpty()) {
+                existingPhotos.forEach(i -> {
+                    photoService.deleteWithValidByurls(i);
+                });
+            }
+            // 初始化工程节点对象
+
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(vo.getId());
+            //  查询数据库中已存在的工程节点
+            List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
+            // 若存在 则进行删除
+            if (!zEngineeringNodeBos.isEmpty()) {
+                zEngineeringNodeBos.forEach(ite -> nodeService.delete(ite));
+            }
+        });
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public ZEngineeringGYVo query(String id, String type) {
+        ZEngineeringGYVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
+        zEngineeringNodeBo.setType(type);
+        zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringIndustryVo;
+    }
+
+    @Override
+    public ZEngineeringGYVo query(String id) {
+        ZEngineeringGYVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
+        zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringIndustryVo;
+    }
+
+    @Override
+    public List<?> queryByType(ZEngineeringIndustryGYBo bo) {
+        LambdaQueryWrapper<ZEngineeringGY> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
+        List<ZEngineeringGY> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryBoLambdaQueryWrapper);
+        List<Map<String, Object>> result = zEngineeringIndustryVos.stream()
+            .map(vo -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", vo.getId());
+                map.put("name", vo.getEnginName());
+                return map;
+            })
+            .collect(Collectors.toList());
+        return result;
+    }
+
+    private LambdaQueryWrapper<ZEngineeringGY> buildListByType(ZEngineeringIndustryGYBo bo) {
+        LambdaQueryWrapper<ZEngineeringGY> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(ZEngineeringGY::getCreateTime);
+        queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType());
+        queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringGY::getEnginClassification, bo.getEnginClassification());
+        return queryWrapper;
+    }
+
+
+}

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

@@ -883,7 +883,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 zEngiineeringPhoto.setPicUrl(item);
                 zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
                 zEngiineeringPhoto.setUpdateTime(new Date());
-                zEngiineeringPhoto.setType(photoType.beforeBack.name().toString());
+                zEngiineeringPhoto.setType(photoType.warnBack.name().toString());
                 photoList2.add(zEngiineeringPhoto);
             });
         }
@@ -895,7 +895,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 zEngiineeringPhoto.setPicUrl(item);
                 zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
                 zEngiineeringPhoto.setUpdateTime(new Date());
-                zEngiineeringPhoto.setType(photoType.beforeBack.name().toString());
+                zEngiineeringPhoto.setType(photoType.afterBack.name().toString());
                 photoList2.add(zEngiineeringPhoto);
             });
         }

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

@@ -38,14 +38,16 @@
 
     <select id="getObjInfo" resultType="java.util.Map">
         SELECT
-            IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name) AS engin_name,
-            IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',IF(zein.type = '1','工业工程','市政工程')),'危险工程'),'基建工程'),'顶管工程') AS type
-        FROM z_engineering_node ze
+            IF(ISNULL(gy.engin_name),IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name),gy.engin_name) AS engin_name,
+            IF(ISNULL(gy.engin_name),IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-','市政工程'),'危险工程'),'基建工程'),'顶管工程'),'工业工程') AS type
+        FROM z_engineering_node_2024_06 ze
                  LEFT JOIN z_engineering_pipe_jacking zepj ON zepj.id = ze.civli_id
                  LEFT JOIN z_engineering_infrastructure zei ON zei.id = ze.civli_id
                  LEFT JOIN z_engineering_dangerous zed ON zed.id = ze.civli_id
                  LEFT JOIN z_engineering_industry zein ON zein.id = ze.civli_id
+                 LEFT JOIN z_engineering_gy gy ON gy.id = ze.civli_id
         WHERE ze.id = #{nodeId}
     </select>
 
+
 </mapper>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.zdsz.mapper.ZEngineeringGYMapper">
+
+    <resultMap type="com.ruoyi.zdsz.domain.ZEngineeringGY" id="ZEngineeringGYResult">
+        <result property="id" column="id"/>
+        <result property="enginType" column="engin_type"/>
+        <result property="constructUnit" column="construct_unit"/>
+        <result property="projectHead" column="project_head"/>
+        <result property="sceneHead" column="scene_head"/>
+        <result property="designUnit" column="design_unit"/>
+        <result property="designHead" column="design_head"/>
+        <result property="designPhone" column="design_phone"/>
+        <result property="supervisionUnit" column="supervision_unit"/>
+        <result property="supervisionHead" column="supervision_head"/>
+        <result property="supervisionPhone" column="supervision_phone"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>