12-05-事故管理-事故上报、事故调查
This commit is contained in:
@ -1,26 +1,28 @@
|
||||
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 jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
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.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.safety.accident.domain.bo.HseSafetySgdcBo;
|
||||
import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo;
|
||||
import org.dromara.safety.accident.domain.vo.SgsbCountVo;
|
||||
import org.dromara.safety.accident.service.IHseSafetySgdcService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 安全-事故调查
|
||||
@ -102,4 +104,14 @@ public class HseSafetySgdcController extends BaseController {
|
||||
@PathVariable Long[] ids) {
|
||||
return toAjax(hseSafetySgdcService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计数据
|
||||
*/
|
||||
@SaCheckPermission("accident:safetySgdc:list")
|
||||
@GetMapping("/getCountValue")
|
||||
public R<SgsbCountVo> getCountValue() {
|
||||
return R.ok(hseSafetySgdcService.getListCount());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -29,6 +29,11 @@ public class HseSafetySgdc extends BaseEntity {
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 事故关联项目ID
|
||||
*/
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 调查编号
|
||||
*/
|
||||
|
||||
@ -51,12 +51,12 @@ public class HseSafetySgsb extends BaseEntity {
|
||||
private String sfdd;
|
||||
|
||||
/**
|
||||
* 事故类型
|
||||
* 事故类型(1高空坠落2触电3火灾4机械伤害5物体打击6其他)
|
||||
*/
|
||||
private String sglx;
|
||||
|
||||
/**
|
||||
* 事故等级
|
||||
* 事故等级(1一般2较大3重大4特别重大)
|
||||
*/
|
||||
private String sgdj;
|
||||
|
||||
|
||||
@ -27,6 +27,11 @@ public class HseSafetySgdcBo extends BaseEntity {
|
||||
@NotNull(message = "id不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 事故关联项目ID
|
||||
*/
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 调查编号
|
||||
*/
|
||||
|
||||
@ -54,7 +54,7 @@ public class HseSafetySgsbBo extends BaseEntity {
|
||||
private String sglx;
|
||||
|
||||
/**
|
||||
* 事故等级
|
||||
* 事故等级(1一般2较大3重大4特别重大)
|
||||
*/
|
||||
private String sgdj;
|
||||
|
||||
|
||||
@ -44,6 +44,16 @@ public class HseSafetySgdcVo implements Serializable {
|
||||
@ExcelProperty(value = "关联事故id")
|
||||
private Long sgId;
|
||||
|
||||
/**
|
||||
* 事故关联项目ID
|
||||
*/
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 事故编号
|
||||
*/
|
||||
private String sgbh;
|
||||
|
||||
/**
|
||||
* 调查小组
|
||||
*/
|
||||
@ -92,18 +102,33 @@ public class HseSafetySgdcVo implements Serializable {
|
||||
@ExcelProperty(value = "责任部门")
|
||||
private Long zrbm;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String bmmc;
|
||||
|
||||
/**
|
||||
* 主要负责人
|
||||
*/
|
||||
@ExcelProperty(value = "主要负责人")
|
||||
private Long zyfzr;
|
||||
|
||||
/**
|
||||
* 主要责任人名称
|
||||
*/
|
||||
private String zyzrrmc;
|
||||
|
||||
/**
|
||||
* 次要负责人
|
||||
*/
|
||||
@ExcelProperty(value = "次要负责人")
|
||||
private Long cyfzr;
|
||||
|
||||
/**
|
||||
* 次要责任人名称
|
||||
*/
|
||||
private String cyzrrmc;
|
||||
|
||||
/**
|
||||
* 责任划分
|
||||
*/
|
||||
@ -134,6 +159,11 @@ public class HseSafetySgdcVo implements Serializable {
|
||||
@ExcelProperty(value = "整改负责人")
|
||||
private Long zgfzr;
|
||||
|
||||
/**
|
||||
* 整改负责人名称
|
||||
*/
|
||||
private String zgfzrmc;
|
||||
|
||||
/**
|
||||
* 整改优先级(暂时废弃)
|
||||
*/
|
||||
@ -152,6 +182,11 @@ public class HseSafetySgdcVo implements Serializable {
|
||||
@ExcelProperty(value = "复查人员")
|
||||
private Long fcry;
|
||||
|
||||
/**
|
||||
* 复查人员名称
|
||||
*/
|
||||
private String fcrymc;
|
||||
|
||||
/**
|
||||
* 整改验收标准
|
||||
*/
|
||||
@ -170,6 +205,11 @@ public class HseSafetySgdcVo implements Serializable {
|
||||
@ExcelProperty(value = "调查负责人")
|
||||
private Long dcfzr;
|
||||
|
||||
/**
|
||||
* 调查负责人名称
|
||||
*/
|
||||
private String dcfzrmc;
|
||||
|
||||
/**
|
||||
* 多文件逗号分隔
|
||||
*/
|
||||
|
||||
@ -64,7 +64,7 @@ public class HseSafetySgsbVo implements Serializable {
|
||||
private String sglx;
|
||||
|
||||
/**
|
||||
* 事故等级
|
||||
* 事故等级(1一般2较大3重大4特别重大)
|
||||
*/
|
||||
@ExcelProperty(value = "事故等级")
|
||||
private String sgdj;
|
||||
@ -152,5 +152,14 @@ public class HseSafetySgsbVo implements Serializable {
|
||||
@ExcelProperty(value = "事故状态(已上报,待调查,待整改,已整改,,已闭环)")
|
||||
private String sgzt;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private Long createBy;
|
||||
|
||||
/**
|
||||
* 创建人名称
|
||||
*/
|
||||
private String createByName;
|
||||
|
||||
}
|
||||
|
||||
@ -27,4 +27,24 @@ public class SgsbCountVo {
|
||||
*/
|
||||
private BigDecimal sgzgwcl;
|
||||
|
||||
/**
|
||||
* 待调查事故
|
||||
*/
|
||||
private Long ddcsg;
|
||||
|
||||
/**
|
||||
* 调查中事故
|
||||
*/
|
||||
private Long dczsg;
|
||||
|
||||
/**
|
||||
* 已完成调查
|
||||
*/
|
||||
private Long ywcdc;
|
||||
|
||||
/**
|
||||
* 待整改事故
|
||||
*/
|
||||
private Long dzgsg;
|
||||
|
||||
}
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
package org.dromara.safety.accident.mapper;
|
||||
|
||||
import org.dromara.safety.accident.domain.HseSafetySgdc;
|
||||
import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgdc;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgsb;
|
||||
import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 安全-事故调查Mapper接口
|
||||
@ -12,4 +16,10 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
*/
|
||||
public interface HseSafetySgdcMapper extends BaseMapperPlus<HseSafetySgdc, HseSafetySgdcVo> {
|
||||
|
||||
@Select("select * from hse_safety_sgsb where id = #{id}")
|
||||
HseSafetySgsb getSgsb(Long id);
|
||||
|
||||
@Select("select * from hse_safety_sgsb")
|
||||
List<HseSafetySgsb> getSbList();
|
||||
|
||||
}
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
package org.dromara.safety.accident.mapper;
|
||||
|
||||
import org.dromara.safety.accident.domain.HseSafetySgsb;
|
||||
import org.dromara.safety.accident.domain.vo.HseSafetySgsbVo;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgsb;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgzgbh;
|
||||
import org.dromara.safety.accident.domain.vo.HseSafetySgsbVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 安全-事故上报Mapper接口
|
||||
@ -12,4 +16,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
*/
|
||||
public interface HseSafetySgsbMapper extends BaseMapperPlus<HseSafetySgsb, HseSafetySgsbVo> {
|
||||
|
||||
@Select("select * from hse_safety_sgzgbh")
|
||||
List<HseSafetySgzgbh> getSgzgList();
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
package org.dromara.safety.accident.menu;
|
||||
|
||||
public enum SGdjEnum {
|
||||
//事故等级(1一般2较大3重大4特别重大)
|
||||
YB("1", "一般"),
|
||||
JD("2", "较大"),
|
||||
ZD("3", "重大"),
|
||||
TBZD("4", "特别重大");
|
||||
|
||||
private final String code;
|
||||
|
||||
private final String desc;
|
||||
|
||||
SGdjEnum(String code, String desc) {
|
||||
this.code = code;
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package org.dromara.safety.accident.menu;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum SGlxEnum {
|
||||
//事故类型(1高空坠落2触电3火灾4机械伤害5物体打击6其他)
|
||||
|
||||
GKZL("1", "高空坠落"),
|
||||
|
||||
CD("2", "触电"),
|
||||
|
||||
HZ("3", "火灾"),
|
||||
|
||||
JXSH("4", "机械伤害"),
|
||||
|
||||
WTDJ("5", "物体打击"),
|
||||
|
||||
QT("6", "其他");
|
||||
|
||||
private final String code;
|
||||
|
||||
private final String desc;
|
||||
|
||||
SGlxEnum(String code, String desc) {
|
||||
this.code = code;
|
||||
this.desc = desc;
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,13 @@
|
||||
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 org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgdc;
|
||||
import org.dromara.safety.accident.domain.bo.HseSafetySgdcBo;
|
||||
import org.dromara.safety.accident.domain.vo.HseSafetySgdcVo;
|
||||
import org.dromara.safety.accident.domain.vo.SgsbCountVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@ -67,4 +68,10 @@ public interface IHseSafetySgdcService extends IService<HseSafetySgdc>{
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
|
||||
/**
|
||||
* 统计数据
|
||||
* @return
|
||||
*/
|
||||
SgsbCountVo getListCount();
|
||||
}
|
||||
|
||||
@ -1,24 +1,35 @@
|
||||
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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.utils.BatchNumberGenerator;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgdc;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgsb;
|
||||
import org.dromara.safety.accident.domain.HseSafetySgzgbh;
|
||||
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.domain.vo.SgsbCountVo;
|
||||
import org.dromara.safety.accident.mapper.HseSafetySgdcMapper;
|
||||
import org.dromara.safety.accident.menu.SGStatusEnum;
|
||||
import org.dromara.safety.accident.service.IHseSafetySgdcService;
|
||||
import org.dromara.system.domain.vo.SysDeptVo;
|
||||
import org.dromara.system.domain.vo.SysUserVo;
|
||||
import org.dromara.system.service.impl.SysDeptServiceImpl;
|
||||
import org.dromara.system.service.impl.SysUserServiceImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 安全-事故调查Service业务层处理
|
||||
@ -31,6 +42,13 @@ import java.util.Collection;
|
||||
public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, HseSafetySgdc> implements IHseSafetySgdcService {
|
||||
|
||||
private final HseSafetySgdcMapper baseMapper;
|
||||
@Autowired
|
||||
private SysDeptServiceImpl deptService;
|
||||
@Autowired
|
||||
private SysUserServiceImpl userService;
|
||||
@Autowired
|
||||
private HseSafetySgzgbhServiceImpl zgbhService;
|
||||
|
||||
|
||||
/**
|
||||
* 查询安全-事故调查
|
||||
@ -111,6 +129,9 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
|
||||
public Boolean insertByBo(HseSafetySgdcBo bo) {
|
||||
HseSafetySgdc add = MapstructUtils.convert(bo, HseSafetySgdc.class);
|
||||
validEntityBeforeSave(add);
|
||||
//生成调查编号
|
||||
add.setDcbh(BatchNumberGenerator.generateBatchNumber("SGDC-"));
|
||||
add.setBczt("0");
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
@ -128,6 +149,10 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
|
||||
public Boolean updateByBo(HseSafetySgdcBo bo) {
|
||||
HseSafetySgdc update = MapstructUtils.convert(bo, HseSafetySgdc.class);
|
||||
validEntityBeforeSave(update);
|
||||
//如果报错装填审核通过后向事故整改插入数据 这里放在新增
|
||||
if (bo.getBczt().equals("1")) {
|
||||
addZgxx(update.getId());
|
||||
}
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
@ -152,4 +177,174 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 装填数据
|
||||
*/
|
||||
public void setValue(List<HseSafetySgdcVo> vos){
|
||||
List<SysDeptVo> deptVos = new ArrayList<>();
|
||||
if (!vos.isEmpty()) {
|
||||
//获取部门
|
||||
deptVos = deptService.querListDept();
|
||||
}
|
||||
for (HseSafetySgdcVo vo : vos) {
|
||||
//事故关联项目id
|
||||
HseSafetySgsb hseSafetySgsbVo = baseMapper.getSgsb(vo.getSgId());
|
||||
if (hseSafetySgsbVo != null){
|
||||
vo.setProjectId(hseSafetySgsbVo.getProjectId());
|
||||
//事故编号
|
||||
if (hseSafetySgsbVo.getSgbh() != null){
|
||||
vo.setSgbh(hseSafetySgsbVo.getSgbh());
|
||||
}
|
||||
}
|
||||
//部门名称
|
||||
if (vo.getZrbm() != null){
|
||||
for (SysDeptVo deptVo : deptVos) {
|
||||
if (vo.getZrbm().equals(deptVo.getDeptId())){
|
||||
vo.setBmmc(deptVo.getDeptName());
|
||||
}
|
||||
}
|
||||
}
|
||||
//主要负责人
|
||||
if (vo.getZyfzr() != null){
|
||||
SysUserVo sysUserVo = userService.queryById(vo.getZyfzr());
|
||||
if (sysUserVo != null){
|
||||
vo.setZyzrrmc(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
//次要负责人
|
||||
if (vo.getCyfzr() != null){
|
||||
SysUserVo sysUserVo = userService.queryById(vo.getCyfzr());
|
||||
if (sysUserVo != null){
|
||||
vo.setCyzrrmc(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
//整改负责人
|
||||
if (vo.getZgfzrType() != null) {
|
||||
// if (vo.getZgfzrType().equals("1")) {
|
||||
// //班组长
|
||||
//
|
||||
// } else if (vo.getZgfzrType().equals("2")) {
|
||||
// //分包人
|
||||
//
|
||||
// }
|
||||
SysUserVo sysUserVo = userService.queryById(vo.getZgfzr());
|
||||
if (sysUserVo != null){
|
||||
vo.setZgfzrmc(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
|
||||
//复查人员
|
||||
if (vo.getFcry() != null){
|
||||
SysUserVo sysUserVo = userService.queryById(vo.getFcry());
|
||||
if (sysUserVo != null){
|
||||
vo.setFcrymc(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
//调查负责人
|
||||
if (vo.getDcfzr() != null){
|
||||
SysUserVo sysUserVo = userService.queryById(vo.getDcfzr());
|
||||
if (sysUserVo != null){
|
||||
vo.setDcfzrmc(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加整改
|
||||
*/
|
||||
public void addZgxx(Long id){
|
||||
if (id == null){
|
||||
return;
|
||||
}
|
||||
HseSafetySgzgbh sgzg = new HseSafetySgzgbh();
|
||||
//调查
|
||||
HseSafetySgdcVo sgdc = queryById(id);
|
||||
//事故id
|
||||
sgzg.setSgId(sgdc.getSgId());
|
||||
//事故编号
|
||||
sgzg.setSgbh(sgdc.getSgbh());
|
||||
//事发地点 需要查询
|
||||
HseSafetySgsb sgsb = baseMapper.getSgsb(sgdc.getSgId());
|
||||
if (sgsb == null){
|
||||
return;
|
||||
}
|
||||
sgzg.setSfdd(sgsb.getSfdd());
|
||||
//事故类型
|
||||
sgzg.setSglx(sgsb.getSglx());
|
||||
//事故等级
|
||||
sgzg.setSgdj(sgsb.getSgdj());
|
||||
//事故原因
|
||||
sgzg.setSgyy(sgsb.getSgyy());
|
||||
//调查人
|
||||
sgzg.setJsr(sgdc.getDcfzr());
|
||||
//上报人
|
||||
sgzg.setSbr(sgsb.getCreateBy());
|
||||
//上报时间
|
||||
sgzg.setSbsj(sgsb.getCreateTime());
|
||||
//整改状态
|
||||
sgzg.setZgStatus(SGStatusEnum.TO_BE_RECTIFIED.getCode());
|
||||
//整改人
|
||||
sgzg.setZgr(sgdc.getZgfzr());
|
||||
//是否预期
|
||||
sgzg.setIsFinish("0");
|
||||
//调查id
|
||||
sgzg.setDcId(sgdc.getId());
|
||||
//添加
|
||||
zgbhService.save(sgzg);
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计数据
|
||||
*/
|
||||
@Override
|
||||
public SgsbCountVo getListCount(){
|
||||
//初始化
|
||||
SgsbCountVo countVo = new SgsbCountVo();
|
||||
long ddcsg = 0;
|
||||
long dczsg = 0;
|
||||
long ywcdc = 0;
|
||||
long dzgsg = 0;
|
||||
|
||||
List<HseSafetySgsb> sbList = baseMapper.getSbList();
|
||||
for (HseSafetySgsb sgsb : sbList) {
|
||||
//待调查事故 上报后 审核后 待调查
|
||||
if (sgsb.getSgzt().equals(SGStatusEnum.UNDER_INVESTIGATION.getCode())){
|
||||
ddcsg++;
|
||||
}else if (sgsb.getSgzt().equals(SGStatusEnum.SG_TO_BE_RECTIFIED.getCode())){
|
||||
//调查中事故 待调查 填写完数据提交后 待整改
|
||||
dczsg++;
|
||||
}else if (sgsb.getSgzt().equals(SGStatusEnum.SG_HAS_BEEN_RECTIFIED.getCode())){
|
||||
//已完成调查 待整改 -> 已整改
|
||||
ywcdc++;
|
||||
}
|
||||
//待整改事项 查看整改表关联此调查的数据 整改状态为待整改
|
||||
LambdaQueryWrapper<HseSafetySgdc> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(HseSafetySgdc::getSgId,sgsb.getId());
|
||||
List<HseSafetySgdc> sgdcs = list(queryWrapper);
|
||||
for (HseSafetySgdc sgdc : sgdcs) {
|
||||
//寻找对应整改数据
|
||||
LambdaQueryWrapper<HseSafetySgzgbh> zgqwr = new LambdaQueryWrapper<>();
|
||||
zgqwr.eq(HseSafetySgzgbh::getDcId,sgdc.getId());
|
||||
List<HseSafetySgzgbh> zgs = zgbhService.list(zgqwr);
|
||||
for (HseSafetySgzgbh zg : zgs) {
|
||||
//寻找待整改
|
||||
if (zg.getZgStatus().equals(SGStatusEnum.TO_BE_RECTIFIED.getCode())){
|
||||
dzgsg++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
countVo.setDdcsg(ddcsg);
|
||||
countVo.setDczsg(dczsg);
|
||||
countVo.setYwcdc(ywcdc);
|
||||
countVo.setDzgsg(dzgsg);
|
||||
|
||||
return countVo;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -52,8 +52,8 @@ public class HseSafetySgsbServiceImpl extends ServiceImpl<HseSafetySgsbMapper, H
|
||||
// private HseSafetyZgxxServiceImpl zgxxService;
|
||||
@Autowired
|
||||
private HseSafetySgdcServiceImpl sgdcService;
|
||||
@Autowired
|
||||
private HseSafetySgzgbhServiceImpl sgzgbhService;
|
||||
// @Autowired
|
||||
// private IHseSafetySgzgbhService sgzgbhService;
|
||||
|
||||
/**
|
||||
* 查询安全-事故上报
|
||||
@ -142,7 +142,7 @@ public class HseSafetySgsbServiceImpl extends ServiceImpl<HseSafetySgsbMapper, H
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
addDcxx( bo);
|
||||
addDcxx( bo.getId());
|
||||
return flag;
|
||||
}
|
||||
|
||||
@ -191,7 +191,7 @@ public class HseSafetySgsbServiceImpl extends ServiceImpl<HseSafetySgsbMapper, H
|
||||
lambdaQueryWrapper.eq(HseSafetySgsb::getProjectId, projectId);
|
||||
List<HseSafetySgsb> list = this.list(lambdaQueryWrapper);
|
||||
//获取整改对应列表
|
||||
List<HseSafetySgzgbh> zgxxes = sgzgbhService.list();
|
||||
List<HseSafetySgzgbh> zgxxes = baseMapper.getSgzgList();
|
||||
//获取调查列表
|
||||
List<HseSafetySgdc> dcList = sgdcService.list();
|
||||
//初始化统计信息
|
||||
@ -261,6 +261,12 @@ public class HseSafetySgsbServiceImpl extends ServiceImpl<HseSafetySgsbMapper, H
|
||||
vo.setJsrmc(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
if (vo.getCreateBy() != null){
|
||||
SysUserVo sysUserVo = sysUserService.selectUserById(vo.getCreateBy());
|
||||
if (sysUserVo != null){
|
||||
vo.setCreateByName(sysUserVo.getNickName());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -285,14 +291,14 @@ public class HseSafetySgsbServiceImpl extends ServiceImpl<HseSafetySgsbMapper, H
|
||||
/**
|
||||
* 对调查进行新增一条数据 有审核后放在审核后进行 现在放在新增里
|
||||
*/
|
||||
public void addDcxx(HseSafetySgsbBo bo){
|
||||
public void addDcxx(Long boId){
|
||||
HseSafetySgdcBo dcBo = new HseSafetySgdcBo();
|
||||
dcBo.setDcbh(BatchNumberGenerator.generateBatchNumber("SGDC-"));
|
||||
dcBo.setSgId(bo.getId());
|
||||
dcBo.setSgId(boId);
|
||||
dcBo.setBczt("0");
|
||||
sgdcService.insertByBo(dcBo);
|
||||
//更新事故上报的状态
|
||||
HseSafetySgsb byId = getById(bo.getId());
|
||||
HseSafetySgsb byId = getById(boId);
|
||||
if (byId != null){
|
||||
byId.setSgzt(SGStatusEnum.UNDER_INVESTIGATION.getCode());
|
||||
updateById(byId);
|
||||
|
||||
Reference in New Issue
Block a user