diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgdanjlController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgdanjlController.java new file mode 100644 index 00000000..0743423b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgdanjlController.java @@ -0,0 +1,105 @@ +package org.dromara.safety.accident.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.safety.accident.domain.vo.HseSafetySgdanjlVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgdanjlBo; +import org.dromara.safety.accident.service.IHseSafetySgdanjlService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 安全-事故档案记录 + * + * @author Lion Li + * @date 2025-12-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/accident/safetySgdanjl") +public class HseSafetySgdanjlController extends BaseController { + + private final IHseSafetySgdanjlService hseSafetySgdanjlService; + + /** + * 查询安全-事故档案记录列表 + */ + @SaCheckPermission("accident:safetySgdanjl:list") + @GetMapping("/list") + public TableDataInfo list(HseSafetySgdanjlBo bo, PageQuery pageQuery) { + return hseSafetySgdanjlService.queryPageList(bo, pageQuery); + } + + /** + * 导出安全-事故档案记录列表 + */ + @SaCheckPermission("accident:safetySgdanjl:export") + @Log(title = "安全-事故档案记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HseSafetySgdanjlBo bo, HttpServletResponse response) { + List list = hseSafetySgdanjlService.queryList(bo); + ExcelUtil.exportExcel(list, "安全-事故档案记录", HseSafetySgdanjlVo.class, response); + } + + /** + * 获取安全-事故档案记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("accident:safetySgdanjl:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hseSafetySgdanjlService.queryById(id)); + } + + /** + * 新增安全-事故档案记录 + */ + @SaCheckPermission("accident:safetySgdanjl:add") + @Log(title = "安全-事故档案记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HseSafetySgdanjlBo bo) { + return toAjax(hseSafetySgdanjlService.insertByBo(bo)); + } + + /** + * 修改安全-事故档案记录 + */ + @SaCheckPermission("accident:safetySgdanjl:edit") + @Log(title = "安全-事故档案记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HseSafetySgdanjlBo bo) { + return toAjax(hseSafetySgdanjlService.updateByBo(bo)); + } + + /** + * 删除安全-事故档案记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("accident:safetySgdanjl:remove") + @Log(title = "安全-事故档案记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseSafetySgdanjlService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgdcController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgdcController.java new file mode 100644 index 00000000..c328b22c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgdcController.java @@ -0,0 +1,105 @@ +package org.dromara.safety.accident.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgdcBo; +import org.dromara.safety.accident.service.IHseSafetySgdcService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 安全-事故调查 + * + * @author Lion Li + * @date 2025-12-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/accident/safetySgdc") +public class HseSafetySgdcController extends BaseController { + + private final IHseSafetySgdcService hseSafetySgdcService; + + /** + * 查询安全-事故调查列表 + */ + @SaCheckPermission("accident:safetySgdc:list") + @GetMapping("/list") + public TableDataInfo list(HseSafetySgdcBo bo, PageQuery pageQuery) { + return hseSafetySgdcService.queryPageList(bo, pageQuery); + } + + /** + * 导出安全-事故调查列表 + */ + @SaCheckPermission("accident:safetySgdc:export") + @Log(title = "安全-事故调查", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HseSafetySgdcBo bo, HttpServletResponse response) { + List list = hseSafetySgdcService.queryList(bo); + ExcelUtil.exportExcel(list, "安全-事故调查", HseSafetySgdcVo.class, response); + } + + /** + * 获取安全-事故调查详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("accident:safetySgdc:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hseSafetySgdcService.queryById(id)); + } + + /** + * 新增安全-事故调查 + */ + @SaCheckPermission("accident:safetySgdc:add") + @Log(title = "安全-事故调查", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HseSafetySgdcBo bo) { + return toAjax(hseSafetySgdcService.insertByBo(bo)); + } + + /** + * 修改安全-事故调查 + */ + @SaCheckPermission("accident:safetySgdc:edit") + @Log(title = "安全-事故调查", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HseSafetySgdcBo bo) { + return toAjax(hseSafetySgdcService.updateByBo(bo)); + } + + /** + * 删除安全-事故调查 + * + * @param ids 主键串 + */ + @SaCheckPermission("accident:safetySgdc:remove") + @Log(title = "安全-事故调查", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseSafetySgdcService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgsbController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgsbController.java new file mode 100644 index 00000000..2637f288 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgsbController.java @@ -0,0 +1,105 @@ +package org.dromara.safety.accident.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.safety.accident.domain.vo.HseSafetySgsbVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgsbBo; +import org.dromara.safety.accident.service.IHseSafetySgsbService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 安全-事故上报 + * + * @author Lion Li + * @date 2025-12-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/accident/safetySgsb") +public class HseSafetySgsbController extends BaseController { + + private final IHseSafetySgsbService hseSafetySgsbService; + + /** + * 查询安全-事故上报列表 + */ + @SaCheckPermission("accident:safetySgsb:list") + @GetMapping("/list") + public TableDataInfo list(HseSafetySgsbBo bo, PageQuery pageQuery) { + return hseSafetySgsbService.queryPageList(bo, pageQuery); + } + + /** + * 导出安全-事故上报列表 + */ + @SaCheckPermission("accident:safetySgsb:export") + @Log(title = "安全-事故上报", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HseSafetySgsbBo bo, HttpServletResponse response) { + List list = hseSafetySgsbService.queryList(bo); + ExcelUtil.exportExcel(list, "安全-事故上报", HseSafetySgsbVo.class, response); + } + + /** + * 获取安全-事故上报详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("accident:safetySgsb:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hseSafetySgsbService.queryById(id)); + } + + /** + * 新增安全-事故上报 + */ + @SaCheckPermission("accident:safetySgsb:add") + @Log(title = "安全-事故上报", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HseSafetySgsbBo bo) { + return toAjax(hseSafetySgsbService.insertByBo(bo)); + } + + /** + * 修改安全-事故上报 + */ + @SaCheckPermission("accident:safetySgsb:edit") + @Log(title = "安全-事故上报", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HseSafetySgsbBo bo) { + return toAjax(hseSafetySgsbService.updateByBo(bo)); + } + + /** + * 删除安全-事故上报 + * + * @param ids 主键串 + */ + @SaCheckPermission("accident:safetySgsb:remove") + @Log(title = "安全-事故上报", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseSafetySgsbService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgzgbhController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgzgbhController.java new file mode 100644 index 00000000..23649e52 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/controller/HseSafetySgzgbhController.java @@ -0,0 +1,105 @@ +package org.dromara.safety.accident.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.safety.accident.domain.vo.HseSafetySgzgbhVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgzgbhBo; +import org.dromara.safety.accident.service.IHseSafetySgzgbhService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 安全-事故整改闭环 + * + * @author Lion Li + * @date 2025-12-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/accident/safetySgzgbh") +public class HseSafetySgzgbhController extends BaseController { + + private final IHseSafetySgzgbhService hseSafetySgzgbhService; + + /** + * 查询安全-事故整改闭环列表 + */ + @SaCheckPermission("accident:safetySgzgbh:list") + @GetMapping("/list") + public TableDataInfo list(HseSafetySgzgbhBo bo, PageQuery pageQuery) { + return hseSafetySgzgbhService.queryPageList(bo, pageQuery); + } + + /** + * 导出安全-事故整改闭环列表 + */ + @SaCheckPermission("accident:safetySgzgbh:export") + @Log(title = "安全-事故整改闭环", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HseSafetySgzgbhBo bo, HttpServletResponse response) { + List list = hseSafetySgzgbhService.queryList(bo); + ExcelUtil.exportExcel(list, "安全-事故整改闭环", HseSafetySgzgbhVo.class, response); + } + + /** + * 获取安全-事故整改闭环详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("accident:safetySgzgbh:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hseSafetySgzgbhService.queryById(id)); + } + + /** + * 新增安全-事故整改闭环 + */ + @SaCheckPermission("accident:safetySgzgbh:add") + @Log(title = "安全-事故整改闭环", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HseSafetySgzgbhBo bo) { + return toAjax(hseSafetySgzgbhService.insertByBo(bo)); + } + + /** + * 修改安全-事故整改闭环 + */ + @SaCheckPermission("accident:safetySgzgbh:edit") + @Log(title = "安全-事故整改闭环", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HseSafetySgzgbhBo bo) { + return toAjax(hseSafetySgzgbhService.updateByBo(bo)); + } + + /** + * 删除安全-事故整改闭环 + * + * @param ids 主键串 + */ + @SaCheckPermission("accident:safetySgzgbh:remove") + @Log(title = "安全-事故整改闭环", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hseSafetySgzgbhService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetyFcxx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetyFcxx.java new file mode 100644 index 00000000..d023720a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetyFcxx.java @@ -0,0 +1,83 @@ +package org.dromara.safety.accident.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 安全事故复查信息对象 hse_safety_fcxx + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_safety_fcxx") +public class HseSafetyFcxx extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 安全事故整改与闭环ID + */ + private Long masterId; + + /** + * 整改ID + */ + private Long zgId; + + /** + * 复查人 + */ + private Long review; + + /** + * 复查日期 + */ + private Date reviewDate; + + /** + * 复查意见 + */ + private String reviewOpinion; + + /** + * 复查状态 + */ + private String reviewState; + + /** + * 不通过原因 + */ + private String notPassCause; + + /** + * 复查意见详情 + */ + private String reviewOpinionParticulars; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + /** + * pdf文件（多个文件逗号分隔） + */ + private String pdfId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgdanjl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgdanjl.java new file mode 100644 index 00000000..7a192032 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgdanjl.java @@ -0,0 +1,118 @@ +package org.dromara.safety.accident.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 安全-事故档案记录对象 hse_safety_sgdanjl + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_safety_sgdanjl") +public class HseSafetySgdanjl extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 档案编号 + */ + private String danbh; + + /** + * 关联项目 + */ + private String project; + + /** + * 事故编号 + */ + private String sgbh; + + /** + * 事发时间 + */ + private Date sfsj; + + /** + * 事发地点 + */ + private String sfdd; + + /** + * 事故类型 + */ + private String sglx; + + /** + * 事故等级 + */ + private String sgdj; + + /** + * 事故原因 + */ + private String sgyy; + + /** + * 事故详情 + */ + private String sgxq; + + /** + * 调查详情 + */ + private String dcxq; + + /** + * 整改与复查详情 + */ + private String zgfcxq; + + /** + * 档案管理人 + */ + private String danglr; + + /** + * 档案保存期限 + */ + private String storageLife; + + /** + * 电子档案存储位置 + */ + private String dzdanccwz; + + /** + * 纸质档案存放位置 + */ + private String zzdancfwz; + + /** + * 档案备注 + */ + private String remarks; + + /** + * 审核状态 + */ + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgdc.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgdc.java new file mode 100644 index 00000000..3c016e9b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgdc.java @@ -0,0 +1,158 @@ +package org.dromara.safety.accident.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 安全-事故调查对象 hse_safety_sgdc + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_safety_sgdc") +public class HseSafetySgdc extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 调查编号 + */ + private String dcbh; + + /** + * 关联事故id + */ + private Long sgId; + + /** + * 调查小组 + */ + private String dcxz; + + /** + * 调查开始时间 + */ + private Date dckssj; + + /** + * 调查结束时间 + */ + private Date dcjssj; + + /** + * 事故详细经过 + */ + private String sgxxjg; + + /** + * 直接原因 + */ + private String zjjy; + + /** + * 间接原因 + */ + private String jjyy; + + /** + * 证据材料说明 + */ + private String zjcl; + + /** + * 责任部门 + */ + private Long zrbm; + + /** + * 主要负责人 + */ + private Long zyfzr; + + /** + * 次要负责人 + */ + private Long cyfzr; + + /** + * 责任划分 + */ + private String zrhf; + + /** + * 责任认定说明 + */ + private String zrrdsm; + + /** + * 整改措施内容 + */ + private String zgcsnr; + + /** + * 1班组长2分包人 + */ + private String zgfzrType; + + /** + * 整改负责人 + */ + private Long zgfzr; + + /** + * 整改优先级(暂时废弃) + */ + private String zgyxj; + + /** + * 整改时限 + */ + private Date zgsx; + + /** + * 复查人员 + */ + private Long fcry; + + /** + * 整改验收标准 + */ + private String zgysbz; + + /** + * 处理意见 + */ + private String clyj; + + /** + * 调查负责人 + */ + private Long dcfzr; + + /** + * 多文件逗号分隔 + */ + private String file; + + /** + * 审核状态 + */ + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgsb.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgsb.java new file mode 100644 index 00000000..d659414d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgsb.java @@ -0,0 +1,128 @@ +package org.dromara.safety.accident.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 安全-事故上报对象 hse_safety_sgsb + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_safety_sgsb") +public class HseSafetySgsb extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 关联项目 + */ + private Long projectId; + + /** + * 事故编号 + */ + private String sgbh; + + /** + * 事发时间 + */ + private Date sfsj; + + /** + * 事发地点 + */ + private String sfdd; + + /** + * 事故类型 + */ + private String sglx; + + /** + * 事故等级 + */ + private String sgdj; + + /** + * 死亡人数 + */ + private Long swrs; + + /** + * 重伤人数 + */ + private Long zsrs; + + /** + * 轻伤人数 + */ + private Long qsrs; + + /** + * 人员信息 + */ + private String ryxx; + + /** + * 初步估算(万元-角分) + */ + private Long cbgs; + + /** + * 事故原因 + */ + private String sgyy; + + /** + * 联系方式 + */ + private String lxfs; + + /** + * 上报渠道 + */ + private String sbqd; + + /** + * 接收人 + */ + private Long jsr; + + /** + * 紧急措施 + */ + private String jjcs; + + /** + * 文件id逗号分隔 + */ + private String file; + + /** + * 审核状态 + */ + private String shzt; + + /** + * 事故状态(待上报,已上报,待调查,待整改,已整改,需整改,已闭环) + */ + private String sgzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgzgbh.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgzgbh.java new file mode 100644 index 00000000..839bd331 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetySgzgbh.java @@ -0,0 +1,118 @@ +package org.dromara.safety.accident.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 安全-事故整改闭环对象 hse_safety_sgzgbh + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_safety_sgzgbh") +public class HseSafetySgzgbh extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 整改闭环编号 + */ + private String zgbhbh; + + /** + * 关联项目 + */ + private Long projectId; + + /** + * 事故编号 + */ + private String sgbh; + + /** + * 事发时间 + */ + private Date sfsj; + + /** + * 事发地点 + */ + private String sfdd; + + /** + * 事故类型 + */ + private String sglx; + + /** + * 事故等级 + */ + private String sgdj; + + /** + * 事故原因 + */ + private String sgyy; + + /** + * 调查人 + */ + private Long jsr; + + /** + * 上报人 + */ + private Long sbr; + + /** + * 上报时间 + */ + private Date sbsj; + + /** + * 整改状态 + */ + private String zgStatus; + + /** + * 整改人 + */ + private Long zgr; + + /** + * 复查状态 + */ + private String fcStatus; + + /** + * 复查人 + */ + private Long fcr; + + /** + * 最终闭环状态 + */ + private String reviewStatus; + + /** + * 审核状态 + */ + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetyZgxx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetyZgxx.java new file mode 100644 index 00000000..38bcc51c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/HseSafetyZgxx.java @@ -0,0 +1,78 @@ +package org.dromara.safety.accident.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 安全事故整改信息对象 hse_safety_zgxx + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hse_safety_zgxx") +public class HseSafetyZgxx extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 安全事故整改与闭环ID + */ + private Long masterId; + + /** + * 整改责任人 + */ + private Long abarbeitung; + + /** + * 整改开始日期 + */ + private Date abarbeitungKsdate; + + /** + * 整改结束日期 + */ + private Date abarbeitungJsdate; + + /** + * 整改措施 + */ + private String abarbeitungMeasure; + + /** + * 整改完成情况 + */ + private String abarbeitungAccomplish; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + /** + * 顺序 + */ + private Long sort; + + /** + * pdf文件（多个文件逗号分隔） + */ + private String pdfId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetyFcxxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetyFcxxBo.java new file mode 100644 index 00000000..a8887262 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetyFcxxBo.java @@ -0,0 +1,89 @@ +package org.dromara.safety.accident.domain.bo; + +import org.dromara.safety.accident.domain.HseSafetyFcxx; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 安全事故复查信息业务对象 hse_safety_fcxx + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseSafetyFcxx.class, reverseConvertGenerate = false) +public class HseSafetyFcxxBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 安全事故整改与闭环ID + */ + @NotNull(message = "安全事故整改与闭环ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long masterId; + + /** + * 整改ID + */ + @NotNull(message = "整改ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long zgId; + + /** + * 复查人 + */ + @NotNull(message = "复查人不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long review; + + /** + * 复查日期 + */ + @NotNull(message = "复查日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date reviewDate; + + /** + * 复查意见 + */ + @NotBlank(message = "复查意见不能为空", groups = { AddGroup.class, EditGroup.class }) + private String reviewOpinion; + + /** + * 复查状态 + */ + @NotBlank(message = "复查状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private String reviewState; + + /** + * 不通过原因 + */ + private String notPassCause; + + /** + * 复查意见详情 + */ + @NotBlank(message = "复查意见详情不能为空", groups = { AddGroup.class, EditGroup.class }) + private String reviewOpinionParticulars; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + /** + * pdf文件（多个文件逗号分隔） + */ + private String pdfId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgdanjlBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgdanjlBo.java new file mode 100644 index 00000000..9d04cc9a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgdanjlBo.java @@ -0,0 +1,117 @@ +package org.dromara.safety.accident.domain.bo; + +import org.dromara.safety.accident.domain.HseSafetySgdanjl; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 安全-事故档案记录业务对象 hse_safety_sgdanjl + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseSafetySgdanjl.class, reverseConvertGenerate = false) +public class HseSafetySgdanjlBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 档案编号 + */ + private String danbh; + + /** + * 关联项目 + */ + private String project; + + /** + * 事故编号 + */ + private String sgbh; + + /** + * 事发时间 + */ + private Date sfsj; + + /** + * 事发地点 + */ + private String sfdd; + + /** + * 事故类型 + */ + private String sglx; + + /** + * 事故等级 + */ + private String sgdj; + + /** + * 事故原因 + */ + private String sgyy; + + /** + * 事故详情 + */ + private String sgxq; + + /** + * 调查详情 + */ + private String dcxq; + + /** + * 整改与复查详情 + */ + private String zgfcxq; + + /** + * 档案管理人 + */ + private String danglr; + + /** + * 档案保存期限 + */ + private String storageLife; + + /** + * 电子档案存储位置 + */ + private String dzdanccwz; + + /** + * 纸质档案存放位置 + */ + private String zzdancfwz; + + /** + * 档案备注 + */ + private String remarks; + + /** + * 审核状态 + */ + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgdcBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgdcBo.java new file mode 100644 index 00000000..764b0b85 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgdcBo.java @@ -0,0 +1,157 @@ +package org.dromara.safety.accident.domain.bo; + +import org.dromara.safety.accident.domain.HseSafetySgdc; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 安全-事故调查业务对象 hse_safety_sgdc + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseSafetySgdc.class, reverseConvertGenerate = false) +public class HseSafetySgdcBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 调查编号 + */ + private String dcbh; + + /** + * 关联事故id + */ + private Long sgId; + + /** + * 调查小组 + */ + private String dcxz; + + /** + * 调查开始时间 + */ + private Date dckssj; + + /** + * 调查结束时间 + */ + private Date dcjssj; + + /** + * 事故详细经过 + */ + private String sgxxjg; + + /** + * 直接原因 + */ + private String zjjy; + + /** + * 间接原因 + */ + private String jjyy; + + /** + * 证据材料说明 + */ + private String zjcl; + + /** + * 责任部门 + */ + private Long zrbm; + + /** + * 主要负责人 + */ + private Long zyfzr; + + /** + * 次要负责人 + */ + private Long cyfzr; + + /** + * 责任划分 + */ + private String zrhf; + + /** + * 责任认定说明 + */ + private String zrrdsm; + + /** + * 整改措施内容 + */ + private String zgcsnr; + + /** + * 1班组长2分包人 + */ + private String zgfzrType; + + /** + * 整改负责人 + */ + private Long zgfzr; + + /** + * 整改优先级(暂时废弃) + */ + private String zgyxj; + + /** + * 整改时限 + */ + private Date zgsx; + + /** + * 复查人员 + */ + private Long fcry; + + /** + * 整改验收标准 + */ + private String zgysbz; + + /** + * 处理意见 + */ + private String clyj; + + /** + * 调查负责人 + */ + private Long dcfzr; + + /** + * 多文件逗号分隔 + */ + private String file; + + /** + * 审核状态 + */ + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgsbBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgsbBo.java new file mode 100644 index 00000000..9c618a33 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgsbBo.java @@ -0,0 +1,127 @@ +package org.dromara.safety.accident.domain.bo; + +import org.dromara.safety.accident.domain.HseSafetySgsb; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 安全-事故上报业务对象 hse_safety_sgsb + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseSafetySgsb.class, reverseConvertGenerate = false) +public class HseSafetySgsbBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 关联项目 + */ + private Long projectId; + + /** + * 事故编号 + */ + private String sgbh; + + /** + * 事发时间 + */ + private Date sfsj; + + /** + * 事发地点 + */ + private String sfdd; + + /** + * 事故类型 + */ + private String sglx; + + /** + * 事故等级 + */ + private String sgdj; + + /** + * 死亡人数 + */ + private Long swrs; + + /** + * 重伤人数 + */ + private Long zsrs; + + /** + * 轻伤人数 + */ + private Long qsrs; + + /** + * 人员信息 + */ + private String ryxx; + + /** + * 初步估算(万元-角分) + */ + private Long cbgs; + + /** + * 事故原因 + */ + private String sgyy; + + /** + * 联系方式 + */ + private String lxfs; + + /** + * 上报渠道 + */ + private String sbqd; + + /** + * 接收人 + */ + private Long jsr; + + /** + * 紧急措施 + */ + private String jjcs; + + /** + * 文件id逗号分隔 + */ + private String file; + + /** + * 审核状态 + */ + private String shzt; + + /** + * 事故状态(待上报,已上报,待调查,待整改,已整改,需整改,已闭环) + */ + private String sgzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgzgbhBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgzgbhBo.java new file mode 100644 index 00000000..b77896a7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetySgzgbhBo.java @@ -0,0 +1,117 @@ +package org.dromara.safety.accident.domain.bo; + +import org.dromara.safety.accident.domain.HseSafetySgzgbh; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 安全-事故整改闭环业务对象 hse_safety_sgzgbh + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseSafetySgzgbh.class, reverseConvertGenerate = false) +public class HseSafetySgzgbhBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 整改闭环编号 + */ + private String zgbhbh; + + /** + * 关联项目 + */ + private Long projectId; + + /** + * 事故编号 + */ + private String sgbh; + + /** + * 事发时间 + */ + private Date sfsj; + + /** + * 事发地点 + */ + private String sfdd; + + /** + * 事故类型 + */ + private String sglx; + + /** + * 事故等级 + */ + private String sgdj; + + /** + * 事故原因 + */ + private String sgyy; + + /** + * 调查人 + */ + private Long jsr; + + /** + * 上报人 + */ + private Long sbr; + + /** + * 上报时间 + */ + private Date sbsj; + + /** + * 整改状态 + */ + private String zgStatus; + + /** + * 整改人 + */ + private Long zgr; + + /** + * 复查状态 + */ + private String fcStatus; + + /** + * 复查人 + */ + private Long fcr; + + /** + * 最终闭环状态 + */ + private String reviewStatus; + + /** + * 审核状态 + */ + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetyZgxxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetyZgxxBo.java new file mode 100644 index 00000000..a1d07c82 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/bo/HseSafetyZgxxBo.java @@ -0,0 +1,83 @@ +package org.dromara.safety.accident.domain.bo; + +import org.dromara.safety.accident.domain.HseSafetyZgxx; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 安全事故整改信息业务对象 hse_safety_zgxx + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HseSafetyZgxx.class, reverseConvertGenerate = false) +public class HseSafetyZgxxBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 安全事故整改与闭环ID + */ + @NotNull(message = "安全事故整改与闭环ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long masterId; + + /** + * 整改责任人 + */ + @NotNull(message = "整改责任人不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long abarbeitung; + + /** + * 整改开始日期 + */ + @NotNull(message = "整改开始日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date abarbeitungKsdate; + + /** + * 整改结束日期 + */ + @NotNull(message = "整改结束日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date abarbeitungJsdate; + + /** + * 整改措施 + */ + @NotBlank(message = "整改措施不能为空", groups = { AddGroup.class, EditGroup.class }) + private String abarbeitungMeasure; + + /** + * 整改完成情况 + */ + @NotBlank(message = "整改完成情况不能为空", groups = { AddGroup.class, EditGroup.class }) + private String abarbeitungAccomplish; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + /** + * 顺序 + */ + private Long sort; + + /** + * pdf文件（多个文件逗号分隔） + */ + private String pdfId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetyFcxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetyFcxxVo.java new file mode 100644 index 00000000..ebef3a91 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetyFcxxVo.java @@ -0,0 +1,102 @@ +package org.dromara.safety.accident.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.safety.accident.domain.HseSafetyFcxx; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 安全事故复查信息视图对象 hse_safety_fcxx + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseSafetyFcxx.class) +public class HseSafetyFcxxVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 安全事故整改与闭环ID + */ + @ExcelProperty(value = "安全事故整改与闭环ID") + private Long masterId; + + /** + * 整改ID + */ + @ExcelProperty(value = "整改ID") + private Long zgId; + + /** + * 复查人 + */ + @ExcelProperty(value = "复查人") + private Long review; + + /** + * 复查日期 + */ + @ExcelProperty(value = "复查日期") + private Date reviewDate; + + /** + * 复查意见 + */ + @ExcelProperty(value = "复查意见") + private String reviewOpinion; + + /** + * 复查状态 + */ + @ExcelProperty(value = "复查状态") + private String reviewState; + + /** + * 不通过原因 + */ + @ExcelProperty(value = "不通过原因") + private String notPassCause; + + /** + * 复查意见详情 + */ + @ExcelProperty(value = "复查意见详情") + private String reviewOpinionParticulars; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + /** + * pdf文件（多个文件逗号分隔） + */ + @ExcelProperty(value = "pdf文件", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String pdfId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdanjlVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdanjlVo.java new file mode 100644 index 00000000..48adfbf9 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdanjlVo.java @@ -0,0 +1,142 @@ +package org.dromara.safety.accident.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.safety.accident.domain.HseSafetySgdanjl; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 安全-事故档案记录视图对象 hse_safety_sgdanjl + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseSafetySgdanjl.class) +public class HseSafetySgdanjlVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 档案编号 + */ + @ExcelProperty(value = "档案编号") + private String danbh; + + /** + * 关联项目 + */ + @ExcelProperty(value = "关联项目") + private String project; + + /** + * 事故编号 + */ + @ExcelProperty(value = "事故编号") + private String sgbh; + + /** + * 事发时间 + */ + @ExcelProperty(value = "事发时间") + private Date sfsj; + + /** + * 事发地点 + */ + @ExcelProperty(value = "事发地点") + private String sfdd; + + /** + * 事故类型 + */ + @ExcelProperty(value = "事故类型") + private String sglx; + + /** + * 事故等级 + */ + @ExcelProperty(value = "事故等级") + private String sgdj; + + /** + * 事故原因 + */ + @ExcelProperty(value = "事故原因") + private String sgyy; + + /** + * 事故详情 + */ + @ExcelProperty(value = "事故详情") + private String sgxq; + + /** + * 调查详情 + */ + @ExcelProperty(value = "调查详情") + private String dcxq; + + /** + * 整改与复查详情 + */ + @ExcelProperty(value = "整改与复查详情") + private String zgfcxq; + + /** + * 档案管理人 + */ + @ExcelProperty(value = "档案管理人") + private String danglr; + + /** + * 档案保存期限 + */ + @ExcelProperty(value = "档案保存期限") + private String storageLife; + + /** + * 电子档案存储位置 + */ + @ExcelProperty(value = "电子档案存储位置") + private String dzdanccwz; + + /** + * 纸质档案存放位置 + */ + @ExcelProperty(value = "纸质档案存放位置") + private String zzdancfwz; + + /** + * 档案备注 + */ + @ExcelProperty(value = "档案备注") + private String remarks; + + /** + * 审核状态 + */ + @ExcelProperty(value = "审核状态") + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java new file mode 100644 index 00000000..8361b8b1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java @@ -0,0 +1,190 @@ +package org.dromara.safety.accident.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.safety.accident.domain.HseSafetySgdc; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 安全-事故调查视图对象 hse_safety_sgdc + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseSafetySgdc.class) +public class HseSafetySgdcVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 调查编号 + */ + @ExcelProperty(value = "调查编号") + private String dcbh; + + /** + * 关联事故id + */ + @ExcelProperty(value = "关联事故id") + private Long sgId; + + /** + * 调查小组 + */ + @ExcelProperty(value = "调查小组") + private String dcxz; + + /** + * 调查开始时间 + */ + @ExcelProperty(value = "调查开始时间") + private Date dckssj; + + /** + * 调查结束时间 + */ + @ExcelProperty(value = "调查结束时间") + private Date dcjssj; + + /** + * 事故详细经过 + */ + @ExcelProperty(value = "事故详细经过") + private String sgxxjg; + + /** + * 直接原因 + */ + @ExcelProperty(value = "直接原因") + private String zjjy; + + /** + * 间接原因 + */ + @ExcelProperty(value = "间接原因") + private String jjyy; + + /** + * 证据材料说明 + */ + @ExcelProperty(value = "证据材料说明") + private String zjcl; + + /** + * 责任部门 + */ + @ExcelProperty(value = "责任部门") + private Long zrbm; + + /** + * 主要负责人 + */ + @ExcelProperty(value = "主要负责人") + private Long zyfzr; + + /** + * 次要负责人 + */ + @ExcelProperty(value = "次要负责人") + private Long cyfzr; + + /** + * 责任划分 + */ + @ExcelProperty(value = "责任划分") + private String zrhf; + + /** + * 责任认定说明 + */ + @ExcelProperty(value = "责任认定说明") + private String zrrdsm; + + /** + * 整改措施内容 + */ + @ExcelProperty(value = "整改措施内容") + private String zgcsnr; + + /** + * 1班组长2分包人 + */ + @ExcelProperty(value = "1班组长2分包人") + private String zgfzrType; + + /** + * 整改负责人 + */ + @ExcelProperty(value = "整改负责人") + private Long zgfzr; + + /** + * 整改优先级(暂时废弃) + */ + @ExcelProperty(value = "整改优先级(暂时废弃)") + private String zgyxj; + + /** + * 整改时限 + */ + @ExcelProperty(value = "整改时限") + private Date zgsx; + + /** + * 复查人员 + */ + @ExcelProperty(value = "复查人员") + private Long fcry; + + /** + * 整改验收标准 + */ + @ExcelProperty(value = "整改验收标准") + private String zgysbz; + + /** + * 处理意见 + */ + @ExcelProperty(value = "处理意见") + private String clyj; + + /** + * 调查负责人 + */ + @ExcelProperty(value = "调查负责人") + private Long dcfzr; + + /** + * 多文件逗号分隔 + */ + @ExcelProperty(value = "多文件逗号分隔") + private String file; + + /** + * 审核状态 + */ + @ExcelProperty(value = "审核状态") + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgsbVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgsbVo.java new file mode 100644 index 00000000..7e619ecd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgsbVo.java @@ -0,0 +1,154 @@ +package org.dromara.safety.accident.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.safety.accident.domain.HseSafetySgsb; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 安全-事故上报视图对象 hse_safety_sgsb + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseSafetySgsb.class) +public class HseSafetySgsbVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 关联项目 + */ + @ExcelProperty(value = "关联项目") + private Long projectId; + + /** + * 事故编号 + */ + @ExcelProperty(value = "事故编号") + private String sgbh; + + /** + * 事发时间 + */ + @ExcelProperty(value = "事发时间") + private Date sfsj; + + /** + * 事发地点 + */ + @ExcelProperty(value = "事发地点") + private String sfdd; + + /** + * 事故类型 + */ + @ExcelProperty(value = "事故类型") + private String sglx; + + /** + * 事故等级 + */ + @ExcelProperty(value = "事故等级") + private String sgdj; + + /** + * 死亡人数 + */ + @ExcelProperty(value = "死亡人数") + private Long swrs; + + /** + * 重伤人数 + */ + @ExcelProperty(value = "重伤人数") + private Long zsrs; + + /** + * 轻伤人数 + */ + @ExcelProperty(value = "轻伤人数") + private Long qsrs; + + /** + * 人员信息 + */ + @ExcelProperty(value = "人员信息") + private String ryxx; + + /** + * 初步估算(万元-角分) + */ + @ExcelProperty(value = "初步估算(万元-角分)") + private Long cbgs; + + /** + * 事故原因 + */ + @ExcelProperty(value = "事故原因") + private String sgyy; + + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式") + private String lxfs; + + /** + * 上报渠道 + */ + @ExcelProperty(value = "上报渠道") + private String sbqd; + + /** + * 接收人 + */ + @ExcelProperty(value = "接收人") + private Long jsr; + + /** + * 紧急措施 + */ + @ExcelProperty(value = "紧急措施") + private String jjcs; + + /** + * 文件id逗号分隔 + */ + @ExcelProperty(value = "文件id逗号分隔") + private String file; + + /** + * 审核状态 + */ + @ExcelProperty(value = "审核状态") + private String shzt; + + /** + * 事故状态(待上报,已上报,待调查,待整改,已整改,需整改,已闭环) + */ + @ExcelProperty(value = "事故状态(待上报,已上报,待调查,待整改,已整改,需整改,已闭环)") + private String sgzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgzgbhVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgzgbhVo.java new file mode 100644 index 00000000..61e7d4b7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgzgbhVo.java @@ -0,0 +1,142 @@ +package org.dromara.safety.accident.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.safety.accident.domain.HseSafetySgzgbh; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 安全-事故整改闭环视图对象 hse_safety_sgzgbh + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseSafetySgzgbh.class) +public class HseSafetySgzgbhVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 整改闭环编号 + */ + @ExcelProperty(value = "整改闭环编号") + private String zgbhbh; + + /** + * 关联项目 + */ + @ExcelProperty(value = "关联项目") + private Long projectId; + + /** + * 事故编号 + */ + @ExcelProperty(value = "事故编号") + private String sgbh; + + /** + * 事发时间 + */ + @ExcelProperty(value = "事发时间") + private Date sfsj; + + /** + * 事发地点 + */ + @ExcelProperty(value = "事发地点") + private String sfdd; + + /** + * 事故类型 + */ + @ExcelProperty(value = "事故类型") + private String sglx; + + /** + * 事故等级 + */ + @ExcelProperty(value = "事故等级") + private String sgdj; + + /** + * 事故原因 + */ + @ExcelProperty(value = "事故原因") + private String sgyy; + + /** + * 调查人 + */ + @ExcelProperty(value = "调查人") + private Long jsr; + + /** + * 上报人 + */ + @ExcelProperty(value = "上报人") + private Long sbr; + + /** + * 上报时间 + */ + @ExcelProperty(value = "上报时间") + private Date sbsj; + + /** + * 整改状态 + */ + @ExcelProperty(value = "整改状态") + private String zgStatus; + + /** + * 整改人 + */ + @ExcelProperty(value = "整改人") + private Long zgr; + + /** + * 复查状态 + */ + @ExcelProperty(value = "复查状态") + private String fcStatus; + + /** + * 复查人 + */ + @ExcelProperty(value = "复查人") + private Long fcr; + + /** + * 最终闭环状态 + */ + @ExcelProperty(value = "最终闭环状态") + private String reviewStatus; + + /** + * 审核状态 + */ + @ExcelProperty(value = "审核状态") + private String shzt; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetyZgxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetyZgxxVo.java new file mode 100644 index 00000000..7661d833 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetyZgxxVo.java @@ -0,0 +1,96 @@ +package org.dromara.safety.accident.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.safety.accident.domain.HseSafetyZgxx; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 安全事故整改信息视图对象 hse_safety_zgxx + * + * @author Lion Li + * @date 2025-12-05 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HseSafetyZgxx.class) +public class HseSafetyZgxxVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 安全事故整改与闭环ID + */ + @ExcelProperty(value = "安全事故整改与闭环ID") + private Long masterId; + + /** + * 整改责任人 + */ + @ExcelProperty(value = "整改责任人") + private Long abarbeitung; + + /** + * 整改开始日期 + */ + @ExcelProperty(value = "整改开始日期") + private Date abarbeitungKsdate; + + /** + * 整改结束日期 + */ + @ExcelProperty(value = "整改结束日期") + private Date abarbeitungJsdate; + + /** + * 整改措施 + */ + @ExcelProperty(value = "整改措施") + private String abarbeitungMeasure; + + /** + * 整改完成情况 + */ + @ExcelProperty(value = "整改完成情况") + private String abarbeitungAccomplish; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + /** + * 顺序 + */ + @ExcelProperty(value = "顺序") + private Long sort; + + /** + * pdf文件（多个文件逗号分隔） + */ + @ExcelProperty(value = "pdf文件", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String pdfId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetyFcxxMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetyFcxxMapper.java new file mode 100644 index 00000000..18c1e547 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetyFcxxMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.accident.mapper; + +import org.dromara.safety.accident.domain.HseSafetyFcxx; +import org.dromara.safety.accident.domain.vo.HseSafetyFcxxVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 安全事故复查信息Mapper接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface HseSafetyFcxxMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdanjlMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdanjlMapper.java new file mode 100644 index 00000000..a8db1412 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdanjlMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.accident.mapper; + +import org.dromara.safety.accident.domain.HseSafetySgdanjl; +import org.dromara.safety.accident.domain.vo.HseSafetySgdanjlVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 安全-事故档案记录Mapper接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface HseSafetySgdanjlMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java new file mode 100644 index 00000000..92ca2084 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.accident.mapper; + +import org.dromara.safety.accident.domain.HseSafetySgdc; +import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 安全-事故调查Mapper接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface HseSafetySgdcMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgsbMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgsbMapper.java new file mode 100644 index 00000000..fe52737a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgsbMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.accident.mapper; + +import org.dromara.safety.accident.domain.HseSafetySgsb; +import org.dromara.safety.accident.domain.vo.HseSafetySgsbVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 安全-事故上报Mapper接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface HseSafetySgsbMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgzgbhMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgzgbhMapper.java new file mode 100644 index 00000000..3d6dc8a6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgzgbhMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.accident.mapper; + +import org.dromara.safety.accident.domain.HseSafetySgzgbh; +import org.dromara.safety.accident.domain.vo.HseSafetySgzgbhVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 安全-事故整改闭环Mapper接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface HseSafetySgzgbhMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetyZgxxMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetyZgxxMapper.java new file mode 100644 index 00000000..9c422dd7 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetyZgxxMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.accident.mapper; + +import org.dromara.safety.accident.domain.HseSafetyZgxx; +import org.dromara.safety.accident.domain.vo.HseSafetyZgxxVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 安全事故整改信息Mapper接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface HseSafetyZgxxMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetyFcxxService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetyFcxxService.java new file mode 100644 index 00000000..71f0f068 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetyFcxxService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.accident.service; + +import org.dromara.safety.accident.domain.vo.HseSafetyFcxxVo; +import org.dromara.safety.accident.domain.bo.HseSafetyFcxxBo; +import org.dromara.safety.accident.domain.HseSafetyFcxx; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 安全事故复查信息Service接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface IHseSafetyFcxxService extends IService{ + + /** + * 查询安全事故复查信息 + * + * @param id 主键 + * @return 安全事故复查信息 + */ + HseSafetyFcxxVo queryById(Long id); + + /** + * 分页查询安全事故复查信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全事故复查信息分页列表 + */ + TableDataInfo queryPageList(HseSafetyFcxxBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的安全事故复查信息列表 + * + * @param bo 查询条件 + * @return 安全事故复查信息列表 + */ + List queryList(HseSafetyFcxxBo bo); + + /** + * 新增安全事故复查信息 + * + * @param bo 安全事故复查信息 + * @return 是否新增成功 + */ + Boolean insertByBo(HseSafetyFcxxBo bo); + + /** + * 修改安全事故复查信息 + * + * @param bo 安全事故复查信息 + * @return 是否修改成功 + */ + Boolean updateByBo(HseSafetyFcxxBo bo); + + /** + * 校验并批量删除安全事故复查信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgdanjlService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgdanjlService.java new file mode 100644 index 00000000..11d083d5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgdanjlService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.accident.service; + +import org.dromara.safety.accident.domain.vo.HseSafetySgdanjlVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgdanjlBo; +import org.dromara.safety.accident.domain.HseSafetySgdanjl; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 安全-事故档案记录Service接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface IHseSafetySgdanjlService extends IService{ + + /** + * 查询安全-事故档案记录 + * + * @param id 主键 + * @return 安全-事故档案记录 + */ + HseSafetySgdanjlVo queryById(Long id); + + /** + * 分页查询安全-事故档案记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故档案记录分页列表 + */ + TableDataInfo queryPageList(HseSafetySgdanjlBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的安全-事故档案记录列表 + * + * @param bo 查询条件 + * @return 安全-事故档案记录列表 + */ + List queryList(HseSafetySgdanjlBo bo); + + /** + * 新增安全-事故档案记录 + * + * @param bo 安全-事故档案记录 + * @return 是否新增成功 + */ + Boolean insertByBo(HseSafetySgdanjlBo bo); + + /** + * 修改安全-事故档案记录 + * + * @param bo 安全-事故档案记录 + * @return 是否修改成功 + */ + Boolean updateByBo(HseSafetySgdanjlBo bo); + + /** + * 校验并批量删除安全-事故档案记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgdcService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgdcService.java new file mode 100644 index 00000000..595b7dca --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgdcService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.accident.service; + +import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgdcBo; +import org.dromara.safety.accident.domain.HseSafetySgdc; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 安全-事故调查Service接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface IHseSafetySgdcService extends IService{ + + /** + * 查询安全-事故调查 + * + * @param id 主键 + * @return 安全-事故调查 + */ + HseSafetySgdcVo queryById(Long id); + + /** + * 分页查询安全-事故调查列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故调查分页列表 + */ + TableDataInfo queryPageList(HseSafetySgdcBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的安全-事故调查列表 + * + * @param bo 查询条件 + * @return 安全-事故调查列表 + */ + List queryList(HseSafetySgdcBo bo); + + /** + * 新增安全-事故调查 + * + * @param bo 安全-事故调查 + * @return 是否新增成功 + */ + Boolean insertByBo(HseSafetySgdcBo bo); + + /** + * 修改安全-事故调查 + * + * @param bo 安全-事故调查 + * @return 是否修改成功 + */ + Boolean updateByBo(HseSafetySgdcBo bo); + + /** + * 校验并批量删除安全-事故调查信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgsbService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgsbService.java new file mode 100644 index 00000000..87a3803a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgsbService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.accident.service; + +import org.dromara.safety.accident.domain.vo.HseSafetySgsbVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgsbBo; +import org.dromara.safety.accident.domain.HseSafetySgsb; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 安全-事故上报Service接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface IHseSafetySgsbService extends IService{ + + /** + * 查询安全-事故上报 + * + * @param id 主键 + * @return 安全-事故上报 + */ + HseSafetySgsbVo queryById(Long id); + + /** + * 分页查询安全-事故上报列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故上报分页列表 + */ + TableDataInfo queryPageList(HseSafetySgsbBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的安全-事故上报列表 + * + * @param bo 查询条件 + * @return 安全-事故上报列表 + */ + List queryList(HseSafetySgsbBo bo); + + /** + * 新增安全-事故上报 + * + * @param bo 安全-事故上报 + * @return 是否新增成功 + */ + Boolean insertByBo(HseSafetySgsbBo bo); + + /** + * 修改安全-事故上报 + * + * @param bo 安全-事故上报 + * @return 是否修改成功 + */ + Boolean updateByBo(HseSafetySgsbBo bo); + + /** + * 校验并批量删除安全-事故上报信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgzgbhService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgzgbhService.java new file mode 100644 index 00000000..b03abfac --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetySgzgbhService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.accident.service; + +import org.dromara.safety.accident.domain.vo.HseSafetySgzgbhVo; +import org.dromara.safety.accident.domain.bo.HseSafetySgzgbhBo; +import org.dromara.safety.accident.domain.HseSafetySgzgbh; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 安全-事故整改闭环Service接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface IHseSafetySgzgbhService extends IService{ + + /** + * 查询安全-事故整改闭环 + * + * @param id 主键 + * @return 安全-事故整改闭环 + */ + HseSafetySgzgbhVo queryById(Long id); + + /** + * 分页查询安全-事故整改闭环列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故整改闭环分页列表 + */ + TableDataInfo queryPageList(HseSafetySgzgbhBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的安全-事故整改闭环列表 + * + * @param bo 查询条件 + * @return 安全-事故整改闭环列表 + */ + List queryList(HseSafetySgzgbhBo bo); + + /** + * 新增安全-事故整改闭环 + * + * @param bo 安全-事故整改闭环 + * @return 是否新增成功 + */ + Boolean insertByBo(HseSafetySgzgbhBo bo); + + /** + * 修改安全-事故整改闭环 + * + * @param bo 安全-事故整改闭环 + * @return 是否修改成功 + */ + Boolean updateByBo(HseSafetySgzgbhBo bo); + + /** + * 校验并批量删除安全-事故整改闭环信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetyZgxxService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetyZgxxService.java new file mode 100644 index 00000000..205fa5b1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/IHseSafetyZgxxService.java @@ -0,0 +1,70 @@ +package org.dromara.safety.accident.service; + +import org.dromara.safety.accident.domain.vo.HseSafetyZgxxVo; +import org.dromara.safety.accident.domain.bo.HseSafetyZgxxBo; +import org.dromara.safety.accident.domain.HseSafetyZgxx; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 安全事故整改信息Service接口 + * + * @author Lion Li + * @date 2025-12-05 + */ +public interface IHseSafetyZgxxService extends IService{ + + /** + * 查询安全事故整改信息 + * + * @param id 主键 + * @return 安全事故整改信息 + */ + HseSafetyZgxxVo queryById(Long id); + + /** + * 分页查询安全事故整改信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全事故整改信息分页列表 + */ + TableDataInfo queryPageList(HseSafetyZgxxBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的安全事故整改信息列表 + * + * @param bo 查询条件 + * @return 安全事故整改信息列表 + */ + List queryList(HseSafetyZgxxBo bo); + + /** + * 新增安全事故整改信息 + * + * @param bo 安全事故整改信息 + * @return 是否新增成功 + */ + Boolean insertByBo(HseSafetyZgxxBo bo); + + /** + * 修改安全事故整改信息 + * + * @param bo 安全事故整改信息 + * @return 是否修改成功 + */ + Boolean updateByBo(HseSafetyZgxxBo bo); + + /** + * 校验并批量删除安全事故整改信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetyFcxxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetyFcxxServiceImpl.java new file mode 100644 index 00000000..ab9f1518 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetyFcxxServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.safety.accident.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.accident.domain.bo.HseSafetyFcxxBo; +import org.dromara.safety.accident.domain.vo.HseSafetyFcxxVo; +import org.dromara.safety.accident.domain.HseSafetyFcxx; +import org.dromara.safety.accident.mapper.HseSafetyFcxxMapper; +import org.dromara.safety.accident.service.IHseSafetyFcxxService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 安全事故复查信息Service业务层处理 + * + * @author Lion Li + * @date 2025-12-05 + */ +@RequiredArgsConstructor +@Service +public class HseSafetyFcxxServiceImpl extends ServiceImpl implements IHseSafetyFcxxService { + + private final HseSafetyFcxxMapper baseMapper; + + /** + * 查询安全事故复查信息 + * + * @param id 主键 + * @return 安全事故复查信息 + */ + @Override + public HseSafetyFcxxVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询安全事故复查信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全事故复查信息分页列表 + */ + @Override + public TableDataInfo queryPageList(HseSafetyFcxxBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的安全事故复查信息列表 + * + * @param bo 查询条件 + * @return 安全事故复查信息列表 + */ + @Override + public List queryList(HseSafetyFcxxBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseSafetyFcxxBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseSafetyFcxx::getId); + lqw.eq(bo.getMasterId() != null, HseSafetyFcxx::getMasterId, bo.getMasterId()); + lqw.eq(bo.getZgId() != null, HseSafetyFcxx::getZgId, bo.getZgId()); + lqw.eq(bo.getReview() != null, HseSafetyFcxx::getReview, bo.getReview()); + lqw.eq(bo.getReviewDate() != null, HseSafetyFcxx::getReviewDate, bo.getReviewDate()); + lqw.eq(StringUtils.isNotBlank(bo.getReviewOpinion()), HseSafetyFcxx::getReviewOpinion, bo.getReviewOpinion()); + lqw.eq(StringUtils.isNotBlank(bo.getReviewState()), HseSafetyFcxx::getReviewState, bo.getReviewState()); + lqw.eq(StringUtils.isNotBlank(bo.getNotPassCause()), HseSafetyFcxx::getNotPassCause, bo.getNotPassCause()); + lqw.eq(StringUtils.isNotBlank(bo.getReviewOpinionParticulars()), HseSafetyFcxx::getReviewOpinionParticulars, bo.getReviewOpinionParticulars()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), HseSafetyFcxx::getFileId, bo.getFileId()); + lqw.eq(StringUtils.isNotBlank(bo.getPdfId()), HseSafetyFcxx::getPdfId, bo.getPdfId()); + return lqw; + } + + /** + * 新增安全事故复查信息 + * + * @param bo 安全事故复查信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseSafetyFcxxBo bo) { + HseSafetyFcxx add = MapstructUtils.convert(bo, HseSafetyFcxx.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改安全事故复查信息 + * + * @param bo 安全事故复查信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseSafetyFcxxBo bo) { + HseSafetyFcxx update = MapstructUtils.convert(bo, HseSafetyFcxx.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseSafetyFcxx entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除安全事故复查信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdanjlServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdanjlServiceImpl.java new file mode 100644 index 00000000..21da4595 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdanjlServiceImpl.java @@ -0,0 +1,147 @@ +package org.dromara.safety.accident.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.accident.domain.bo.HseSafetySgdanjlBo; +import org.dromara.safety.accident.domain.vo.HseSafetySgdanjlVo; +import org.dromara.safety.accident.domain.HseSafetySgdanjl; +import org.dromara.safety.accident.mapper.HseSafetySgdanjlMapper; +import org.dromara.safety.accident.service.IHseSafetySgdanjlService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 安全-事故档案记录Service业务层处理 + * + * @author Lion Li + * @date 2025-12-05 + */ +@RequiredArgsConstructor +@Service +public class HseSafetySgdanjlServiceImpl extends ServiceImpl implements IHseSafetySgdanjlService { + + private final HseSafetySgdanjlMapper baseMapper; + + /** + * 查询安全-事故档案记录 + * + * @param id 主键 + * @return 安全-事故档案记录 + */ + @Override + public HseSafetySgdanjlVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询安全-事故档案记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故档案记录分页列表 + */ + @Override + public TableDataInfo queryPageList(HseSafetySgdanjlBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的安全-事故档案记录列表 + * + * @param bo 查询条件 + * @return 安全-事故档案记录列表 + */ + @Override + public List queryList(HseSafetySgdanjlBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseSafetySgdanjlBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseSafetySgdanjl::getId); + lqw.eq(StringUtils.isNotBlank(bo.getDanbh()), HseSafetySgdanjl::getDanbh, bo.getDanbh()); + lqw.eq(StringUtils.isNotBlank(bo.getProject()), HseSafetySgdanjl::getProject, bo.getProject()); + lqw.eq(StringUtils.isNotBlank(bo.getSgbh()), HseSafetySgdanjl::getSgbh, bo.getSgbh()); + lqw.eq(bo.getSfsj() != null, HseSafetySgdanjl::getSfsj, bo.getSfsj()); + lqw.eq(StringUtils.isNotBlank(bo.getSfdd()), HseSafetySgdanjl::getSfdd, bo.getSfdd()); + lqw.eq(StringUtils.isNotBlank(bo.getSglx()), HseSafetySgdanjl::getSglx, bo.getSglx()); + lqw.eq(StringUtils.isNotBlank(bo.getSgdj()), HseSafetySgdanjl::getSgdj, bo.getSgdj()); + lqw.eq(StringUtils.isNotBlank(bo.getSgyy()), HseSafetySgdanjl::getSgyy, bo.getSgyy()); + lqw.eq(StringUtils.isNotBlank(bo.getSgxq()), HseSafetySgdanjl::getSgxq, bo.getSgxq()); + lqw.eq(StringUtils.isNotBlank(bo.getDcxq()), HseSafetySgdanjl::getDcxq, bo.getDcxq()); + lqw.eq(StringUtils.isNotBlank(bo.getZgfcxq()), HseSafetySgdanjl::getZgfcxq, bo.getZgfcxq()); + lqw.eq(StringUtils.isNotBlank(bo.getDanglr()), HseSafetySgdanjl::getDanglr, bo.getDanglr()); + lqw.eq(StringUtils.isNotBlank(bo.getStorageLife()), HseSafetySgdanjl::getStorageLife, bo.getStorageLife()); + lqw.eq(StringUtils.isNotBlank(bo.getDzdanccwz()), HseSafetySgdanjl::getDzdanccwz, bo.getDzdanccwz()); + lqw.eq(StringUtils.isNotBlank(bo.getZzdancfwz()), HseSafetySgdanjl::getZzdancfwz, bo.getZzdancfwz()); + lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), HseSafetySgdanjl::getRemarks, bo.getRemarks()); + lqw.eq(StringUtils.isNotBlank(bo.getShzt()), HseSafetySgdanjl::getShzt, bo.getShzt()); + return lqw; + } + + /** + * 新增安全-事故档案记录 + * + * @param bo 安全-事故档案记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseSafetySgdanjlBo bo) { + HseSafetySgdanjl add = MapstructUtils.convert(bo, HseSafetySgdanjl.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改安全-事故档案记录 + * + * @param bo 安全-事故档案记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseSafetySgdanjlBo bo) { + HseSafetySgdanjl update = MapstructUtils.convert(bo, HseSafetySgdanjl.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseSafetySgdanjl entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除安全-事故档案记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java new file mode 100644 index 00000000..e35dc5b9 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java @@ -0,0 +1,155 @@ +package org.dromara.safety.accident.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.accident.domain.bo.HseSafetySgdcBo; +import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo; +import org.dromara.safety.accident.domain.HseSafetySgdc; +import org.dromara.safety.accident.mapper.HseSafetySgdcMapper; +import org.dromara.safety.accident.service.IHseSafetySgdcService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 安全-事故调查Service业务层处理 + * + * @author Lion Li + * @date 2025-12-05 + */ +@RequiredArgsConstructor +@Service +public class HseSafetySgdcServiceImpl extends ServiceImpl implements IHseSafetySgdcService { + + private final HseSafetySgdcMapper baseMapper; + + /** + * 查询安全-事故调查 + * + * @param id 主键 + * @return 安全-事故调查 + */ + @Override + public HseSafetySgdcVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询安全-事故调查列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故调查分页列表 + */ + @Override + public TableDataInfo queryPageList(HseSafetySgdcBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的安全-事故调查列表 + * + * @param bo 查询条件 + * @return 安全-事故调查列表 + */ + @Override + public List queryList(HseSafetySgdcBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseSafetySgdcBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseSafetySgdc::getId); + lqw.eq(StringUtils.isNotBlank(bo.getDcbh()), HseSafetySgdc::getDcbh, bo.getDcbh()); + lqw.eq(bo.getSgId() != null, HseSafetySgdc::getSgId, bo.getSgId()); + lqw.eq(StringUtils.isNotBlank(bo.getDcxz()), HseSafetySgdc::getDcxz, bo.getDcxz()); + lqw.eq(bo.getDckssj() != null, HseSafetySgdc::getDckssj, bo.getDckssj()); + lqw.eq(bo.getDcjssj() != null, HseSafetySgdc::getDcjssj, bo.getDcjssj()); + lqw.eq(StringUtils.isNotBlank(bo.getSgxxjg()), HseSafetySgdc::getSgxxjg, bo.getSgxxjg()); + lqw.eq(StringUtils.isNotBlank(bo.getZjjy()), HseSafetySgdc::getZjjy, bo.getZjjy()); + lqw.eq(StringUtils.isNotBlank(bo.getJjyy()), HseSafetySgdc::getJjyy, bo.getJjyy()); + lqw.eq(StringUtils.isNotBlank(bo.getZjcl()), HseSafetySgdc::getZjcl, bo.getZjcl()); + lqw.eq(bo.getZrbm() != null, HseSafetySgdc::getZrbm, bo.getZrbm()); + lqw.eq(bo.getZyfzr() != null, HseSafetySgdc::getZyfzr, bo.getZyfzr()); + lqw.eq(bo.getCyfzr() != null, HseSafetySgdc::getCyfzr, bo.getCyfzr()); + lqw.eq(StringUtils.isNotBlank(bo.getZrhf()), HseSafetySgdc::getZrhf, bo.getZrhf()); + lqw.eq(StringUtils.isNotBlank(bo.getZrrdsm()), HseSafetySgdc::getZrrdsm, bo.getZrrdsm()); + lqw.eq(StringUtils.isNotBlank(bo.getZgcsnr()), HseSafetySgdc::getZgcsnr, bo.getZgcsnr()); + lqw.eq(StringUtils.isNotBlank(bo.getZgfzrType()), HseSafetySgdc::getZgfzrType, bo.getZgfzrType()); + lqw.eq(bo.getZgfzr() != null, HseSafetySgdc::getZgfzr, bo.getZgfzr()); + lqw.eq(StringUtils.isNotBlank(bo.getZgyxj()), HseSafetySgdc::getZgyxj, bo.getZgyxj()); + lqw.eq(bo.getZgsx() != null, HseSafetySgdc::getZgsx, bo.getZgsx()); + lqw.eq(bo.getFcry() != null, HseSafetySgdc::getFcry, bo.getFcry()); + lqw.eq(StringUtils.isNotBlank(bo.getZgysbz()), HseSafetySgdc::getZgysbz, bo.getZgysbz()); + lqw.eq(StringUtils.isNotBlank(bo.getClyj()), HseSafetySgdc::getClyj, bo.getClyj()); + lqw.eq(bo.getDcfzr() != null, HseSafetySgdc::getDcfzr, bo.getDcfzr()); + lqw.eq(StringUtils.isNotBlank(bo.getFile()), HseSafetySgdc::getFile, bo.getFile()); + lqw.eq(StringUtils.isNotBlank(bo.getShzt()), HseSafetySgdc::getShzt, bo.getShzt()); + return lqw; + } + + /** + * 新增安全-事故调查 + * + * @param bo 安全-事故调查 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseSafetySgdcBo bo) { + HseSafetySgdc add = MapstructUtils.convert(bo, HseSafetySgdc.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改安全-事故调查 + * + * @param bo 安全-事故调查 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseSafetySgdcBo bo) { + HseSafetySgdc update = MapstructUtils.convert(bo, HseSafetySgdc.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseSafetySgdc entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除安全-事故调查信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgsbServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgsbServiceImpl.java new file mode 100644 index 00000000..9fff10dc --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgsbServiceImpl.java @@ -0,0 +1,149 @@ +package org.dromara.safety.accident.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.accident.domain.bo.HseSafetySgsbBo; +import org.dromara.safety.accident.domain.vo.HseSafetySgsbVo; +import org.dromara.safety.accident.domain.HseSafetySgsb; +import org.dromara.safety.accident.mapper.HseSafetySgsbMapper; +import org.dromara.safety.accident.service.IHseSafetySgsbService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 安全-事故上报Service业务层处理 + * + * @author Lion Li + * @date 2025-12-05 + */ +@RequiredArgsConstructor +@Service +public class HseSafetySgsbServiceImpl extends ServiceImpl implements IHseSafetySgsbService { + + private final HseSafetySgsbMapper baseMapper; + + /** + * 查询安全-事故上报 + * + * @param id 主键 + * @return 安全-事故上报 + */ + @Override + public HseSafetySgsbVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询安全-事故上报列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故上报分页列表 + */ + @Override + public TableDataInfo queryPageList(HseSafetySgsbBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的安全-事故上报列表 + * + * @param bo 查询条件 + * @return 安全-事故上报列表 + */ + @Override + public List queryList(HseSafetySgsbBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseSafetySgsbBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseSafetySgsb::getId); + lqw.eq(bo.getProjectId() != null, HseSafetySgsb::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getSgbh()), HseSafetySgsb::getSgbh, bo.getSgbh()); + lqw.eq(bo.getSfsj() != null, HseSafetySgsb::getSfsj, bo.getSfsj()); + lqw.eq(StringUtils.isNotBlank(bo.getSfdd()), HseSafetySgsb::getSfdd, bo.getSfdd()); + lqw.eq(StringUtils.isNotBlank(bo.getSglx()), HseSafetySgsb::getSglx, bo.getSglx()); + lqw.eq(StringUtils.isNotBlank(bo.getSgdj()), HseSafetySgsb::getSgdj, bo.getSgdj()); + lqw.eq(bo.getSwrs() != null, HseSafetySgsb::getSwrs, bo.getSwrs()); + lqw.eq(bo.getZsrs() != null, HseSafetySgsb::getZsrs, bo.getZsrs()); + lqw.eq(bo.getQsrs() != null, HseSafetySgsb::getQsrs, bo.getQsrs()); + lqw.eq(StringUtils.isNotBlank(bo.getRyxx()), HseSafetySgsb::getRyxx, bo.getRyxx()); + lqw.eq(bo.getCbgs() != null, HseSafetySgsb::getCbgs, bo.getCbgs()); + lqw.eq(StringUtils.isNotBlank(bo.getSgyy()), HseSafetySgsb::getSgyy, bo.getSgyy()); + lqw.eq(StringUtils.isNotBlank(bo.getLxfs()), HseSafetySgsb::getLxfs, bo.getLxfs()); + lqw.eq(StringUtils.isNotBlank(bo.getSbqd()), HseSafetySgsb::getSbqd, bo.getSbqd()); + lqw.eq(bo.getJsr() != null, HseSafetySgsb::getJsr, bo.getJsr()); + lqw.eq(StringUtils.isNotBlank(bo.getJjcs()), HseSafetySgsb::getJjcs, bo.getJjcs()); + lqw.eq(StringUtils.isNotBlank(bo.getFile()), HseSafetySgsb::getFile, bo.getFile()); + lqw.eq(StringUtils.isNotBlank(bo.getShzt()), HseSafetySgsb::getShzt, bo.getShzt()); + lqw.eq(StringUtils.isNotBlank(bo.getSgzt()), HseSafetySgsb::getSgzt, bo.getSgzt()); + return lqw; + } + + /** + * 新增安全-事故上报 + * + * @param bo 安全-事故上报 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseSafetySgsbBo bo) { + HseSafetySgsb add = MapstructUtils.convert(bo, HseSafetySgsb.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改安全-事故上报 + * + * @param bo 安全-事故上报 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseSafetySgsbBo bo) { + HseSafetySgsb update = MapstructUtils.convert(bo, HseSafetySgsb.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseSafetySgsb entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除安全-事故上报信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgzgbhServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgzgbhServiceImpl.java new file mode 100644 index 00000000..fdbf756c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgzgbhServiceImpl.java @@ -0,0 +1,147 @@ +package org.dromara.safety.accident.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.accident.domain.bo.HseSafetySgzgbhBo; +import org.dromara.safety.accident.domain.vo.HseSafetySgzgbhVo; +import org.dromara.safety.accident.domain.HseSafetySgzgbh; +import org.dromara.safety.accident.mapper.HseSafetySgzgbhMapper; +import org.dromara.safety.accident.service.IHseSafetySgzgbhService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 安全-事故整改闭环Service业务层处理 + * + * @author Lion Li + * @date 2025-12-05 + */ +@RequiredArgsConstructor +@Service +public class HseSafetySgzgbhServiceImpl extends ServiceImpl implements IHseSafetySgzgbhService { + + private final HseSafetySgzgbhMapper baseMapper; + + /** + * 查询安全-事故整改闭环 + * + * @param id 主键 + * @return 安全-事故整改闭环 + */ + @Override + public HseSafetySgzgbhVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询安全-事故整改闭环列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全-事故整改闭环分页列表 + */ + @Override + public TableDataInfo queryPageList(HseSafetySgzgbhBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的安全-事故整改闭环列表 + * + * @param bo 查询条件 + * @return 安全-事故整改闭环列表 + */ + @Override + public List queryList(HseSafetySgzgbhBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseSafetySgzgbhBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseSafetySgzgbh::getId); + lqw.eq(StringUtils.isNotBlank(bo.getZgbhbh()), HseSafetySgzgbh::getZgbhbh, bo.getZgbhbh()); + lqw.eq(bo.getProjectId() != null, HseSafetySgzgbh::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getSgbh()), HseSafetySgzgbh::getSgbh, bo.getSgbh()); + lqw.eq(bo.getSfsj() != null, HseSafetySgzgbh::getSfsj, bo.getSfsj()); + lqw.eq(StringUtils.isNotBlank(bo.getSfdd()), HseSafetySgzgbh::getSfdd, bo.getSfdd()); + lqw.eq(StringUtils.isNotBlank(bo.getSglx()), HseSafetySgzgbh::getSglx, bo.getSglx()); + lqw.eq(StringUtils.isNotBlank(bo.getSgdj()), HseSafetySgzgbh::getSgdj, bo.getSgdj()); + lqw.eq(StringUtils.isNotBlank(bo.getSgyy()), HseSafetySgzgbh::getSgyy, bo.getSgyy()); + lqw.eq(bo.getJsr() != null, HseSafetySgzgbh::getJsr, bo.getJsr()); + lqw.eq(bo.getSbr() != null, HseSafetySgzgbh::getSbr, bo.getSbr()); + lqw.eq(bo.getSbsj() != null, HseSafetySgzgbh::getSbsj, bo.getSbsj()); + lqw.eq(StringUtils.isNotBlank(bo.getZgStatus()), HseSafetySgzgbh::getZgStatus, bo.getZgStatus()); + lqw.eq(bo.getZgr() != null, HseSafetySgzgbh::getZgr, bo.getZgr()); + lqw.eq(StringUtils.isNotBlank(bo.getFcStatus()), HseSafetySgzgbh::getFcStatus, bo.getFcStatus()); + lqw.eq(bo.getFcr() != null, HseSafetySgzgbh::getFcr, bo.getFcr()); + lqw.eq(StringUtils.isNotBlank(bo.getReviewStatus()), HseSafetySgzgbh::getReviewStatus, bo.getReviewStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getShzt()), HseSafetySgzgbh::getShzt, bo.getShzt()); + return lqw; + } + + /** + * 新增安全-事故整改闭环 + * + * @param bo 安全-事故整改闭环 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseSafetySgzgbhBo bo) { + HseSafetySgzgbh add = MapstructUtils.convert(bo, HseSafetySgzgbh.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改安全-事故整改闭环 + * + * @param bo 安全-事故整改闭环 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseSafetySgzgbhBo bo) { + HseSafetySgzgbh update = MapstructUtils.convert(bo, HseSafetySgzgbh.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseSafetySgzgbh entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除安全-事故整改闭环信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetyZgxxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetyZgxxServiceImpl.java new file mode 100644 index 00000000..53a9769d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetyZgxxServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.safety.accident.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.safety.accident.domain.bo.HseSafetyZgxxBo; +import org.dromara.safety.accident.domain.vo.HseSafetyZgxxVo; +import org.dromara.safety.accident.domain.HseSafetyZgxx; +import org.dromara.safety.accident.mapper.HseSafetyZgxxMapper; +import org.dromara.safety.accident.service.IHseSafetyZgxxService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 安全事故整改信息Service业务层处理 + * + * @author Lion Li + * @date 2025-12-05 + */ +@RequiredArgsConstructor +@Service +public class HseSafetyZgxxServiceImpl extends ServiceImpl implements IHseSafetyZgxxService { + + private final HseSafetyZgxxMapper baseMapper; + + /** + * 查询安全事故整改信息 + * + * @param id 主键 + * @return 安全事故整改信息 + */ + @Override + public HseSafetyZgxxVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询安全事故整改信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 安全事故整改信息分页列表 + */ + @Override + public TableDataInfo queryPageList(HseSafetyZgxxBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的安全事故整改信息列表 + * + * @param bo 查询条件 + * @return 安全事故整改信息列表 + */ + @Override + public List queryList(HseSafetyZgxxBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HseSafetyZgxxBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(HseSafetyZgxx::getId); + lqw.eq(bo.getMasterId() != null, HseSafetyZgxx::getMasterId, bo.getMasterId()); + lqw.eq(bo.getAbarbeitung() != null, HseSafetyZgxx::getAbarbeitung, bo.getAbarbeitung()); + lqw.eq(bo.getAbarbeitungKsdate() != null, HseSafetyZgxx::getAbarbeitungKsdate, bo.getAbarbeitungKsdate()); + lqw.eq(bo.getAbarbeitungJsdate() != null, HseSafetyZgxx::getAbarbeitungJsdate, bo.getAbarbeitungJsdate()); + lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungMeasure()), HseSafetyZgxx::getAbarbeitungMeasure, bo.getAbarbeitungMeasure()); + lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungAccomplish()), HseSafetyZgxx::getAbarbeitungAccomplish, bo.getAbarbeitungAccomplish()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), HseSafetyZgxx::getFileId, bo.getFileId()); + lqw.eq(bo.getSort() != null, HseSafetyZgxx::getSort, bo.getSort()); + lqw.eq(StringUtils.isNotBlank(bo.getPdfId()), HseSafetyZgxx::getPdfId, bo.getPdfId()); + return lqw; + } + + /** + * 新增安全事故整改信息 + * + * @param bo 安全事故整改信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HseSafetyZgxxBo bo) { + HseSafetyZgxx add = MapstructUtils.convert(bo, HseSafetyZgxx.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改安全事故整改信息 + * + * @param bo 安全事故整改信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HseSafetyZgxxBo bo) { + HseSafetyZgxx update = MapstructUtils.convert(bo, HseSafetyZgxx.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(HseSafetyZgxx entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除安全事故整改信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetyFcxxMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetyFcxxMapper.xml new file mode 100644 index 00000000..e04c74b0 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetyFcxxMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgdanjlMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgdanjlMapper.xml new file mode 100644 index 00000000..0df5f5d0 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgdanjlMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgdcMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgdcMapper.xml new file mode 100644 index 00000000..472c7e31 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgdcMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgsbMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgsbMapper.xml new file mode 100644 index 00000000..aad26344 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgsbMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgzgbhMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgzgbhMapper.xml new file mode 100644 index 00000000..33a71e64 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetySgzgbhMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetyZgxxMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetyZgxxMapper.xml new file mode 100644 index 00000000..5c49f80e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/accident/HseSafetyZgxxMapper.xml @@ -0,0 +1,7 @@ + + + + +