一机一档档案上传查看

master/src/main/java/com/ruoyi/project/intact/his/controller/TIntactHiGjController.java

@@ -0,0 +1,120 @@
+package com.ruoyi.project.intact.his.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.service.ITIntactHiGjService;
+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.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性-管件台账变更历史记录Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@RestController
+@RequestMapping("/his/gj")
+public class TIntactHiGjController extends BaseController
+{
+    @Autowired
+    private ITIntactHiGjService tIntactHiGjService;
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactHiGj tIntactHiGj)
+    {
+        startPage();
+        List<TIntactHiGj> list = tIntactHiGjService.selectTIntactHiGjList(tIntactHiGj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性-管件台账变更历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:export')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactHiGj tIntactHiGj)
+    {
+        List<TIntactHiGj> list = tIntactHiGjService.selectTIntactHiGjList(tIntactHiGj);
+        ExcelUtil<TIntactHiGj> util = new ExcelUtil<TIntactHiGj>(TIntactHiGj.class);
+        return util.exportExcel(list, "gj");
+    }
+
+    /**
+     * 获取设备完整性-管件台账变更历史记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactHiGjService.selectTIntactHiGjById(id));
+    }
+
+
+    /**
+     * 获取管件台账历史改造历史
+     */
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
+    @GetMapping(value = "/reform/{devId}")
+    public AjaxResult getReform(@PathVariable("devId") Long devId)
+    {
+
+        return AjaxResult.success(tIntactHiGjService.selectTIntactHiGjByReform(devId));
+    }
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:add')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactHiGj tIntactHiGj)
+    {
+        tIntactHiGjService.deleteTIntactHiGjByDevId(tIntactHiGj.getId());
+        tIntactHiGj.setDevId(tIntactHiGj.getId());
+        tIntactHiGj.setHiType((long)1);
+        tIntactHiGjService.insertTIntactHiGj(tIntactHiGj);
+        return AjaxResult.success("id" , tIntactHiGj.getId());
+    }
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:edit')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactHiGj tIntactHiGj)
+    {
+        return toAjax(tIntactHiGjService.updateTIntactHiGj(tIntactHiGj));
+    }
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:gj:remove')")
+    @Log(title = "设备完整性-管件台账变更历史记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactHiGjService.deleteTIntactHiGjByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/controller/TIntactHiPumpController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.project.intact.his.controller;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.intact.his.service.ITIntactHiPumpService;
+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.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 设备完整性泵台账历史记录Controller
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@RestController
+@RequestMapping("/his/pump")
+public class TIntactHiPumpController extends BaseController
+{
+    @Autowired
+    private ITIntactHiPumpService tIntactHiPumpService;
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TIntactHiPump tIntactHiPump)
+    {
+        startPage();
+        List<TIntactHiPump> list = tIntactHiPumpService.selectTIntactHiPumpList(tIntactHiPump);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备完整性泵台账历史记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:export')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIntactHiPump tIntactHiPump)
+    {
+        List<TIntactHiPump> list = tIntactHiPumpService.selectTIntactHiPumpList(tIntactHiPump);
+        ExcelUtil<TIntactHiPump> util = new ExcelUtil<TIntactHiPump>(TIntactHiPump.class);
+        return util.exportExcel(list, "pump");
+    }
+
+    /**
+     * 获取设备完整性泵台账历史记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIntactHiPumpService.selectTIntactHiPumpById(id));
+    }
+
+
+    /**
+     * 获取泵台账历史改造历史
+     */
+    @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
+    @GetMapping(value = "/reform/{devId}")
+    public AjaxResult getReform(@PathVariable("devId") Long devId)
+    {
+
+        return AjaxResult.success(tIntactHiPumpService.selectTIntactHiPumpByReform(devId));
+    }
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:add')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIntactHiPump tIntactHiPump)
+    {
+
+        tIntactHiPumpService.deleteTIntactHiPumpByDevId(tIntactHiPump.getId());
+        tIntactHiPump.setDevId(tIntactHiPump.getId());
+        tIntactHiPump.setHiType((long)1);
+        tIntactHiPumpService.insertTIntactHiPump(tIntactHiPump);
+        return AjaxResult.success("id" , tIntactHiPump.getId());
+    }
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:edit')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIntactHiPump tIntactHiPump)
+    {
+        return toAjax(tIntactHiPumpService.updateTIntactHiPump(tIntactHiPump));
+    }
+
+    /**
+     * 删除设备完整性泵台账历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('intact:pump:remove')")
+    @Log(title = "设备完整性泵台账历史记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIntactHiPumpService.deleteTIntactHiPumpByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/domain/TIntactHiGj.java

@@ -0,0 +1,888 @@
+package com.ruoyi.project.intact.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性-管件台账变更历史记录对象 t_intacthi_gj
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public class TIntactHiGj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 投用年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 管道级别 */
+    @Excel(name = "管道级别")
+    private String grade;
+
+    /** 设计单位 */
+    @Excel(name = "设计单位")
+    private String designer;
+
+    /** 安装单位 */
+    @Excel(name = "安装单位")
+    private String installer;
+
+    /** 材质 */
+    @Excel(name = "材质")
+    private String material;
+
+    /** 直径 */
+    @Excel(name = "直径")
+    private String dia;
+
+    /** 厚度等级 */
+    @Excel(name = "厚度等级")
+    private String scheduleNo;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    private String length;
+
+    /** 起点 */
+    @Excel(name = "起点")
+    private String starting;
+
+    /** 终点 */
+    @Excel(name = "终点")
+    private String ending;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 工作压力 */
+    @Excel(name = "工作压力")
+    private String optPressure;
+
+    /** 工作温度 */
+    @Excel(name = "工作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 年度检查结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 安全状况等级 */
+    @Excel(name = "安全状况等级")
+    private String safeClass;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** PM维修组 */
+    @Excel(name = "PM维修组")
+    private String plantMaint;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 焊口数量 */
+    @Excel(name = "焊口数量")
+    private String weldNumber;
+
+    /** 敷设方式 */
+    @Excel(name = "敷设方式")
+    private String layingMethod;
+
+    /** 绝热层代码 */
+    @Excel(name = "绝热层代码")
+    private String adiabatic;
+
+    /** 防腐层代码 */
+    @Excel(name = "防腐层代码")
+    private String antiCorrosion;
+
+    /** 绝热层厚度 */
+    @Excel(name = "绝热层厚度")
+    private String adiabaticThickness;
+
+    /** 是否涉危化品 */
+    @Excel(name = "是否涉危化品")
+    private String isDanger;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
+
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
+
+    /** 管道编号是否变色 */
+    @Excel(name = "管道编号是否变色")
+    private Long isRepeat;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long deviceSize;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long devId;
+
+    /** 状态0:改造,1:修改 */
+    @Excel(name = "状态0:改造,1:修改")
+    private Long hiType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setDesigner(String designer)
+    {
+        this.designer = designer;
+    }
+
+    public String getDesigner()
+    {
+        return designer;
+    }
+    public void setInstaller(String installer)
+    {
+        this.installer = installer;
+    }
+
+    public String getInstaller()
+    {
+        return installer;
+    }
+    public void setMaterial(String material)
+    {
+        this.material = material;
+    }
+
+    public String getMaterial()
+    {
+        return material;
+    }
+    public void setDia(String dia)
+    {
+        this.dia = dia;
+    }
+
+    public String getDia()
+    {
+        return dia;
+    }
+    public void setScheduleNo(String scheduleNo)
+    {
+        this.scheduleNo = scheduleNo;
+    }
+
+    public String getScheduleNo()
+    {
+        return scheduleNo;
+    }
+    public void setLength(String length)
+    {
+        this.length = length;
+    }
+
+    public String getLength()
+    {
+        return length;
+    }
+    public void setStarting(String starting)
+    {
+        this.starting = starting;
+    }
+
+    public String getStarting()
+    {
+        return starting;
+    }
+    public void setEnding(String ending)
+    {
+        this.ending = ending;
+    }
+
+    public String getEnding()
+    {
+        return ending;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setSafeClass(String safeClass)
+    {
+        this.safeClass = safeClass;
+    }
+
+    public String getSafeClass()
+    {
+        return safeClass;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setWeldNumber(String weldNumber)
+    {
+        this.weldNumber = weldNumber;
+    }
+
+    public String getWeldNumber()
+    {
+        return weldNumber;
+    }
+    public void setLayingMethod(String layingMethod)
+    {
+        this.layingMethod = layingMethod;
+    }
+
+    public String getLayingMethod()
+    {
+        return layingMethod;
+    }
+    public void setAdiabatic(String adiabatic)
+    {
+        this.adiabatic = adiabatic;
+    }
+
+    public String getAdiabatic()
+    {
+        return adiabatic;
+    }
+    public void setAntiCorrosion(String antiCorrosion)
+    {
+        this.antiCorrosion = antiCorrosion;
+    }
+
+    public String getAntiCorrosion()
+    {
+        return antiCorrosion;
+    }
+    public void setAdiabaticThickness(String adiabaticThickness)
+    {
+        this.adiabaticThickness = adiabaticThickness;
+    }
+
+    public String getAdiabaticThickness()
+    {
+        return adiabaticThickness;
+    }
+    public void setIsDanger(String isDanger)
+    {
+        this.isDanger = isDanger;
+    }
+
+    public String getIsDanger()
+    {
+        return isDanger;
+    }
+    public void setInstallDate(Date installDate)
+    {
+        this.installDate = installDate;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+    public void setYearWarnDate(Date yearWarnDate)
+    {
+        this.yearWarnDate = yearWarnDate;
+    }
+
+    public Date getYearWarnDate()
+    {
+        return yearWarnDate;
+    }
+    public void setYearNextWarnDate(Date yearNextWarnDate)
+    {
+        this.yearNextWarnDate = yearNextWarnDate;
+    }
+
+    public Date getYearNextWarnDate()
+    {
+        return yearNextWarnDate;
+    }
+    public void setYearReportNo(String yearReportNo)
+    {
+        this.yearReportNo = yearReportNo;
+    }
+
+    public String getYearReportNo()
+    {
+        return yearReportNo;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(Long deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public Long getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+    public void setDevId(Long devId)
+    {
+        this.devId = devId;
+    }
+
+    public Long getDevId()
+    {
+        return devId;
+    }
+    public void setHiType(Long hiType)
+    {
+        this.hiType = hiType;
+    }
+
+    public Long getHiType()
+    {
+        return hiType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("grade", getGrade())
+            .append("designer", getDesigner())
+            .append("installer", getInstaller())
+            .append("material", getMaterial())
+            .append("dia", getDia())
+            .append("scheduleNo", getScheduleNo())
+            .append("length", getLength())
+            .append("starting", getStarting())
+            .append("ending", getEnding())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("checkConclusion", getCheckConclusion())
+            .append("checkUnit", getCheckUnit())
+            .append("safeClass", getSafeClass())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("engineer", getEngineer())
+            .append("weldNumber", getWeldNumber())
+            .append("layingMethod", getLayingMethod())
+            .append("adiabatic", getAdiabatic())
+            .append("antiCorrosion", getAntiCorrosion())
+            .append("adiabaticThickness", getAdiabaticThickness())
+            .append("isDanger", getIsDanger())
+            .append("installDate", getInstallDate())
+            .append("yearWarnDate", getYearWarnDate())
+            .append("yearNextWarnDate", getYearNextWarnDate())
+            .append("yearReportNo", getYearReportNo())
+            .append("isRepeat", getIsRepeat())
+            .append("type", getType())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("leakageMode", getLeakageMode())
+            .append("archives", getArchives())
+            .append("devId", getDevId())
+            .append("hiType", getHiType())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/domain/TIntactHiPump.java

@@ -0,0 +1,888 @@
+package com.ruoyi.project.intact.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备完整性泵台账历史记录对象 t_intactHi_pump
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public class TIntactHiPump extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String plantCode;
+
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String devname;
+
+    /** 设备位号 */
+    @Excel(name = "设备位号")
+    private String devno;
+
+    /** 投用年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "投用年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitdate;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 注册代码 */
+    @Excel(name = "注册代码")
+    private String regno;
+
+    /** 使用证编号 */
+    @Excel(name = "使用证编号")
+    private String useno;
+
+    /** 上次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "上次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warnDate;
+
+    /** 检测周期 */
+    @Excel(name = "检测周期")
+    private Long warnCycle;
+
+    /** 下次年检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "下次年检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextWarnDate;
+
+    /** 预警标识 */
+    @Excel(name = "预警标识")
+    private Long warnFlag;
+
+    /** 管道级别 */
+    @Excel(name = "管道级别")
+    private String grade;
+
+    /** 设计单位 */
+    @Excel(name = "设计单位")
+    private String designer;
+
+    /** 安装单位 */
+    @Excel(name = "安装单位")
+    private String installer;
+
+    /** 材质 */
+    @Excel(name = "材质")
+    private String material;
+
+    /** 直径 */
+    @Excel(name = "直径")
+    private String dia;
+
+    /** 厚度等级 */
+    @Excel(name = "厚度等级")
+    private String scheduleNo;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    private String length;
+
+    /** 起点 */
+    @Excel(name = "起点")
+    private String starting;
+
+    /** 终点 */
+    @Excel(name = "终点")
+    private String ending;
+
+    /** 设计压力 */
+    @Excel(name = "设计压力")
+    private String desPressure;
+
+    /** 设计温度 */
+    @Excel(name = "设计温度")
+    private String desTemp;
+
+    /** 工作压力 */
+    @Excel(name = "工作压力")
+    private String optPressure;
+
+    /** 工作温度 */
+    @Excel(name = "工作温度")
+    private String optTemp;
+
+    /** 介质 */
+    @Excel(name = "介质")
+    private String medium;
+
+    /** 年度检查结论 */
+    @Excel(name = "年度检查结论")
+    private String checkConclusion;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String checkUnit;
+
+    /** 安全状况等级 */
+    @Excel(name = "安全状况等级")
+    private String safeClass;
+
+    /** 报告编号 */
+    @Excel(name = "报告编号")
+    private String reportNo;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 状态修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "状态修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** PM维修组 */
+    @Excel(name = "PM维修组")
+    private String plantMaint;
+
+    /** 装置维修工程师 */
+    @Excel(name = "装置维修工程师")
+    private String engineer;
+
+    /** 焊口数量 */
+    @Excel(name = "焊口数量")
+    private String weldNumber;
+
+    /** 敷设方式 */
+    @Excel(name = "敷设方式")
+    private String layingMethod;
+
+    /** 绝热层代码 */
+    @Excel(name = "绝热层代码")
+    private String adiabatic;
+
+    /** 防腐层代码 */
+    @Excel(name = "防腐层代码")
+    private String antiCorrosion;
+
+    /** 绝热层厚度 */
+    @Excel(name = "绝热层厚度")
+    private String adiabaticThickness;
+
+    /** 是否涉危化品 */
+    @Excel(name = "是否涉危化品")
+    private String isDanger;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearWarnDate;
+
+    /** 年度检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "年度检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yearNextWarnDate;
+
+    /** 年度检查报告编号 */
+    @Excel(name = "年度检查报告编号")
+    private String yearReportNo;
+
+    /** 管道编号是否变色 */
+    @Excel(name = "管道编号是否变色")
+    private Long isRepeat;
+
+    /** 种类 */
+    @Excel(name = "种类")
+    private Long type;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String position;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private Long deviceSize;
+
+    /** 泄空方式 */
+    @Excel(name = "泄空方式")
+    private String leakageMode;
+
+    /** 档案 */
+    @Excel(name = "档案")
+    private String archives;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long devId;
+
+    /** 状态0:改造,1:修改 */
+    @Excel(name = "状态0:改造,1:修改")
+    private Long hiType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setDevname(String devname)
+    {
+        this.devname = devname;
+    }
+
+    public String getDevname()
+    {
+        return devname;
+    }
+    public void setDevno(String devno)
+    {
+        this.devno = devno;
+    }
+
+    public String getDevno()
+    {
+        return devno;
+    }
+    public void setSubmitdate(Date submitdate)
+    {
+        this.submitdate = submitdate;
+    }
+
+    public Date getSubmitdate()
+    {
+        return submitdate;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setRegno(String regno)
+    {
+        this.regno = regno;
+    }
+
+    public String getRegno()
+    {
+        return regno;
+    }
+    public void setUseno(String useno)
+    {
+        this.useno = useno;
+    }
+
+    public String getUseno()
+    {
+        return useno;
+    }
+    public void setWarnDate(Date warnDate)
+    {
+        this.warnDate = warnDate;
+    }
+
+    public Date getWarnDate()
+    {
+        return warnDate;
+    }
+    public void setWarnCycle(Long warnCycle)
+    {
+        this.warnCycle = warnCycle;
+    }
+
+    public Long getWarnCycle()
+    {
+        return warnCycle;
+    }
+    public void setNextWarnDate(Date nextWarnDate)
+    {
+        this.nextWarnDate = nextWarnDate;
+    }
+
+    public Date getNextWarnDate()
+    {
+        return nextWarnDate;
+    }
+    public void setWarnFlag(Long warnFlag)
+    {
+        this.warnFlag = warnFlag;
+    }
+
+    public Long getWarnFlag()
+    {
+        return warnFlag;
+    }
+    public void setGrade(String grade)
+    {
+        this.grade = grade;
+    }
+
+    public String getGrade()
+    {
+        return grade;
+    }
+    public void setDesigner(String designer)
+    {
+        this.designer = designer;
+    }
+
+    public String getDesigner()
+    {
+        return designer;
+    }
+    public void setInstaller(String installer)
+    {
+        this.installer = installer;
+    }
+
+    public String getInstaller()
+    {
+        return installer;
+    }
+    public void setMaterial(String material)
+    {
+        this.material = material;
+    }
+
+    public String getMaterial()
+    {
+        return material;
+    }
+    public void setDia(String dia)
+    {
+        this.dia = dia;
+    }
+
+    public String getDia()
+    {
+        return dia;
+    }
+    public void setScheduleNo(String scheduleNo)
+    {
+        this.scheduleNo = scheduleNo;
+    }
+
+    public String getScheduleNo()
+    {
+        return scheduleNo;
+    }
+    public void setLength(String length)
+    {
+        this.length = length;
+    }
+
+    public String getLength()
+    {
+        return length;
+    }
+    public void setStarting(String starting)
+    {
+        this.starting = starting;
+    }
+
+    public String getStarting()
+    {
+        return starting;
+    }
+    public void setEnding(String ending)
+    {
+        this.ending = ending;
+    }
+
+    public String getEnding()
+    {
+        return ending;
+    }
+    public void setDesPressure(String desPressure)
+    {
+        this.desPressure = desPressure;
+    }
+
+    public String getDesPressure()
+    {
+        return desPressure;
+    }
+    public void setDesTemp(String desTemp)
+    {
+        this.desTemp = desTemp;
+    }
+
+    public String getDesTemp()
+    {
+        return desTemp;
+    }
+    public void setOptPressure(String optPressure)
+    {
+        this.optPressure = optPressure;
+    }
+
+    public String getOptPressure()
+    {
+        return optPressure;
+    }
+    public void setOptTemp(String optTemp)
+    {
+        this.optTemp = optTemp;
+    }
+
+    public String getOptTemp()
+    {
+        return optTemp;
+    }
+    public void setMedium(String medium)
+    {
+        this.medium = medium;
+    }
+
+    public String getMedium()
+    {
+        return medium;
+    }
+    public void setCheckConclusion(String checkConclusion)
+    {
+        this.checkConclusion = checkConclusion;
+    }
+
+    public String getCheckConclusion()
+    {
+        return checkConclusion;
+    }
+    public void setCheckUnit(String checkUnit)
+    {
+        this.checkUnit = checkUnit;
+    }
+
+    public String getCheckUnit()
+    {
+        return checkUnit;
+    }
+    public void setSafeClass(String safeClass)
+    {
+        this.safeClass = safeClass;
+    }
+
+    public String getSafeClass()
+    {
+        return safeClass;
+    }
+    public void setReportNo(String reportNo)
+    {
+        this.reportNo = reportNo;
+    }
+
+    public String getReportNo()
+    {
+        return reportNo;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setChangeTime(Date changeTime)
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime()
+    {
+        return changeTime;
+    }
+    public void setPlantMaint(String plantMaint)
+    {
+        this.plantMaint = plantMaint;
+    }
+
+    public String getPlantMaint()
+    {
+        return plantMaint;
+    }
+    public void setEngineer(String engineer)
+    {
+        this.engineer = engineer;
+    }
+
+    public String getEngineer()
+    {
+        return engineer;
+    }
+    public void setWeldNumber(String weldNumber)
+    {
+        this.weldNumber = weldNumber;
+    }
+
+    public String getWeldNumber()
+    {
+        return weldNumber;
+    }
+    public void setLayingMethod(String layingMethod)
+    {
+        this.layingMethod = layingMethod;
+    }
+
+    public String getLayingMethod()
+    {
+        return layingMethod;
+    }
+    public void setAdiabatic(String adiabatic)
+    {
+        this.adiabatic = adiabatic;
+    }
+
+    public String getAdiabatic()
+    {
+        return adiabatic;
+    }
+    public void setAntiCorrosion(String antiCorrosion)
+    {
+        this.antiCorrosion = antiCorrosion;
+    }
+
+    public String getAntiCorrosion()
+    {
+        return antiCorrosion;
+    }
+    public void setAdiabaticThickness(String adiabaticThickness)
+    {
+        this.adiabaticThickness = adiabaticThickness;
+    }
+
+    public String getAdiabaticThickness()
+    {
+        return adiabaticThickness;
+    }
+    public void setIsDanger(String isDanger)
+    {
+        this.isDanger = isDanger;
+    }
+
+    public String getIsDanger()
+    {
+        return isDanger;
+    }
+    public void setInstallDate(Date installDate)
+    {
+        this.installDate = installDate;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+    public void setYearWarnDate(Date yearWarnDate)
+    {
+        this.yearWarnDate = yearWarnDate;
+    }
+
+    public Date getYearWarnDate()
+    {
+        return yearWarnDate;
+    }
+    public void setYearNextWarnDate(Date yearNextWarnDate)
+    {
+        this.yearNextWarnDate = yearNextWarnDate;
+    }
+
+    public Date getYearNextWarnDate()
+    {
+        return yearNextWarnDate;
+    }
+    public void setYearReportNo(String yearReportNo)
+    {
+        this.yearReportNo = yearReportNo;
+    }
+
+    public String getYearReportNo()
+    {
+        return yearReportNo;
+    }
+    public void setIsRepeat(Long isRepeat)
+    {
+        this.isRepeat = isRepeat;
+    }
+
+    public Long getIsRepeat()
+    {
+        return isRepeat;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDeviceSize(Long deviceSize)
+    {
+        this.deviceSize = deviceSize;
+    }
+
+    public Long getDeviceSize()
+    {
+        return deviceSize;
+    }
+    public void setLeakageMode(String leakageMode)
+    {
+        this.leakageMode = leakageMode;
+    }
+
+    public String getLeakageMode()
+    {
+        return leakageMode;
+    }
+    public void setArchives(String archives)
+    {
+        this.archives = archives;
+    }
+
+    public String getArchives()
+    {
+        return archives;
+    }
+    public void setDevId(Long devId)
+    {
+        this.devId = devId;
+    }
+
+    public Long getDevId()
+    {
+        return devId;
+    }
+    public void setHiType(Long hiType)
+    {
+        this.hiType = hiType;
+    }
+
+    public Long getHiType()
+    {
+        return hiType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantCode", getPlantCode())
+            .append("unit", getUnit())
+            .append("devname", getDevname())
+            .append("devno", getDevno())
+            .append("submitdate", getSubmitdate())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("regno", getRegno())
+            .append("useno", getUseno())
+            .append("warnDate", getWarnDate())
+            .append("warnCycle", getWarnCycle())
+            .append("nextWarnDate", getNextWarnDate())
+            .append("warnFlag", getWarnFlag())
+            .append("grade", getGrade())
+            .append("designer", getDesigner())
+            .append("installer", getInstaller())
+            .append("material", getMaterial())
+            .append("dia", getDia())
+            .append("scheduleNo", getScheduleNo())
+            .append("length", getLength())
+            .append("starting", getStarting())
+            .append("ending", getEnding())
+            .append("desPressure", getDesPressure())
+            .append("desTemp", getDesTemp())
+            .append("optPressure", getOptPressure())
+            .append("optTemp", getOptTemp())
+            .append("medium", getMedium())
+            .append("checkConclusion", getCheckConclusion())
+            .append("checkUnit", getCheckUnit())
+            .append("safeClass", getSafeClass())
+            .append("reportNo", getReportNo())
+            .append("approveTime", getApproveTime())
+            .append("changeTime", getChangeTime())
+            .append("plantMaint", getPlantMaint())
+            .append("engineer", getEngineer())
+            .append("weldNumber", getWeldNumber())
+            .append("layingMethod", getLayingMethod())
+            .append("adiabatic", getAdiabatic())
+            .append("antiCorrosion", getAntiCorrosion())
+            .append("adiabaticThickness", getAdiabaticThickness())
+            .append("isDanger", getIsDanger())
+            .append("installDate", getInstallDate())
+            .append("yearWarnDate", getYearWarnDate())
+            .append("yearNextWarnDate", getYearNextWarnDate())
+            .append("yearReportNo", getYearReportNo())
+            .append("isRepeat", getIsRepeat())
+            .append("type", getType())
+            .append("position", getPosition())
+            .append("deviceSize", getDeviceSize())
+            .append("leakageMode", getLeakageMode())
+            .append("archives", getArchives())
+            .append("devId", getDevId())
+            .append("hiType", getHiType())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/mapper/TIntactHiGjMapper.java

@@ -0,0 +1,72 @@
+package com.ruoyi.project.intact.his.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+
+
+/**
+ * 设备完整性-管件台账变更历史记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public interface TIntactHiGjMapper 
+{
+    /**
+     * 查询设备完整性-管件台账变更历史记录
+     * 
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    public TIntactHiGj selectTIntactHiGjById(Long id);
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 设备完整性-管件台账变更历史记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactHiGj> selectTIntactHiGjList(TIntactHiGj tIntactHiGj);
+
+
+    //查询改造记录
+    public List<TIntactHiGj> selectTIntactHiGjByReform(Long devId);
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    public int insertTIntactHiGj(TIntactHiGj tIntactHiGj);
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     * 
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    public int updateTIntactHiGj(TIntactHiGj tIntactHiGj);
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录
+     * 
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiGjById(Long id);
+
+    /**
+     * 批量删除设备完整性-管件台账变更历史记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactHiGjByIds(Long[] ids);
+
+    //设备id删除
+    public int deleteTIntactHiGjByDevId(Long devId);
+}

master/src/main/java/com/ruoyi/project/intact/his/mapper/TIntactHiPumpMapper.java

@@ -0,0 +1,72 @@
+package com.ruoyi.project.intact.his.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TApproveMaintenance;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.sems.his.domain.TSpechiYlrq;
+
+/**
+ * 设备完整性泵台账历史记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+public interface TIntactHiPumpMapper extends BaseMapper<TIntactHiPump>
+{
+    /**
+     * 查询设备完整性泵台账历史记录
+     * 
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 设备完整性泵台账历史记录
+     */
+    public TIntactHiPump selectTIntactHiPumpById(Long id);
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 设备完整性泵台账历史记录集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TIntactHiPump> selectTIntactHiPumpList(TIntactHiPump tIntactHiPump);
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    public int insertTIntactHiPump(TIntactHiPump tIntactHiPump);
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     * 
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    public int updateTIntactHiPump(TIntactHiPump tIntactHiPump);
+
+    //查询改造记录
+    public List<TIntactHiPump> selectTIntactHiPumpByReform(Long devId);
+
+    /**
+     * 删除设备完整性泵台账历史记录
+     * 
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    public int deleteTIntactHiPumpById(Long id);
+
+    /**
+     * 批量删除设备完整性泵台账历史记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIntactHiPumpByIds(Long[] ids);
+
+    public int deleteTIntactHiPumpByDevId(Long devId);
+}

master/src/main/java/com/ruoyi/project/intact/his/service/impl/TIntactHiGjServiceImpl.java

@@ -0,0 +1,111 @@
+package com.ruoyi.project.intact.his.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiGj;
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.intact.his.mapper.TIntactHiGjMapper;
+import com.ruoyi.project.intact.his.service.ITIntactHiGjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 设备完整性-管件台账变更历史记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@Service
+public class TIntactHiGjServiceImpl implements ITIntactHiGjService
+{
+    @Autowired
+    private TIntactHiGjMapper tIntactHiGjMapper;
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录
+     *
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    @Override
+    public TIntactHiGj selectTIntactHiGjById(Long id)
+    {
+        return tIntactHiGjMapper.selectTIntactHiGjById(id);
+    }
+
+    /**
+     * 查询设备完整性-管件台账变更历史记录列表
+     *
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 设备完整性-管件台账变更历史记录
+     */
+    @Override
+    public List<TIntactHiGj> selectTIntactHiGjList(TIntactHiGj tIntactHiGj)
+    {
+        return tIntactHiGjMapper.selectTIntactHiGjList(tIntactHiGj);
+    }
+
+
+    @Override
+    public List<TIntactHiGj> selectTIntactHiGjByReform(Long devId) {
+        return tIntactHiGjMapper.selectTIntactHiGjByReform(devId);
+    }
+
+    /**
+     * 新增设备完整性-管件台账变更历史记录
+     *
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactHiGj(TIntactHiGj tIntactHiGj)
+    {
+        return tIntactHiGjMapper.insertTIntactHiGj(tIntactHiGj);
+    }
+
+    /**
+     * 修改设备完整性-管件台账变更历史记录
+     *
+     * @param tIntactHiGj 设备完整性-管件台账变更历史记录
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactHiGj(TIntactHiGj tIntactHiGj)
+    {
+        return tIntactHiGjMapper.updateTIntactHiGj(tIntactHiGj);
+    }
+
+    /**
+     * 批量删除设备完整性-管件台账变更历史记录
+     *
+     * @param ids 需要删除的设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactHiGjByIds(Long[] ids)
+    {
+        return tIntactHiGjMapper.deleteTIntactHiGjByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性-管件台账变更历史记录信息
+     *
+     * @param id 设备完整性-管件台账变更历史记录ID
+     * @return 结果
+     */
+
+    @Override
+    public int deleteTIntactHiGjById(Long id)
+    {
+        return tIntactHiGjMapper.deleteTIntactHiGjById(id);
+    }
+    /**
+     * 通过devId删除修改记录
+     * @param devId
+     * @return
+     */
+    @Override
+    public int deleteTIntactHiGjByDevId(Long devId) {
+        return tIntactHiGjMapper.deleteTIntactHiGjByDevId(devId);
+    }
+}

master/src/main/java/com/ruoyi/project/intact/his/service/impl/TIntactHiPumpServiceImpl.java

@@ -0,0 +1,111 @@
+package com.ruoyi.project.intact.his.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.project.intact.his.domain.TIntactHiPump;
+import com.ruoyi.project.intact.his.mapper.TIntactHiPumpMapper;
+import com.ruoyi.project.intact.his.service.ITIntactHiPumpService;
+import com.ruoyi.project.sems.his.domain.TSpechiYlrq;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 设备完整性泵台账历史记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-06-29
+ */
+@Service
+public class TIntactHiPumpServiceImpl implements ITIntactHiPumpService
+{
+    @Autowired
+    private TIntactHiPumpMapper tIntactHiPumpMapper;
+
+    /**
+     * 查询设备完整性泵台账历史记录
+     *
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 设备完整性泵台账历史记录
+     */
+    @Override
+    public TIntactHiPump selectTIntactHiPumpById(Long id)
+    {
+        return tIntactHiPumpMapper.selectTIntactHiPumpById(id);
+    }
+
+    /**
+     * 查询设备完整性泵台账历史记录列表
+     *
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 设备完整性泵台账历史记录
+     */
+    @Override
+    public List<TIntactHiPump> selectTIntactHiPumpList(TIntactHiPump tIntactHiPump)
+    {
+        return tIntactHiPumpMapper.selectTIntactHiPumpList(tIntactHiPump);
+    }
+
+    /**
+     * 新增设备完整性泵台账历史记录
+     *
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    @Override
+    public int insertTIntactHiPump(TIntactHiPump tIntactHiPump)
+    {
+        return tIntactHiPumpMapper.insertTIntactHiPump(tIntactHiPump);
+    }
+
+    /**
+     * 修改设备完整性泵台账历史记录
+     *
+     * @param tIntactHiPump 设备完整性泵台账历史记录
+     * @return 结果
+     */
+    @Override
+    public int updateTIntactHiPump(TIntactHiPump tIntactHiPump)
+    {
+        return tIntactHiPumpMapper.updateTIntactHiPump(tIntactHiPump);
+    }
+
+    @Override
+    public List<TIntactHiPump> selectTIntactHiPumpByReform(Long devId) {
+        return tIntactHiPumpMapper.selectTIntactHiPumpByReform(devId);
+    }
+
+    /**
+     * 批量删除设备完整性泵台账历史记录
+     *
+     * @param ids 需要删除的设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactHiPumpByIds(Long[] ids)
+    {
+        return tIntactHiPumpMapper.deleteTIntactHiPumpByIds(ids);
+    }
+
+    /**
+     * 删除设备完整性泵台账历史记录信息
+     *
+     * @param id 设备完整性泵台账历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIntactHiPumpById(Long id)
+    {
+        return tIntactHiPumpMapper.deleteTIntactHiPumpById(id);
+    }
+
+    /**
+     * 通过devId删除修改记录
+     * @param devId
+     * @return
+     */
+    @Override
+    public int deleteTIntactHiPumpByDevId(Long devId) {
+        return tIntactHiPumpMapper.deleteTIntactHiPumpByDevId(devId);
+    }
+}

master/src/main/resources/mybatis/intact/TIntactHiGjMapper.xml

@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.intact.mapper.TIntactHiGjMapper">
+    
+    <resultMap type="TIntactHiGj" id="TIntactHiGjResult">
+        <result property="id"    column="id"    />
+        <result property="plantCode"    column="plant_code"    />
+        <result property="unit"    column="unit"    />
+        <result property="devname"    column="devname"    />
+        <result property="devno"    column="devno"    />
+        <result property="submitdate"    column="submitdate"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="regno"    column="regno"    />
+        <result property="useno"    column="useno"    />
+        <result property="warnDate"    column="warn_date"    />
+        <result property="warnCycle"    column="warn_cycle"    />
+        <result property="nextWarnDate"    column="next_warn_date"    />
+        <result property="warnFlag"    column="warn_flag"    />
+        <result property="grade"    column="grade"    />
+        <result property="designer"    column="designer"    />
+        <result property="installer"    column="installer"    />
+        <result property="material"    column="material"    />
+        <result property="dia"    column="dia"    />
+        <result property="scheduleNo"    column="schedule_no"    />
+        <result property="length"    column="length"    />
+        <result property="starting"    column="starting"    />
+        <result property="ending"    column="ending"    />
+        <result property="desPressure"    column="des_pressure"    />
+        <result property="desTemp"    column="des_temp"    />
+        <result property="optPressure"    column="opt_pressure"    />
+        <result property="optTemp"    column="opt_temp"    />
+        <result property="medium"    column="medium"    />
+        <result property="checkConclusion"    column="check_conclusion"    />
+        <result property="checkUnit"    column="check_unit"    />
+        <result property="safeClass"    column="safe_class"    />
+        <result property="reportNo"    column="report_no"    />
+        <result property="approveTime"    column="approve_time"    />
+        <result property="changeTime"    column="change_time"    />
+        <result property="plantMaint"    column="plant_maint"    />
+        <result property="engineer"    column="engineer"    />
+        <result property="weldNumber"    column="weld_number"    />
+        <result property="layingMethod"    column="laying_method"    />
+        <result property="adiabatic"    column="adiabatic"    />
+        <result property="antiCorrosion"    column="anti_corrosion"    />
+        <result property="adiabaticThickness"    column="adiabatic_thickness"    />
+        <result property="isDanger"    column="is_danger"    />
+        <result property="installDate"    column="install_date"    />
+        <result property="yearWarnDate"    column="year_warn_date"    />
+        <result property="yearNextWarnDate"    column="year_next_warn_date"    />
+        <result property="yearReportNo"    column="year_report_no"    />
+        <result property="isRepeat"    column="is_repeat"    />
+        <result property="type"    column="type"    />
+        <result property="position"    column="position"    />
+        <result property="deviceSize"    column="device_size"    />
+        <result property="leakageMode"    column="leakage_mode"    />
+        <result property="archives"    column="archives"    />
+        <result property="devId"    column="dev_id"    />
+        <result property="hiType"    column="hi_type"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTIntactHiGjVo">
+        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.grade, d.designer, d.installer, d.material, d.dia, d.schedule_no, d.length, d.starting, d.ending, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.medium, d.check_conclusion, d.check_unit, d.safe_class, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.engineer, d.weld_number, d.laying_method, d.adiabatic, d.anti_corrosion, d.adiabatic_thickness, d.is_danger, d.install_date, d.year_warn_date, d.year_next_warn_date, d.year_report_no, d.is_repeat, d.type, d.position, d.device_size, d.leakage_mode, d.archives, d.dev_id, d.hi_type ,s.dept_name from t_intacthi_gj d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+
+    <select id="selectTIntactHiGjByReform" parameterType="Long" resultMap="TIntactHiGjResult">
+        <include refid="selectTIntactHiGjVo"/>
+        where d.dev_id = #{devId}
+        and d.hi_type = 0
+        and d.del_flag = 0
+    </select>
+
+    <select id="selectTIntactHiGjList" parameterType="TIntactHiGj" resultMap="TIntactHiGjResult">
+        <include refid="selectTIntactHiGjVo"/>
+        <where>  
+            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
+            <if test="devno != null  and devno != ''"> and devno = #{devno}</if>
+            <if test="submitdate != null "> and submitdate = #{submitdate}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="regno != null  and regno != ''"> and regno = #{regno}</if>
+            <if test="useno != null  and useno != ''"> and useno = #{useno}</if>
+            <if test="warnDate != null "> and warn_date = #{warnDate}</if>
+            <if test="warnCycle != null "> and warn_cycle = #{warnCycle}</if>
+            <if test="nextWarnDate != null "> and next_warn_date = #{nextWarnDate}</if>
+            <if test="warnFlag != null "> and warn_flag = #{warnFlag}</if>
+            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
+            <if test="designer != null  and designer != ''"> and designer = #{designer}</if>
+            <if test="installer != null  and installer != ''"> and installer = #{installer}</if>
+            <if test="material != null  and material != ''"> and material = #{material}</if>
+            <if test="dia != null  and dia != ''"> and dia = #{dia}</if>
+            <if test="scheduleNo != null  and scheduleNo != ''"> and schedule_no = #{scheduleNo}</if>
+            <if test="length != null  and length != ''"> and length = #{length}</if>
+            <if test="starting != null  and starting != ''"> and starting = #{starting}</if>
+            <if test="ending != null  and ending != ''"> and ending = #{ending}</if>
+            <if test="desPressure != null  and desPressure != ''"> and des_pressure = #{desPressure}</if>
+            <if test="desTemp != null  and desTemp != ''"> and des_temp = #{desTemp}</if>
+            <if test="optPressure != null  and optPressure != ''"> and opt_pressure = #{optPressure}</if>
+            <if test="optTemp != null  and optTemp != ''"> and opt_temp = #{optTemp}</if>
+            <if test="medium != null  and medium != ''"> and medium = #{medium}</if>
+            <if test="checkConclusion != null  and checkConclusion != ''"> and check_conclusion = #{checkConclusion}</if>
+            <if test="checkUnit != null  and checkUnit != ''"> and check_unit = #{checkUnit}</if>
+            <if test="safeClass != null  and safeClass != ''"> and safe_class = #{safeClass}</if>
+            <if test="reportNo != null  and reportNo != ''"> and report_no = #{reportNo}</if>
+            <if test="approveTime != null "> and approve_time = #{approveTime}</if>
+            <if test="changeTime != null "> and change_time = #{changeTime}</if>
+            <if test="plantMaint != null  and plantMaint != ''"> and plant_maint = #{plantMaint}</if>
+            <if test="engineer != null  and engineer != ''"> and engineer = #{engineer}</if>
+            <if test="weldNumber != null  and weldNumber != ''"> and weld_number = #{weldNumber}</if>
+            <if test="layingMethod != null  and layingMethod != ''"> and laying_method = #{layingMethod}</if>
+            <if test="adiabatic != null  and adiabatic != ''"> and adiabatic = #{adiabatic}</if>
+            <if test="antiCorrosion != null  and antiCorrosion != ''"> and anti_corrosion = #{antiCorrosion}</if>
+            <if test="adiabaticThickness != null  and adiabaticThickness != ''"> and adiabatic_thickness = #{adiabaticThickness}</if>
+            <if test="isDanger != null  and isDanger != ''"> and is_danger = #{isDanger}</if>
+            <if test="installDate != null "> and install_date = #{installDate}</if>
+            <if test="yearWarnDate != null "> and year_warn_date = #{yearWarnDate}</if>
+            <if test="yearNextWarnDate != null "> and year_next_warn_date = #{yearNextWarnDate}</if>
+            <if test="yearReportNo != null  and yearReportNo != ''"> and year_report_no = #{yearReportNo}</if>
+            <if test="isRepeat != null "> and is_repeat = #{isRepeat}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="position != null  and position != ''"> and position = #{position}</if>
+            <if test="deviceSize != null "> and device_size = #{deviceSize}</if>
+            <if test="leakageMode != null  and leakageMode != ''"> and leakage_mode = #{leakageMode}</if>
+            <if test="archives != null  and archives != ''"> and archives = #{archives}</if>
+            <if test="devId != null "> and dev_id = #{devId}</if>
+            <if test="hiType != null "> and hi_type = #{hiType}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTIntactHiGjById" parameterType="Long" resultMap="TIntactHiGjResult">
+        <include refid="selectTIntactHiGjVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTIntactHiGjByReform" parameterType="Long" resultMap="TIntactHiGjResult">
+        <include refid="selectTIntactHiGjVo"/>
+        where d.dev_id = #{devId}
+        and d.hi_type = 0
+        and d.del_flag = 0
+    </select>
+
+        
+    <insert id="insertTIntactHiGj" parameterType="TIntactHiGj">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_intacthi_gj.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_intacthi_gj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="plantCode != null">plant_code,</if>
+            <if test="unit != null">unit,</if>
+            <if test="devname != null">devname,</if>
+            <if test="devno != null">devno,</if>
+            <if test="submitdate != null">submitdate,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="regno != null">regno,</if>
+            <if test="useno != null">useno,</if>
+            <if test="warnDate != null">warn_date,</if>
+            <if test="warnCycle != null">warn_cycle,</if>
+            <if test="nextWarnDate != null">next_warn_date,</if>
+            <if test="warnFlag != null">warn_flag,</if>
+            <if test="grade != null">grade,</if>
+            <if test="designer != null">designer,</if>
+            <if test="installer != null">installer,</if>
+            <if test="material != null">material,</if>
+            <if test="dia != null">dia,</if>
+            <if test="scheduleNo != null">schedule_no,</if>
+            <if test="length != null">length,</if>
+            <if test="starting != null">starting,</if>
+            <if test="ending != null">ending,</if>
+            <if test="desPressure != null">des_pressure,</if>
+            <if test="desTemp != null">des_temp,</if>
+            <if test="optPressure != null">opt_pressure,</if>
+            <if test="optTemp != null">opt_temp,</if>
+            <if test="medium != null">medium,</if>
+            <if test="checkConclusion != null">check_conclusion,</if>
+            <if test="checkUnit != null">check_unit,</if>
+            <if test="safeClass != null">safe_class,</if>
+            <if test="reportNo != null">report_no,</if>
+            <if test="approveTime != null">approve_time,</if>
+            <if test="changeTime != null">change_time,</if>
+            <if test="plantMaint != null">plant_maint,</if>
+            <if test="engineer != null">engineer,</if>
+            <if test="weldNumber != null">weld_number,</if>
+            <if test="layingMethod != null">laying_method,</if>
+            <if test="adiabatic != null">adiabatic,</if>
+            <if test="antiCorrosion != null">anti_corrosion,</if>
+            <if test="adiabaticThickness != null">adiabatic_thickness,</if>
+            <if test="isDanger != null">is_danger,</if>
+            <if test="installDate != null">install_date,</if>
+            <if test="yearWarnDate != null">year_warn_date,</if>
+            <if test="yearNextWarnDate != null">year_next_warn_date,</if>
+            <if test="yearReportNo != null">year_report_no,</if>
+            <if test="isRepeat != null">is_repeat,</if>
+            <if test="type != null">type,</if>
+            <if test="position != null">position,</if>
+            <if test="deviceSize != null">device_size,</if>
+            <if test="leakageMode != null">leakage_mode,</if>
+            <if test="archives != null">archives,</if>
+            <if test="devId != null">dev_id,</if>
+            <if test="hiType != null">hi_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="plantCode != null">#{plantCode},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="devname != null">#{devname},</if>
+            <if test="devno != null">#{devno},</if>
+            <if test="submitdate != null">#{submitdate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="regno != null">#{regno},</if>
+            <if test="useno != null">#{useno},</if>
+            <if test="warnDate != null">#{warnDate},</if>
+            <if test="warnCycle != null">#{warnCycle},</if>
+            <if test="nextWarnDate != null">#{nextWarnDate},</if>
+            <if test="warnFlag != null">#{warnFlag},</if>
+            <if test="grade != null">#{grade},</if>
+            <if test="designer != null">#{designer},</if>
+            <if test="installer != null">#{installer},</if>
+            <if test="material != null">#{material},</if>
+            <if test="dia != null">#{dia},</if>
+            <if test="scheduleNo != null">#{scheduleNo},</if>
+            <if test="length != null">#{length},</if>
+            <if test="starting != null">#{starting},</if>
+            <if test="ending != null">#{ending},</if>
+            <if test="desPressure != null">#{desPressure},</if>
+            <if test="desTemp != null">#{desTemp},</if>
+            <if test="optPressure != null">#{optPressure},</if>
+            <if test="optTemp != null">#{optTemp},</if>
+            <if test="medium != null">#{medium},</if>
+            <if test="checkConclusion != null">#{checkConclusion},</if>
+            <if test="checkUnit != null">#{checkUnit},</if>
+            <if test="safeClass != null">#{safeClass},</if>
+            <if test="reportNo != null">#{reportNo},</if>
+            <if test="approveTime != null">#{approveTime},</if>
+            <if test="changeTime != null">#{changeTime},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
+            <if test="engineer != null">#{engineer},</if>
+            <if test="weldNumber != null">#{weldNumber},</if>
+            <if test="layingMethod != null">#{layingMethod},</if>
+            <if test="adiabatic != null">#{adiabatic},</if>
+            <if test="antiCorrosion != null">#{antiCorrosion},</if>
+            <if test="adiabaticThickness != null">#{adiabaticThickness},</if>
+            <if test="isDanger != null">#{isDanger},</if>
+            <if test="installDate != null">#{installDate},</if>
+            <if test="yearWarnDate != null">#{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">#{yearNextWarnDate},</if>
+            <if test="yearReportNo != null">#{yearReportNo},</if>
+            <if test="isRepeat != null">#{isRepeat},</if>
+            <if test="type != null">#{type},</if>
+            <if test="position != null">#{position},</if>
+            <if test="deviceSize != null">#{deviceSize},</if>
+            <if test="leakageMode != null">#{leakageMode},</if>
+            <if test="archives != null">#{archives},</if>
+            <if test="devId != null">#{devId},</if>
+            <if test="hiType != null">#{hiType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTIntactHiGj" parameterType="TIntactHiGj">
+        update t_intacthi_gj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantCode != null">plant_code = #{plantCode},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="devname != null">devname = #{devname},</if>
+            <if test="devno != null">devno = #{devno},</if>
+            <if test="submitdate != null">submitdate = #{submitdate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="regno != null">regno = #{regno},</if>
+            <if test="useno != null">useno = #{useno},</if>
+            <if test="warnDate != null">warn_date = #{warnDate},</if>
+            <if test="warnCycle != null">warn_cycle = #{warnCycle},</if>
+            <if test="nextWarnDate != null">next_warn_date = #{nextWarnDate},</if>
+            <if test="warnFlag != null">warn_flag = #{warnFlag},</if>
+            <if test="grade != null">grade = #{grade},</if>
+            <if test="designer != null">designer = #{designer},</if>
+            <if test="installer != null">installer = #{installer},</if>
+            <if test="material != null">material = #{material},</if>
+            <if test="dia != null">dia = #{dia},</if>
+            <if test="scheduleNo != null">schedule_no = #{scheduleNo},</if>
+            <if test="length != null">length = #{length},</if>
+            <if test="starting != null">starting = #{starting},</if>
+            <if test="ending != null">ending = #{ending},</if>
+            <if test="desPressure != null">des_pressure = #{desPressure},</if>
+            <if test="desTemp != null">des_temp = #{desTemp},</if>
+            <if test="optPressure != null">opt_pressure = #{optPressure},</if>
+            <if test="optTemp != null">opt_temp = #{optTemp},</if>
+            <if test="medium != null">medium = #{medium},</if>
+            <if test="checkConclusion != null">check_conclusion = #{checkConclusion},</if>
+            <if test="checkUnit != null">check_unit = #{checkUnit},</if>
+            <if test="safeClass != null">safe_class = #{safeClass},</if>
+            <if test="reportNo != null">report_no = #{reportNo},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</if>
+            <if test="changeTime != null">change_time = #{changeTime},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+            <if test="engineer != null">engineer = #{engineer},</if>
+            <if test="weldNumber != null">weld_number = #{weldNumber},</if>
+            <if test="layingMethod != null">laying_method = #{layingMethod},</if>
+            <if test="adiabatic != null">adiabatic = #{adiabatic},</if>
+            <if test="antiCorrosion != null">anti_corrosion = #{antiCorrosion},</if>
+            <if test="adiabaticThickness != null">adiabatic_thickness = #{adiabaticThickness},</if>
+            <if test="isDanger != null">is_danger = #{isDanger},</if>
+            <if test="installDate != null">install_date = #{installDate},</if>
+            <if test="yearWarnDate != null">year_warn_date = #{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">year_next_warn_date = #{yearNextWarnDate},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="position != null">position = #{position},</if>
+            <if test="deviceSize != null">device_size = #{deviceSize},</if>
+            <if test="leakageMode != null">leakage_mode = #{leakageMode},</if>
+            <if test="archives != null">archives = #{archives},</if>
+            <if test="devId != null">dev_id = #{devId},</if>
+            <if test="hiType != null">hi_type = #{hiType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTIntactHiGjById" parameterType="Long">
+        update t_intacthi_gj set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTIntactHiGjByIds" parameterType="String">
+        update t_intacthi_gj set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="deleteTIntactHiGjByDevId" parameterType="Long">
+        update t_intacthi_gj set del_flag = 2 where dev_id = #{devId} and hi_type = 1
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/intact/TIntactHiPumpMapper.xml

@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.intact.mapper.TIntactHiPumpMapper">
+    
+    <resultMap type="TIntactHiPump" id="TIntactHiPumpResult">
+        <result property="id"    column="id"    />
+        <result property="plantCode"    column="plant_code"    />
+        <result property="unit"    column="unit"    />
+        <result property="devname"    column="devname"    />
+        <result property="devno"    column="devno"    />
+        <result property="submitdate"    column="submitdate"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="regno"    column="regno"    />
+        <result property="useno"    column="useno"    />
+        <result property="warnDate"    column="warn_date"    />
+        <result property="warnCycle"    column="warn_cycle"    />
+        <result property="nextWarnDate"    column="next_warn_date"    />
+        <result property="warnFlag"    column="warn_flag"    />
+        <result property="grade"    column="grade"    />
+        <result property="designer"    column="designer"    />
+        <result property="installer"    column="installer"    />
+        <result property="material"    column="material"    />
+        <result property="dia"    column="dia"    />
+        <result property="scheduleNo"    column="schedule_no"    />
+        <result property="length"    column="length"    />
+        <result property="starting"    column="starting"    />
+        <result property="ending"    column="ending"    />
+        <result property="desPressure"    column="des_pressure"    />
+        <result property="desTemp"    column="des_temp"    />
+        <result property="optPressure"    column="opt_pressure"    />
+        <result property="optTemp"    column="opt_temp"    />
+        <result property="medium"    column="medium"    />
+        <result property="checkConclusion"    column="check_conclusion"    />
+        <result property="checkUnit"    column="check_unit"    />
+        <result property="safeClass"    column="safe_class"    />
+        <result property="reportNo"    column="report_no"    />
+        <result property="approveTime"    column="approve_time"    />
+        <result property="changeTime"    column="change_time"    />
+        <result property="plantMaint"    column="plant_maint"    />
+        <result property="engineer"    column="engineer"    />
+        <result property="weldNumber"    column="weld_number"    />
+        <result property="layingMethod"    column="laying_method"    />
+        <result property="adiabatic"    column="adiabatic"    />
+        <result property="antiCorrosion"    column="anti_corrosion"    />
+        <result property="adiabaticThickness"    column="adiabatic_thickness"    />
+        <result property="isDanger"    column="is_danger"    />
+        <result property="installDate"    column="install_date"    />
+        <result property="yearWarnDate"    column="year_warn_date"    />
+        <result property="yearNextWarnDate"    column="year_next_warn_date"    />
+        <result property="yearReportNo"    column="year_report_no"    />
+        <result property="isRepeat"    column="is_repeat"    />
+        <result property="type"    column="type"    />
+        <result property="position"    column="position"    />
+        <result property="deviceSize"    column="device_size"    />
+        <result property="leakageMode"    column="leakage_mode"    />
+        <result property="archives"    column="archives"    />
+        <result property="devId"    column="dev_id"    />
+        <result property="hiType"    column="hi_type"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTIntactHiPumpVo">
+        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.grade, d.designer, d.installer, d.material, d.dia, d.schedule_no, d.length, d.starting, d.ending, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.medium, d.check_conclusion, d.check_unit, d.safe_class, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.engineer, d.weld_number, d.laying_method, d.adiabatic, d.anti_corrosion, d.adiabatic_thickness, d.is_danger, d.install_date, d.year_warn_date, d.year_next_warn_date, d.year_report_no, d.is_repeat, d.type, d.position, d.device_size, d.leakage_mode, d.archives, d.dev_id, d.hi_type ,s.dept_name from t_intactHi_pump d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTIntactHiPumpList" parameterType="TIntactHiPump" resultMap="TIntactHiPumpResult">
+        <include refid="selectTIntactHiPumpVo"/>
+        <where>  
+            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
+            <if test="devno != null  and devno != ''"> and devno = #{devno}</if>
+            <if test="submitdate != null "> and submitdate = #{submitdate}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="regno != null  and regno != ''"> and regno = #{regno}</if>
+            <if test="useno != null  and useno != ''"> and useno = #{useno}</if>
+            <if test="warnDate != null "> and warn_date = #{warnDate}</if>
+            <if test="warnCycle != null "> and warn_cycle = #{warnCycle}</if>
+            <if test="nextWarnDate != null "> and next_warn_date = #{nextWarnDate}</if>
+            <if test="warnFlag != null "> and warn_flag = #{warnFlag}</if>
+            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
+            <if test="designer != null  and designer != ''"> and designer = #{designer}</if>
+            <if test="installer != null  and installer != ''"> and installer = #{installer}</if>
+            <if test="material != null  and material != ''"> and material = #{material}</if>
+            <if test="dia != null  and dia != ''"> and dia = #{dia}</if>
+            <if test="scheduleNo != null  and scheduleNo != ''"> and schedule_no = #{scheduleNo}</if>
+            <if test="length != null  and length != ''"> and length = #{length}</if>
+            <if test="starting != null  and starting != ''"> and starting = #{starting}</if>
+            <if test="ending != null  and ending != ''"> and ending = #{ending}</if>
+            <if test="desPressure != null  and desPressure != ''"> and des_pressure = #{desPressure}</if>
+            <if test="desTemp != null  and desTemp != ''"> and des_temp = #{desTemp}</if>
+            <if test="optPressure != null  and optPressure != ''"> and opt_pressure = #{optPressure}</if>
+            <if test="optTemp != null  and optTemp != ''"> and opt_temp = #{optTemp}</if>
+            <if test="medium != null  and medium != ''"> and medium = #{medium}</if>
+            <if test="checkConclusion != null  and checkConclusion != ''"> and check_conclusion = #{checkConclusion}</if>
+            <if test="checkUnit != null  and checkUnit != ''"> and check_unit = #{checkUnit}</if>
+            <if test="safeClass != null  and safeClass != ''"> and safe_class = #{safeClass}</if>
+            <if test="reportNo != null  and reportNo != ''"> and report_no = #{reportNo}</if>
+            <if test="approveTime != null "> and approve_time = #{approveTime}</if>
+            <if test="changeTime != null "> and change_time = #{changeTime}</if>
+            <if test="plantMaint != null  and plantMaint != ''"> and plant_maint = #{plantMaint}</if>
+            <if test="engineer != null  and engineer != ''"> and engineer = #{engineer}</if>
+            <if test="weldNumber != null  and weldNumber != ''"> and weld_number = #{weldNumber}</if>
+            <if test="layingMethod != null  and layingMethod != ''"> and laying_method = #{layingMethod}</if>
+            <if test="adiabatic != null  and adiabatic != ''"> and adiabatic = #{adiabatic}</if>
+            <if test="antiCorrosion != null  and antiCorrosion != ''"> and anti_corrosion = #{antiCorrosion}</if>
+            <if test="adiabaticThickness != null  and adiabaticThickness != ''"> and adiabatic_thickness = #{adiabaticThickness}</if>
+            <if test="isDanger != null  and isDanger != ''"> and is_danger = #{isDanger}</if>
+            <if test="installDate != null "> and install_date = #{installDate}</if>
+            <if test="yearWarnDate != null "> and year_warn_date = #{yearWarnDate}</if>
+            <if test="yearNextWarnDate != null "> and year_next_warn_date = #{yearNextWarnDate}</if>
+            <if test="yearReportNo != null  and yearReportNo != ''"> and year_report_no = #{yearReportNo}</if>
+            <if test="isRepeat != null "> and is_repeat = #{isRepeat}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="position != null  and position != ''"> and position = #{position}</if>
+            <if test="deviceSize != null "> and device_size = #{deviceSize}</if>
+            <if test="leakageMode != null  and leakageMode != ''"> and leakage_mode = #{leakageMode}</if>
+            <if test="archives != null  and archives != ''"> and archives = #{archives}</if>
+            <if test="devId != null "> and dev_id = #{devId}</if>
+            <if test="hiType != null "> and hi_type = #{hiType}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTIntactHiPumpById" parameterType="Long" resultMap="TIntactHiPumpResult">
+        <include refid="selectTIntactHiPumpVo"/>
+        where id = #{id}
+    </select>
+
+
+    <select id="selectTIntactHiPumpByReform" parameterType="Long" resultMap="TIntactHiPumpResult">
+        <include refid="selectTIntactHiPumpVo"/>
+        where d.dev_id = #{devId}
+        and d.hi_type = 0
+        and d.del_flag = 0
+    </select>
+        
+    <insert id="insertTIntactHiPump" parameterType="TIntactHiPump">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_intactHi_pump.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_intactHi_pump
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="plantCode != null">plant_code,</if>
+            <if test="unit != null">unit,</if>
+            <if test="devname != null">devname,</if>
+            <if test="devno != null">devno,</if>
+            <if test="submitdate != null">submitdate,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="regno != null">regno,</if>
+            <if test="useno != null">useno,</if>
+            <if test="warnDate != null">warn_date,</if>
+            <if test="warnCycle != null">warn_cycle,</if>
+            <if test="nextWarnDate != null">next_warn_date,</if>
+            <if test="warnFlag != null">warn_flag,</if>
+            <if test="grade != null">grade,</if>
+            <if test="designer != null">designer,</if>
+            <if test="installer != null">installer,</if>
+            <if test="material != null">material,</if>
+            <if test="dia != null">dia,</if>
+            <if test="scheduleNo != null">schedule_no,</if>
+            <if test="length != null">length,</if>
+            <if test="starting != null">starting,</if>
+            <if test="ending != null">ending,</if>
+            <if test="desPressure != null">des_pressure,</if>
+            <if test="desTemp != null">des_temp,</if>
+            <if test="optPressure != null">opt_pressure,</if>
+            <if test="optTemp != null">opt_temp,</if>
+            <if test="medium != null">medium,</if>
+            <if test="checkConclusion != null">check_conclusion,</if>
+            <if test="checkUnit != null">check_unit,</if>
+            <if test="safeClass != null">safe_class,</if>
+            <if test="reportNo != null">report_no,</if>
+            <if test="approveTime != null">approve_time,</if>
+            <if test="changeTime != null">change_time,</if>
+            <if test="plantMaint != null">plant_maint,</if>
+            <if test="engineer != null">engineer,</if>
+            <if test="weldNumber != null">weld_number,</if>
+            <if test="layingMethod != null">laying_method,</if>
+            <if test="adiabatic != null">adiabatic,</if>
+            <if test="antiCorrosion != null">anti_corrosion,</if>
+            <if test="adiabaticThickness != null">adiabatic_thickness,</if>
+            <if test="isDanger != null">is_danger,</if>
+            <if test="installDate != null">install_date,</if>
+            <if test="yearWarnDate != null">year_warn_date,</if>
+            <if test="yearNextWarnDate != null">year_next_warn_date,</if>
+            <if test="yearReportNo != null">year_report_no,</if>
+            <if test="isRepeat != null">is_repeat,</if>
+            <if test="type != null">type,</if>
+            <if test="position != null">position,</if>
+            <if test="deviceSize != null">device_size,</if>
+            <if test="leakageMode != null">leakage_mode,</if>
+            <if test="archives != null">archives,</if>
+            <if test="devId != null">dev_id,</if>
+            <if test="hiType != null">hi_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="plantCode != null">#{plantCode},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="devname != null">#{devname},</if>
+            <if test="devno != null">#{devno},</if>
+            <if test="submitdate != null">#{submitdate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="regno != null">#{regno},</if>
+            <if test="useno != null">#{useno},</if>
+            <if test="warnDate != null">#{warnDate},</if>
+            <if test="warnCycle != null">#{warnCycle},</if>
+            <if test="nextWarnDate != null">#{nextWarnDate},</if>
+            <if test="warnFlag != null">#{warnFlag},</if>
+            <if test="grade != null">#{grade},</if>
+            <if test="designer != null">#{designer},</if>
+            <if test="installer != null">#{installer},</if>
+            <if test="material != null">#{material},</if>
+            <if test="dia != null">#{dia},</if>
+            <if test="scheduleNo != null">#{scheduleNo},</if>
+            <if test="length != null">#{length},</if>
+            <if test="starting != null">#{starting},</if>
+            <if test="ending != null">#{ending},</if>
+            <if test="desPressure != null">#{desPressure},</if>
+            <if test="desTemp != null">#{desTemp},</if>
+            <if test="optPressure != null">#{optPressure},</if>
+            <if test="optTemp != null">#{optTemp},</if>
+            <if test="medium != null">#{medium},</if>
+            <if test="checkConclusion != null">#{checkConclusion},</if>
+            <if test="checkUnit != null">#{checkUnit},</if>
+            <if test="safeClass != null">#{safeClass},</if>
+            <if test="reportNo != null">#{reportNo},</if>
+            <if test="approveTime != null">#{approveTime},</if>
+            <if test="changeTime != null">#{changeTime},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
+            <if test="engineer != null">#{engineer},</if>
+            <if test="weldNumber != null">#{weldNumber},</if>
+            <if test="layingMethod != null">#{layingMethod},</if>
+            <if test="adiabatic != null">#{adiabatic},</if>
+            <if test="antiCorrosion != null">#{antiCorrosion},</if>
+            <if test="adiabaticThickness != null">#{adiabaticThickness},</if>
+            <if test="isDanger != null">#{isDanger},</if>
+            <if test="installDate != null">#{installDate},</if>
+            <if test="yearWarnDate != null">#{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">#{yearNextWarnDate},</if>
+            <if test="yearReportNo != null">#{yearReportNo},</if>
+            <if test="isRepeat != null">#{isRepeat},</if>
+            <if test="type != null">#{type},</if>
+            <if test="position != null">#{position},</if>
+            <if test="deviceSize != null">#{deviceSize},</if>
+            <if test="leakageMode != null">#{leakageMode},</if>
+            <if test="archives != null">#{archives},</if>
+            <if test="devId != null">#{devId},</if>
+            <if test="hiType != null">#{hiType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTIntactHiPump" parameterType="TIntactHiPump">
+        update t_intactHi_pump
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantCode != null">plant_code = #{plantCode},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="devname != null">devname = #{devname},</if>
+            <if test="devno != null">devno = #{devno},</if>
+            <if test="submitdate != null">submitdate = #{submitdate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="regno != null">regno = #{regno},</if>
+            <if test="useno != null">useno = #{useno},</if>
+            <if test="warnDate != null">warn_date = #{warnDate},</if>
+            <if test="warnCycle != null">warn_cycle = #{warnCycle},</if>
+            <if test="nextWarnDate != null">next_warn_date = #{nextWarnDate},</if>
+            <if test="warnFlag != null">warn_flag = #{warnFlag},</if>
+            <if test="grade != null">grade = #{grade},</if>
+            <if test="designer != null">designer = #{designer},</if>
+            <if test="installer != null">installer = #{installer},</if>
+            <if test="material != null">material = #{material},</if>
+            <if test="dia != null">dia = #{dia},</if>
+            <if test="scheduleNo != null">schedule_no = #{scheduleNo},</if>
+            <if test="length != null">length = #{length},</if>
+            <if test="starting != null">starting = #{starting},</if>
+            <if test="ending != null">ending = #{ending},</if>
+            <if test="desPressure != null">des_pressure = #{desPressure},</if>
+            <if test="desTemp != null">des_temp = #{desTemp},</if>
+            <if test="optPressure != null">opt_pressure = #{optPressure},</if>
+            <if test="optTemp != null">opt_temp = #{optTemp},</if>
+            <if test="medium != null">medium = #{medium},</if>
+            <if test="checkConclusion != null">check_conclusion = #{checkConclusion},</if>
+            <if test="checkUnit != null">check_unit = #{checkUnit},</if>
+            <if test="safeClass != null">safe_class = #{safeClass},</if>
+            <if test="reportNo != null">report_no = #{reportNo},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</if>
+            <if test="changeTime != null">change_time = #{changeTime},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+            <if test="engineer != null">engineer = #{engineer},</if>
+            <if test="weldNumber != null">weld_number = #{weldNumber},</if>
+            <if test="layingMethod != null">laying_method = #{layingMethod},</if>
+            <if test="adiabatic != null">adiabatic = #{adiabatic},</if>
+            <if test="antiCorrosion != null">anti_corrosion = #{antiCorrosion},</if>
+            <if test="adiabaticThickness != null">adiabatic_thickness = #{adiabaticThickness},</if>
+            <if test="isDanger != null">is_danger = #{isDanger},</if>
+            <if test="installDate != null">install_date = #{installDate},</if>
+            <if test="yearWarnDate != null">year_warn_date = #{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">year_next_warn_date = #{yearNextWarnDate},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="position != null">position = #{position},</if>
+            <if test="deviceSize != null">device_size = #{deviceSize},</if>
+            <if test="leakageMode != null">leakage_mode = #{leakageMode},</if>
+            <if test="archives != null">archives = #{archives},</if>
+            <if test="devId != null">dev_id = #{devId},</if>
+            <if test="hiType != null">hi_type = #{hiType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTIntactHiPumpById" parameterType="Long">
+        update t_intactHi_pump set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTIntactHiPumpByIds" parameterType="String">
+        update t_intactHi_pump set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="deleteTIntactHiPumpByDevId" parameterType="Long">
+        update t_intactHi_pump set del_flag = 2 where dev_id = #{devId} and hi_type = 1
+    </update>
+    
+</mapper>

ui/src/views/intact/gj/specGl-hisReform.vue

@@ -0,0 +1,195 @@
+<template>
+  <el-dialog :title="$t('台账历史')" :visible.sync="visible" width="1200px" append-to-body>
+    <el-table v-loading="loading" ref="reTable" :data="specHiGlList"  :height="clientHeight" border>
+      <el-table-column :label="$t('装置')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
+<!--      <el-table-column :label="$t('状态')" align="center"  fixed="left" prop="status" :formatter="statusFormat" />-->
+<!--      <el-table-column :label="$t('申请状态')" align="center" fixed="left"  prop="approveStatus" :formatter="approveStatusFormat" />-->
+      <el-table-column :label="$t('装置维修组')" align="center" fixed="left"  prop="plantMaint" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修工程师')" align="center" fixed="left"  prop="engineer" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备名称')" align="center" prop="devname" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('燃烧方式')" align="center" prop="burnMode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('水处理方式')" align="center" prop="waterMode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('燃烧种类')" align="center" prop="burnKind" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('额定出力')" align="center" prop="ratedPower" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计温度')+'℃'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作温度')+'℃'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设计压力')+'MPa(G)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作压力')+'MPa(G)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('本次内部检验日期')" align="center" prop="warnDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('内部检验结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('外部检验结论')" align="center" prop="outCheckConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('外部检验报告编号')" align="center" prop="outReportNo" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('下次外部检验日期')" align="center" prop="outNextWarnDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('创建时间')" align="center" prop="createdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+  import {getSpecGlByReform} from "@/api/sems/specGl";
+  import { getToken } from "@/utils/auth";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+  export default {
+        name: "specGl-hisReform",
+      data() {
+        return {
+          specHiGlList: [],
+          devType: null,
+          // 遮罩层
+          loading: true,
+          visible: false,
+          // 选中数组
+          ids: [],
+          // 非单个禁用
+          single: true,
+          // 非多个禁用
+          multiple: true,
+          // 显示搜索条件
+          showSearch: false,
+          // 总条数
+          total: 0,
+          // 特种设备检验记录表格数据
+          checkList: [],
+          // 弹出层标题
+          title: "",
+          // 部门树选项
+          deptOptions: undefined,
+          clientHeight:300,
+          // 是否显示弹出层
+          open: false,
+          // 用户导入参数
+          upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/sems/check/importData"
+          },
+          // 查询参数
+          queryParams: {
+            pageNum: 1,
+            pageSize: 20,
+            createrCode: null,
+            createdate: null,
+            updaterCode: null,
+            updatedate: null,
+            checkUnit: null,
+            warnDate: null,
+            nextWarnDate: null,
+            reportNo: null,
+            yearWarnDate: null,
+            checkConclusion: null,
+            yearNextWarnDate: null,
+            yearReportNo: null,
+            outWarnDate: null,
+            outNextWarnDate: null,
+            outCheckConclusion: null,
+            outReportNo: null,
+            devId: null,
+            devType: null,
+            safeClass: null
+          },
+
+          // 表单参数
+          form: {},
+          // 表单校验
+          rules: {
+          }
+        };
+      },
+      watch: {
+        // // 根据名称筛选部门树
+        // deptName(val) {
+        //   this.$refs.tree.filter(val);
+        // }
+      },
+      created() {
+        //设置表格高度对应屏幕高度
+        this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+        })
+
+      },
+      methods: {
+        init(row) {
+          this.visible = true
+          this.queryParams.devId = row.id
+          // this.queryParams.devType = type
+          // this.devType = type
+          // console.log(this.devType)
+          this.loading = true;
+          this.$nextTick(() => {
+            console.log(this.queryParams)
+            getSpecGlByReform(row.id).then(response => {
+              this.specHiGlList = response.data;
+              this.$nextTick(() => {
+                this.$refs.reTable.doLayout(); // 解决表格错位
+              });
+              this.loading = false;
+            });
+          })
+
+        },
+        // 状态字典翻译
+        statusFormat(row, column) {
+          return this.selectDictLabel(this.statusOptions, row.status);
+        },
+        // 申请状态字典翻译
+        approveStatusFormat(row, column) {
+          return this.selectDictLabel(this.approveStatusOptions, row.approveStatus);
+        },
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

ui/src/views/intact/gyl/intactRecord.vue

@@ -283,8 +283,22 @@
         </el-form>
       </div>
       </div>
-      <el-table :data="list" v-loading="planLoading"  border>
-
+      <el-table :data="changelist" v-loading="planLoading"  border>
+           <el-table-column :label="$t('申请人')" align="center" prop="userName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备类型')+':'" align="center" prop="devType" :formatter="devTypeFormat" />
+      <el-table-column :label="$t('审批类型')" align="center" prop="approveType" :formatter="approveTypeFormat" />
+      <el-table-column :label="$t('内容')" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请状态')" align="center" prop="status"  :formatter="statusFormat"/>
+      <el-table-column :label="$t('开始时间')" align="center" prop="creattime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.creattime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('结束时间')" align="center" prop="endtime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       </el-table>
     </el-card>
   </el-dialog>
@@ -320,6 +334,7 @@ export default {
       list: [],
       yuanshilist:[],
       anzhuanglist:[],
+      changelist:[],
       // 遮罩层
       loading: false,
       planLoading: false,
@@ -478,6 +493,16 @@ export default {
         this.loading = false;
       
       });
+       var data3={
+        devId : row.id,
+        devType : this.devType
+      }
+      getApproveInfo(data3).then(response => {
+        this.changelist = response.data;
+        this.total = response.total;
+        this.loading = false;
+      
+      });
     },
     staffPlanQuery1(row,year){
       var data2={
@@ -565,8 +590,8 @@ export default {
       this.doc11.id = row.id;
       this.doc11.title = row.filename;
       this.doc11.open = true;
-      this.doc11.queryParams.pId = row.id+row.id
-      this.doc11.pId = row.id+row.id
+      this.doc11.queryParams.pId =parseFloat( row.id.toString()+row.id.toString())
+      this.doc11.pId = parseFloat( row.id.toString()+row.id.toString())
       this.getFileList11()
       this.$nextTick(() => {
         this.$refs.doc11.clearFiles()