Commit c0404b0f authored by xulihui's avatar xulihui

重大危险源档案管理添加监管码;添加“监督检查记录”功能;添加“隐患及整改”功能

parent c69195a5
package com.zehong.web.controller.energency;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TDangersRectifications;
import com.zehong.system.service.ITDangersRectificationsService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 隐患及整改Controller
*
* @author zehong
* @date 2026-03-16
*/
@RestController
@RequestMapping("/dangers/rectifications")
public class TDangersRectificationsController extends BaseController
{
@Autowired
private ITDangersRectificationsService tDangersRectificationsService;
/**
* 查询隐患及整改列表
*/
@GetMapping("/list")
public TableDataInfo list(TDangersRectifications tDangersRectifications)
{
startPage();
List<TDangersRectifications> list = tDangersRectificationsService.selectTDangersRectificationsList(tDangersRectifications);
return getDataTable(list);
}
/**
* 导出隐患及整改列表
*/
@Log(title = "隐患及整改", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TDangersRectifications tDangersRectifications)
{
List<TDangersRectifications> list = tDangersRectificationsService.selectTDangersRectificationsList(tDangersRectifications);
ExcelUtil<TDangersRectifications> util = new ExcelUtil<TDangersRectifications>(TDangersRectifications.class);
return util.exportExcel(list, "隐患及整改数据");
}
/**
* 获取隐患及整改详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(tDangersRectificationsService.selectTDangersRectificationsById(id));
}
/**
* 新增隐患及整改
*/
@Log(title = "隐患及整改", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TDangersRectifications tDangersRectifications)
{
return toAjax(tDangersRectificationsService.insertTDangersRectifications(tDangersRectifications));
}
/**
* 修改隐患及整改
*/
@Log(title = "隐患及整改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TDangersRectifications tDangersRectifications)
{
return toAjax(tDangersRectificationsService.updateTDangersRectifications(tDangersRectifications));
}
/**
* 删除隐患及整改
*/
@Log(title = "隐患及整改", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(tDangersRectificationsService.deleteTDangersRectificationsByIds(ids));
}
}
\ No newline at end of file
package com.zehong.web.controller.energency;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TSupervisionInspection;
import com.zehong.system.service.ITSupervisionInspectionService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 监督检查记录Controller
*
* @author zehong
* @date 2026-03-16
*/
@RestController
@RequestMapping("/supervision/inspection")
public class TSupervisionInspectionController extends BaseController
{
@Autowired
private ITSupervisionInspectionService tSupervisionInspectionService;
/**
* 查询监督检查记录列表
*/
@GetMapping("/list")
public TableDataInfo list(TSupervisionInspection tSupervisionInspection)
{
startPage();
List<TSupervisionInspection> list = tSupervisionInspectionService.selectTSupervisionInspectionList(tSupervisionInspection);
return getDataTable(list);
}
/**
* 导出监督检查记录列表
*/
@Log(title = "监督检查记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TSupervisionInspection tSupervisionInspection)
{
List<TSupervisionInspection> list = tSupervisionInspectionService.selectTSupervisionInspectionList(tSupervisionInspection);
ExcelUtil<TSupervisionInspection> util = new ExcelUtil<TSupervisionInspection>(TSupervisionInspection.class);
return util.exportExcel(list, "监督检查记录数据");
}
/**
* 获取监督检查记录详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(tSupervisionInspectionService.selectTSupervisionInspectionById(id));
}
/**
* 新增监督检查记录
*/
@Log(title = "监督检查记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TSupervisionInspection tSupervisionInspection)
{
return toAjax(tSupervisionInspectionService.insertTSupervisionInspection(tSupervisionInspection));
}
/**
* 修改监督检查记录
*/
@Log(title = "监督检查记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TSupervisionInspection tSupervisionInspection)
{
return toAjax(tSupervisionInspectionService.updateTSupervisionInspection(tSupervisionInspection));
}
/**
* 删除监督检查记录
*/
@Log(title = "监督检查记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(tSupervisionInspectionService.deleteTSupervisionInspectionByIds(ids));
}
}
\ No newline at end of file
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 隐患及整改对象 t_dangers_rectifications
*
* @author zehong
* @date 2026-03-16
*/
public class TDangersRectifications extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 重大危险源监管表id */
@Excel(name = "重大危险源监管表id")
private Long fHazardId;
/** 风险等级 */
@Excel(name = "风险等级")
private String riskLevel;
/** 整改措施 */
@Excel(name = "整改措施")
private String rectificationMeasures;
/** 隐患描述 */
@Excel(name = "隐患描述")
private String hazardDescription;
/** 整改完成时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "整改完成时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date completionTime;
/** 佐证材料 */
@Excel(name = "佐证材料")
private String fileUrl;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setfHazardId(Long fHazardId)
{
this.fHazardId = fHazardId;
}
public Long getfHazardId()
{
return fHazardId;
}
public void setRiskLevel(String riskLevel)
{
this.riskLevel = riskLevel;
}
public String getRiskLevel()
{
return riskLevel;
}
public void setRectificationMeasures(String rectificationMeasures)
{
this.rectificationMeasures = rectificationMeasures;
}
public String getRectificationMeasures()
{
return rectificationMeasures;
}
public void setHazardDescription(String hazardDescription)
{
this.hazardDescription = hazardDescription;
}
public String getHazardDescription()
{
return hazardDescription;
}
public void setCompletionTime(Date completionTime)
{
this.completionTime = completionTime;
}
public Date getCompletionTime()
{
return completionTime;
}
public void setFileUrl(String fileUrl)
{
this.fileUrl = fileUrl;
}
public String getFileUrl()
{
return fileUrl;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("fHazardId", getfHazardId())
.append("createTime", getCreateTime())
.append("riskLevel", getRiskLevel())
.append("rectificationMeasures", getRectificationMeasures())
.append("hazardDescription", getHazardDescription())
.append("completionTime", getCompletionTime())
.append("fileUrl", getFileUrl())
.toString();
}
}
\ No newline at end of file
...@@ -71,6 +71,16 @@ public class TSupMajorHazard extends BaseEntity ...@@ -71,6 +71,16 @@ public class TSupMajorHazard extends BaseEntity
/** 备注 */ /** 备注 */
private String fRemarks; private String fRemarks;
private String supervisionCode;
public String getSupervisionCode() {
return supervisionCode;
}
public void setSupervisionCode(String supervisionCode) {
this.supervisionCode = supervisionCode;
}
public void setfHazardId(Long fHazardId) public void setfHazardId(Long fHazardId)
{ {
this.fHazardId = fHazardId; this.fHazardId = fHazardId;
......
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 监督检查记录对象 t_supervision_inspection
*
* @author zehong
* @date 2026-03-16
*/
public class TSupervisionInspection extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 重大危险源监管表id */
@Excel(name = "重大危险源监管表id")
private Long fHazardId;
/** 检查日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "检查日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date inspectionDate;
/** 检查单位id */
@Excel(name = "检查单位id")
private String enterpriseId;
/** 检查单位名称 */
@Excel(name = "检查单位名称")
private String enterpriseName;
/** 发现问题 */
@Excel(name = "发现问题")
private String identifyProblems;
/** 整改要求 */
@Excel(name = "整改要求")
private String rectificationRequirements;
/** 复查结果 */
@Excel(name = "复查结果")
private String reviewResults;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setfHazardId(Long fHazardId)
{
this.fHazardId = fHazardId;
}
public Long getfHazardId()
{
return fHazardId;
}
public void setInspectionDate(Date inspectionDate)
{
this.inspectionDate = inspectionDate;
}
public Date getInspectionDate()
{
return inspectionDate;
}
public void setEnterpriseId(String enterpriseId)
{
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId()
{
return enterpriseId;
}
public void setEnterpriseName(String enterpriseName)
{
this.enterpriseName = enterpriseName;
}
public String getEnterpriseName()
{
return enterpriseName;
}
public void setIdentifyProblems(String identifyProblems)
{
this.identifyProblems = identifyProblems;
}
public String getIdentifyProblems()
{
return identifyProblems;
}
public void setRectificationRequirements(String rectificationRequirements)
{
this.rectificationRequirements = rectificationRequirements;
}
public String getRectificationRequirements()
{
return rectificationRequirements;
}
public void setReviewResults(String reviewResults)
{
this.reviewResults = reviewResults;
}
public String getReviewResults()
{
return reviewResults;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("fHazardId", getfHazardId())
.append("inspectionDate", getInspectionDate())
.append("enterpriseId", getEnterpriseId())
.append("enterpriseName", getEnterpriseName())
.append("identifyProblems", getIdentifyProblems())
.append("rectificationRequirements", getRectificationRequirements())
.append("reviewResults", getReviewResults())
.append("createTime", getCreateTime())
.toString();
}
}
\ No newline at end of file
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TDangersRectifications;
/**
* 隐患及整改Mapper接口
*
* @author zehong
* @date 2026-03-16
*/
public interface TDangersRectificationsMapper
{
/**
* 查询隐患及整改
*
* @param id 隐患及整改ID
* @return 隐患及整改
*/
public TDangersRectifications selectTDangersRectificationsById(Long id);
/**
* 查询隐患及整改列表
*
* @param tDangersRectifications 隐患及整改
* @return 隐患及整改集合
*/
public List<TDangersRectifications> selectTDangersRectificationsList(TDangersRectifications tDangersRectifications);
/**
* 新增隐患及整改
*
* @param tDangersRectifications 隐患及整改
* @return 结果
*/
public int insertTDangersRectifications(TDangersRectifications tDangersRectifications);
/**
* 修改隐患及整改
*
* @param tDangersRectifications 隐患及整改
* @return 结果
*/
public int updateTDangersRectifications(TDangersRectifications tDangersRectifications);
/**
* 删除隐患及整改
*
* @param id 隐患及整改ID
* @return 结果
*/
public int deleteTDangersRectificationsById(Long id);
/**
* 批量删除隐患及整改
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteTDangersRectificationsByIds(Long[] ids);
}
\ No newline at end of file
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TSupervisionInspection;
/**
* 监督检查记录Mapper接口
*
* @author zehong
* @date 2026-03-16
*/
public interface TSupervisionInspectionMapper
{
/**
* 查询监督检查记录
*
* @param id 监督检查记录ID
* @return 监督检查记录
*/
public TSupervisionInspection selectTSupervisionInspectionById(Long id);
/**
* 查询监督检查记录列表
*
* @param tSupervisionInspection 监督检查记录
* @return 监督检查记录集合
*/
public List<TSupervisionInspection> selectTSupervisionInspectionList(TSupervisionInspection tSupervisionInspection);
/**
* 新增监督检查记录
*
* @param tSupervisionInspection 监督检查记录
* @return 结果
*/
public int insertTSupervisionInspection(TSupervisionInspection tSupervisionInspection);
/**
* 修改监督检查记录
*
* @param tSupervisionInspection 监督检查记录
* @return 结果
*/
public int updateTSupervisionInspection(TSupervisionInspection tSupervisionInspection);
/**
* 删除监督检查记录
*
* @param id 监督检查记录ID
* @return 结果
*/
public int deleteTSupervisionInspectionById(Long id);
/**
* 批量删除监督检查记录
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteTSupervisionInspectionByIds(Long[] ids);
}
\ No newline at end of file
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TDangersRectifications;
/**
* 隐患及整改Service接口
*
* @author zehong
* @date 2026-03-16
*/
public interface ITDangersRectificationsService
{
/**
* 查询隐患及整改
*
* @param id 隐患及整改ID
* @return 隐患及整改
*/
public TDangersRectifications selectTDangersRectificationsById(Long id);
/**
* 查询隐患及整改列表
*
* @param tDangersRectifications 隐患及整改
* @return 隐患及整改集合
*/
public List<TDangersRectifications> selectTDangersRectificationsList(TDangersRectifications tDangersRectifications);
/**
* 新增隐患及整改
*
* @param tDangersRectifications 隐患及整改
* @return 结果
*/
public int insertTDangersRectifications(TDangersRectifications tDangersRectifications);
/**
* 修改隐患及整改
*
* @param tDangersRectifications 隐患及整改
* @return 结果
*/
public int updateTDangersRectifications(TDangersRectifications tDangersRectifications);
/**
* 批量删除隐患及整改
*
* @param ids 需要删除的隐患及整改ID
* @return 结果
*/
public int deleteTDangersRectificationsByIds(Long[] ids);
/**
* 删除隐患及整改信息
*
* @param id 隐患及整改ID
* @return 结果
*/
public int deleteTDangersRectificationsById(Long id);
}
\ No newline at end of file
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TSupervisionInspection;
/**
* 监督检查记录Service接口
*
* @author zehong
* @date 2026-03-16
*/
public interface ITSupervisionInspectionService
{
/**
* 查询监督检查记录
*
* @param id 监督检查记录ID
* @return 监督检查记录
*/
public TSupervisionInspection selectTSupervisionInspectionById(Long id);
/**
* 查询监督检查记录列表
*
* @param tSupervisionInspection 监督检查记录
* @return 监督检查记录集合
*/
public List<TSupervisionInspection> selectTSupervisionInspectionList(TSupervisionInspection tSupervisionInspection);
/**
* 新增监督检查记录
*
* @param tSupervisionInspection 监督检查记录
* @return 结果
*/
public int insertTSupervisionInspection(TSupervisionInspection tSupervisionInspection);
/**
* 修改监督检查记录
*
* @param tSupervisionInspection 监督检查记录
* @return 结果
*/
public int updateTSupervisionInspection(TSupervisionInspection tSupervisionInspection);
/**
* 批量删除监督检查记录
*
* @param ids 需要删除的监督检查记录ID
* @return 结果
*/
public int deleteTSupervisionInspectionByIds(Long[] ids);
/**
* 删除监督检查记录信息
*
* @param id 监督检查记录ID
* @return 结果
*/
public int deleteTSupervisionInspectionById(Long id);
}
\ No newline at end of file
package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TDangersRectificationsMapper;
import com.zehong.system.domain.TDangersRectifications;
import com.zehong.system.service.ITDangersRectificationsService;
/**
* 隐患及整改Service业务层处理
*
* @author zehong
* @date 2026-03-16
*/
@Service
public class TDangersRectificationsServiceImpl implements ITDangersRectificationsService
{
@Autowired
private TDangersRectificationsMapper tDangersRectificationsMapper;
/**
* 查询隐患及整改
*
* @param id 隐患及整改ID
* @return 隐患及整改
*/
@Override
public TDangersRectifications selectTDangersRectificationsById(Long id)
{
return tDangersRectificationsMapper.selectTDangersRectificationsById(id);
}
/**
* 查询隐患及整改列表
*
* @param tDangersRectifications 隐患及整改
* @return 隐患及整改
*/
@Override
public List<TDangersRectifications> selectTDangersRectificationsList(TDangersRectifications tDangersRectifications)
{
return tDangersRectificationsMapper.selectTDangersRectificationsList(tDangersRectifications);
}
/**
* 新增隐患及整改
*
* @param tDangersRectifications 隐患及整改
* @return 结果
*/
@Override
public int insertTDangersRectifications(TDangersRectifications tDangersRectifications)
{
tDangersRectifications.setCreateTime(DateUtils.getNowDate());
return tDangersRectificationsMapper.insertTDangersRectifications(tDangersRectifications);
}
/**
* 修改隐患及整改
*
* @param tDangersRectifications 隐患及整改
* @return 结果
*/
@Override
public int updateTDangersRectifications(TDangersRectifications tDangersRectifications)
{
return tDangersRectificationsMapper.updateTDangersRectifications(tDangersRectifications);
}
/**
* 批量删除隐患及整改
*
* @param ids 需要删除的隐患及整改ID
* @return 结果
*/
@Override
public int deleteTDangersRectificationsByIds(Long[] ids)
{
return tDangersRectificationsMapper.deleteTDangersRectificationsByIds(ids);
}
/**
* 删除隐患及整改信息
*
* @param id 隐患及整改ID
* @return 结果
*/
@Override
public int deleteTDangersRectificationsById(Long id)
{
return tDangersRectificationsMapper.deleteTDangersRectificationsById(id);
}
}
\ No newline at end of file
package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TSupervisionInspectionMapper;
import com.zehong.system.domain.TSupervisionInspection;
import com.zehong.system.service.ITSupervisionInspectionService;
/**
* 监督检查记录Service业务层处理
*
* @author zehong
* @date 2026-03-16
*/
@Service
public class TSupervisionInspectionServiceImpl implements ITSupervisionInspectionService
{
@Autowired
private TSupervisionInspectionMapper tSupervisionInspectionMapper;
/**
* 查询监督检查记录
*
* @param id 监督检查记录ID
* @return 监督检查记录
*/
@Override
public TSupervisionInspection selectTSupervisionInspectionById(Long id)
{
return tSupervisionInspectionMapper.selectTSupervisionInspectionById(id);
}
/**
* 查询监督检查记录列表
*
* @param tSupervisionInspection 监督检查记录
* @return 监督检查记录
*/
@Override
public List<TSupervisionInspection> selectTSupervisionInspectionList(TSupervisionInspection tSupervisionInspection)
{
return tSupervisionInspectionMapper.selectTSupervisionInspectionList(tSupervisionInspection);
}
/**
* 新增监督检查记录
*
* @param tSupervisionInspection 监督检查记录
* @return 结果
*/
@Override
public int insertTSupervisionInspection(TSupervisionInspection tSupervisionInspection)
{
tSupervisionInspection.setCreateTime(DateUtils.getNowDate());
return tSupervisionInspectionMapper.insertTSupervisionInspection(tSupervisionInspection);
}
/**
* 修改监督检查记录
*
* @param tSupervisionInspection 监督检查记录
* @return 结果
*/
@Override
public int updateTSupervisionInspection(TSupervisionInspection tSupervisionInspection)
{
return tSupervisionInspectionMapper.updateTSupervisionInspection(tSupervisionInspection);
}
/**
* 批量删除监督检查记录
*
* @param ids 需要删除的监督检查记录ID
* @return 结果
*/
@Override
public int deleteTSupervisionInspectionByIds(Long[] ids)
{
return tSupervisionInspectionMapper.deleteTSupervisionInspectionByIds(ids);
}
/**
* 删除监督检查记录信息
*
* @param id 监督检查记录ID
* @return 结果
*/
@Override
public int deleteTSupervisionInspectionById(Long id)
{
return tSupervisionInspectionMapper.deleteTSupervisionInspectionById(id);
}
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TDangersRectificationsMapper">
<resultMap type="com.zehong.system.domain.TDangersRectifications" id="TDangersRectificationsResult">
<result property="id" column="id" />
<result property="fHazardId" column="f_hazard_id" />
<result property="createTime" column="create_time" />
<result property="riskLevel" column="risk_level" />
<result property="rectificationMeasures" column="rectification_measures" />
<result property="hazardDescription" column="hazard_description" />
<result property="completionTime" column="completion_time" />
<result property="fileUrl" column="file_url" />
</resultMap>
<sql id="selectTDangersRectificationsVo">
select id, f_hazard_id, create_time, risk_level, rectification_measures, hazard_description, completion_time, file_url from t_dangers_rectifications
</sql>
<select id="selectTDangersRectificationsList" parameterType="com.zehong.system.domain.TDangersRectifications" resultMap="TDangersRectificationsResult">
<include refid="selectTDangersRectificationsVo"/>
<where>
<if test="fHazardId != null "> and f_hazard_id = #{fHazardId}</if>
<if test="riskLevel != null and riskLevel != ''"> and risk_level = #{riskLevel}</if>
<if test="rectificationMeasures != null and rectificationMeasures != ''"> and rectification_measures = #{rectificationMeasures}</if>
<if test="hazardDescription != null and hazardDescription != ''"> and hazard_description = #{hazardDescription}</if>
<if test="completionTime != null "> and completion_time = #{completionTime}</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if>
</where>
</select>
<select id="selectTDangersRectificationsById" parameterType="Long" resultMap="TDangersRectificationsResult">
<include refid="selectTDangersRectificationsVo"/>
where id = #{id}
</select>
<insert id="insertTDangersRectifications" parameterType="com.zehong.system.domain.TDangersRectifications" useGeneratedKeys="true" keyProperty="id">
insert into t_dangers_rectifications
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fHazardId != null">f_hazard_id,</if>
<if test="createTime != null">create_time,</if>
<if test="riskLevel != null">risk_level,</if>
<if test="rectificationMeasures != null">rectification_measures,</if>
<if test="hazardDescription != null">hazard_description,</if>
<if test="completionTime != null">completion_time,</if>
<if test="fileUrl != null">file_url,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fHazardId != null">#{fHazardId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="riskLevel != null">#{riskLevel},</if>
<if test="rectificationMeasures != null">#{rectificationMeasures},</if>
<if test="hazardDescription != null">#{hazardDescription},</if>
<if test="completionTime != null">#{completionTime},</if>
<if test="fileUrl != null">#{fileUrl},</if>
</trim>
</insert>
<update id="updateTDangersRectifications" parameterType="com.zehong.system.domain.TDangersRectifications">
update t_dangers_rectifications
<trim prefix="SET" suffixOverrides=",">
<if test="fHazardId != null">f_hazard_id = #{fHazardId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="riskLevel != null">risk_level = #{riskLevel},</if>
<if test="rectificationMeasures != null">rectification_measures = #{rectificationMeasures},</if>
<if test="hazardDescription != null">hazard_description = #{hazardDescription},</if>
<if test="completionTime != null">completion_time = #{completionTime},</if>
<if test="fileUrl != null">file_url = #{fileUrl},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTDangersRectificationsById" parameterType="Long">
delete from t_dangers_rectifications where id = #{id}
</delete>
<delete id="deleteTDangersRectificationsByIds" parameterType="String">
delete from t_dangers_rectifications where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
...@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fUpdateTime" column="f_update_time" /> <result property="fUpdateTime" column="f_update_time" />
<result property="fIsDel" column="f_is_del" /> <result property="fIsDel" column="f_is_del" />
<result property="fRemarks" column="f_remarks" /> <result property="fRemarks" column="f_remarks" />
<result property="supervisionCode" column="supervision_code" />
</resultMap> </resultMap>
<resultMap type="TSupMajorHazard" id="ExportTSupMajorHazardResult"> <resultMap type="TSupMajorHazard" id="ExportTSupMajorHazardResult">
...@@ -34,9 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -34,9 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fUpdateTime" column="f_update_time" /> <result property="fUpdateTime" column="f_update_time" />
<result property="fIsDel" column="f_is_del" /> <result property="fIsDel" column="f_is_del" />
<result property="fRemarks" column="f_remarks" /> <result property="fRemarks" column="f_remarks" />
<result property="supervisionCode" column="supervision_code" />
</resultMap> </resultMap>
<sql id="selectTSupMajorHazardVo"> <sql id="selectTSupMajorHazardVo">
select f_hazard_id, f_name, f_res_per, f_phone, f_eva_infor, longitude, latitude, f_level, f_create_time, f_update_time, f_is_del, f_remarks,beyond_enterprise_id from t_sup_major_hazard select f_hazard_id, f_name, f_res_per, f_phone, f_eva_infor, longitude, latitude, f_level, f_create_time, f_update_time, f_is_del, f_remarks,beyond_enterprise_id,supervision_code from t_sup_major_hazard
</sql> </sql>
<sql id="exportSelectTSupMajorHazardVo"> <sql id="exportSelectTSupMajorHazardVo">
...@@ -54,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -54,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f_is_del, f_is_del,
f_remarks, f_remarks,
beyond_enterprise_id , beyond_enterprise_id ,
dict_label dict_label,
supervision_code,
FROM FROM
t_sup_major_hazard hazard inner join sys_dict_data dictData on hazard.f_level = dictData.dict_value and dictData.dict_type = 'major_poll_source_level' t_sup_major_hazard hazard inner join sys_dict_data dictData on hazard.f_level = dictData.dict_value and dictData.dict_type = 'major_poll_source_level'
</sql> </sql>
...@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fUpdateTime != null">f_update_time,</if> <if test="fUpdateTime != null">f_update_time,</if>
<if test="fIsDel != null">f_is_del,</if> <if test="fIsDel != null">f_is_del,</if>
<if test="fRemarks != null">f_remarks,</if> <if test="fRemarks != null">f_remarks,</if>
<if test="supervisionCode != null">supervision_code,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fName != null">#{fName},</if> <if test="fName != null">#{fName},</if>
...@@ -107,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -107,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fUpdateTime != null">#{fUpdateTime},</if> <if test="fUpdateTime != null">#{fUpdateTime},</if>
<if test="fIsDel != null">#{fIsDel},</if> <if test="fIsDel != null">#{fIsDel},</if>
<if test="fRemarks != null">#{fRemarks},</if> <if test="fRemarks != null">#{fRemarks},</if>
<if test="supervisionCode != null">#{supervisionCode},</if>
</trim> </trim>
</insert> </insert>
...@@ -125,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -125,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if> <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
<if test="fIsDel != null">f_is_del = #{fIsDel},</if> <if test="fIsDel != null">f_is_del = #{fIsDel},</if>
<if test="fRemarks != null">f_remarks = #{fRemarks},</if> <if test="fRemarks != null">f_remarks = #{fRemarks},</if>
<if test="supervisionCode != null">supervision_code = #{supervisionCode},</if>
</trim> </trim>
where f_hazard_id = #{fHazardId} where f_hazard_id = #{fHazardId}
</update> </update>
......
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TSupervisionInspectionMapper">
<resultMap type="com.zehong.system.domain.TSupervisionInspection" id="TSupervisionInspectionResult">
<result property="id" column="id" />
<result property="fHazardId" column="f_hazard_id" />
<result property="inspectionDate" column="inspection_date" />
<result property="enterpriseId" column="enterprise_id" />
<result property="enterpriseName" column="enterprise_name" />
<result property="identifyProblems" column="identify_problems" />
<result property="rectificationRequirements" column="rectification_requirements" />
<result property="reviewResults" column="review_results" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectTSupervisionInspectionVo">
select id, f_hazard_id, inspection_date, enterprise_id, enterprise_name, identify_problems, rectification_requirements, review_results, create_time from t_supervision_inspection
</sql>
<select id="selectTSupervisionInspectionList" parameterType="com.zehong.system.domain.TSupervisionInspection" resultMap="TSupervisionInspectionResult">
<include refid="selectTSupervisionInspectionVo"/>
<where>
<if test="fHazardId != null "> and f_hazard_id = #{fHazardId}</if>
<if test="inspectionDate != null "> and inspection_date = #{inspectionDate}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="identifyProblems != null and identifyProblems != ''"> and identify_problems = #{identifyProblems}</if>
<if test="rectificationRequirements != null and rectificationRequirements != ''"> and rectification_requirements = #{rectificationRequirements}</if>
<if test="reviewResults != null and reviewResults != ''"> and review_results = #{reviewResults}</if>
</where>
</select>
<select id="selectTSupervisionInspectionById" parameterType="Long" resultMap="TSupervisionInspectionResult">
<include refid="selectTSupervisionInspectionVo"/>
where id = #{id}
</select>
<insert id="insertTSupervisionInspection" parameterType="com.zehong.system.domain.TSupervisionInspection" useGeneratedKeys="true" keyProperty="id">
insert into t_supervision_inspection
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fHazardId != null">f_hazard_id,</if>
<if test="inspectionDate != null">inspection_date,</if>
<if test="enterpriseId != null">enterprise_id,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="identifyProblems != null">identify_problems,</if>
<if test="rectificationRequirements != null">rectification_requirements,</if>
<if test="reviewResults != null">review_results,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fHazardId != null">#{fHazardId},</if>
<if test="inspectionDate != null">#{inspectionDate},</if>
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="identifyProblems != null">#{identifyProblems},</if>
<if test="rectificationRequirements != null">#{rectificationRequirements},</if>
<if test="reviewResults != null">#{reviewResults},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateTSupervisionInspection" parameterType="com.zehong.system.domain.TSupervisionInspection">
update t_supervision_inspection
<trim prefix="SET" suffixOverrides=",">
<if test="fHazardId != null">f_hazard_id = #{fHazardId},</if>
<if test="inspectionDate != null">inspection_date = #{inspectionDate},</if>
<if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="identifyProblems != null">identify_problems = #{identifyProblems},</if>
<if test="rectificationRequirements != null">rectification_requirements = #{rectificationRequirements},</if>
<if test="reviewResults != null">review_results = #{reviewResults},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTSupervisionInspectionById" parameterType="Long">
delete from t_supervision_inspection where id = #{id}
</delete>
<delete id="deleteTSupervisionInspectionByIds" parameterType="String">
delete from t_supervision_inspection where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
import request from '@/utils/request'
// 查询隐患及整改列表
export function listRectifications(query) {
return request({
url: '/dangers/rectifications/list',
method: 'get',
params: query
})
}
// 查询隐患及整改详细
export function getRectifications(id) {
return request({
url: '/dangers/rectifications/' + id,
method: 'get'
})
}
// 新增隐患及整改
export function addRectifications(data) {
return request({
url: '/dangers/rectifications',
method: 'post',
data: data
})
}
// 修改隐患及整改
export function updateRectifications(data) {
return request({
url: '/dangers/rectifications',
method: 'put',
data: data
})
}
// 删除隐患及整改
export function delRectifications(id) {
return request({
url: '/dangers/rectifications/' + id,
method: 'delete'
})
}
// 导出隐患及整改
export function exportRectifications(query) {
return request({
url: '/dangers/rectifications/export',
method: 'get',
params: query
})
}
import request from '@/utils/request'
// 查询监督检查记录列表
export function listInspection(query) {
return request({
url: '/supervision/inspection/list',
method: 'get',
params: query
})
}
// 查询监督检查记录详细
export function getInspection(id) {
return request({
url: '/supervision/inspection/' + id,
method: 'get'
})
}
// 新增监督检查记录
export function addInspection(data) {
return request({
url: '/supervision/inspection',
method: 'post',
data: data
})
}
// 修改监督检查记录
export function updateInspection(data) {
return request({
url: '/supervision/inspection',
method: 'put',
data: data
})
}
// 删除监督检查记录
export function delInspection(id) {
return request({
url: '/supervision/inspection/' + id,
method: 'delete'
})
}
// 导出监督检查记录
export function exportInspection(query) {
return request({
url: '/supervision/inspection/export',
method: 'get',
params: query
})
}
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="监管码" prop="supervisionCode">
<el-input
v-model="queryParams.supervisionCode"
placeholder="请输入监管码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="名称" prop="fName"> <el-form-item label="名称" prop="fName">
<el-input <el-input
v-model="queryParams.fName" v-model="queryParams.fName"
...@@ -70,6 +79,7 @@ ...@@ -70,6 +79,7 @@
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="监管码" align="center" prop="supervisionCode" />
<el-table-column label="名称" align="center" prop="fName" /> <el-table-column label="名称" align="center" prop="fName" />
<el-table-column label="责任人" align="center" prop="fResPer" /> <el-table-column label="责任人" align="center" prop="fResPer" />
<el-table-column label="电话" align="center" prop="fPhone" /> <el-table-column label="电话" align="center" prop="fPhone" />
...@@ -91,6 +101,18 @@ ...@@ -91,6 +101,18 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button> >删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-document"
@click="handleSupervisionRecord(scope.row)"
>监督检查记录</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-warning-outline"
@click="handleHazardRectification(scope.row)"
>隐患及整改</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -108,19 +130,24 @@ ...@@ -108,19 +130,24 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="12">
<el-form-item label="名称" prop="fName"> <el-form-item label="名称" prop="fName">
<el-input v-model="form.fName" placeholder="请输入名称" /> <el-input v-model="form.fName" placeholder="请输入名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="11">
<el-form-item label="责任人" prop="fResPer"> <el-form-item label="监管码" prop="supervisionCode">
<el-input v-model="form.fResPer" placeholder="请输入责任人" /> <el-input v-model="form.supervisionCode" placeholder="请输入监管码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="责任人" prop="fResPer">
<el-input v-model="form.fResPer" placeholder="请输入责任人" />
</el-form-item>
</el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="电话" prop="fPhone"> <el-form-item label="电话" prop="fPhone">
<el-input v-model="form.fPhone" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="请输入电话" /> <el-input v-model="form.fPhone" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="请输入电话" />
...@@ -191,6 +218,34 @@ ...@@ -191,6 +218,34 @@
@close="dialogcancelFun" @close="dialogcancelFun"
@getPath="getPath" @getPath="getPath"
/> />
<!-- 监督检查记录对话框 -->
<el-dialog
:title="'监督检查记录'"
:visible.sync="supervisionDialogVisible"
width="70%"
append-to-body
@close="closeSupervisionDialog"
>
<sup-major-hazard
ref="supMajorHazardRef"
:f-hazard-id="currentFHazardId"
/>
</el-dialog>
<!-- 隐患及整改对话框 -->
<el-dialog
:title="'隐患及整改'"
:visible.sync="hazardDialogVisible"
width="70%"
append-to-body
@close="closeHazardDialog"
>
<dangers-rectifications
ref="dangersRectificationsRef"
:f-hazard-id="currentFHazardId"
/>
</el-dialog>
</div> </div>
</template> </template>
...@@ -200,11 +255,16 @@ import GetPos from '@/components/GetPos'; ...@@ -200,11 +255,16 @@ import GetPos from '@/components/GetPos';
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
import { enterpriseLists } from "@/api/regulation/info"; import { enterpriseLists } from "@/api/regulation/info";
import { getInspectionUsers } from "@/api/system/user"; import { getInspectionUsers } from "@/api/system/user";
import SupMajorHazard from '../supMajorHazard/index.vue';
import DangersRectifications from '../dangersRectifications/index.vue';
export default { export default {
name: "Record", name: "Record",
components: { components: {
GetPos, GetPos,
Editor Editor,
SupMajorHazard,
DangersRectifications
}, },
data() { data() {
return { return {
...@@ -240,6 +300,7 @@ export default { ...@@ -240,6 +300,7 @@ export default {
pageSize: 10, pageSize: 10,
fName: null, fName: null,
fResPer: null, fResPer: null,
supervisionCode: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -255,7 +316,13 @@ export default { ...@@ -255,7 +316,13 @@ export default {
/**--------------地图使用数据---------------*/ /**--------------地图使用数据---------------*/
dialogTableVisibles: false, dialogTableVisibles: false,
devicePos: [] devicePos: [],
// 监督检查记录对话框
supervisionDialogVisible: false,
// 隐患及整改对话框
hazardDialogVisible: false,
// 当前选中的 fHazardId
currentFHazardId: null,
}; };
}, },
created() { created() {
...@@ -443,6 +510,34 @@ export default { ...@@ -443,6 +510,34 @@ export default {
}); });
}, },
/** 打开监督检查记录 */
handleSupervisionRecord(row) {
this.currentFHazardId = row.fHazardId;
this.supervisionDialogVisible = true;
this.$nextTick(() => {
if (this.$refs.supMajorHazardRef) {
this.$refs.supMajorHazardRef.initQuery(this.currentFHazardId);
}
});
},
/** 打开隐患及整改 */
handleHazardRectification(row) {
this.currentFHazardId = row.fHazardId;
this.hazardDialogVisible = true;
this.$nextTick(() => {
if (this.$refs.dangersRectificationsRef) {
this.$refs.dangersRectificationsRef.initQuery(this.currentFHazardId);
}
});
},
/** 关闭监督检查记录对话框 */
closeSupervisionDialog() {
this.currentFHazardId = null;
},
/** 关闭隐患及整改对话框 */
closeHazardDialog() {
this.currentFHazardId = null;
}
} }
}; };
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment