修改库表设计 重新初始化实体类

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 照片
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engiineeringPhoto")
+public class ZEngiineeringPhotoController extends BaseController {
+
+    private final IZEngiineeringPhotoService iZEngiineeringPhotoService;
+
+    /**
+     * 查询照片列表
+     */
+    @SaCheckPermission("zdsz:engiineeringPhoto:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngiineeringPhotoVo> list(ZEngiineeringPhotoBo bo, PageQuery pageQuery) {
+        return iZEngiineeringPhotoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出照片列表
+     */
+    @SaCheckPermission("zdsz:engiineeringPhoto:export")
+    @Log(title = "照片", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngiineeringPhotoBo bo, HttpServletResponse response) {
+        List<ZEngiineeringPhotoVo> list = iZEngiineeringPhotoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "照片", ZEngiineeringPhotoVo.class, response);
+    }
+
+    /**
+     * 获取照片详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engiineeringPhoto:query")
+    @GetMapping("/{id}")
+    public R<ZEngiineeringPhotoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngiineeringPhotoService.queryById(id));
+    }
+
+    /**
+     * 新增照片
+     */
+    @SaCheckPermission("zdsz:engiineeringPhoto:add")
+    @Log(title = "照片", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngiineeringPhotoBo bo) {
+        return toAjax(iZEngiineeringPhotoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改照片
+     */
+    @SaCheckPermission("zdsz:engiineeringPhoto:edit")
+    @Log(title = "照片", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngiineeringPhotoBo bo) {
+        return toAjax(iZEngiineeringPhotoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除照片
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engiineeringPhoto:remove")
+    @Log(title = "照片", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngiineeringPhotoService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCityInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCityInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringCityInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 市政工程详情
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringCityInfo")
-public class ZEngineeringCityInfoController extends BaseController {
-
-    private final IZEngineeringCityInfoService iZEngineeringCityInfoService;
-
-    /**
-     * 查询市政工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringCityInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringCityInfoVo> list(ZEngineeringCityInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringCityInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出市政工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringCityInfo:export")
-    @Log(title = "市政工程详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringCityInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringCityInfoVo> list = iZEngineeringCityInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "市政工程详情", ZEngineeringCityInfoVo.class, response);
-    }
-
-    /**
-     * 获取市政工程详情详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringCityInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringCityInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringCityInfoService.queryById(id));
-    }
-
-    /**
-     * 新增市政工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringCityInfo:add")
-    @Log(title = "市政工程详情", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCityInfoBo bo) {
-        return toAjax(iZEngineeringCityInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改市政工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringCityInfo:edit")
-    @Log(title = "市政工程详情", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringCityInfoBo bo) {
-        return toAjax(iZEngineeringCityInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除市政工程详情
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringCityInfo:remove")
-    @Log(title = "市政工程详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringCityInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.service.IZEngineeringCivilService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 民用工程
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringCivil")
+public class ZEngineeringCivilController extends BaseController {
+
+    private final IZEngineeringCivilService iZEngineeringCivilService;
+
+    /**
+     * 查询民用工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringCivilVo> list(ZEngineeringCivilBo bo, PageQuery pageQuery) {
+        return iZEngineeringCivilService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出民用工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:export")
+    @Log(title = "民用工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringCivilBo bo, HttpServletResponse response) {
+        List<ZEngineeringCivilVo> list = iZEngineeringCivilService.queryList(bo);
+        ExcelUtil.exportExcel(list, "民用工程", ZEngineeringCivilVo.class, response);
+    }
+
+    /**
+     * 获取民用工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringCivilService.queryById(id));
+    }
+
+    /**
+     * 新增民用工程
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:add")
+    @Log(title = "民用工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
+        return toAjax(iZEngineeringCivilService.insertByBo(bo));
+    }
+
+    /**
+     * 修改民用工程
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:edit")
+    @Log(title = "民用工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringCivilBo bo) {
+        return toAjax(iZEngineeringCivilService.updateByBo(bo));
+    }
+
+    /**
+     * 删除民用工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:remove")
+    @Log(title = "民用工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringCivilService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringCivilInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 民用工程详情信息
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringCivilInfo")
-public class ZEngineeringCivilInfoController extends BaseController {
-
-    private final IZEngineeringCivilInfoService iZEngineeringCivilInfoService;
-
-    /**
-     * 查询民用工程详情信息列表
-     */
-    @SaCheckPermission("zdsz:engineeringCivilInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringCivilInfoVo> list(ZEngineeringCivilInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringCivilInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出民用工程详情信息列表
-     */
-    @SaCheckPermission("zdsz:engineeringCivilInfo:export")
-    @Log(title = "民用工程详情信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringCivilInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringCivilInfoVo> list = iZEngineeringCivilInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "民用工程详情信息", ZEngineeringCivilInfoVo.class, response);
-    }
-
-    /**
-     * 获取民用工程详情信息详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringCivilInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringCivilInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringCivilInfoService.queryById(id));
-    }
-
-    /**
-     * 新增民用工程详情信息
-     */
-    @SaCheckPermission("zdsz:engineeringCivilInfo:add")
-    @Log(title = "民用工程详情信息", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilInfoBo bo) {
-        return toAjax(iZEngineeringCivilInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改民用工程详情信息
-     */
-    @SaCheckPermission("zdsz:engineeringCivilInfo:edit")
-    @Log(title = "民用工程详情信息", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringCivilInfoBo bo) {
-        return toAjax(iZEngineeringCivilInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除民用工程详情信息
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringCivilInfo:remove")
-    @Log(title = "民用工程详情信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringCivilInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringBo;
-import com.ruoyi.zdsz.service.IZEngineeringService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工程管理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineering")
-public class ZEngineeringController extends BaseController {
-
-    private final IZEngineeringService iZEngineeringService;
-
-    /**
-     * 查询工程管理列表
-     */
-    @SaCheckPermission("zdsz:engineering:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringVo> list(ZEngineeringBo bo, PageQuery pageQuery) {
-        return iZEngineeringService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工程管理列表
-     */
-    @SaCheckPermission("zdsz:engineering:export")
-    @Log(title = "工程管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringBo bo, HttpServletResponse response) {
-        List<ZEngineeringVo> list = iZEngineeringService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程管理", ZEngineeringVo.class, response);
-    }
-
-    /**
-     * 获取工程管理详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineering:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringService.queryById(id));
-    }
-
-    /**
-     * 新增工程管理
-     */
-    @SaCheckPermission("zdsz:engineering:add")
-    @Log(title = "工程管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringBo bo) {
-        return toAjax(iZEngineeringService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工程管理
-     */
-    @SaCheckPermission("zdsz:engineering:edit")
-    @Log(title = "工程管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringBo bo) {
-        return toAjax(iZEngineeringService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工程管理
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineering:remove")
-    @Log(title = "工程管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringDangerInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 危险作业工程
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringDangerInfo")
-public class ZEngineeringDangerInfoController extends BaseController {
-
-    private final IZEngineeringDangerInfoService iZEngineeringDangerInfoService;
-
-    /**
-     * 查询危险作业工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringDangerInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringDangerInfoVo> list(ZEngineeringDangerInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringDangerInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出危险作业工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringDangerInfo:export")
-    @Log(title = "危险作业工程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringDangerInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringDangerInfoVo> list = iZEngineeringDangerInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "危险作业工程", ZEngineeringDangerInfoVo.class, response);
-    }
-
-    /**
-     * 获取危险作业工程详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringDangerInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringDangerInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringDangerInfoService.queryById(id));
-    }
-
-    /**
-     * 新增危险作业工程
-     */
-    @SaCheckPermission("zdsz:engineeringDangerInfo:add")
-    @Log(title = "危险作业工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringDangerInfoBo bo) {
-        return toAjax(iZEngineeringDangerInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改危险作业工程
-     */
-    @SaCheckPermission("zdsz:engineeringDangerInfo:edit")
-    @Log(title = "危险作业工程", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerInfoBo bo) {
-        return toAjax(iZEngineeringDangerInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除危险作业工程
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringDangerInfo:remove")
-    @Log(title = "危险作业工程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringDangerInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
+import com.ruoyi.zdsz.service.IZEngineeringDangerousService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 危险工程
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringDangerous")
+public class ZEngineeringDangerousController extends BaseController {
+
+    private final IZEngineeringDangerousService iZEngineeringDangerousService;
+
+    /**
+     * 查询危险工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringDangerous:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringDangerousVo> list(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
+        return iZEngineeringDangerousService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出危险工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringDangerous:export")
+    @Log(title = "危险工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringDangerousBo bo, HttpServletResponse response) {
+        List<ZEngineeringDangerousVo> list = iZEngineeringDangerousService.queryList(bo);
+        ExcelUtil.exportExcel(list, "危险工程", ZEngineeringDangerousVo.class, response);
+    }
+
+    /**
+     * 获取危险工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringDangerous:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringDangerousVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringDangerousService.queryById(id));
+    }
+
+    /**
+     * 新增危险工程
+     */
+    @SaCheckPermission("zdsz:engineeringDangerous:add")
+    @Log(title = "危险工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
+        return toAjax(iZEngineeringDangerousService.insertByBo(bo));
+    }
+
+    /**
+     * 修改危险工程
+     */
+    @SaCheckPermission("zdsz:engineeringDangerous:edit")
+    @Log(title = "危险工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
+        return toAjax(iZEngineeringDangerousService.updateByBo(bo));
+    }
+
+    /**
+     * 删除危险工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringDangerous:remove")
+    @Log(title = "危险工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringDangerousService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringFilesVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringFilesBo;
-import com.ruoyi.zdsz.service.IZEngineeringFilesService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 附件
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringFiles")
-public class ZEngineeringFilesController extends BaseController {
-
-    private final IZEngineeringFilesService iZEngineeringFilesService;
-
-    /**
-     * 查询附件列表
-     */
-    @SaCheckPermission("zdsz:engineeringFiles:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringFilesVo> list(ZEngineeringFilesBo bo, PageQuery pageQuery) {
-        return iZEngineeringFilesService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出附件列表
-     */
-    @SaCheckPermission("zdsz:engineeringFiles:export")
-    @Log(title = "附件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringFilesBo bo, HttpServletResponse response) {
-        List<ZEngineeringFilesVo> list = iZEngineeringFilesService.queryList(bo);
-        ExcelUtil.exportExcel(list, "附件", ZEngineeringFilesVo.class, response);
-    }
-
-    /**
-     * 获取附件详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringFiles:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringFilesVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringFilesService.queryById(id));
-    }
-
-    /**
-     * 新增附件
-     */
-    @SaCheckPermission("zdsz:engineeringFiles:add")
-    @Log(title = "附件", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringFilesBo bo) {
-        return toAjax(iZEngineeringFilesService.insertByBo(bo));
-    }
-
-    /**
-     * 修改附件
-     */
-    @SaCheckPermission("zdsz:engineeringFiles:edit")
-    @Log(title = "附件", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringFilesBo bo) {
-        return toAjax(iZEngineeringFilesService.updateByBo(bo));
-    }
-
-    /**
-     * 删除附件
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringFiles:remove")
-    @Log(title = "附件", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringFilesService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustrialInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustrialInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringIndustrialInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工业工程详情
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringIndustrialInfo")
-public class ZEngineeringIndustrialInfoController extends BaseController {
-
-    private final IZEngineeringIndustrialInfoService iZEngineeringIndustrialInfoService;
-
-    /**
-     * 查询工业工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringIndustrialInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringIndustrialInfoVo> list(ZEngineeringIndustrialInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringIndustrialInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工业工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringIndustrialInfo:export")
-    @Log(title = "工业工程详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringIndustrialInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringIndustrialInfoVo> list = iZEngineeringIndustrialInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工业工程详情", ZEngineeringIndustrialInfoVo.class, response);
-    }
-
-    /**
-     * 获取工业工程详情详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringIndustrialInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringIndustrialInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringIndustrialInfoService.queryById(id));
-    }
-
-    /**
-     * 新增工业工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringIndustrialInfo:add")
-    @Log(title = "工业工程详情", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringIndustrialInfoBo bo) {
-        return toAjax(iZEngineeringIndustrialInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工业工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringIndustrialInfo:edit")
-    @Log(title = "工业工程详情", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustrialInfoBo bo) {
-        return toAjax(iZEngineeringIndustrialInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工业工程详情
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringIndustrialInfo:remove")
-    @Log(title = "工业工程详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringIndustrialInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工业工程|市政工程
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringIndustry")
+public class ZEngineeringIndustryController extends BaseController {
+
+    private final IZEngineeringIndustryService iZEngineeringIndustryService;
+
+    /**
+     * 查询工业工程|市政工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringIndustry:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
+        return iZEngineeringIndustryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工业工程|市政工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringIndustry:export")
+    @Log(title = "工业工程|市政工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringIndustryBo bo, HttpServletResponse response) {
+        List<ZEngineeringIndustryVo> list = iZEngineeringIndustryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工业工程|市政工程", ZEngineeringIndustryVo.class, response);
+    }
+
+    /**
+     * 获取工业工程|市政工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringIndustryVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long 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 ZEngineeringIndustryBo bo) {
+        return toAjax(iZEngineeringIndustryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工业工程|市政工程
+     */
+    @SaCheckPermission("zdsz:engineeringIndustry:edit")
+    @Log(title = "工业工程|市政工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryBo 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 Long[] ids) {
+        return toAjax(iZEngineeringIndustryService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.service.IZEngineeringInfoService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工程详情
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringInfo")
+public class ZEngineeringInfoController extends BaseController {
+
+    private final IZEngineeringInfoService iZEngineeringInfoService;
+
+    /**
+     * 查询工程详情列表
+     */
+    @SaCheckPermission("zdsz:engineeringInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringInfoVo> list(ZEngineeringInfoBo bo, PageQuery pageQuery) {
+        return iZEngineeringInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工程详情列表
+     */
+    @SaCheckPermission("zdsz:engineeringInfo:export")
+    @Log(title = "工程详情", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringInfoBo bo, HttpServletResponse response) {
+        List<ZEngineeringInfoVo> list = iZEngineeringInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工程详情", ZEngineeringInfoVo.class, response);
+    }
+
+    /**
+     * 获取工程详情详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringInfo:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringInfoService.queryById(id));
+    }
+
+    /**
+     * 新增工程详情
+     */
+    @SaCheckPermission("zdsz:engineeringInfo:add")
+    @Log(title = "工程详情", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringInfoBo bo) {
+        return toAjax(iZEngineeringInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工程详情
+     */
+    @SaCheckPermission("zdsz:engineeringInfo:edit")
+    @Log(title = "工程详情", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringInfoBo bo) {
+        return toAjax(iZEngineeringInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工程详情
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringInfo:remove")
+    @Log(title = "工程详情", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
+import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 基建工程
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringInfrastructure")
+public class ZEngineeringInfrastructureController extends BaseController {
+
+    private final IZEngineeringInfrastructureService iZEngineeringInfrastructureService;
+
+    /**
+     * 查询基建工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringInfrastructureVo> list(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
+        return iZEngineeringInfrastructureService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出基建工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:export")
+    @Log(title = "基建工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringInfrastructureBo bo, HttpServletResponse response) {
+        List<ZEngineeringInfrastructureVo> list = iZEngineeringInfrastructureService.queryList(bo);
+        ExcelUtil.exportExcel(list, "基建工程", ZEngineeringInfrastructureVo.class, response);
+    }
+
+    /**
+     * 获取基建工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringInfrastructureService.queryById(id));
+    }
+
+    /**
+     * 新增基建工程
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
+    @Log(title = "基建工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringInfrastructureBo bo) {
+        return toAjax(iZEngineeringInfrastructureService.insertByBo(bo));
+    }
+
+    /**
+     * 修改基建工程
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:edit")
+    @Log(title = "基建工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringInfrastructureBo bo) {
+        return toAjax(iZEngineeringInfrastructureService.updateByBo(bo));
+    }
+
+    /**
+     * 删除基建工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringInfrastructure:remove")
+    @Log(title = "基建工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringInfrastructureService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringInfrastructureInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 基建工程详情
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringInfrastructureInfo")
-public class ZEngineeringInfrastructureInfoController extends BaseController {
-
-    private final IZEngineeringInfrastructureInfoService iZEngineeringInfrastructureInfoService;
-
-    /**
-     * 查询基建工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructureInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringInfrastructureInfoVo> list(ZEngineeringInfrastructureInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringInfrastructureInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出基建工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructureInfo:export")
-    @Log(title = "基建工程详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringInfrastructureInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringInfrastructureInfoVo> list = iZEngineeringInfrastructureInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "基建工程详情", ZEngineeringInfrastructureInfoVo.class, response);
-    }
-
-    /**
-     * 获取基建工程详情详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructureInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringInfrastructureInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringInfrastructureInfoService.queryById(id));
-    }
-
-    /**
-     * 新增基建工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructureInfo:add")
-    @Log(title = "基建工程详情", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringInfrastructureInfoBo bo) {
-        return toAjax(iZEngineeringInfrastructureInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改基建工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructureInfo:edit")
-    @Log(title = "基建工程详情", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringInfrastructureInfoBo bo) {
-        return toAjax(iZEngineeringInfrastructureInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除基建工程详情
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructureInfo:remove")
-    @Log(title = "基建工程详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringInfrastructureInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
+import com.ruoyi.zdsz.service.IZEngineeringMaterialService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工程用料
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringMaterial")
+public class ZEngineeringMaterialController extends BaseController {
+
+    private final IZEngineeringMaterialService iZEngineeringMaterialService;
+
+    /**
+     * 查询工程用料列表
+     */
+    @SaCheckPermission("zdsz:engineeringMaterial:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringMaterialVo> list(ZEngineeringMaterialBo bo, PageQuery pageQuery) {
+        return iZEngineeringMaterialService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工程用料列表
+     */
+    @SaCheckPermission("zdsz:engineeringMaterial:export")
+    @Log(title = "工程用料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringMaterialBo bo, HttpServletResponse response) {
+        List<ZEngineeringMaterialVo> list = iZEngineeringMaterialService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工程用料", ZEngineeringMaterialVo.class, response);
+    }
+
+    /**
+     * 获取工程用料详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringMaterial:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringMaterialVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringMaterialService.queryById(id));
+    }
+
+    /**
+     * 新增工程用料
+     */
+    @SaCheckPermission("zdsz:engineeringMaterial:add")
+    @Log(title = "工程用料", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringMaterialBo bo) {
+        return toAjax(iZEngineeringMaterialService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工程用料
+     */
+    @SaCheckPermission("zdsz:engineeringMaterial:edit")
+    @Log(title = "工程用料", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringMaterialBo bo) {
+        return toAjax(iZEngineeringMaterialService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工程用料
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringMaterial:remove")
+    @Log(title = "工程用料", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringMaterialService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -20,43 +20,43 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialPresetVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialPresetBo;
-import com.ruoyi.zdsz.service.IZEngineeringMaterialPresetService;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialsResetsBo;
+import com.ruoyi.zdsz.service.IZEngineeringMaterialsResetsService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 工程用料预设
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/zdsz/engineeringMaterialPreset")
-public class ZEngineeringMaterialPresetController extends BaseController {
+@RequestMapping("/zdsz/engineeringMaterialsResets")
+public class ZEngineeringMaterialsResetsController extends BaseController {
 
-    private final IZEngineeringMaterialPresetService iZEngineeringMaterialPresetService;
+    private final IZEngineeringMaterialsResetsService iZEngineeringMaterialsResetsService;
 
     /**
      * 查询工程用料预设列表
      */
-    @SaCheckPermission("zdsz:engineeringMaterialPreset:list")
+    @SaCheckPermission("zdsz:engineeringMaterialsResets:list")
     @GetMapping("/list")
-    public TableDataInfo<ZEngineeringMaterialPresetVo> list(ZEngineeringMaterialPresetBo bo, PageQuery pageQuery) {
-        return iZEngineeringMaterialPresetService.queryPageList(bo, pageQuery);
+    public TableDataInfo<ZEngineeringMaterialsResetsVo> list(ZEngineeringMaterialsResetsBo bo, PageQuery pageQuery) {
+        return iZEngineeringMaterialsResetsService.queryPageList(bo, pageQuery);
     }
 
     /**
      * 导出工程用料预设列表
      */
-    @SaCheckPermission("zdsz:engineeringMaterialPreset:export")
+    @SaCheckPermission("zdsz:engineeringMaterialsResets:export")
     @Log(title = "工程用料预设", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(ZEngineeringMaterialPresetBo bo, HttpServletResponse response) {
-        List<ZEngineeringMaterialPresetVo> list = iZEngineeringMaterialPresetService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程用料预设", ZEngineeringMaterialPresetVo.class, response);
+    public void export(ZEngineeringMaterialsResetsBo bo, HttpServletResponse response) {
+        List<ZEngineeringMaterialsResetsVo> list = iZEngineeringMaterialsResetsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工程用料预设", ZEngineeringMaterialsResetsVo.class, response);
     }
 
     /**
@@ -64,33 +64,33 @@ public class ZEngineeringMaterialPresetController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringMaterialPreset:query")
+    @SaCheckPermission("zdsz:engineeringMaterialsResets:query")
     @GetMapping("/{id}")
-    public R<ZEngineeringMaterialPresetVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringMaterialPresetService.queryById(id));
+    public R<ZEngineeringMaterialsResetsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringMaterialsResetsService.queryById(id));
     }
 
     /**
      * 新增工程用料预设
      */
-    @SaCheckPermission("zdsz:engineeringMaterialPreset:add")
+    @SaCheckPermission("zdsz:engineeringMaterialsResets:add")
     @Log(title = "工程用料预设", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringMaterialPresetBo bo) {
-        return toAjax(iZEngineeringMaterialPresetService.insertByBo(bo));
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringMaterialsResetsBo bo) {
+        return toAjax(iZEngineeringMaterialsResetsService.insertByBo(bo));
     }
 
     /**
      * 修改工程用料预设
      */
-    @SaCheckPermission("zdsz:engineeringMaterialPreset:edit")
+    @SaCheckPermission("zdsz:engineeringMaterialsResets:edit")
     @Log(title = "工程用料预设", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringMaterialPresetBo bo) {
-        return toAjax(iZEngineeringMaterialPresetService.updateByBo(bo));
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringMaterialsResetsBo bo) {
+        return toAjax(iZEngineeringMaterialsResetsService.updateByBo(bo));
     }
 
     /**
@@ -98,11 +98,11 @@ public class ZEngineeringMaterialPresetController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringMaterialPreset:remove")
+    @SaCheckPermission("zdsz:engineeringMaterialsResets:remove")
     @Log(title = "工程用料预设", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringMaterialPresetService.deleteWithValidByIds(Arrays.asList(ids), true));
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringMaterialsResetsService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

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

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 工程节点
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Validated
 @RequiredArgsConstructor
@@ -67,7 +67,7 @@ public class ZEngineeringNodeController extends BaseController {
     @SaCheckPermission("zdsz:engineeringNode:query")
     @GetMapping("/{id}")
     public R<ZEngineeringNodeVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iZEngineeringNodeService.queryById(id));
     }
 
@@ -102,7 +102,7 @@ public class ZEngineeringNodeController extends BaseController {
     @Log(title = "工程节点", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iZEngineeringNodeService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
+import com.ruoyi.zdsz.service.IZEngineeringPipeJackingService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 顶管工程
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringPipeJacking")
+public class ZEngineeringPipeJackingController extends BaseController {
+
+    private final IZEngineeringPipeJackingService iZEngineeringPipeJackingService;
+
+    /**
+     * 查询顶管工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringPipeJackingVo> list(ZEngineeringPipeJackingBo bo, PageQuery pageQuery) {
+        return iZEngineeringPipeJackingService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出顶管工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:export")
+    @Log(title = "顶管工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringPipeJackingBo bo, HttpServletResponse response) {
+        List<ZEngineeringPipeJackingVo> list = iZEngineeringPipeJackingService.queryList(bo);
+        ExcelUtil.exportExcel(list, "顶管工程", ZEngineeringPipeJackingVo.class, response);
+    }
+
+    /**
+     * 获取顶管工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringPipeJackingVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iZEngineeringPipeJackingService.queryById(id));
+    }
+
+    /**
+     * 新增顶管工程
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
+    @Log(title = "顶管工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
+        return toAjax(iZEngineeringPipeJackingService.insertByBo(bo));
+    }
+
+    /**
+     * 修改顶管工程
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:edit")
+    @Log(title = "顶管工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
+        return toAjax(iZEngineeringPipeJackingService.updateByBo(bo));
+    }
+
+    /**
+     * 删除顶管工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:remove")
+    @Log(title = "顶管工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iZEngineeringPipeJackingService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-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.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringPipeJackingInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 顶管工程详情
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringPipeJackingInfo")
-public class ZEngineeringPipeJackingInfoController extends BaseController {
-
-    private final IZEngineeringPipeJackingInfoService iZEngineeringPipeJackingInfoService;
-
-    /**
-     * 查询顶管工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJackingInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringPipeJackingInfoVo> list(ZEngineeringPipeJackingInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringPipeJackingInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出顶管工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJackingInfo:export")
-    @Log(title = "顶管工程详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringPipeJackingInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringPipeJackingInfoVo> list = iZEngineeringPipeJackingInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "顶管工程详情", ZEngineeringPipeJackingInfoVo.class, response);
-    }
-
-    /**
-     * 获取顶管工程详情详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJackingInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringPipeJackingInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(iZEngineeringPipeJackingInfoService.queryById(id));
-    }
-
-    /**
-     * 新增顶管工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJackingInfo:add")
-    @Log(title = "顶管工程详情", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringPipeJackingInfoBo bo) {
-        return toAjax(iZEngineeringPipeJackingInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改顶管工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJackingInfo:edit")
-    @Log(title = "顶管工程详情", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringPipeJackingInfoBo bo) {
-        return toAjax(iZEngineeringPipeJackingInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除顶管工程详情
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJackingInfo:remove")
-    @Log(title = "顶管工程详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
-        return toAjax(iZEngineeringPipeJackingInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

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

@@ -26,10 +26,10 @@ import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 审核信息
+ * 工程审核
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Validated
 @RequiredArgsConstructor
@@ -40,7 +40,7 @@ public class ZEngineeringReviewController extends BaseController {
     private final IZEngineeringReviewService iZEngineeringReviewService;
 
     /**
-     * 查询审核信息列表
+     * 查询工程审核列表
      */
     @SaCheckPermission("zdsz:engineeringReview:list")
     @GetMapping("/list")
@@ -49,33 +49,33 @@ public class ZEngineeringReviewController extends BaseController {
     }
 
     /**
-     * 导出审核信息列表
+     * 导出工程审核列表
      */
     @SaCheckPermission("zdsz:engineeringReview:export")
-    @Log(title = "审核信息", businessType = BusinessType.EXPORT)
+    @Log(title = "工程审核", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringReviewBo bo, HttpServletResponse response) {
         List<ZEngineeringReviewVo> list = iZEngineeringReviewService.queryList(bo);
-        ExcelUtil.exportExcel(list, "审核信息", ZEngineeringReviewVo.class, response);
+        ExcelUtil.exportExcel(list, "工程审核", ZEngineeringReviewVo.class, response);
     }
 
     /**
-     * 获取审核信息详细信息
+     * 获取工程审核详细信息
      *
      * @param id 主键
      */
     @SaCheckPermission("zdsz:engineeringReview:query")
     @GetMapping("/{id}")
     public R<ZEngineeringReviewVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                     @PathVariable Long id) {
         return R.ok(iZEngineeringReviewService.queryById(id));
     }
 
     /**
-     * 新增审核信息
+     * 新增工程审核
      */
     @SaCheckPermission("zdsz:engineeringReview:add")
-    @Log(title = "审核信息", businessType = BusinessType.INSERT)
+    @Log(title = "工程审核", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringReviewBo bo) {
@@ -83,10 +83,10 @@ public class ZEngineeringReviewController extends BaseController {
     }
 
     /**
-     * 修改审核信息
+     * 修改工程审核
      */
     @SaCheckPermission("zdsz:engineeringReview:edit")
-    @Log(title = "审核信息", businessType = BusinessType.UPDATE)
+    @Log(title = "工程审核", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringReviewBo bo) {
@@ -94,15 +94,15 @@ public class ZEngineeringReviewController extends BaseController {
     }
 
     /**
-     * 删除审核信息
+     * 删除工程审核
      *
      * @param ids 主键串
      */
     @SaCheckPermission("zdsz:engineeringReview:remove")
-    @Log(title = "审核信息", businessType = BusinessType.DELETE)
+    @Log(title = "工程审核", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+                          @PathVariable Long[] ids) {
         return toAjax(iZEngineeringReviewService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

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

@@ -10,15 +10,15 @@ import java.math.BigDecimal;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 附件对象 z_engineering_files
+ * 照片对象 z_engiineering_photo
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_files")
-public class ZEngineeringFiles extends BaseEntity {
+@TableName("z_engiineering_photo")
+public class ZEngiineeringPhoto extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -26,11 +26,11 @@ public class ZEngineeringFiles extends BaseEntity {
      * 主键
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 上级id
      */
-    private String parentId;
+    private Long parentId;
     /**
      * 图片地址
      */

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

@@ -1,80 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 市政工程详情对象 z_engineering_city_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_city_info")
-public class ZEngineeringCityInfo extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private String id;
-    /**
-     * 工程节点id
-     */
-    private String engInfoId;
-    /**
-     * 工程类型(字典)
-     */
-    private String engType;
-    /**
-     * 建设单位
-     */
-    private String buildUnit;
-    /**
-     * 项目负责人id
-     */
-    private String buildUser;
-    /**
-     * 项目负责人电话
-     */
-    private String buildPhone;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-    /**
-     * 建设单位
-     */
-    private String psUnit;
-    /**
-     * 项目负责人id
-     */
-    private String psUser;
-    /**
-     * 项目负责人电话
-     */
-    private String psPhone;
-    /**
-     * 建设单位
-     */
-    private String checkUnit;
-    /**
-     * 项目负责人id
-     */
-    private String checkUser;
-    /**
-     * 项目负责人电话
-     */
-    private String checkPhone;
-
-}

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

@@ -10,15 +10,15 @@ import java.math.BigDecimal;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 工程管理对象 z_engineering
+ * 民用工程对象 z_engineering_civil
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering")
-public class ZEngineering extends BaseEntity {
+@TableName("z_engineering_civil")
+public class ZEngineeringCivil extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -26,25 +26,25 @@ public class ZEngineering extends BaseEntity {
      * 主键
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 小区id
      */
-    private String areaId;
+    private Long areaId;
     /**
      * 楼宇id
      */
-    private String buildingId;
+    private Long buildingId;
     /**
      * 单元id
      */
-    private String unitId;
+    private Long unitId;
     /**
      * 房间id
      */
-    private String houseId;
+    private Long houseId;
     /**
-     * 工程类型(字典)
+     * 工程类型
      */
     private String engineeringType;
     /**
@@ -56,10 +56,15 @@ public class ZEngineering extends BaseEntity {
      */
     private String headPhone;
     /**
-     * 工程分类(字典)
+     * 工程分类
      */
     private String engineeringClassification;
     /**
+     * 
+     */
+    @Version
+    private String version;
+    /**
      * 删除标识
      */
     @TableLogic

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

@@ -1,154 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 危险作业工程对象 z_engineering_danger_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_danger_info")
-public class ZEngineeringDangerInfo extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private String id;
-    /**
-     * 工程节点id
-     */
-    private String engInfoId;
-    /**
-     * 工程名称
-     */
-    private String proName;
-    /**
-     * 工程地址
-     */
-    private String proAdress;
-    /**
-     * 工程时间
-     */
-    private Date proTime;
-    /**
-     * 管径
-     */
-    private String pipJing;
-    /**
-     * 管材
-     */
-    private String pipGoods;
-    /**
-     * 是否存在套管(字典)
-     */
-    private String hasPip;
-    /**
-     * 管道压力
-     */
-    private String pipPower;
-    /**
-     * 气源方向
-     */
-    private String airTo;
-    /**
-     * 作业位置
-     */
-    private String workUnit;
-    /**
-     * 与作业相关阀门位置
-     */
-    private String workFaUnit;
-    /**
-     * 压力报告
-     */
-    private String powerReport;
-    /**
-     * 监理旁站记录
-     */
-    private String checkRecord;
-    /**
-     * 工作联系单
-     */
-    private String workConnOrder;
-    /**
-     * 巡线确认单
-     */
-    private String lineOrder;
-    /**
-     * 危险作业坑大小（字典）
-     */
-    private String dangerKeng;
-    /**
-     * 是否需要支护（字典）
-     */
-    private String isProtect;
-    /**
-     * 作业坑内其他管道情况
-     */
-    private String workOtherPips;
-    /**
-     * 现场负责人id
-     */
-    private String nowUserId;
-    /**
-     * 现场负责人联系方式
-     */
-    private String nowUserPhone;
-    /**
-     * 检口
-     */
-    private String checkKou;
-    /**
-     * 管道刷油
-     */
-    private String pipBoil;
-    /**
-     * 管道防腐
-     */
-    private String pipFu;
-    /**
-     * 管道支护
-     */
-    private String pipPay;
-    /**
-     * 砌筑阀门井及保护井
-     */
-    private String faJing;
-    /**
-     * 管件保护井砌筑
-     */
-    private String jingProtect;
-    /**
-     * 回田
-     */
-    private String backField;
-    /**
-     * 务实
-     */
-    private String wuShi;
-    /**
-     * 平整场地
-     */
-    private String smoothPlace;
-    /**
-     * 删除标志
-     */
-    @TableLogic
-    private String delFlag;
-
-}

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

@@ -0,0 +1,175 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 危险工程对象 z_engineering_dangerous
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_dangerous")
+public class ZEngineeringDangerous extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 作业基本信息
+     */
+    private String basicInformation;
+    /**
+     * 工程名称
+     */
+    private String enginName;
+    /**
+     * 工程地点
+     */
+    private String enginAddre;
+    /**
+     * 工程时间
+     */
+    private Date enginTime;
+    /**
+     * 管径
+     */
+    private String pipeDiameter;
+    /**
+     * 管材
+     */
+    private String tubularProduct;
+    /**
+     * 是否存在套管
+     */
+    private String casingPresent;
+    /**
+     * 管道压力
+     */
+    private String pipePressure;
+    /**
+     * 气源方向
+     */
+    private String gasSourceDirection;
+    /**
+     * 作业位置
+     */
+    private String taskPosition;
+    /**
+     * 与作业相关阀门位置
+     */
+    private String valvePosition;
+    /**
+     * 压力报告
+     */
+    private String stressReport;
+    /**
+     * 监理旁站记录
+     */
+    private String supervisionRecord;
+    /**
+     * 工作联系单
+     */
+    private String workContactForm;
+    /**
+     * 巡线确认单
+     */
+    private String linePatrolConfirmationForm;
+    /**
+     * 危险作业坑大小(长)
+     */
+    private Long hazardousWorkPitsLong;
+    /**
+     * 危险作业坑大小(宽)
+     */
+    private Long hazardousWorkPitsWide;
+    /**
+     * 危险作业坑大小(深)
+     */
+    private Long hazardousWorkPitsDeep;
+    /**
+     * 是否需要支护
+     */
+    private String needSupport;
+    /**
+     * 作业坑内其他管道情况
+     */
+    private String otherPipelineConditionsWorkPit;
+    /**
+     * 现场负责人
+     */
+    private String siteHead;
+    /**
+     * 现场负责人电话
+     */
+    private String siteHeadPhone;
+    /**
+     * 作业人员信息
+     */
+    private String operatorInformation;
+    /**
+     * 检口
+     */
+    private String inspectionPort;
+    /**
+     * 管道刷油
+     */
+    private String pipelinePainting;
+    /**
+     * 管道支护
+     */
+    private String pipelineSupport;
+    /**
+     * 管道防腐
+     */
+    private String pipelineCorrosionProtection;
+    /**
+     * 砌筑阀门井
+     */
+    private String masonryValveWell;
+    /**
+     * 保护井
+     */
+    private String protectionWell;
+    /**
+     * 管件保护井砌筑
+     */
+    private String pipeProtectionWelMasonry;
+    /**
+     * 回填
+     */
+    private String backfill;
+    /**
+     * 夯实
+     */
+    private String tamp;
+    /**
+     * 平整场地
+     */
+    private String levelingTheSite;
+    /**
+     * 
+     */
+    @Version
+    private String version;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -1,80 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工业工程详情对象 z_engineering_industrial_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_industrial_info")
-public class ZEngineeringIndustrialInfo extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private String id;
-    /**
-     * 工程节点id
-     */
-    private String engInfoId;
-    /**
-     * 工程类型(字典)
-     */
-    private String engType;
-    /**
-     * 建设单位
-     */
-    private String buildUnit;
-    /**
-     * 项目负责人id
-     */
-    private String buildUser;
-    /**
-     * 项目负责人电话
-     */
-    private String buildPhone;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-    /**
-     * 建设单位
-     */
-    private String psUnit;
-    /**
-     * 项目负责人id
-     */
-    private String psUser;
-    /**
-     * 项目负责人电话
-     */
-    private String psPhone;
-    /**
-     * 建设单位
-     */
-    private String checkUnit;
-    /**
-     * 项目负责人id
-     */
-    private String checkUser;
-    /**
-     * 项目负责人电话
-     */
-    private String checkPhone;
-
-}

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

@@ -0,0 +1,85 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工业工程|市政工程对象 z_engineering_industry
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_industry")
+public class ZEngineeringIndustry extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 工程类型
+     */
+    private String engineeringType;
+    /**
+     * 建筑单位
+     */
+    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 type;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 
+     */
+    @Version
+    private String version;
+
+}

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

@@ -12,15 +12,15 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 民用工程详情信息对象 z_engineering_civil_info
+ * 工程详情对象 z_engineering_info
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_civil_info")
-public class ZEngineeringCivilInfo extends BaseEntity {
+@TableName("z_engineering_info")
+public class ZEngineeringInfo extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -28,55 +28,44 @@ public class ZEngineeringCivilInfo extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
-     * 工程节点id
+     * 民用工程id
      */
-    private String engInfoId;
-    /**
-     * 施工人id
-     */
-    private String constructUser;
+    private Long engInfoId;
     /**
      * 施工地址
      */
     private String constructAddre;
     /**
-     * 施工时间
-     */
-    private Date constructTime;
-    /**
-     * 是否按图纸施工(字典)
+     * 是否按图纸施工
      */
     private String constructAccordingDrawings;
     /**
-     * 施工人电话
-     */
-    private String constructPhone;
-    /**
-     * 材质
+     * 分段打压是否合格
      */
-    private String materialQuality;
+    private String segmentedCompressionQualified;
     /**
-     * 规格
+     * 回填时间
      */
-    private String specifications;
+    private Date backfillTime;
     /**
-     * 尺寸
+     * 施工人电话
      */
-    private Long size;
+    private String constructPhone;
     /**
-     * 数量
+     * 施工人
      */
-    private Long number;
+    private String constructUser;
     /**
-     * 分段打压是否合格(字典)
+     * 施工时间
      */
-    private String segmentedCompressionQualified;
+    private Date constructTime;
     /**
-     * 回填时间
+     * 
      */
-    private Date backfillTime;
+    @Version
+    private String version;
     /**
      * 删除标识
      */

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

@@ -12,15 +12,15 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 基建工程详情对象 z_engineering_infrastructure_info
+ * 基建工程对象 z_engineering_infrastructure
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_infrastructure_info")
-public class ZEngineeringInfrastructureInfo extends BaseEntity {
+@TableName("z_engineering_infrastructure")
+public class ZEngineeringInfrastructure extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -28,23 +28,19 @@ public class ZEngineeringInfrastructureInfo extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
-    /**
-     * 工程节点id
-     */
-    private String engInfoId;
+    private Long id;
     /**
      * 工程名称
      */
-    private String engName;
+    private String enginName;
     /**
      * 工程地址
      */
-    private String buildPlace;
+    private String enginAddre;
     /**
      * 建设单位
      */
-    private String buildUnit;
+    private String constructUnit;
     /**
      * 开工时间
      */
@@ -52,31 +48,20 @@ public class ZEngineeringInfrastructureInfo extends BaseEntity {
     /**
      * 计划工期
      */
-    private Date planTime;
+    private String plannedDuration;
     /**
      * 竣工时间
      */
-    private Date workTime;
+    private Date completedTime;
     /**
      * 工程内容
      */
-    private String workContent;
+    private String enginContent;
     /**
-     * 工程规格
-     */
-    private String buildModel;
-    /**
-     * 工程尺寸
-     */
-    private String buildChi;
-    /**
-     * 工程数量
-     */
-    private Long buildMuch;
-    /**
-     * 施工人员
+     * 
      */
-    private String buildUserId;
+    @Version
+    private String version;
     /**
      * 删除标识
      */

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

@@ -0,0 +1,61 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程用料对象 z_engineering_material
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_material")
+public class ZEngineeringMaterial extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 详情id
+     */
+    private Long detailsId;
+    /**
+     * 材质
+     */
+    private String materialQuality;
+    /**
+     * 规格
+     */
+    private String specifications;
+    /**
+     * 尺寸
+     */
+    private Long size;
+    /**
+     * 数量
+     */
+    private Long number;
+    /**
+     * 
+     */
+    @Version
+    private String version;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -0,0 +1,56 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程用料预设对象 z_engineering_materials_resets
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_materials_resets")
+public class ZEngineeringMaterialsResets extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 
+     */
+    private Long areaId;
+    /**
+     * 材质
+     */
+    private String materialQuality;
+    /**
+     * 规格
+     */
+    private String estimatedSpecifications;
+    /**
+     * 预估尺寸
+     */
+    private Long estimatedSize;
+    /**
+     * 预估金额
+     */
+    private String estimatedAmount;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 工程节点对象 z_engineering_node
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -26,16 +26,21 @@ public class ZEngineeringNode extends BaseEntity {
      * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
-     * 工程id
+     * 民用工程id
      */
-    private String civliId;
+    private Long civliId;
     /**
-     * 节点类型(字典)
+     * 节点类型
      */
     private String type;
     /**
+     * 
+     */
+    @Version
+    private String version;
+    /**
      * 删除标识
      */
     @TableLogic

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

@@ -7,59 +7,59 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
-import java.math.BigDecimal;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 工程用料预设对象 z_engineering_material_preset
+ * 顶管工程对象 z_engineering_pipe_jacking
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_material_preset")
-public class ZEngineeringMaterialPreset extends BaseEntity {
+@TableName("z_engineering_pipe_jacking")
+public class ZEngineeringPipeJacking extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
     /**
-     * 主键
+     * 
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
-     * 小区id
+     * 工程名称
      */
-    private String areaId;
+    private String enginName;
     /**
-     * 材质
+     * 工程地址
      */
-    private String goodsKind;
+    private String enginAddre;
     /**
-     * 预计规格
+     * 工程编码
      */
-    private String planGui;
+    private String enginCode;
     /**
-     * 实际规格
+     * 施工单位
      */
-    private String realGui;
+    private String constructUnit;
     /**
-     * 实际金额
+     * 工程规模
      */
-    private BigDecimal realMoney;
+    private String enginScale;
     /**
-     * 预计金额
+     * 施工质量
      */
-    private BigDecimal planMoney;
+    private String constructQuality;
     /**
-     * 预计尺寸
+     * 施工进度
      */
-    private String planSize;
+    private String constructSchedule;
     /**
-     * 实际尺寸
+     * 
      */
-    private String realSzie;
+    @Version
+    private String version;
     /**
      * 删除标识
      */

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

@@ -1,78 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 顶管工程详情对象 z_engineering_pipe_jacking_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_pipe_jacking_info")
-public class ZEngineeringPipeJackingInfo extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private String id;
-    /**
-     * 工程节点id
-     */
-    private String engInfoId;
-    /**
-     * 工程名称
-     */
-    private String engName;
-    /**
-     * 工程地点
-     */
-    private String buildPlace;
-    /**
-     * 工程编码
-     */
-    private String buildCode;
-    /**
-     * 工程单位
-     */
-    private String buildUnit;
-    /**
-     * 工程规模
-     */
-    private String buildModel;
-    /**
-     * 工程质量
-     */
-    private String buildMg;
-    /**
-     * 施工人员
-     */
-    private String buildUserId;
-    /**
-     * 施工时间
-     */
-    private Date buildTime;
-    /**
-     * 工程进度
-     */
-    private String buildProcess;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

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

@@ -12,10 +12,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 审核信息对象 z_engineering_review
+ * 工程审核对象 z_engineering_review
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +28,7 @@ public class ZEngineeringReview extends BaseEntity {
      * 主键
      */
     @TableId(value = "id")
-    private String id;
+    private Long id;
     /**
      * 审核时间
      */
@@ -38,7 +38,7 @@ public class ZEngineeringReview extends BaseEntity {
      */
     private String reviewUser;
     /**
-     * 审核状态(字典)
+     * 审核状态
      */
     private String reviewStatus;
     /**
@@ -48,7 +48,12 @@ public class ZEngineeringReview extends BaseEntity {
     /**
      * 节点ID
      */
-    private String engInfoId;
+    private Long engInfoId;
+    /**
+     * 
+     */
+    @Version
+    private String version;
     /**
      * 删除标识
      */

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

@@ -11,27 +11,27 @@ import java.util.Date;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 附件业务对象 z_engineering_files
+ * 照片业务对象 z_engiineering_photo
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ZEngineeringFilesBo extends BaseEntity {
+public class ZEngiineeringPhotoBo extends BaseEntity {
 
     /**
      * 主键
      */
-    @NotBlank(message = "主键不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 上级id
      */
-    @NotBlank(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String parentId;
+    @NotNull(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long parentId;
 
     /**
      * 图片地址

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

@@ -1,97 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 市政工程详情业务对象 z_engineering_city_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringCityInfoBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @NotBlank(message = "工程节点id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
-
-    /**
-     * 工程类型(字典)
-     */
-    @NotBlank(message = "工程类型(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engType;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @NotBlank(message = "项目负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @NotBlank(message = "项目负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildPhone;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String psUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @NotBlank(message = "项目负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String psUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @NotBlank(message = "项目负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String psPhone;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @NotBlank(message = "项目负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @NotBlank(message = "项目负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkPhone;
-
-
-}

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

@@ -11,50 +11,50 @@ import java.util.Date;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 工程管理业务对象 z_engineering
+ * 民用工程业务对象 z_engineering_civil
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ZEngineeringBo extends BaseEntity {
+public class ZEngineeringCivilBo extends BaseEntity {
 
     /**
      * 主键
      */
-    @NotBlank(message = "主键不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 小区id
      */
-    @NotBlank(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String areaId;
+    @NotNull(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long areaId;
 
     /**
      * 楼宇id
      */
-    @NotBlank(message = "楼宇id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildingId;
+    @NotNull(message = "楼宇id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long buildingId;
 
     /**
      * 单元id
      */
-    @NotBlank(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String unitId;
+    @NotNull(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long unitId;
 
     /**
      * 房间id
      */
-    @NotBlank(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String houseId;
+    @NotNull(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long houseId;
 
     /**
-     * 工程类型(字典)
+     * 工程类型
      */
-    @NotBlank(message = "工程类型(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String engineeringType;
 
     /**
@@ -70,9 +70,9 @@ public class ZEngineeringBo extends BaseEntity {
     private String headPhone;
 
     /**
-     * 工程分类(字典)
+     * 工程分类
      */
-    @NotBlank(message = "工程分类(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String engineeringClassification;
 
 

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

@@ -1,105 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 民用工程详情信息业务对象 z_engineering_civil_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringCivilInfoBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @NotBlank(message = "工程节点id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
-
-    /**
-     * 施工人id
-     */
-    @NotBlank(message = "施工人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructUser;
-
-    /**
-     * 施工地址
-     */
-    @NotBlank(message = "施工地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructAddre;
-
-    /**
-     * 施工时间
-     */
-    @NotNull(message = "施工时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date constructTime;
-
-    /**
-     * 是否按图纸施工(字典)
-     */
-    @NotBlank(message = "是否按图纸施工(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructAccordingDrawings;
-
-    /**
-     * 施工人电话
-     */
-    @NotBlank(message = "施工人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructPhone;
-
-    /**
-     * 材质
-     */
-    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String materialQuality;
-
-    /**
-     * 规格
-     */
-    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String specifications;
-
-    /**
-     * 尺寸
-     */
-    @NotNull(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long size;
-
-    /**
-     * 数量
-     */
-    @NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long number;
-
-    /**
-     * 分段打压是否合格(字典)
-     */
-    @NotBlank(message = "分段打压是否合格(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String segmentedCompressionQualified;
-
-    /**
-     * 回填时间
-     */
-    @NotNull(message = "回填时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date backfillTime;
-
-
-}

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

@@ -13,195 +13,219 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 危险作业工程业务对象 z_engineering_danger_info
+ * 危险工程业务对象 z_engineering_dangerous
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ZEngineeringDangerInfoBo extends BaseEntity {
+public class ZEngineeringDangerousBo extends BaseEntity {
 
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
-     * 工程节点id
+     * 作业基本信息
      */
-    @NotBlank(message = "工程节点id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
+    @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String basicInformation;
 
     /**
      * 工程名称
      */
     @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String proName;
+    private String enginName;
 
     /**
-     * 工程地址
+     * 工程地点
      */
-    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String proAdress;
+    @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginAddre;
 
     /**
      * 工程时间
      */
     @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date proTime;
+    private Date enginTime;
 
     /**
      * 管径
      */
     @NotBlank(message = "管径不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipJing;
+    private String pipeDiameter;
 
     /**
      * 管材
      */
     @NotBlank(message = "管材不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipGoods;
+    private String tubularProduct;
 
     /**
-     * 是否存在套管(字典)
+     * 是否存在套管
      */
-    @NotBlank(message = "是否存在套管(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String hasPip;
+    @NotBlank(message = "是否存在套管不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String casingPresent;
 
     /**
      * 管道压力
      */
     @NotBlank(message = "管道压力不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipPower;
+    private String pipePressure;
 
     /**
      * 气源方向
      */
     @NotBlank(message = "气源方向不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String airTo;
+    private String gasSourceDirection;
 
     /**
      * 作业位置
      */
     @NotBlank(message = "作业位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String workUnit;
+    private String taskPosition;
 
     /**
      * 与作业相关阀门位置
      */
     @NotBlank(message = "与作业相关阀门位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String workFaUnit;
+    private String valvePosition;
 
     /**
      * 压力报告
      */
     @NotBlank(message = "压力报告不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String powerReport;
+    private String stressReport;
 
     /**
      * 监理旁站记录
      */
     @NotBlank(message = "监理旁站记录不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkRecord;
+    private String supervisionRecord;
 
     /**
      * 工作联系单
      */
     @NotBlank(message = "工作联系单不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String workConnOrder;
+    private String workContactForm;
 
     /**
      * 巡线确认单
      */
     @NotBlank(message = "巡线确认单不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String lineOrder;
+    private String linePatrolConfirmationForm;
 
     /**
-     * 危险作业坑大小（字典）
+     * 危险作业坑大小(长)
      */
-    @NotBlank(message = "危险作业坑大小（字典）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String dangerKeng;
+    @NotNull(message = "危险作业坑大小(长)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hazardousWorkPitsLong;
 
     /**
-     * 是否需要支护（字典）
+     * 危险作业坑大小(宽)
      */
-    @NotBlank(message = "是否需要支护（字典）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String isProtect;
+    @NotNull(message = "危险作业坑大小(宽)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hazardousWorkPitsWide;
+
+    /**
+     * 危险作业坑大小(深)
+     */
+    @NotNull(message = "危险作业坑大小(深)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hazardousWorkPitsDeep;
+
+    /**
+     * 是否需要支护
+     */
+    @NotBlank(message = "是否需要支护不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String needSupport;
 
     /**
      * 作业坑内其他管道情况
      */
     @NotBlank(message = "作业坑内其他管道情况不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String workOtherPips;
+    private String otherPipelineConditionsWorkPit;
+
+    /**
+     * 现场负责人
+     */
+    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String siteHead;
 
     /**
-     * 现场负责人id
+     * 现场负责人电话
      */
-    @NotBlank(message = "现场负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String nowUserId;
+    @NotBlank(message = "现场负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String siteHeadPhone;
 
     /**
-     * 现场负责人联系方式
+     * 作业人员信息
      */
-    @NotBlank(message = "现场负责人联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String nowUserPhone;
+    @NotBlank(message = "作业人员信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String operatorInformation;
 
     /**
      * 检口
      */
     @NotBlank(message = "检口不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkKou;
+    private String inspectionPort;
 
     /**
      * 管道刷油
      */
     @NotBlank(message = "管道刷油不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipBoil;
+    private String pipelinePainting;
+
+    /**
+     * 管道支护
+     */
+    @NotBlank(message = "管道支护不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipelineSupport;
 
     /**
      * 管道防腐
      */
     @NotBlank(message = "管道防腐不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipFu;
+    private String pipelineCorrosionProtection;
 
     /**
-     * 管道支护
+     * 砌筑阀门井
      */
-    @NotBlank(message = "管道支护不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipPay;
+    @NotBlank(message = "砌筑阀门井不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String masonryValveWell;
 
     /**
-     * 砌筑阀门井及保护井
+     * 保护井
      */
-    @NotBlank(message = "砌筑阀门井及保护井不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String faJing;
+    @NotBlank(message = "保护井不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String protectionWell;
 
     /**
      * 管件保护井砌筑
      */
     @NotBlank(message = "管件保护井砌筑不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String jingProtect;
+    private String pipeProtectionWelMasonry;
 
     /**
-     * 回田
+     * 回填
      */
-    @NotBlank(message = "回田不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String backField;
+    @NotBlank(message = "回填不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String backfill;
 
     /**
-     * 务实
+     * 夯实
      */
-    @NotBlank(message = "务实不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String wuShi;
+    @NotBlank(message = "夯实不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tamp;
 
     /**
      * 平整场地
      */
     @NotBlank(message = "平整场地不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String smoothPlace;
+    private String levelingTheSite;
 
 
 }

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

@@ -1,97 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工业工程详情业务对象 z_engineering_industrial_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringIndustrialInfoBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @NotBlank(message = "工程节点id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
-
-    /**
-     * 工程类型(字典)
-     */
-    @NotBlank(message = "工程类型(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engType;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @NotBlank(message = "项目负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @NotBlank(message = "项目负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildPhone;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String psUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @NotBlank(message = "项目负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String psUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @NotBlank(message = "项目负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String psPhone;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @NotBlank(message = "项目负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @NotBlank(message = "项目负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String checkPhone;
-
-
-}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工业工程|市政工程业务对象 z_engineering_industry
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringIndustryBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 工程类型
+     */
+    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String engineeringType;
+
+    /**
+     * 建筑单位
+     */
+    @NotBlank(message = "建筑单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructUnit;
+
+    /**
+     * 项目负责人
+     */
+    @NotBlank(message = "项目负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String projectHead;
+
+    /**
+     * 现场负责人
+     */
+    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sceneHead;
+
+    /**
+     * 设计单位
+     */
+    @NotBlank(message = "设计单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String designUnit;
+
+    /**
+     * 设计负责人
+     */
+    @NotBlank(message = "设计负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String designHead;
+
+    /**
+     * 设计联系电话
+     */
+    @NotBlank(message = "设计联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String designPhone;
+
+    /**
+     * 监理单位
+     */
+    @NotBlank(message = "监理单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String supervisionUnit;
+
+    /**
+     * 监理负责人
+     */
+    @NotBlank(message = "监理负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String supervisionHead;
+
+    /**
+     * 监理联系电话
+     */
+    @NotBlank(message = "监理联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String supervisionPhone;
+
+    /**
+     * 类型(工业工程|市政工程)
+     */
+    @NotBlank(message = "类型(工业工程|市政工程)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+
+}

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

@@ -0,0 +1,81 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程详情业务对象 z_engineering_info
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringInfoBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 民用工程id
+     */
+    @NotNull(message = "民用工程id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long engInfoId;
+
+    /**
+     * 施工地址
+     */
+    @NotBlank(message = "施工地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructAddre;
+
+    /**
+     * 是否按图纸施工
+     */
+    @NotBlank(message = "是否按图纸施工不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructAccordingDrawings;
+
+    /**
+     * 分段打压是否合格
+     */
+    @NotBlank(message = "分段打压是否合格不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String segmentedCompressionQualified;
+
+    /**
+     * 回填时间
+     */
+    @NotNull(message = "回填时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date backfillTime;
+
+    /**
+     * 施工人电话
+     */
+    @NotBlank(message = "施工人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructPhone;
+
+    /**
+     * 施工人
+     */
+    @NotBlank(message = "施工人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructUser;
+
+    /**
+     * 施工时间
+     */
+    @NotNull(message = "施工时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date constructTime;
+
+
+}

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

@@ -13,45 +13,39 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 基建工程详情业务对象 z_engineering_infrastructure_info
+ * 基建工程业务对象 z_engineering_infrastructure
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ZEngineeringInfrastructureInfoBo extends BaseEntity {
+public class ZEngineeringInfrastructureBo extends BaseEntity {
 
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @NotBlank(message = "工程节点id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 工程名称
      */
     @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engName;
+    private String enginName;
 
     /**
      * 工程地址
      */
     @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildPlace;
+    private String enginAddre;
 
     /**
      * 建设单位
      */
     @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUnit;
+    private String constructUnit;
 
     /**
      * 开工时间
@@ -62,44 +56,20 @@ public class ZEngineeringInfrastructureInfoBo extends BaseEntity {
     /**
      * 计划工期
      */
-    @NotNull(message = "计划工期不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date planTime;
+    @NotBlank(message = "计划工期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String plannedDuration;
 
     /**
      * 竣工时间
      */
     @NotNull(message = "竣工时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date workTime;
+    private Date completedTime;
 
     /**
      * 工程内容
      */
     @NotBlank(message = "工程内容不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String workContent;
-
-    /**
-     * 工程规格
-     */
-    @NotBlank(message = "工程规格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildModel;
-
-    /**
-     * 工程尺寸
-     */
-    @NotBlank(message = "工程尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildChi;
-
-    /**
-     * 工程数量
-     */
-    @NotNull(message = "工程数量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long buildMuch;
-
-    /**
-     * 施工人员
-     */
-    @NotBlank(message = "施工人员不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUserId;
+    private String enginContent;
 
 
 }

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

@@ -0,0 +1,61 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程用料业务对象 z_engineering_material
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringMaterialBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 详情id
+     */
+    @NotNull(message = "详情id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long detailsId;
+
+    /**
+     * 材质
+     */
+    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String materialQuality;
+
+    /**
+     * 规格
+     */
+    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String specifications;
+
+    /**
+     * 尺寸
+     */
+    @NotNull(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long size;
+
+    /**
+     * 数量
+     */
+    @NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long number;
+
+
+}

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

@@ -1,80 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程用料预设业务对象 z_engineering_material_preset
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringMaterialPresetBo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    @NotBlank(message = "主键不能为空", groups = { EditGroup.class })
-    private String id;
-
-    /**
-     * 小区id
-     */
-    @NotBlank(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String areaId;
-
-    /**
-     * 材质
-     */
-    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String goodsKind;
-
-    /**
-     * 预计规格
-     */
-    @NotBlank(message = "预计规格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String planGui;
-
-    /**
-     * 实际规格
-     */
-    @NotBlank(message = "实际规格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String realGui;
-
-    /**
-     * 实际金额
-     */
-    @NotNull(message = "实际金额不能为空", groups = { AddGroup.class, EditGroup.class })
-    private BigDecimal realMoney;
-
-    /**
-     * 预计金额
-     */
-    @NotNull(message = "预计金额不能为空", groups = { AddGroup.class, EditGroup.class })
-    private BigDecimal planMoney;
-
-    /**
-     * 预计尺寸
-     */
-    @NotBlank(message = "预计尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String planSize;
-
-    /**
-     * 实际尺寸
-     */
-    @NotBlank(message = "实际尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String realSzie;
-
-
-}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程用料预设业务对象 z_engineering_materials_resets
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringMaterialsResetsBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long areaId;
+
+    /**
+     * 材质
+     */
+    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String materialQuality;
+
+    /**
+     * 规格
+     */
+    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String estimatedSpecifications;
+
+    /**
+     * 预估尺寸
+     */
+    @NotNull(message = "预估尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long estimatedSize;
+
+    /**
+     * 预估金额
+     */
+    @NotBlank(message = "预估金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String estimatedAmount;
+
+
+}

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

@@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 工程节点业务对象 z_engineering_node
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 
 @Data
@@ -24,19 +24,19 @@ public class ZEngineeringNodeBo extends BaseEntity {
     /**
      * 
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
-     * 工程id
+     * 民用工程id
      */
-    @NotBlank(message = "工程id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String civliId;
+    @NotNull(message = "民用工程id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long civliId;
 
     /**
-     * 节点类型(字典)
+     * 节点类型
      */
-    @NotBlank(message = "节点类型(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "节点类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
 

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

@@ -0,0 +1,73 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 顶管工程业务对象 z_engineering_pipe_jacking
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringPipeJackingBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 工程名称
+     */
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+
+    /**
+     * 工程地址
+     */
+    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginAddre;
+
+    /**
+     * 工程编码
+     */
+    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginCode;
+
+    /**
+     * 施工单位
+     */
+    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructUnit;
+
+    /**
+     * 工程规模
+     */
+    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginScale;
+
+    /**
+     * 施工质量
+     */
+    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructQuality;
+
+    /**
+     * 施工进度
+     */
+    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructSchedule;
+
+
+}

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

@@ -1,93 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 顶管工程详情业务对象 z_engineering_pipe_jacking_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringPipeJackingInfoBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @NotBlank(message = "工程节点id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
-
-    /**
-     * 工程名称
-     */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engName;
-
-    /**
-     * 工程地点
-     */
-    @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildPlace;
-
-    /**
-     * 工程编码
-     */
-    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildCode;
-
-    /**
-     * 工程单位
-     */
-    @NotBlank(message = "工程单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUnit;
-
-    /**
-     * 工程规模
-     */
-    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildModel;
-
-    /**
-     * 工程质量
-     */
-    @NotBlank(message = "工程质量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildMg;
-
-    /**
-     * 施工人员
-     */
-    @NotBlank(message = "施工人员不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildUserId;
-
-    /**
-     * 施工时间
-     */
-    @NotNull(message = "施工时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date buildTime;
-
-    /**
-     * 工程进度
-     */
-    @NotBlank(message = "工程进度不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String buildProcess;
-
-
-}

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

@@ -13,10 +13,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 审核信息业务对象 z_engineering_review
+ * 工程审核业务对象 z_engineering_review
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 
 @Data
@@ -26,8 +26,8 @@ public class ZEngineeringReviewBo extends BaseEntity {
     /**
      * 主键
      */
-    @NotBlank(message = "主键不能为空", groups = { EditGroup.class })
-    private String id;
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
 
     /**
      * 审核时间
@@ -42,9 +42,9 @@ public class ZEngineeringReviewBo extends BaseEntity {
     private String reviewUser;
 
     /**
-     * 审核状态(字典)
+     * 审核状态
      */
-    @NotBlank(message = "审核状态(字典)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "审核状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String reviewStatus;
 
     /**
@@ -56,8 +56,8 @@ public class ZEngineeringReviewBo extends BaseEntity {
     /**
      * 节点ID
      */
-    @NotBlank(message = "节点ID不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engInfoId;
+    @NotNull(message = "节点ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long engInfoId;
 
 
 }

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

@@ -10,14 +10,14 @@ import java.util.Date;
 import java.io.Serializable;
 
 /**
- * 附件视图对象 z_engineering_files
+ * 照片视图对象 z_engiineering_photo
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringFilesVo implements Serializable {
+public class ZEngiineeringPhotoVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -25,13 +25,13 @@ public class ZEngineeringFilesVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private String id;
+    private Long id;
 
     /**
      * 上级id
      */
     @ExcelProperty(value = "上级id")
-    private String parentId;
+    private Long parentId;
 
     /**
      * 图片地址

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

@@ -1,97 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 市政工程详情视图对象 z_engineering_city_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringCityInfoVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @ExcelProperty(value = "工程节点id")
-    private String engInfoId;
-
-    /**
-     * 工程类型(字典)
-     */
-    @ExcelProperty(value = "工程类型(字典)")
-    private String engType;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String buildUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @ExcelProperty(value = "项目负责人id")
-    private String buildUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @ExcelProperty(value = "项目负责人电话")
-    private String buildPhone;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String psUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @ExcelProperty(value = "项目负责人id")
-    private String psUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @ExcelProperty(value = "项目负责人电话")
-    private String psPhone;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String checkUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @ExcelProperty(value = "项目负责人id")
-    private String checkUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @ExcelProperty(value = "项目负责人电话")
-    private String checkPhone;
-
-
-}

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

@@ -10,14 +10,14 @@ import java.util.Date;
 import java.io.Serializable;
 
 /**
- * 工程管理视图对象 z_engineering
+ * 民用工程视图对象 z_engineering_civil
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringVo implements Serializable {
+public class ZEngineeringCivilVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -25,36 +25,36 @@ public class ZEngineeringVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private String id;
+    private Long id;
 
     /**
      * 小区id
      */
     @ExcelProperty(value = "小区id")
-    private String areaId;
+    private Long areaId;
 
     /**
      * 楼宇id
      */
     @ExcelProperty(value = "楼宇id")
-    private String buildingId;
+    private Long buildingId;
 
     /**
      * 单元id
      */
     @ExcelProperty(value = "单元id")
-    private String unitId;
+    private Long unitId;
 
     /**
      * 房间id
      */
     @ExcelProperty(value = "房间id")
-    private String houseId;
+    private Long houseId;
 
     /**
-     * 工程类型(字典)
+     * 工程类型
      */
-    @ExcelProperty(value = "工程类型(字典)")
+    @ExcelProperty(value = "工程类型")
     private String engineeringType;
 
     /**
@@ -70,9 +70,9 @@ public class ZEngineeringVo implements Serializable {
     private String headPhone;
 
     /**
-     * 工程分类(字典)
+     * 工程分类
      */
-    @ExcelProperty(value = "工程分类(字典)")
+    @ExcelProperty(value = "工程分类")
     private String engineeringClassification;
 
 

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

@@ -1,209 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 危险作业工程视图对象 z_engineering_danger_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringDangerInfoVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @ExcelProperty(value = "工程节点id")
-    private String engInfoId;
-
-    /**
-     * 工程名称
-     */
-    @ExcelProperty(value = "工程名称")
-    private String proName;
-
-    /**
-     * 工程地址
-     */
-    @ExcelProperty(value = "工程地址")
-    private String proAdress;
-
-    /**
-     * 工程时间
-     */
-    @ExcelProperty(value = "工程时间")
-    private Date proTime;
-
-    /**
-     * 管径
-     */
-    @ExcelProperty(value = "管径")
-    private String pipJing;
-
-    /**
-     * 管材
-     */
-    @ExcelProperty(value = "管材")
-    private String pipGoods;
-
-    /**
-     * 是否存在套管(字典)
-     */
-    @ExcelProperty(value = "是否存在套管(字典)")
-    private String hasPip;
-
-    /**
-     * 管道压力
-     */
-    @ExcelProperty(value = "管道压力")
-    private String pipPower;
-
-    /**
-     * 气源方向
-     */
-    @ExcelProperty(value = "气源方向")
-    private String airTo;
-
-    /**
-     * 作业位置
-     */
-    @ExcelProperty(value = "作业位置")
-    private String workUnit;
-
-    /**
-     * 与作业相关阀门位置
-     */
-    @ExcelProperty(value = "与作业相关阀门位置")
-    private String workFaUnit;
-
-    /**
-     * 压力报告
-     */
-    @ExcelProperty(value = "压力报告")
-    private String powerReport;
-
-    /**
-     * 监理旁站记录
-     */
-    @ExcelProperty(value = "监理旁站记录")
-    private String checkRecord;
-
-    /**
-     * 工作联系单
-     */
-    @ExcelProperty(value = "工作联系单")
-    private String workConnOrder;
-
-    /**
-     * 巡线确认单
-     */
-    @ExcelProperty(value = "巡线确认单")
-    private String lineOrder;
-
-    /**
-     * 危险作业坑大小（字典）
-     */
-    @ExcelProperty(value = "危险作业坑大小", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "字=典")
-    private String dangerKeng;
-
-    /**
-     * 是否需要支护（字典）
-     */
-    @ExcelProperty(value = "是否需要支护", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "字=典")
-    private String isProtect;
-
-    /**
-     * 作业坑内其他管道情况
-     */
-    @ExcelProperty(value = "作业坑内其他管道情况")
-    private String workOtherPips;
-
-    /**
-     * 现场负责人id
-     */
-    @ExcelProperty(value = "现场负责人id")
-    private String nowUserId;
-
-    /**
-     * 现场负责人联系方式
-     */
-    @ExcelProperty(value = "现场负责人联系方式")
-    private String nowUserPhone;
-
-    /**
-     * 检口
-     */
-    @ExcelProperty(value = "检口")
-    private String checkKou;
-
-    /**
-     * 管道刷油
-     */
-    @ExcelProperty(value = "管道刷油")
-    private String pipBoil;
-
-    /**
-     * 管道防腐
-     */
-    @ExcelProperty(value = "管道防腐")
-    private String pipFu;
-
-    /**
-     * 管道支护
-     */
-    @ExcelProperty(value = "管道支护")
-    private String pipPay;
-
-    /**
-     * 砌筑阀门井及保护井
-     */
-    @ExcelProperty(value = "砌筑阀门井及保护井")
-    private String faJing;
-
-    /**
-     * 管件保护井砌筑
-     */
-    @ExcelProperty(value = "管件保护井砌筑")
-    private String jingProtect;
-
-    /**
-     * 回田
-     */
-    @ExcelProperty(value = "回田")
-    private String backField;
-
-    /**
-     * 务实
-     */
-    @ExcelProperty(value = "务实")
-    private String wuShi;
-
-    /**
-     * 平整场地
-     */
-    @ExcelProperty(value = "平整场地")
-    private String smoothPlace;
-
-
-}

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

@@ -0,0 +1,231 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 危险工程视图对象 z_engineering_dangerous
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringDangerousVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 作业基本信息
+     */
+    @ExcelProperty(value = "作业基本信息")
+    private String basicInformation;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程地点
+     */
+    @ExcelProperty(value = "工程地点")
+    private String enginAddre;
+
+    /**
+     * 工程时间
+     */
+    @ExcelProperty(value = "工程时间")
+    private Date enginTime;
+
+    /**
+     * 管径
+     */
+    @ExcelProperty(value = "管径")
+    private String pipeDiameter;
+
+    /**
+     * 管材
+     */
+    @ExcelProperty(value = "管材")
+    private String tubularProduct;
+
+    /**
+     * 是否存在套管
+     */
+    @ExcelProperty(value = "是否存在套管")
+    private String casingPresent;
+
+    /**
+     * 管道压力
+     */
+    @ExcelProperty(value = "管道压力")
+    private String pipePressure;
+
+    /**
+     * 气源方向
+     */
+    @ExcelProperty(value = "气源方向")
+    private String gasSourceDirection;
+
+    /**
+     * 作业位置
+     */
+    @ExcelProperty(value = "作业位置")
+    private String taskPosition;
+
+    /**
+     * 与作业相关阀门位置
+     */
+    @ExcelProperty(value = "与作业相关阀门位置")
+    private String valvePosition;
+
+    /**
+     * 压力报告
+     */
+    @ExcelProperty(value = "压力报告")
+    private String stressReport;
+
+    /**
+     * 监理旁站记录
+     */
+    @ExcelProperty(value = "监理旁站记录")
+    private String supervisionRecord;
+
+    /**
+     * 工作联系单
+     */
+    @ExcelProperty(value = "工作联系单")
+    private String workContactForm;
+
+    /**
+     * 巡线确认单
+     */
+    @ExcelProperty(value = "巡线确认单")
+    private String linePatrolConfirmationForm;
+
+    /**
+     * 危险作业坑大小(长)
+     */
+    @ExcelProperty(value = "危险作业坑大小(长)")
+    private Long hazardousWorkPitsLong;
+
+    /**
+     * 危险作业坑大小(宽)
+     */
+    @ExcelProperty(value = "危险作业坑大小(宽)")
+    private Long hazardousWorkPitsWide;
+
+    /**
+     * 危险作业坑大小(深)
+     */
+    @ExcelProperty(value = "危险作业坑大小(深)")
+    private Long hazardousWorkPitsDeep;
+
+    /**
+     * 是否需要支护
+     */
+    @ExcelProperty(value = "是否需要支护")
+    private String needSupport;
+
+    /**
+     * 作业坑内其他管道情况
+     */
+    @ExcelProperty(value = "作业坑内其他管道情况")
+    private String otherPipelineConditionsWorkPit;
+
+    /**
+     * 现场负责人
+     */
+    @ExcelProperty(value = "现场负责人")
+    private String siteHead;
+
+    /**
+     * 现场负责人电话
+     */
+    @ExcelProperty(value = "现场负责人电话")
+    private String siteHeadPhone;
+
+    /**
+     * 作业人员信息
+     */
+    @ExcelProperty(value = "作业人员信息")
+    private String operatorInformation;
+
+    /**
+     * 检口
+     */
+    @ExcelProperty(value = "检口")
+    private String inspectionPort;
+
+    /**
+     * 管道刷油
+     */
+    @ExcelProperty(value = "管道刷油")
+    private String pipelinePainting;
+
+    /**
+     * 管道支护
+     */
+    @ExcelProperty(value = "管道支护")
+    private String pipelineSupport;
+
+    /**
+     * 管道防腐
+     */
+    @ExcelProperty(value = "管道防腐")
+    private String pipelineCorrosionProtection;
+
+    /**
+     * 砌筑阀门井
+     */
+    @ExcelProperty(value = "砌筑阀门井")
+    private String masonryValveWell;
+
+    /**
+     * 保护井
+     */
+    @ExcelProperty(value = "保护井")
+    private String protectionWell;
+
+    /**
+     * 管件保护井砌筑
+     */
+    @ExcelProperty(value = "管件保护井砌筑")
+    private String pipeProtectionWelMasonry;
+
+    /**
+     * 回填
+     */
+    @ExcelProperty(value = "回填")
+    private String backfill;
+
+    /**
+     * 夯实
+     */
+    @ExcelProperty(value = "夯实")
+    private String tamp;
+
+    /**
+     * 平整场地
+     */
+    @ExcelProperty(value = "平整场地")
+    private String levelingTheSite;
+
+
+}

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

@@ -1,97 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工业工程详情视图对象 z_engineering_industrial_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringIndustrialInfoVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @ExcelProperty(value = "工程节点id")
-    private String engInfoId;
-
-    /**
-     * 工程类型(字典)
-     */
-    @ExcelProperty(value = "工程类型(字典)")
-    private String engType;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String buildUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @ExcelProperty(value = "项目负责人id")
-    private String buildUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @ExcelProperty(value = "项目负责人电话")
-    private String buildPhone;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String psUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @ExcelProperty(value = "项目负责人id")
-    private String psUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @ExcelProperty(value = "项目负责人电话")
-    private String psPhone;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String checkUnit;
-
-    /**
-     * 项目负责人id
-     */
-    @ExcelProperty(value = "项目负责人id")
-    private String checkUser;
-
-    /**
-     * 项目负责人电话
-     */
-    @ExcelProperty(value = "项目负责人电话")
-    private String checkPhone;
-
-
-}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 工业工程|市政工程视图对象 z_engineering_industry
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringIndustryVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 工程类型
+     */
+    @ExcelProperty(value = "工程类型")
+    private String engineeringType;
+
+    /**
+     * 建筑单位
+     */
+    @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 type;
+
+
+}

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

@@ -12,14 +12,14 @@ import java.util.Date;
 import java.io.Serializable;
 
 /**
- * 民用工程详情信息视图对象 z_engineering_civil_info
+ * 工程详情视图对象 z_engineering_info
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringCivilInfoVo implements Serializable {
+public class ZEngineeringInfoVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -27,19 +27,13 @@ public class ZEngineeringCivilInfoVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
-     * 工程节点id
+     * 民用工程id
      */
-    @ExcelProperty(value = "工程节点id")
-    private String engInfoId;
-
-    /**
-     * 施工人id
-     */
-    @ExcelProperty(value = "施工人id")
-    private String constructUser;
+    @ExcelProperty(value = "民用工程id")
+    private Long engInfoId;
 
     /**
      * 施工地址
@@ -48,58 +42,40 @@ public class ZEngineeringCivilInfoVo implements Serializable {
     private String constructAddre;
 
     /**
-     * 施工时间
+     * 是否按图纸施工
      */
-    @ExcelProperty(value = "施工时间")
-    private Date constructTime;
-
-    /**
-     * 是否按图纸施工(字典)
-     */
-    @ExcelProperty(value = "是否按图纸施工(字典)")
+    @ExcelProperty(value = "是否按图纸施工")
     private String constructAccordingDrawings;
 
     /**
-     * 施工人电话
-     */
-    @ExcelProperty(value = "施工人电话")
-    private String constructPhone;
-
-    /**
-     * 材质
-     */
-    @ExcelProperty(value = "材质")
-    private String materialQuality;
-
-    /**
-     * 规格
+     * 分段打压是否合格
      */
-    @ExcelProperty(value = "规格")
-    private String specifications;
+    @ExcelProperty(value = "分段打压是否合格")
+    private String segmentedCompressionQualified;
 
     /**
-     * 尺寸
+     * 回填时间
      */
-    @ExcelProperty(value = "尺寸")
-    private Long size;
+    @ExcelProperty(value = "回填时间")
+    private Date backfillTime;
 
     /**
-     * 数量
+     * 施工人电话
      */
-    @ExcelProperty(value = "数量")
-    private Long number;
+    @ExcelProperty(value = "施工人电话")
+    private String constructPhone;
 
     /**
-     * 分段打压是否合格(字典)
+     * 施工人
      */
-    @ExcelProperty(value = "分段打压是否合格(字典)")
-    private String segmentedCompressionQualified;
+    @ExcelProperty(value = "施工人")
+    private String constructUser;
 
     /**
-     * 回填时间
+     * 施工时间
      */
-    @ExcelProperty(value = "回填时间")
-    private Date backfillTime;
+    @ExcelProperty(value = "施工时间")
+    private Date constructTime;
 
 
 }

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

@@ -12,14 +12,14 @@ import java.util.Date;
 import java.io.Serializable;
 
 /**
- * 基建工程详情视图对象 z_engineering_infrastructure_info
+ * 基建工程视图对象 z_engineering_infrastructure
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringInfrastructureInfoVo implements Serializable {
+public class ZEngineeringInfrastructureVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -27,31 +27,25 @@ public class ZEngineeringInfrastructureInfoVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @ExcelProperty(value = "工程节点id")
-    private String engInfoId;
+    private Long id;
 
     /**
      * 工程名称
      */
     @ExcelProperty(value = "工程名称")
-    private String engName;
+    private String enginName;
 
     /**
      * 工程地址
      */
     @ExcelProperty(value = "工程地址")
-    private String buildPlace;
+    private String enginAddre;
 
     /**
      * 建设单位
      */
     @ExcelProperty(value = "建设单位")
-    private String buildUnit;
+    private String constructUnit;
 
     /**
      * 开工时间
@@ -63,43 +57,19 @@ public class ZEngineeringInfrastructureInfoVo implements Serializable {
      * 计划工期
      */
     @ExcelProperty(value = "计划工期")
-    private Date planTime;
+    private String plannedDuration;
 
     /**
      * 竣工时间
      */
     @ExcelProperty(value = "竣工时间")
-    private Date workTime;
+    private Date completedTime;
 
     /**
      * 工程内容
      */
     @ExcelProperty(value = "工程内容")
-    private String workContent;
-
-    /**
-     * 工程规格
-     */
-    @ExcelProperty(value = "工程规格")
-    private String buildModel;
-
-    /**
-     * 工程尺寸
-     */
-    @ExcelProperty(value = "工程尺寸")
-    private String buildChi;
-
-    /**
-     * 工程数量
-     */
-    @ExcelProperty(value = "工程数量")
-    private Long buildMuch;
-
-    /**
-     * 施工人员
-     */
-    @ExcelProperty(value = "施工人员")
-    private String buildUserId;
+    private String enginContent;
 
 
 }

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

@@ -1,80 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.math.BigDecimal;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工程用料预设视图对象 z_engineering_material_preset
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringMaterialPresetVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private String id;
-
-    /**
-     * 小区id
-     */
-    @ExcelProperty(value = "小区id")
-    private String areaId;
-
-    /**
-     * 材质
-     */
-    @ExcelProperty(value = "材质")
-    private String goodsKind;
-
-    /**
-     * 预计规格
-     */
-    @ExcelProperty(value = "预计规格")
-    private String planGui;
-
-    /**
-     * 实际规格
-     */
-    @ExcelProperty(value = "实际规格")
-    private String realGui;
-
-    /**
-     * 实际金额
-     */
-    @ExcelProperty(value = "实际金额")
-    private BigDecimal realMoney;
-
-    /**
-     * 预计金额
-     */
-    @ExcelProperty(value = "预计金额")
-    private BigDecimal planMoney;
-
-    /**
-     * 预计尺寸
-     */
-    @ExcelProperty(value = "预计尺寸")
-    private String planSize;
-
-    /**
-     * 实际尺寸
-     */
-    @ExcelProperty(value = "实际尺寸")
-    private String realSzie;
-
-
-}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 工程用料视图对象 z_engineering_material
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringMaterialVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 详情id
+     */
+    @ExcelProperty(value = "详情id")
+    private Long detailsId;
+
+    /**
+     * 材质
+     */
+    @ExcelProperty(value = "材质")
+    private String materialQuality;
+
+    /**
+     * 规格
+     */
+    @ExcelProperty(value = "规格")
+    private String specifications;
+
+    /**
+     * 尺寸
+     */
+    @ExcelProperty(value = "尺寸")
+    private Long size;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private Long number;
+
+
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 工程用料预设视图对象 z_engineering_materials_resets
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringMaterialsResetsVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long areaId;
+
+    /**
+     * 材质
+     */
+    @ExcelProperty(value = "材质")
+    private String materialQuality;
+
+    /**
+     * 规格
+     */
+    @ExcelProperty(value = "规格")
+    private String estimatedSpecifications;
+
+    /**
+     * 预估尺寸
+     */
+    @ExcelProperty(value = "预估尺寸")
+    private Long estimatedSize;
+
+    /**
+     * 预估金额
+     */
+    @ExcelProperty(value = "预估金额")
+    private String estimatedAmount;
+
+
+}

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * 工程节点视图对象 z_engineering_node
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -25,18 +25,18 @@ public class ZEngineeringNodeVo implements Serializable {
      * 
      */
     @ExcelProperty(value = "")
-    private String id;
+    private Long id;
 
     /**
-     * 工程id
+     * 民用工程id
      */
-    @ExcelProperty(value = "工程id")
-    private String civliId;
+    @ExcelProperty(value = "民用工程id")
+    private Long civliId;
 
     /**
-     * 节点类型(字典)
+     * 节点类型
      */
-    @ExcelProperty(value = "节点类型(字典)")
+    @ExcelProperty(value = "节点类型")
     private String type;
 
 

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

@@ -1,93 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 顶管工程详情视图对象 z_engineering_pipe_jacking_info
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringPipeJackingInfoVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String id;
-
-    /**
-     * 工程节点id
-     */
-    @ExcelProperty(value = "工程节点id")
-    private String engInfoId;
-
-    /**
-     * 工程名称
-     */
-    @ExcelProperty(value = "工程名称")
-    private String engName;
-
-    /**
-     * 工程地点
-     */
-    @ExcelProperty(value = "工程地点")
-    private String buildPlace;
-
-    /**
-     * 工程编码
-     */
-    @ExcelProperty(value = "工程编码")
-    private String buildCode;
-
-    /**
-     * 工程单位
-     */
-    @ExcelProperty(value = "工程单位")
-    private String buildUnit;
-
-    /**
-     * 工程规模
-     */
-    @ExcelProperty(value = "工程规模")
-    private String buildModel;
-
-    /**
-     * 工程质量
-     */
-    @ExcelProperty(value = "工程质量")
-    private String buildMg;
-
-    /**
-     * 施工人员
-     */
-    @ExcelProperty(value = "施工人员")
-    private String buildUserId;
-
-    /**
-     * 施工时间
-     */
-    @ExcelProperty(value = "施工时间")
-    private Date buildTime;
-
-    /**
-     * 工程进度
-     */
-    @ExcelProperty(value = "工程进度")
-    private String buildProcess;
-
-
-}

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

@@ -0,0 +1,73 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 顶管工程视图对象 z_engineering_pipe_jacking
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringPipeJackingVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程地址
+     */
+    @ExcelProperty(value = "工程地址")
+    private String enginAddre;
+
+    /**
+     * 工程编码
+     */
+    @ExcelProperty(value = "工程编码")
+    private String enginCode;
+
+    /**
+     * 施工单位
+     */
+    @ExcelProperty(value = "施工单位")
+    private String constructUnit;
+
+    /**
+     * 工程规模
+     */
+    @ExcelProperty(value = "工程规模")
+    private String enginScale;
+
+    /**
+     * 施工质量
+     */
+    @ExcelProperty(value = "施工质量")
+    private String constructQuality;
+
+    /**
+     * 施工进度
+     */
+    @ExcelProperty(value = "施工进度")
+    private String constructSchedule;
+
+
+}

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

@@ -12,10 +12,10 @@ import java.util.Date;
 import java.io.Serializable;
 
 /**
- * 审核信息视图对象 z_engineering_review
+ * 工程审核视图对象 z_engineering_review
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -27,7 +27,7 @@ public class ZEngineeringReviewVo implements Serializable {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    private String id;
+    private Long id;
 
     /**
      * 审核时间
@@ -42,9 +42,9 @@ public class ZEngineeringReviewVo implements Serializable {
     private String reviewUser;
 
     /**
-     * 审核状态(字典)
+     * 审核状态
      */
-    @ExcelProperty(value = "审核状态(字典)")
+    @ExcelProperty(value = "审核状态")
     private String reviewStatus;
 
     /**
@@ -57,7 +57,7 @@ public class ZEngineeringReviewVo implements Serializable {
      * 节点ID
      */
     @ExcelProperty(value = "节点ID")
-    private String engInfoId;
+    private Long engInfoId;
 
 
 }

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

@@ -0,0 +1,15 @@
+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;
+
+/**
+ * 照片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngiineeringPhotoMapper extends BaseMapperPlus<ZEngiineeringPhotoMapper, ZEngiineeringPhoto, ZEngiineeringPhotoVo> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringCityInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCityInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 市政工程详情Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringCityInfoMapper extends BaseMapperPlus<ZEngineeringCityInfoMapper, ZEngineeringCityInfo, ZEngineeringCityInfoVo> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringCivilInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 民用工程详情信息Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringCivilInfoMapper extends BaseMapperPlus<ZEngineeringCivilInfoMapper, ZEngineeringCivilInfo, ZEngineeringCivilInfoVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringCivil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 民用工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivilMapper, ZEngineeringCivil, ZEngineeringCivilVo> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringDangerInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 危险作业工程Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringDangerInfoMapper extends BaseMapperPlus<ZEngineeringDangerInfoMapper, ZEngineeringDangerInfo, ZEngineeringDangerInfoVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 危险工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringDangerousMapper extends BaseMapperPlus<ZEngineeringDangerousMapper, ZEngineeringDangerous, ZEngineeringDangerousVo> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringFiles;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringFilesVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 附件Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringFilesMapper extends BaseMapperPlus<ZEngineeringFilesMapper, ZEngineeringFiles, ZEngineeringFilesVo> {
-
-}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringIndustrialInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustrialInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工业工程详情Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringIndustrialInfoMapper extends BaseMapperPlus<ZEngineeringIndustrialInfoMapper, ZEngineeringIndustrialInfo, ZEngineeringIndustrialInfoVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 工业工程|市政工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringIndustryMapper extends BaseMapperPlus<ZEngineeringIndustryMapper, ZEngineeringIndustry, ZEngineeringIndustryVo> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringInfo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 工程详情Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringInfoMapper extends BaseMapperPlus<ZEngineeringInfoMapper, ZEngineeringInfo, ZEngineeringInfoVo> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringInfrastructureInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 基建工程详情Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringInfrastructureInfoMapper extends BaseMapperPlus<ZEngineeringInfrastructureInfoMapper, ZEngineeringInfrastructureInfo, ZEngineeringInfrastructureInfoVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 基建工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringInfrastructureMapper extends BaseMapperPlus<ZEngineeringInfrastructureMapper, ZEngineeringInfrastructure, ZEngineeringInfrastructureVo> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineering;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程管理Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringMapper extends BaseMapperPlus<ZEngineeringMapper, ZEngineering, ZEngineeringVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 工程用料Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringMaterialMapper extends BaseMapperPlus<ZEngineeringMaterialMapper, ZEngineeringMaterial, ZEngineeringMaterialVo> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringMaterialPreset;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialPresetVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程用料预设Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringMaterialPresetMapper extends BaseMapperPlus<ZEngineeringMaterialPresetMapper, ZEngineeringMaterialPreset, ZEngineeringMaterialPresetVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 工程用料预设Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringMaterialsResetsMapper extends BaseMapperPlus<ZEngineeringMaterialsResetsMapper, ZEngineeringMaterialsResets, ZEngineeringMaterialsResetsVo> {
+
+}

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

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 工程节点Mapper接口
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 public interface ZEngineeringNodeMapper extends BaseMapperPlus<ZEngineeringNodeMapper, ZEngineeringNode, ZEngineeringNodeVo> {
 

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

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringPipeJackingInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 顶管工程详情Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZEngineeringPipeJackingInfoMapper extends BaseMapperPlus<ZEngineeringPipeJackingInfoMapper, ZEngineeringPipeJackingInfo, ZEngineeringPipeJackingInfoVo> {
-
-}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 顶管工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeringPipeJackingMapper, ZEngineeringPipeJacking, ZEngineeringPipeJackingVo> {
+
+}

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

@@ -5,10 +5,10 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
 /**
- * 审核信息Mapper接口
+ * 工程审核Mapper接口
  *
  * @author ruoyi
- * @date 2023-12-23
+ * @date 2023-12-25
  */
 public interface ZEngineeringReviewMapper extends BaseMapperPlus<ZEngineeringReviewMapper, ZEngineeringReview, ZEngineeringReviewVo> {
 

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 照片Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface IZEngiineeringPhotoService {
+
+    /**
+     * 查询照片
+     */
+    ZEngiineeringPhotoVo queryById(Long id);
+
+    /**
+     * 查询照片列表
+     */
+    TableDataInfo<ZEngiineeringPhotoVo> queryPageList(ZEngiineeringPhotoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询照片列表
+     */
+    List<ZEngiineeringPhotoVo> queryList(ZEngiineeringPhotoBo bo);
+
+    /**
+     * 新增照片
+     */
+    Boolean insertByBo(ZEngiineeringPhotoBo bo);
+
+    /**
+     * 修改照片
+     */
+    Boolean updateByBo(ZEngiineeringPhotoBo bo);
+
+    /**
+     * 校验并批量删除照片信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringCityInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCityInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCityInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 市政工程详情Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringCityInfoService {
-
-    /**
-     * 查询市政工程详情
-     */
-    ZEngineeringCityInfoVo queryById(String id);
-
-    /**
-     * 查询市政工程详情列表
-     */
-    TableDataInfo<ZEngineeringCityInfoVo> queryPageList(ZEngineeringCityInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询市政工程详情列表
-     */
-    List<ZEngineeringCityInfoVo> queryList(ZEngineeringCityInfoBo bo);
-
-    /**
-     * 新增市政工程详情
-     */
-    Boolean insertByBo(ZEngineeringCityInfoBo bo);
-
-    /**
-     * 修改市政工程详情
-     */
-    Boolean updateByBo(ZEngineeringCityInfoBo bo);
-
-    /**
-     * 校验并批量删除市政工程详情信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringCivilInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 民用工程详情信息Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringCivilInfoService {
-
-    /**
-     * 查询民用工程详情信息
-     */
-    ZEngineeringCivilInfoVo queryById(String id);
-
-    /**
-     * 查询民用工程详情信息列表
-     */
-    TableDataInfo<ZEngineeringCivilInfoVo> queryPageList(ZEngineeringCivilInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询民用工程详情信息列表
-     */
-    List<ZEngineeringCivilInfoVo> queryList(ZEngineeringCivilInfoBo bo);
-
-    /**
-     * 新增民用工程详情信息
-     */
-    Boolean insertByBo(ZEngineeringCivilInfoBo bo);
-
-    /**
-     * 修改民用工程详情信息
-     */
-    Boolean updateByBo(ZEngineeringCivilInfoBo bo);
-
-    /**
-     * 校验并批量删除民用工程详情信息信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringCivil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 民用工程Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface IZEngineeringCivilService {
+
+    /**
+     * 查询民用工程
+     */
+    ZEngineeringCivilVo queryById(Long id);
+
+    /**
+     * 查询民用工程列表
+     */
+    TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询民用工程列表
+     */
+    List<ZEngineeringCivilVo> queryList(ZEngineeringCivilBo bo);
+
+    /**
+     * 新增民用工程
+     */
+    Boolean insertByBo(ZEngineeringCivilBo bo);
+
+    /**
+     * 修改民用工程
+     */
+    Boolean updateByBo(ZEngineeringCivilBo bo);
+
+    /**
+     * 校验并批量删除民用工程信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringDangerInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 危险作业工程Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringDangerInfoService {
-
-    /**
-     * 查询危险作业工程
-     */
-    ZEngineeringDangerInfoVo queryById(String id);
-
-    /**
-     * 查询危险作业工程列表
-     */
-    TableDataInfo<ZEngineeringDangerInfoVo> queryPageList(ZEngineeringDangerInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询危险作业工程列表
-     */
-    List<ZEngineeringDangerInfoVo> queryList(ZEngineeringDangerInfoBo bo);
-
-    /**
-     * 新增危险作业工程
-     */
-    Boolean insertByBo(ZEngineeringDangerInfoBo bo);
-
-    /**
-     * 修改危险作业工程
-     */
-    Boolean updateByBo(ZEngineeringDangerInfoBo bo);
-
-    /**
-     * 校验并批量删除危险作业工程信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 危险工程Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface IZEngineeringDangerousService {
+
+    /**
+     * 查询危险工程
+     */
+    ZEngineeringDangerousVo queryById(Long id);
+
+    /**
+     * 查询危险工程列表
+     */
+    TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询危险工程列表
+     */
+    List<ZEngineeringDangerousVo> queryList(ZEngineeringDangerousBo bo);
+
+    /**
+     * 新增危险工程
+     */
+    Boolean insertByBo(ZEngineeringDangerousBo bo);
+
+    /**
+     * 修改危险工程
+     */
+    Boolean updateByBo(ZEngineeringDangerousBo bo);
+
+    /**
+     * 校验并批量删除危险工程信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringFiles;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringFilesVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringFilesBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 附件Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringFilesService {
-
-    /**
-     * 查询附件
-     */
-    ZEngineeringFilesVo queryById(String id);
-
-    /**
-     * 查询附件列表
-     */
-    TableDataInfo<ZEngineeringFilesVo> queryPageList(ZEngineeringFilesBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询附件列表
-     */
-    List<ZEngineeringFilesVo> queryList(ZEngineeringFilesBo bo);
-
-    /**
-     * 新增附件
-     */
-    Boolean insertByBo(ZEngineeringFilesBo bo);
-
-    /**
-     * 修改附件
-     */
-    Boolean updateByBo(ZEngineeringFilesBo bo);
-
-    /**
-     * 校验并批量删除附件信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringIndustrialInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustrialInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustrialInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工业工程详情Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringIndustrialInfoService {
-
-    /**
-     * 查询工业工程详情
-     */
-    ZEngineeringIndustrialInfoVo queryById(String id);
-
-    /**
-     * 查询工业工程详情列表
-     */
-    TableDataInfo<ZEngineeringIndustrialInfoVo> queryPageList(ZEngineeringIndustrialInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工业工程详情列表
-     */
-    List<ZEngineeringIndustrialInfoVo> queryList(ZEngineeringIndustrialInfoBo bo);
-
-    /**
-     * 新增工业工程详情
-     */
-    Boolean insertByBo(ZEngineeringIndustrialInfoBo bo);
-
-    /**
-     * 修改工业工程详情
-     */
-    Boolean updateByBo(ZEngineeringIndustrialInfoBo bo);
-
-    /**
-     * 校验并批量删除工业工程详情信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 工业工程|市政工程Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface IZEngineeringIndustryService {
+
+    /**
+     * 查询工业工程|市政工程
+     */
+    ZEngineeringIndustryVo queryById(Long id);
+
+    /**
+     * 查询工业工程|市政工程列表
+     */
+    TableDataInfo<ZEngineeringIndustryVo> queryPageList(ZEngineeringIndustryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询工业工程|市政工程列表
+     */
+    List<ZEngineeringIndustryVo> queryList(ZEngineeringIndustryBo bo);
+
+    /**
+     * 新增工业工程|市政工程
+     */
+    Boolean insertByBo(ZEngineeringIndustryBo bo);
+
+    /**
+     * 修改工业工程|市政工程
+     */
+    Boolean updateByBo(ZEngineeringIndustryBo bo);
+
+    /**
+     * 校验并批量删除工业工程|市政工程信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringInfo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 工程详情Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface IZEngineeringInfoService {
+
+    /**
+     * 查询工程详情
+     */
+    ZEngineeringInfoVo queryById(Long id);
+
+    /**
+     * 查询工程详情列表
+     */
+    TableDataInfo<ZEngineeringInfoVo> queryPageList(ZEngineeringInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询工程详情列表
+     */
+    List<ZEngineeringInfoVo> queryList(ZEngineeringInfoBo bo);
+
+    /**
+     * 新增工程详情
+     */
+    Boolean insertByBo(ZEngineeringInfoBo bo);
+
+    /**
+     * 修改工程详情
+     */
+    Boolean updateByBo(ZEngineeringInfoBo bo);
+
+    /**
+     * 校验并批量删除工程详情信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringInfrastructureInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 基建工程详情Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringInfrastructureInfoService {
-
-    /**
-     * 查询基建工程详情
-     */
-    ZEngineeringInfrastructureInfoVo queryById(String id);
-
-    /**
-     * 查询基建工程详情列表
-     */
-    TableDataInfo<ZEngineeringInfrastructureInfoVo> queryPageList(ZEngineeringInfrastructureInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询基建工程详情列表
-     */
-    List<ZEngineeringInfrastructureInfoVo> queryList(ZEngineeringInfrastructureInfoBo bo);
-
-    /**
-     * 新增基建工程详情
-     */
-    Boolean insertByBo(ZEngineeringInfrastructureInfoBo bo);
-
-    /**
-     * 修改基建工程详情
-     */
-    Boolean updateByBo(ZEngineeringInfrastructureInfoBo bo);
-
-    /**
-     * 校验并批量删除基建工程详情信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 基建工程Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-25
+ */
+public interface IZEngineeringInfrastructureService {
+
+    /**
+     * 查询基建工程
+     */
+    ZEngineeringInfrastructureVo queryById(Long id);
+
+    /**
+     * 查询基建工程列表
+     */
+    TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询基建工程列表
+     */
+    List<ZEngineeringInfrastructureVo> queryList(ZEngineeringInfrastructureBo bo);
+
+    /**
+     * 新增基建工程
+     */
+    Boolean insertByBo(ZEngineeringInfrastructureBo bo);
+
+    /**
+     * 修改基建工程
+     */
+    Boolean updateByBo(ZEngineeringInfrastructureBo bo);
+
+    /**
+     * 校验并批量删除基建工程信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringMaterialPreset;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialPresetVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialPresetBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工程用料预设Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZEngineeringMaterialPresetService {
-
-    /**
-     * 查询工程用料预设
-     */
-    ZEngineeringMaterialPresetVo queryById(String id);
-
-    /**
-     * 查询工程用料预设列表
-     */
-    TableDataInfo<ZEngineeringMaterialPresetVo> queryPageList(ZEngineeringMaterialPresetBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工程用料预设列表
-     */
-    List<ZEngineeringMaterialPresetVo> queryList(ZEngineeringMaterialPresetBo bo);
-
-    /**
-     * 新增工程用料预设
-     */
-    Boolean insertByBo(ZEngineeringMaterialPresetBo bo);
-
-    /**
-     * 修改工程用料预设
-     */
-    Boolean updateByBo(ZEngineeringMaterialPresetBo bo);
-
-    /**
-     * 校验并批量删除工程用料预设信息
-     */
-    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}