-添加登记审核功能

master/src/main/java/com/ruoyi/project/check/controller/TCheckInstrumentController.java

@@ -0,0 +1,115 @@
+package com.ruoyi.project.check.controller;
+
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.project.check.domain.TCheckInstrument;
+import com.ruoyi.project.check.service.ITCheckInstrumentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 仪器Controller
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+@RestController
+@RequestMapping("/check/instrument")
+public class TCheckInstrumentController extends BaseController
+{
+    @Autowired
+    private ITCheckInstrumentService tCheckInstrumentService;
+
+    /**
+     * 查询仪器列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:instrument:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TCheckInstrument tCheckInstrument)
+    {
+        startPage();
+        List<TCheckInstrument> list = tCheckInstrumentService.selectTCheckInstrumentList(tCheckInstrument);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/allInstrument")
+    public AjaxResult allInstrument()
+    {
+        return AjaxResult.success(tCheckInstrumentService.selectAllInstrument());
+    }
+
+    /**
+     * 导出仪器列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:instrument:export')")
+    @Log(title = "仪器", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TCheckInstrument tCheckInstrument)
+    {
+        List<TCheckInstrument> list = tCheckInstrumentService.selectTCheckInstrumentList(tCheckInstrument);
+        ExcelUtil<TCheckInstrument> util = new ExcelUtil<TCheckInstrument>(TCheckInstrument.class);
+        util.exportExcel(response, list, "仪器数据");
+    }
+
+    /**
+     * 获取仪器详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:instrument:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tCheckInstrumentService.selectTCheckInstrumentById(id));
+    }
+
+    /**
+     * 新增仪器
+     */
+    @PreAuthorize("@ss.hasPermi('check:instrument:add')")
+    @Log(title = "仪器", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TCheckInstrument tCheckInstrument)
+    {
+        tCheckInstrument.setUpdatedate(new Date());
+        tCheckInstrument.setUpdaterCode(getUserId());
+        return toAjax(tCheckInstrumentService.insertTCheckInstrument(tCheckInstrument));
+    }
+
+    /**
+     * 修改仪器
+     */
+    @PreAuthorize("@ss.hasPermi('check:instrument:edit')")
+    @Log(title = "仪器", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TCheckInstrument tCheckInstrument)
+    {
+        tCheckInstrument.setUpdatedate(new Date());
+        tCheckInstrument.setUpdaterCode(getUserId());
+        return toAjax(tCheckInstrumentService.updateTCheckInstrument(tCheckInstrument));
+    }
+
+    /**
+     * 删除仪器
+     */
+    @PreAuthorize("@ss.hasPermi('check:instrument:remove')")
+    @Log(title = "仪器", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tCheckInstrumentService.deleteTCheckInstrumentByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/check/controller/TCheckInstrumentRecordController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.project.check.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.project.check.domain.TCheckInstrumentRecord;
+import com.ruoyi.project.check.service.ITCheckInstrumentRecordService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 仪器维护记录Controller
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+@RestController
+@RequestMapping("/check/record")
+public class TCheckInstrumentRecordController extends BaseController
+{
+    @Autowired
+    private ITCheckInstrumentRecordService tCheckInstrumentRecordService;
+
+    /**
+     * 查询仪器维护记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        startPage();
+        List<TCheckInstrumentRecord> list = tCheckInstrumentRecordService.selectTCheckInstrumentRecordList(tCheckInstrumentRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出仪器维护记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:record:export')")
+    @Log(title = "仪器维护记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        List<TCheckInstrumentRecord> list = tCheckInstrumentRecordService.selectTCheckInstrumentRecordList(tCheckInstrumentRecord);
+        ExcelUtil<TCheckInstrumentRecord> util = new ExcelUtil<TCheckInstrumentRecord>(TCheckInstrumentRecord.class);
+        util.exportExcel(response, list, "仪器维护记录数据");
+    }
+
+    /**
+     * 获取仪器维护记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:record:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tCheckInstrumentRecordService.selectTCheckInstrumentRecordById(id));
+    }
+
+    /**
+     * 新增仪器维护记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:record:add')")
+    @Log(title = "仪器维护记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        return toAjax(tCheckInstrumentRecordService.insertTCheckInstrumentRecord(tCheckInstrumentRecord));
+    }
+
+    /**
+     * 修改仪器维护记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:record:edit')")
+    @Log(title = "仪器维护记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        return toAjax(tCheckInstrumentRecordService.updateTCheckInstrumentRecord(tCheckInstrumentRecord));
+    }
+
+    /**
+     * 删除仪器维护记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:record:remove')")
+    @Log(title = "仪器维护记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tCheckInstrumentRecordService.deleteTCheckInstrumentRecordByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/check/controller/TCheckStandardgasesController.java

@@ -0,0 +1,109 @@
+package com.ruoyi.project.check.controller;
+
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.project.check.domain.TCheckStandardgases;
+import com.ruoyi.project.check.service.ITCheckStandardgasesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 标准气体Controller
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+@RestController
+@RequestMapping("/check/standardgases")
+public class TCheckStandardgasesController extends BaseController
+{
+    @Autowired
+    private ITCheckStandardgasesService tCheckStandardgasesService;
+
+    /**
+     * 查询标准气体列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:standardgases:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TCheckStandardgases tCheckStandardgases)
+    {
+        startPage();
+        List<TCheckStandardgases> list = tCheckStandardgasesService.selectTCheckStandardgasesList(tCheckStandardgases);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出标准气体列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:standardgases:export')")
+    @Log(title = "标准气体", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TCheckStandardgases tCheckStandardgases)
+    {
+        List<TCheckStandardgases> list = tCheckStandardgasesService.selectTCheckStandardgasesList(tCheckStandardgases);
+        ExcelUtil<TCheckStandardgases> util = new ExcelUtil<TCheckStandardgases>(TCheckStandardgases.class);
+        util.exportExcel(response, list, "标准气体数据");
+    }
+
+    /**
+     * 获取标准气体详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:standardgases:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tCheckStandardgasesService.selectTCheckStandardgasesById(id));
+    }
+
+    /**
+     * 新增标准气体
+     */
+    @PreAuthorize("@ss.hasPermi('check:standardgases:add')")
+    @Log(title = "标准气体", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TCheckStandardgases tCheckStandardgases)
+    {
+        tCheckStandardgases.setUpdatedate(new Date());
+        tCheckStandardgases.setUpdaterCode(getUserId());
+        return toAjax(tCheckStandardgasesService.insertTCheckStandardgases(tCheckStandardgases));
+    }
+
+    /**
+     * 修改标准气体
+     */
+    @PreAuthorize("@ss.hasPermi('check:standardgases:edit')")
+    @Log(title = "标准气体", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TCheckStandardgases tCheckStandardgases)
+    {
+        tCheckStandardgases.setUpdatedate(new Date());
+        tCheckStandardgases.setUpdaterCode(getUserId());
+        return toAjax(tCheckStandardgasesService.updateTCheckStandardgases(tCheckStandardgases));
+    }
+
+    /**
+     * 删除标准气体
+     */
+    @PreAuthorize("@ss.hasPermi('check:standardgases:remove')")
+    @Log(title = "标准气体", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tCheckStandardgasesService.deleteTCheckStandardgasesByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/check/domain/TCheckInstrument.java

@@ -0,0 +1,247 @@
+package com.ruoyi.project.check.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 仪器对象 t_check_instrument
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public class TCheckInstrument extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识id */
+    private Long id;
+
+    /** 仪器类型编号 */
+    @Excel(name = "仪器类型编号")
+    private String code;
+
+    /** 仪器类型名称 */
+    @Excel(name = "仪器类型名称")
+    private String name;
+
+    /** 仪器型号 */
+    @Excel(name = "仪器型号")
+    private String model;
+
+    /** 检测原理 */
+    @Excel(name = "检测原理")
+    private String principle;
+
+    /** 线性范围 */
+    @Excel(name = "线性范围")
+    private String linearRange;
+
+    /** 量程 */
+    @Excel(name = "量程")
+    private String range;
+
+    /** 生产厂家 */
+    @Excel(name = "生产厂家")
+    private String factory;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Integer delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+
+    private Long updaterCode;
+
+    @Excel(name = "最后维护人")
+    private String updater;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setModel(String model)
+    {
+        this.model = model;
+    }
+
+    public String getModel()
+    {
+        return model;
+    }
+    public void setPrinciple(String principle)
+    {
+        this.principle = principle;
+    }
+
+    public String getPrinciple()
+    {
+        return principle;
+    }
+    public void setLinearRange(String linearRange)
+    {
+        this.linearRange = linearRange;
+    }
+
+    public String getLinearRange()
+    {
+        return linearRange;
+    }
+    public void setRange(String range)
+    {
+        this.range = range;
+    }
+
+    public String getRange()
+    {
+        return range;
+    }
+    public void setFactory(String factory)
+    {
+        this.factory = factory;
+    }
+
+    public String getFactory()
+    {
+        return factory;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Integer delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("model", getModel())
+            .append("principle", getPrinciple())
+            .append("linearRange", getLinearRange())
+            .append("range", getRange())
+            .append("factory", getFactory())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/check/domain/TCheckInstrumentRecord.java

@@ -0,0 +1,231 @@
+package com.ruoyi.project.check.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 仪器维护记录对象 t_check_instrument_record
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public class TCheckInstrumentRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识id */
+    private Long id;
+
+    /** 仪器id */
+    @Excel(name = "仪器id")
+    private Long instrumentId;
+
+
+    /** 仪器类型编号 */
+    @Excel(name = "仪器类型编号")
+    private String code;
+
+    /** 仪器类型名称 */
+    @Excel(name = "仪器类型名称")
+    private String name;
+
+    /** 仪器型号 */
+    @Excel(name = "仪器型号")
+    private String model;
+
+    /** 维护内容 */
+    @Excel(name = "维护内容")
+    private String content;
+
+    /** 检定/校准单位 */
+    @Excel(name = "检定/校准单位")
+    private String unit;
+
+    /** 检定/校准证书编号 */
+    @Excel(name = "检定/校准证书编号")
+    private String certificate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Integer delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setInstrumentId(Long instrumentId)
+    {
+        this.instrumentId = instrumentId;
+    }
+
+    public Long getInstrumentId()
+    {
+        return instrumentId;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setCertificate(String certificate)
+    {
+        this.certificate = certificate;
+    }
+
+    public String getCertificate()
+    {
+        return certificate;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Integer delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("instrumentId", getInstrumentId())
+            .append("content", getContent())
+            .append("unit", getUnit())
+            .append("certificate", getCertificate())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/check/domain/TCheckStandardgases.java

@@ -0,0 +1,231 @@
+package com.ruoyi.project.check.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 标准气体对象 t_check_standardgases
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public class TCheckStandardgases extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识id */
+    private Long id;
+
+    /** 标准气体证书编号 */
+    @Excel(name = "标准气体证书编号")
+    private String code;
+
+    /** 标准气体名称 */
+    @Excel(name = "标准气体名称")
+    private String name;
+
+    /** 标准气体浓度 */
+    @Excel(name = "标准气体浓度")
+    private String concentration;
+
+    /** 标准气体有效期 */
+    @Excel(name = "标准气体有效期")
+    private String lifespan;
+
+    /** 生产厂家 */
+    @Excel(name = "生产厂家")
+    private String factory;
+
+    /** 钢瓶编号 */
+    @Excel(name = "钢瓶编号")
+    private String cylinderCode;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Integer delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+    private String  updater;
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCode(String code)
+    {
+        this.code = code;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setConcentration(String concentration)
+    {
+        this.concentration = concentration;
+    }
+
+    public String getConcentration()
+    {
+        return concentration;
+    }
+    public void setLifespan(String lifespan)
+    {
+        this.lifespan = lifespan;
+    }
+
+    public String getLifespan()
+    {
+        return lifespan;
+    }
+    public void setFactory(String factory)
+    {
+        this.factory = factory;
+    }
+
+    public String getFactory()
+    {
+        return factory;
+    }
+    public void setCylinderCode(String cylinderCode)
+    {
+        this.cylinderCode = cylinderCode;
+    }
+
+    public String getCylinderCode()
+    {
+        return cylinderCode;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Integer delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("concentration", getConcentration())
+            .append("lifespan", getLifespan())
+            .append("factory", getFactory())
+            .append("cylinderCode", getCylinderCode())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/check/mapper/TCheckInstrumentMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.check.mapper;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckInstrument;
+
+/**
+ * 仪器Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public interface TCheckInstrumentMapper
+{
+    /**
+     * 查询仪器
+     *
+     * @param id 仪器主键
+     * @return 仪器
+     */
+    public TCheckInstrument selectTCheckInstrumentById(Long id);
+
+    /**
+     * 查询仪器列表
+     *
+     * @param tCheckInstrument 仪器
+     * @return 仪器集合
+     */
+    public List<TCheckInstrument> selectTCheckInstrumentList(TCheckInstrument tCheckInstrument);
+    public List<TCheckInstrument> selectAllInstrument();
+
+    /**
+     * 新增仪器
+     *
+     * @param tCheckInstrument 仪器
+     * @return 结果
+     */
+    public int insertTCheckInstrument(TCheckInstrument tCheckInstrument);
+
+    /**
+     * 修改仪器
+     *
+     * @param tCheckInstrument 仪器
+     * @return 结果
+     */
+    public int updateTCheckInstrument(TCheckInstrument tCheckInstrument);
+
+    /**
+     * 删除仪器
+     *
+     * @param id 仪器主键
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentById(Long id);
+
+    /**
+     * 批量删除仪器
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/check/mapper/TCheckInstrumentRecordMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.check.mapper;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckInstrumentRecord;
+
+/**
+ * 仪器维护记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public interface TCheckInstrumentRecordMapper 
+{
+    /**
+     * 查询仪器维护记录
+     * 
+     * @param id 仪器维护记录主键
+     * @return 仪器维护记录
+     */
+    public TCheckInstrumentRecord selectTCheckInstrumentRecordById(Long id);
+
+    /**
+     * 查询仪器维护记录列表
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 仪器维护记录集合
+     */
+    public List<TCheckInstrumentRecord> selectTCheckInstrumentRecordList(TCheckInstrumentRecord tCheckInstrumentRecord);
+
+    /**
+     * 新增仪器维护记录
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 结果
+     */
+    public int insertTCheckInstrumentRecord(TCheckInstrumentRecord tCheckInstrumentRecord);
+
+    /**
+     * 修改仪器维护记录
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 结果
+     */
+    public int updateTCheckInstrumentRecord(TCheckInstrumentRecord tCheckInstrumentRecord);
+
+    /**
+     * 删除仪器维护记录
+     * 
+     * @param id 仪器维护记录主键
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentRecordById(Long id);
+
+    /**
+     * 批量删除仪器维护记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentRecordByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/check/mapper/TCheckStandardgasesMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.check.mapper;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckStandardgases;
+
+/**
+ * 标准气体Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public interface TCheckStandardgasesMapper 
+{
+    /**
+     * 查询标准气体
+     * 
+     * @param id 标准气体主键
+     * @return 标准气体
+     */
+    public TCheckStandardgases selectTCheckStandardgasesById(Long id);
+
+    /**
+     * 查询标准气体列表
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 标准气体集合
+     */
+    public List<TCheckStandardgases> selectTCheckStandardgasesList(TCheckStandardgases tCheckStandardgases);
+
+    /**
+     * 新增标准气体
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 结果
+     */
+    public int insertTCheckStandardgases(TCheckStandardgases tCheckStandardgases);
+
+    /**
+     * 修改标准气体
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 结果
+     */
+    public int updateTCheckStandardgases(TCheckStandardgases tCheckStandardgases);
+
+    /**
+     * 删除标准气体
+     * 
+     * @param id 标准气体主键
+     * @return 结果
+     */
+    public int deleteTCheckStandardgasesById(Long id);
+
+    /**
+     * 批量删除标准气体
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTCheckStandardgasesByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/check/service/ITCheckInstrumentRecordService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.check.service;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckInstrumentRecord;
+
+/**
+ * 仪器维护记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public interface ITCheckInstrumentRecordService 
+{
+    /**
+     * 查询仪器维护记录
+     * 
+     * @param id 仪器维护记录主键
+     * @return 仪器维护记录
+     */
+    public TCheckInstrumentRecord selectTCheckInstrumentRecordById(Long id);
+
+    /**
+     * 查询仪器维护记录列表
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 仪器维护记录集合
+     */
+    public List<TCheckInstrumentRecord> selectTCheckInstrumentRecordList(TCheckInstrumentRecord tCheckInstrumentRecord);
+
+    /**
+     * 新增仪器维护记录
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 结果
+     */
+    public int insertTCheckInstrumentRecord(TCheckInstrumentRecord tCheckInstrumentRecord);
+
+    /**
+     * 修改仪器维护记录
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 结果
+     */
+    public int updateTCheckInstrumentRecord(TCheckInstrumentRecord tCheckInstrumentRecord);
+
+    /**
+     * 批量删除仪器维护记录
+     * 
+     * @param ids 需要删除的仪器维护记录主键集合
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentRecordByIds(Long[] ids);
+
+    /**
+     * 删除仪器维护记录信息
+     * 
+     * @param id 仪器维护记录主键
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentRecordById(Long id);
+}

master/src/main/java/com/ruoyi/project/check/service/ITCheckInstrumentService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.check.service;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckInstrument;
+
+/**
+ * 仪器Service接口
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public interface ITCheckInstrumentService
+{
+    /**
+     * 查询仪器
+     *
+     * @param id 仪器主键
+     * @return 仪器
+     */
+    public TCheckInstrument selectTCheckInstrumentById(Long id);
+
+    /**
+     * 查询仪器列表
+     *
+     * @param tCheckInstrument 仪器
+     * @return 仪器集合
+     */
+    public List<TCheckInstrument> selectTCheckInstrumentList(TCheckInstrument tCheckInstrument);
+    public List<TCheckInstrument> selectAllInstrument();
+
+    /**
+     * 新增仪器
+     *
+     * @param tCheckInstrument 仪器
+     * @return 结果
+     */
+    public int insertTCheckInstrument(TCheckInstrument tCheckInstrument);
+
+    /**
+     * 修改仪器
+     *
+     * @param tCheckInstrument 仪器
+     * @return 结果
+     */
+    public int updateTCheckInstrument(TCheckInstrument tCheckInstrument);
+
+    /**
+     * 批量删除仪器
+     *
+     * @param ids 需要删除的仪器主键集合
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentByIds(Long[] ids);
+
+    /**
+     * 删除仪器信息
+     *
+     * @param id 仪器主键
+     * @return 结果
+     */
+    public int deleteTCheckInstrumentById(Long id);
+}

master/src/main/java/com/ruoyi/project/check/service/ITCheckStandardgasesService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.check.service;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckStandardgases;
+
+/**
+ * 标准气体Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+public interface ITCheckStandardgasesService 
+{
+    /**
+     * 查询标准气体
+     * 
+     * @param id 标准气体主键
+     * @return 标准气体
+     */
+    public TCheckStandardgases selectTCheckStandardgasesById(Long id);
+
+    /**
+     * 查询标准气体列表
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 标准气体集合
+     */
+    public List<TCheckStandardgases> selectTCheckStandardgasesList(TCheckStandardgases tCheckStandardgases);
+
+    /**
+     * 新增标准气体
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 结果
+     */
+    public int insertTCheckStandardgases(TCheckStandardgases tCheckStandardgases);
+
+    /**
+     * 修改标准气体
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 结果
+     */
+    public int updateTCheckStandardgases(TCheckStandardgases tCheckStandardgases);
+
+    /**
+     * 批量删除标准气体
+     * 
+     * @param ids 需要删除的标准气体主键集合
+     * @return 结果
+     */
+    public int deleteTCheckStandardgasesByIds(Long[] ids);
+
+    /**
+     * 删除标准气体信息
+     * 
+     * @param id 标准气体主键
+     * @return 结果
+     */
+    public int deleteTCheckStandardgasesById(Long id);
+}

master/src/main/java/com/ruoyi/project/check/service/impl/TCheckInstrumentRecordServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.check.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.check.mapper.TCheckInstrumentRecordMapper;
+import com.ruoyi.project.check.domain.TCheckInstrumentRecord;
+import com.ruoyi.project.check.service.ITCheckInstrumentRecordService;
+
+/**
+ * 仪器维护记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+@Service
+public class TCheckInstrumentRecordServiceImpl implements ITCheckInstrumentRecordService 
+{
+    @Autowired
+    private TCheckInstrumentRecordMapper tCheckInstrumentRecordMapper;
+
+    /**
+     * 查询仪器维护记录
+     * 
+     * @param id 仪器维护记录主键
+     * @return 仪器维护记录
+     */
+    @Override
+    public TCheckInstrumentRecord selectTCheckInstrumentRecordById(Long id)
+    {
+        return tCheckInstrumentRecordMapper.selectTCheckInstrumentRecordById(id);
+    }
+
+    /**
+     * 查询仪器维护记录列表
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 仪器维护记录
+     */
+    @Override
+    public List<TCheckInstrumentRecord> selectTCheckInstrumentRecordList(TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        return tCheckInstrumentRecordMapper.selectTCheckInstrumentRecordList(tCheckInstrumentRecord);
+    }
+
+    /**
+     * 新增仪器维护记录
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 结果
+     */
+    @Override
+    public int insertTCheckInstrumentRecord(TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        return tCheckInstrumentRecordMapper.insertTCheckInstrumentRecord(tCheckInstrumentRecord);
+    }
+
+    /**
+     * 修改仪器维护记录
+     * 
+     * @param tCheckInstrumentRecord 仪器维护记录
+     * @return 结果
+     */
+    @Override
+    public int updateTCheckInstrumentRecord(TCheckInstrumentRecord tCheckInstrumentRecord)
+    {
+        return tCheckInstrumentRecordMapper.updateTCheckInstrumentRecord(tCheckInstrumentRecord);
+    }
+
+    /**
+     * 批量删除仪器维护记录
+     * 
+     * @param ids 需要删除的仪器维护记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckInstrumentRecordByIds(Long[] ids)
+    {
+        return tCheckInstrumentRecordMapper.deleteTCheckInstrumentRecordByIds(ids);
+    }
+
+    /**
+     * 删除仪器维护记录信息
+     * 
+     * @param id 仪器维护记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckInstrumentRecordById(Long id)
+    {
+        return tCheckInstrumentRecordMapper.deleteTCheckInstrumentRecordById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/check/service/impl/TCheckInstrumentServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.project.check.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.check.mapper.TCheckInstrumentMapper;
+import com.ruoyi.project.check.domain.TCheckInstrument;
+import com.ruoyi.project.check.service.ITCheckInstrumentService;
+
+/**
+ * 仪器Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+@Service
+public class TCheckInstrumentServiceImpl implements ITCheckInstrumentService
+{
+    @Autowired
+    private TCheckInstrumentMapper tCheckInstrumentMapper;
+
+    /**
+     * 查询仪器
+     *
+     * @param id 仪器主键
+     * @return 仪器
+     */
+    @Override
+    public TCheckInstrument selectTCheckInstrumentById(Long id)
+    {
+        return tCheckInstrumentMapper.selectTCheckInstrumentById(id);
+    }
+
+    /**
+     * 查询仪器列表
+     *
+     * @param tCheckInstrument 仪器
+     * @return 仪器
+     */
+    @Override
+    public List<TCheckInstrument> selectTCheckInstrumentList(TCheckInstrument tCheckInstrument)
+    {
+        return tCheckInstrumentMapper.selectTCheckInstrumentList(tCheckInstrument);
+    }
+    @Override
+    public List<TCheckInstrument> selectAllInstrument()
+    {
+        return tCheckInstrumentMapper.selectAllInstrument();
+    }
+
+    /**
+     * 新增仪器
+     *
+     * @param tCheckInstrument 仪器
+     * @return 结果
+     */
+    @Override
+    public int insertTCheckInstrument(TCheckInstrument tCheckInstrument)
+    {
+        return tCheckInstrumentMapper.insertTCheckInstrument(tCheckInstrument);
+    }
+
+    /**
+     * 修改仪器
+     *
+     * @param tCheckInstrument 仪器
+     * @return 结果
+     */
+    @Override
+    public int updateTCheckInstrument(TCheckInstrument tCheckInstrument)
+    {
+        return tCheckInstrumentMapper.updateTCheckInstrument(tCheckInstrument);
+    }
+
+    /**
+     * 批量删除仪器
+     *
+     * @param ids 需要删除的仪器主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckInstrumentByIds(Long[] ids)
+    {
+        return tCheckInstrumentMapper.deleteTCheckInstrumentByIds(ids);
+    }
+
+    /**
+     * 删除仪器信息
+     *
+     * @param id 仪器主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckInstrumentById(Long id)
+    {
+        return tCheckInstrumentMapper.deleteTCheckInstrumentById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/check/service/impl/TCheckStandardgasesServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.check.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.check.mapper.TCheckStandardgasesMapper;
+import com.ruoyi.project.check.domain.TCheckStandardgases;
+import com.ruoyi.project.check.service.ITCheckStandardgasesService;
+
+/**
+ * 标准气体Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-11-22
+ */
+@Service
+public class TCheckStandardgasesServiceImpl implements ITCheckStandardgasesService 
+{
+    @Autowired
+    private TCheckStandardgasesMapper tCheckStandardgasesMapper;
+
+    /**
+     * 查询标准气体
+     * 
+     * @param id 标准气体主键
+     * @return 标准气体
+     */
+    @Override
+    public TCheckStandardgases selectTCheckStandardgasesById(Long id)
+    {
+        return tCheckStandardgasesMapper.selectTCheckStandardgasesById(id);
+    }
+
+    /**
+     * 查询标准气体列表
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 标准气体
+     */
+    @Override
+    public List<TCheckStandardgases> selectTCheckStandardgasesList(TCheckStandardgases tCheckStandardgases)
+    {
+        return tCheckStandardgasesMapper.selectTCheckStandardgasesList(tCheckStandardgases);
+    }
+
+    /**
+     * 新增标准气体
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 结果
+     */
+    @Override
+    public int insertTCheckStandardgases(TCheckStandardgases tCheckStandardgases)
+    {
+        return tCheckStandardgasesMapper.insertTCheckStandardgases(tCheckStandardgases);
+    }
+
+    /**
+     * 修改标准气体
+     * 
+     * @param tCheckStandardgases 标准气体
+     * @return 结果
+     */
+    @Override
+    public int updateTCheckStandardgases(TCheckStandardgases tCheckStandardgases)
+    {
+        return tCheckStandardgasesMapper.updateTCheckStandardgases(tCheckStandardgases);
+    }
+
+    /**
+     * 批量删除标准气体
+     * 
+     * @param ids 需要删除的标准气体主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckStandardgasesByIds(Long[] ids)
+    {
+        return tCheckStandardgasesMapper.deleteTCheckStandardgasesByIds(ids);
+    }
+
+    /**
+     * 删除标准气体信息
+     * 
+     * @param id 标准气体主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckStandardgasesById(Long id)
+    {
+        return tCheckStandardgasesMapper.deleteTCheckStandardgasesById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionController.java

@@ -0,0 +1,125 @@
+package com.ruoyi.project.task.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.task.domain.TTaskInspection;
+import com.ruoyi.project.task.domain.TTaskInspectionPlan;
+import com.ruoyi.project.task.service.ITTaskInspectionPlanService;
+import com.ruoyi.project.task.service.ITTaskInspectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 检测任务Controller
+ *
+ * @author ruoyi
+ * @date 2022-11-21
+ */
+@RestController
+@RequestMapping("/task/inspection")
+public class TTaskInspectionController extends BaseController {
+    @Autowired
+    private ITTaskInspectionService tTaskInspectionService;
+
+    @Autowired
+    private ITTaskInspectionPlanService taskInspectionPlanService;
+
+    /**
+     * 查询检测任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('task:inspection:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTaskInspection tTaskInspection) {
+        startPage();
+        List<TTaskInspection> list = tTaskInspectionService.selectTTaskInspectionList(tTaskInspection);
+        list.forEach(item -> {
+            if (StringUtils.isNotEmpty(item.getTaskDoneNum()) && StringUtils.isNotEmpty(item.getTaskNum())) {
+                item.setPercentage(new BigDecimal(item.getTaskDoneNum()).divide(new BigDecimal(item.getTaskNum()), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).doubleValue());
+            }
+            if (item.getEndTime() != null) {
+                if (item.getEndTime().before(new Date())) {
+                    item.setTimeOut("是");
+                } else {
+                    item.setTimeOut("否");
+                }
+            }
+        });
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检测任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('task:inspection:export')")
+    @Log(title = "检测任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TTaskInspection tTaskInspection) {
+        List<TTaskInspection> list = tTaskInspectionService.selectTTaskInspectionList(tTaskInspection);
+        ExcelUtil<TTaskInspection> util = new ExcelUtil<TTaskInspection>(TTaskInspection.class);
+        util.exportExcel(response, list, "检测任务数据");
+    }
+
+    /**
+     * 获取检测任务详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('task:inspection:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(tTaskInspectionService.selectTTaskInspectionById(id));
+    }
+
+    /**
+     * 新增检测任务
+     */
+    @PreAuthorize("@ss.hasPermi('task:inspection:add')")
+    @Log(title = "检测任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTaskInspection tTaskInspection) {
+        TTaskInspectionPlan tTaskInspectionPlan = taskInspectionPlanService.selectTTaskInspectionPlanById(tTaskInspection.getPlanId());
+        tTaskInspection.setPlantId(tTaskInspectionPlan.getPlantId());
+        return toAjax(tTaskInspectionService.insertTTaskInspection(tTaskInspection));
+    }
+
+    /**
+     * 修改检测任务
+     */
+    @PreAuthorize("@ss.hasPermi('task:inspection:edit')")
+    @Log(title = "检测任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTaskInspection tTaskInspection) {
+        TTaskInspectionPlan tTaskInspectionPlan = taskInspectionPlanService.selectTTaskInspectionPlanById(tTaskInspection.getPlanId());
+        tTaskInspection.setPlantId(tTaskInspectionPlan.getPlantId());
+        return toAjax(tTaskInspectionService.updateTTaskInspection(tTaskInspection));
+    }
+
+    /**
+     * 删除检测任务
+     */
+    @PreAuthorize("@ss.hasPermi('task:inspection:remove')")
+    @Log(title = "检测任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(tTaskInspectionService.deleteTTaskInspectionByIds(ids));
+    }
+
+    @PreAuthorize("@ss.hasPermi('task:inspection:edit')")
+    @Log(title = "检测任务分配", businessType = BusinessType.UPDATE)
+    @PutMapping("/{ids}")
+    public AjaxResult divide(@PathVariable Long[] ids) {
+        return toAjax(tTaskInspectionService.updateTTaskInspectionByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionPlanController.java

@@ -46,6 +46,12 @@ public class TTaskInspectionPlanController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/allPlan")
+    public AjaxResult selectAllPlan()
+    {
+        return AjaxResult.success(tTaskInspectionPlanService.selectAllPlan());
+    }
+
     /**
      * 导出检测计划列表
      */

master/src/main/java/com/ruoyi/project/task/domain/TTaskInspection.java

@@ -0,0 +1,354 @@
+package com.ruoyi.project.task.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 检测任务对象 t_task_inspection
+ *
+ * @author ruoyi
+ * @date 2022-11-21
+ */
+public class TTaskInspection extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识id */
+    private Long id;
+
+    /** 装置id */
+    private Long plantId;
+
+    @Excel(name = "装置名称")
+    private String plantName;
+
+    /** 计划id */
+    private Long planId;
+
+    @Excel(name = "计划名称")
+    private String planName;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String taskName;
+
+    /** 任务编号 */
+    @Excel(name = "任务编号")
+    private String taskCode;
+
+    /** 任务类型 */
+    @Excel(name = "任务类型")
+    private String taskType;
+
+    /** 任务起始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务起始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 任务截止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务截止时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 接收人 */
+    @Excel(name = "接收人")
+    private Long recipient;
+
+    /** 完成率 */
+    private Double percentage;
+
+    /** 任务点数 */
+    @Excel(name = "任务点数")
+    private String taskNum;
+
+    /** 已检测点数 */
+    @Excel(name = "已检测点数")
+    private String taskDoneNum;
+
+    /** 未检测点数 */
+    @Excel(name = "未检测点数")
+    private String taskUndoneNum;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Integer delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    @Excel(name = "是否超时")
+    @TableField(exist = false)
+    private String timeOut;
+
+    public String getTimeOut() {
+
+        return timeOut;
+    }
+
+    public void setTimeOut(String timeOut) {
+        this.timeOut = timeOut;
+    }
+
+    public String getPlantName() {
+        return plantName;
+    }
+
+    public void setPlantName(String plantName) {
+        this.plantName = plantName;
+    }
+
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+    }
+
+    public Double getPercentage() {
+        return percentage;
+    }
+
+    public void setPercentage(Double percentage) {
+        this.percentage = percentage;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantId(Long plantId)
+    {
+        this.plantId = plantId;
+    }
+
+    public Long getPlantId()
+    {
+        return plantId;
+    }
+    public void setPlanId(Long planId)
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId()
+    {
+        return planId;
+    }
+    public void setTaskName(String taskName)
+    {
+        this.taskName = taskName;
+    }
+
+    public String getTaskName()
+    {
+        return taskName;
+    }
+    public void setTaskCode(String taskCode)
+    {
+        this.taskCode = taskCode;
+    }
+
+    public String getTaskCode()
+    {
+        return taskCode;
+    }
+    public void setTaskType(String taskType)
+    {
+        this.taskType = taskType;
+    }
+
+    public String getTaskType()
+    {
+        return taskType;
+    }
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime)
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+    public void setRecipient(Long recipient)
+    {
+        this.recipient = recipient;
+    }
+
+    public Long getRecipient()
+    {
+        return recipient;
+    }
+    public void setTaskNum(String taskNum)
+    {
+        this.taskNum = taskNum;
+    }
+
+    public String getTaskNum()
+    {
+        return taskNum;
+    }
+    public void setTaskDoneNum(String taskDoneNum)
+    {
+        this.taskDoneNum = taskDoneNum;
+    }
+
+    public String getTaskDoneNum()
+    {
+        return taskDoneNum;
+    }
+    public void setTaskUndoneNum(String taskUndoneNum)
+    {
+        this.taskUndoneNum = taskUndoneNum;
+    }
+
+    public String getTaskUndoneNum()
+    {
+        return taskUndoneNum;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Integer delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer 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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantId", getPlantId())
+            .append("planId", getPlanId())
+            .append("taskName", getTaskName())
+            .append("taskCode", getTaskCode())
+            .append("taskType", getTaskType())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("recipient", getRecipient())
+            .append("taskNum", getTaskNum())
+            .append("taskDoneNum", getTaskDoneNum())
+            .append("taskUndoneNum", getTaskUndoneNum())
+            .append("status", getStatus())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/task/mapper/TTaskInspectionMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.task.mapper;
+
+import java.util.List;
+import com.ruoyi.project.task.domain.TTaskInspection;
+
+/**
+ * 检测任务Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-11-21
+ */
+public interface TTaskInspectionMapper
+{
+    /**
+     * 查询检测任务
+     *
+     * @param id 检测任务主键
+     * @return 检测任务
+     */
+    public TTaskInspection selectTTaskInspectionById(Long id);
+
+    /**
+     * 查询检测任务列表
+     *
+     * @param tTaskInspection 检测任务
+     * @return 检测任务集合
+     */
+    public List<TTaskInspection> selectTTaskInspectionList(TTaskInspection tTaskInspection);
+
+    /**
+     * 新增检测任务
+     *
+     * @param tTaskInspection 检测任务
+     * @return 结果
+     */
+    public int insertTTaskInspection(TTaskInspection tTaskInspection);
+
+    /**
+     * 修改检测任务
+     *
+     * @param tTaskInspection 检测任务
+     * @return 结果
+     */
+    public int updateTTaskInspection(TTaskInspection tTaskInspection);
+
+    /**
+     * 删除检测任务
+     *
+     * @param id 检测任务主键
+     * @return 结果
+     */
+    public int deleteTTaskInspectionById(Long id);
+
+    /**
+     * 批量删除检测任务
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTTaskInspectionByIds(Long[] ids);
+    public int updateTTaskInspectionByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/task/mapper/TTaskInspectionPlanMapper.java

@@ -5,15 +5,15 @@ import com.ruoyi.project.task.domain.TTaskInspectionPlan;
 
 /**
  * 检测计划Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-11-17
  */
-public interface TTaskInspectionPlanMapper 
+public interface TTaskInspectionPlanMapper
 {
     /**
      * 查询检测计划
-     * 
+     *
      * @param id 检测计划主键
      * @return 检测计划
      */
@@ -21,15 +21,16 @@ public interface TTaskInspectionPlanMapper
 
     /**
      * 查询检测计划列表
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 检测计划集合
      */
     public List<TTaskInspectionPlan> selectTTaskInspectionPlanList(TTaskInspectionPlan tTaskInspectionPlan);
+    public List<TTaskInspectionPlan> selectAllPlan();
 
     /**
      * 新增检测计划
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface TTaskInspectionPlanMapper
 
     /**
      * 修改检测计划
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface TTaskInspectionPlanMapper
 
     /**
      * 删除检测计划
-     * 
+     *
      * @param id 检测计划主键
      * @return 结果
      */
@@ -53,7 +54,7 @@ public interface TTaskInspectionPlanMapper
 
     /**
      * 批量删除检测计划
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/task/service/ITTaskInspectionPlanService.java

@@ -5,15 +5,15 @@ import com.ruoyi.project.task.domain.TTaskInspectionPlan;
 
 /**
  * 检测计划Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-11-17
  */
-public interface ITTaskInspectionPlanService 
+public interface ITTaskInspectionPlanService
 {
     /**
      * 查询检测计划
-     * 
+     *
      * @param id 检测计划主键
      * @return 检测计划
      */
@@ -21,15 +21,17 @@ public interface ITTaskInspectionPlanService
 
     /**
      * 查询检测计划列表
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 检测计划集合
      */
     public List<TTaskInspectionPlan> selectTTaskInspectionPlanList(TTaskInspectionPlan tTaskInspectionPlan);
 
+    public List<TTaskInspectionPlan> selectAllPlan();
+
     /**
      * 新增检测计划
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ITTaskInspectionPlanService
 
     /**
      * 修改检测计划
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ITTaskInspectionPlanService
 
     /**
      * 批量删除检测计划
-     * 
+     *
      * @param ids 需要删除的检测计划主键集合
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface ITTaskInspectionPlanService
 
     /**
      * 删除检测计划信息
-     * 
+     *
      * @param id 检测计划主键
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/task/service/ITTaskInspectionService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.task.service;
+
+import java.util.List;
+import com.ruoyi.project.task.domain.TTaskInspection;
+
+/**
+ * 检测任务Service接口
+ *
+ * @author ruoyi
+ * @date 2022-11-21
+ */
+public interface ITTaskInspectionService
+{
+    /**
+     * 查询检测任务
+     *
+     * @param id 检测任务主键
+     * @return 检测任务
+     */
+    public TTaskInspection selectTTaskInspectionById(Long id);
+
+    /**
+     * 查询检测任务列表
+     *
+     * @param tTaskInspection 检测任务
+     * @return 检测任务集合
+     */
+    public List<TTaskInspection> selectTTaskInspectionList(TTaskInspection tTaskInspection);
+
+    /**
+     * 新增检测任务
+     *
+     * @param tTaskInspection 检测任务
+     * @return 结果
+     */
+    public int insertTTaskInspection(TTaskInspection tTaskInspection);
+
+    /**
+     * 修改检测任务
+     *
+     * @param tTaskInspection 检测任务
+     * @return 结果
+     */
+    public int updateTTaskInspection(TTaskInspection tTaskInspection);
+
+    /**
+     * 批量删除检测任务
+     *
+     * @param ids 需要删除的检测任务主键集合
+     * @return 结果
+     */
+    public int deleteTTaskInspectionByIds(Long[] ids);
+    public int updateTTaskInspectionByIds(Long[] ids);
+
+    /**
+     * 删除检测任务信息
+     *
+     * @param id 检测任务主键
+     * @return 结果
+     */
+    public int deleteTTaskInspectionById(Long id);
+}

master/src/main/java/com/ruoyi/project/task/service/impl/TTaskInspectionPlanServiceImpl.java

@@ -9,19 +9,19 @@ import com.ruoyi.project.task.service.ITTaskInspectionPlanService;
 
 /**
  * 检测计划Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2022-11-17
  */
 @Service
-public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanService 
+public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanService
 {
     @Autowired
     private TTaskInspectionPlanMapper tTaskInspectionPlanMapper;
 
     /**
      * 查询检测计划
-     * 
+     *
      * @param id 检测计划主键
      * @return 检测计划
      */
@@ -33,7 +33,7 @@ public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanServi
 
     /**
      * 查询检测计划列表
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 检测计划
      */
@@ -43,9 +43,15 @@ public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanServi
         return tTaskInspectionPlanMapper.selectTTaskInspectionPlanList(tTaskInspectionPlan);
     }
 
+    @Override
+    public List<TTaskInspectionPlan> selectAllPlan()
+    {
+        return tTaskInspectionPlanMapper.selectAllPlan();
+    }
+
     /**
      * 新增检测计划
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 结果
      */
@@ -57,7 +63,7 @@ public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanServi
 
     /**
      * 修改检测计划
-     * 
+     *
      * @param tTaskInspectionPlan 检测计划
      * @return 结果
      */
@@ -69,7 +75,7 @@ public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanServi
 
     /**
      * 批量删除检测计划
-     * 
+     *
      * @param ids 需要删除的检测计划主键
      * @return 结果
      */
@@ -81,7 +87,7 @@ public class TTaskInspectionPlanServiceImpl implements ITTaskInspectionPlanServi
 
     /**
      * 删除检测计划信息
-     * 
+     *
      * @param id 检测计划主键
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/task/service/impl/TTaskInspectionServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.project.task.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.task.mapper.TTaskInspectionMapper;
+import com.ruoyi.project.task.domain.TTaskInspection;
+import com.ruoyi.project.task.service.ITTaskInspectionService;
+
+/**
+ * 检测任务Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-11-21
+ */
+@Service
+public class TTaskInspectionServiceImpl implements ITTaskInspectionService
+{
+    @Autowired
+    private TTaskInspectionMapper tTaskInspectionMapper;
+
+    /**
+     * 查询检测任务
+     *
+     * @param id 检测任务主键
+     * @return 检测任务
+     */
+    @Override
+    public TTaskInspection selectTTaskInspectionById(Long id)
+    {
+        return tTaskInspectionMapper.selectTTaskInspectionById(id);
+    }
+
+    /**
+     * 查询检测任务列表
+     *
+     * @param tTaskInspection 检测任务
+     * @return 检测任务
+     */
+    @Override
+    public List<TTaskInspection> selectTTaskInspectionList(TTaskInspection tTaskInspection)
+    {
+        return tTaskInspectionMapper.selectTTaskInspectionList(tTaskInspection);
+    }
+
+    /**
+     * 新增检测任务
+     *
+     * @param tTaskInspection 检测任务
+     * @return 结果
+     */
+    @Override
+    public int insertTTaskInspection(TTaskInspection tTaskInspection)
+    {
+        return tTaskInspectionMapper.insertTTaskInspection(tTaskInspection);
+    }
+
+    /**
+     * 修改检测任务
+     *
+     * @param tTaskInspection 检测任务
+     * @return 结果
+     */
+    @Override
+    public int updateTTaskInspection(TTaskInspection tTaskInspection)
+    {
+        return tTaskInspectionMapper.updateTTaskInspection(tTaskInspection);
+    }
+
+    /**
+     * 批量删除检测任务
+     *
+     * @param ids 需要删除的检测任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTTaskInspectionByIds(Long[] ids)
+    {
+        return tTaskInspectionMapper.deleteTTaskInspectionByIds(ids);
+    }
+    @Override
+    public int updateTTaskInspectionByIds(Long[] ids)
+    {
+        return tTaskInspectionMapper.updateTTaskInspectionByIds(ids);
+    }
+
+    /**
+     * 删除检测任务信息
+     *
+     * @param id 检测任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTTaskInspectionById(Long id)
+    {
+        return tTaskInspectionMapper.deleteTTaskInspectionById(id);
+    }
+}

master/src/main/resources/application.yml

@@ -134,8 +134,7 @@ gen:
   # 作者
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.project.base
-  # 自动去除表前缀，默认是false
+  packageName: com.ruoyi.project.check
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
   tablePrefix: sys_

master/src/main/resources/mybatis/check/TCheckInstrumentMapper.xml

@@ -0,0 +1,127 @@
+<?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.check.mapper.TCheckInstrumentMapper">
+
+    <resultMap type="TCheckInstrument" id="TCheckInstrumentResult">
+        <result property="id"    column="id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="model"    column="model"    />
+        <result property="principle"    column="principle"    />
+        <result property="linearRange"    column="linear_range"    />
+        <result property="range"    column="range"    />
+        <result property="factory"    column="factory"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <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="updater"    column="updater"    />
+        <result property="updatedate"    column="updatedate"    />
+    </resultMap>
+
+    <sql id="selectTCheckInstrumentVo">
+        select id, code, name, model, principle, linear_range, `range`, factory, remarks, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_check_instrument
+    </sql>
+
+    <select id="selectTCheckInstrumentList" parameterType="TCheckInstrument" resultMap="TCheckInstrumentResult">
+        select d.*,su.user_name updater from t_check_instrument d
+        left join sys_user su on su.user_id=d.updater_code
+        <where>
+            <if test="code != null  and code != ''"> and d.`code` = #{code}</if>
+            <if test="name != null  and name != ''"> and d.`name` like concat('%', #{name}, '%')</if>
+            <if test="model != null  and model != ''"> and d.`model` = #{model}</if>
+            <if test="principle != null  and principle != ''"> and d.principle = #{principle}</if>
+            <if test="linearRange != null  and linearRange != ''"> and d.linear_range = #{linearRange}</if>
+            <if test="range != null  and range != ''"> and d.`range` = #{range}</if>
+            <if test="factory != null  and factory != ''"> and d.factory = #{factory}</if>
+            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="createrCode != null "> and d.creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and d.createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and d.updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and d.updatedate = #{updatedate}</if>
+        and d.del_flag = 0
+        </where>
+    </select>
+
+    <select id="selectTCheckInstrumentById" parameterType="Long" resultMap="TCheckInstrumentResult">
+        <include refid="selectTCheckInstrumentVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectAllInstrument" parameterType="Long" resultMap="TCheckInstrumentResult">
+        <include refid="selectTCheckInstrumentVo"/>
+        where del_flag=0 order by createdate desc
+    </select>
+
+    <insert id="insertTCheckInstrument" parameterType="TCheckInstrument" useGeneratedKeys="true" keyProperty="id">
+        insert into t_check_instrument
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">code,</if>
+            <if test="name != null">`name`,</if>
+            <if test="model != null">model,</if>
+            <if test="principle != null">principle,</if>
+            <if test="linearRange != null">linear_range,</if>
+            <if test="range != null">`range`,</if>
+            <if test="factory != null">factory,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
+            <if test="model != null">#{model},</if>
+            <if test="principle != null">#{principle},</if>
+            <if test="linearRange != null">#{linearRange},</if>
+            <if test="range != null">#{range},</if>
+            <if test="factory != null">#{factory},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTCheckInstrument" parameterType="TCheckInstrument">
+        update t_check_instrument
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code = #{code},</if>
+            <if test="name != null">`name` = #{name},</if>
+            <if test="model != null">model = #{model},</if>
+            <if test="principle != null">principle = #{principle},</if>
+            <if test="linearRange != null">linear_range = #{linearRange},</if>
+            <if test="range != null">`range` = #{range},</if>
+            <if test="factory != null">factory = #{factory},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTCheckInstrumentById" parameterType="Long">
+        update t_check_instrument set del_flag=1 where id = #{id}
+    </delete>
+
+    <delete id="deleteTCheckInstrumentByIds" parameterType="String">
+        update t_check_instrument set del_flag=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

master/src/main/resources/mybatis/check/TCheckInstrumentRecordMapper.xml

@@ -0,0 +1,107 @@
+<?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.check.mapper.TCheckInstrumentRecordMapper">
+
+    <resultMap type="TCheckInstrumentRecord" id="TCheckInstrumentRecordResult">
+        <result property="id"    column="id"    />
+        <result property="instrumentId"    column="instrument_id"    />
+        <result property="content"    column="content"    />
+        <result property="unit"    column="unit"    />
+        <result property="certificate"    column="certificate"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectTCheckInstrumentRecordVo">
+        select id, instrument_id, content, unit, certificate, remarks, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_check_instrument_record
+    </sql>
+
+    <select id="selectTCheckInstrumentRecordList" parameterType="TCheckInstrumentRecord" resultMap="TCheckInstrumentRecordResult">
+        select d.*,tci.code,tci.name,tci.model from t_check_instrument_record d
+        left join t_check_instrument tci on d.instrument_id = tci.id
+        <where>
+            <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="certificate != null  and certificate != ''"> and certificate = #{certificate}</if>
+            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="createrCode != null "> and d.creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and d.createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and d.updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and d.updatedate = #{updatedate}</if>
+        and d.del_flag = 0
+        </where>
+    </select>
+
+    <select id="selectTCheckInstrumentRecordById" parameterType="Long" resultMap="TCheckInstrumentRecordResult">
+        <include refid="selectTCheckInstrumentRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTCheckInstrumentRecord" parameterType="TCheckInstrumentRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into t_check_instrument_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="instrumentId != null">instrument_id,</if>
+            <if test="content != null">content,</if>
+            <if test="unit != null">unit,</if>
+            <if test="certificate != null">certificate,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="instrumentId != null">#{instrumentId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="certificate != null">#{certificate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTCheckInstrumentRecord" parameterType="TCheckInstrumentRecord">
+        update t_check_instrument_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="certificate != null">certificate = #{certificate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTCheckInstrumentRecordById" parameterType="Long">
+        update t_check_instrument_record set del_flag=1 where id = #{id}
+    </delete>
+
+    <delete id="deleteTCheckInstrumentRecordByIds" parameterType="String">
+        update t_check_instrument_record set del_flag=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

master/src/main/resources/mybatis/check/TCheckStandardgasesMapper.xml

@@ -0,0 +1,118 @@
+<?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.check.mapper.TCheckStandardgasesMapper">
+
+    <resultMap type="TCheckStandardgases" id="TCheckStandardgasesResult">
+        <result property="id"    column="id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="concentration"    column="concentration"    />
+        <result property="lifespan"    column="lifespan"    />
+        <result property="factory"    column="factory"    />
+        <result property="cylinderCode"    column="cylinder_code"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <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="updater"    column="user_name"    />
+        <result property="updatedate"    column="updatedate"    />
+    </resultMap>
+
+    <sql id="selectTCheckStandardgasesVo">
+        select id, code, name, concentration, lifespan, factory, cylinder_code, remarks, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_check_standardgases
+    </sql>
+
+    <select id="selectTCheckStandardgasesList" parameterType="TCheckStandardgases" resultMap="TCheckStandardgasesResult">
+        select d.*,su.user_name from t_check_standardgases d
+        left join sys_user su on su.user_id=d.updater_code
+        <where>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="concentration != null  and concentration != ''"> and concentration = #{concentration}</if>
+            <if test="lifespan != null  and lifespan != ''"> and lifespan = #{lifespan}</if>
+            <if test="factory != null  and factory != ''"> and factory = #{factory}</if>
+            <if test="cylinderCode != null  and cylinderCode != ''"> and cylinder_code = #{cylinderCode}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</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>
+        and d.del_flag = 0
+        </where>
+    </select>
+
+    <select id="selectTCheckStandardgasesById" parameterType="Long" resultMap="TCheckStandardgasesResult">
+        <include refid="selectTCheckStandardgasesVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTCheckStandardgases" parameterType="TCheckStandardgases" useGeneratedKeys="true" keyProperty="id">
+        insert into t_check_standardgases
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">code,</if>
+            <if test="name != null">name,</if>
+            <if test="concentration != null">concentration,</if>
+            <if test="lifespan != null">lifespan,</if>
+            <if test="factory != null">factory,</if>
+            <if test="cylinderCode != null">cylinder_code,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
+            <if test="concentration != null">#{concentration},</if>
+            <if test="lifespan != null">#{lifespan},</if>
+            <if test="factory != null">#{factory},</if>
+            <if test="cylinderCode != null">#{cylinderCode},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTCheckStandardgases" parameterType="TCheckStandardgases">
+        update t_check_standardgases
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code = #{code},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="concentration != null">concentration = #{concentration},</if>
+            <if test="lifespan != null">lifespan = #{lifespan},</if>
+            <if test="factory != null">factory = #{factory},</if>
+            <if test="cylinderCode != null">cylinder_code = #{cylinderCode},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTCheckStandardgasesById" parameterType="Long">
+        update t_check_standardgases set del_flag=1 where id = #{id}
+    </delete>
+
+    <delete id="deleteTCheckStandardgasesByIds" parameterType="String">
+        update t_check_standardgases set del_flag=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

master/src/main/resources/mybatis/task/TTaskInspectionMapper.xml

@@ -0,0 +1,157 @@
+<?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.task.mapper.TTaskInspectionMapper">
+
+    <resultMap type="TTaskInspection" id="TTaskInspectionResult">
+        <result property="id"    column="id"    />
+        <result property="plantId"    column="plant_id"    />
+        <result property="plantName"    column="plant_name"    />
+        <result property="planId"    column="plan_id"    />
+        <result property="planName"    column="inspection_plan_name"    />
+        <result property="taskName"    column="task_name"    />
+        <result property="taskCode"    column="task_code"    />
+        <result property="taskType"    column="task_type"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="recipient"    column="recipient"    />
+        <result property="taskNum"    column="task_num"    />
+        <result property="taskDoneNum"    column="task_done_num"    />
+        <result property="taskUndoneNum"    column="task_undone_num"    />
+        <result property="status"    column="status"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectTTaskInspectionVo">
+        select id, plant_id, plan_id, task_name, task_code, task_type, start_time, end_time, recipient, task_num, task_done_num, task_undone_num, status, remarks, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_task_inspection
+    </sql>
+
+    <select id="selectTTaskInspectionList" parameterType="TTaskInspection" resultMap="TTaskInspectionResult">
+        select d.*,ip.inspection_plan_name,bp.plant_name from t_task_inspection d
+        left join t_task_inspection_plan ip on d.plan_id=ip.id
+        left join t_base_plant bp on d.plant_id=bp.id
+        <where>
+            <if test="plantId != null "> and d.plant_id = #{plantId}</if>
+            <if test="planId != null "> and d.plan_id = #{planId}</if>
+            <if test="taskName != null  and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="taskCode != null  and taskCode != ''"> and task_code = #{taskCode}</if>
+            <if test="taskType != null  and taskType != ''"> and task_type = #{taskType}</if>
+            <if test="startTime != null "> and d.start_time = #{startTime}</if>
+            <if test="endTime != null "> and d.end_time = #{endTime}</if>
+            <if test="recipient != null "> and recipient = #{recipient}</if>
+            <if test="taskNum != null  and taskNum != ''"> and task_num = #{taskNum}</if>
+            <if test="taskDoneNum != null  and taskDoneNum != ''"> and task_done_num = #{taskDoneNum}</if>
+            <if test="taskUndoneNum != null  and taskUndoneNum != ''"> and task_undone_num = #{taskUndoneNum}</if>
+            <if test="status != null  and status != ''"> and d.`status` = #{status}</if>
+            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="createrCode != null "> and d.creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and d.createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and d.updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and d.updatedate = #{updatedate}</if>
+        and d.del_flag = 0
+        </where>
+    </select>
+
+    <select id="selectTTaskInspectionById" parameterType="Long" resultMap="TTaskInspectionResult">
+        <include refid="selectTTaskInspectionVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTTaskInspection" parameterType="TTaskInspection" useGeneratedKeys="true" keyProperty="id">
+        insert into t_task_inspection
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="plantId != null">plant_id,</if>
+            <if test="planId != null">plan_id,</if>
+            <if test="taskName != null">task_name,</if>
+            <if test="taskCode != null">task_code,</if>
+            <if test="taskType != null">task_type,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="recipient != null">recipient,</if>
+            <if test="taskNum != null">task_num,</if>
+            <if test="taskDoneNum != null">task_done_num,</if>
+            <if test="taskUndoneNum != null">task_undone_num,</if>
+            <if test="status != null">`status`,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="plantId != null">#{plantId},</if>
+            <if test="planId != null">#{planId},</if>
+            <if test="taskName != null">#{taskName},</if>
+            <if test="taskCode != null">#{taskCode},</if>
+            <if test="taskType != null">#{taskType},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="recipient != null">#{recipient},</if>
+            <if test="taskNum != null">#{taskNum},</if>
+            <if test="taskDoneNum != null">#{taskDoneNum},</if>
+            <if test="taskUndoneNum != null">#{taskUndoneNum},</if>
+            <if test="status != null">#{status},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTTaskInspection" parameterType="TTaskInspection">
+        update t_task_inspection
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantId != null">plant_id = #{plantId},</if>
+            <if test="planId != null">plan_id = #{planId},</if>
+            <if test="taskName != null">task_name = #{taskName},</if>
+            <if test="taskCode != null">task_code = #{taskCode},</if>
+            <if test="taskType != null">task_type = #{taskType},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="recipient != null">recipient = #{recipient},</if>
+            <if test="taskNum != null">task_num = #{taskNum},</if>
+            <if test="taskDoneNum != null">task_done_num = #{taskDoneNum},</if>
+            <if test="taskUndoneNum != null">task_undone_num = #{taskUndoneNum},</if>
+            <if test="status != null">`status` = #{status},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</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>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="updateTTaskInspectionByIds" parameterType="String">
+        update t_task_inspection set `status`=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <delete id="deleteTTaskInspectionById" parameterType="Long">
+        update t_task_inspection set del_flag=1 where id = #{id}
+    </delete>
+
+    <delete id="deleteTTaskInspectionByIds" parameterType="String">
+        update t_task_inspection set del_flag=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

master/src/main/resources/mybatis/task/TTaskInspectionPlanMapper.xml

@@ -50,6 +50,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectAllPlan" resultMap="TTaskInspectionPlanResult">
+        <include refid="selectTTaskInspectionPlanVo"/>
+    </select>
+
     <select id="selectTTaskInspectionPlanById" parameterType="Long" resultMap="TTaskInspectionPlanResult">
         <include refid="selectTTaskInspectionPlanVo"/>
         where id = #{id}

ui/src/api/check/instrument.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询仪器列表
+export function listInstrument(query) {
+  return request({
+    url: '/check/instrument/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仪器详细
+export function getInstrument(id) {
+  return request({
+    url: '/check/instrument/' + id,
+    method: 'get'
+  })
+}
+
+export function getAllInstrument() {
+  return request({
+    url: '/check/instrument/allInstrument',
+    method: 'get'
+  })
+}
+
+// 新增仪器
+export function addInstrument(data) {
+  return request({
+    url: '/check/instrument',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仪器
+export function updateInstrument(data) {
+  return request({
+    url: '/check/instrument',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仪器
+export function delInstrument(id) {
+  return request({
+    url: '/check/instrument/' + id,
+    method: 'delete'
+  })
+}

ui/src/api/check/record.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仪器维护记录列表
+export function listRecord(query) {
+  return request({
+    url: '/check/record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仪器维护记录详细
+export function getRecord(id) {
+  return request({
+    url: '/check/record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增仪器维护记录
+export function addRecord(data) {
+  return request({
+    url: '/check/record',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仪器维护记录
+export function updateRecord(data) {
+  return request({
+    url: '/check/record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仪器维护记录
+export function delRecord(id) {
+  return request({
+    url: '/check/record/' + id,
+    method: 'delete'
+  })
+}

ui/src/api/check/standardgases.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询标准气体列表
+export function listStandardgases(query) {
+  return request({
+    url: '/check/standardgases/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询标准气体详细
+export function getStandardgases(id) {
+  return request({
+    url: '/check/standardgases/' + id,
+    method: 'get'
+  })
+}
+
+// 新增标准气体
+export function addStandardgases(data) {
+  return request({
+    url: '/check/standardgases',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改标准气体
+export function updateStandardgases(data) {
+  return request({
+    url: '/check/standardgases',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除标准气体
+export function delStandardgases(id) {
+  return request({
+    url: '/check/standardgases/' + id,
+    method: 'delete'
+  })
+}

ui/src/api/task/inspection.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询检测任务列表
+export function listInspection(query) {
+  return request({
+    url: '/task/inspection/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询检测任务详细
+export function getInspection(id) {
+  return request({
+    url: '/task/inspection/' + id,
+    method: 'get'
+  })
+}
+
+// 新增检测任务
+export function addInspection(data) {
+  return request({
+    url: '/task/inspection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改检测任务
+export function updateInspection(data) {
+  return request({
+    url: '/task/inspection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除检测任务
+export function delInspection(id) {
+  return request({
+    url: '/task/inspection/' + id,
+    method: 'delete'
+  })
+}
+
+export function divideInspection(id) {
+  return request({
+    url: '/task/inspection/' + id,
+    method: 'put'
+  })
+}

ui/src/api/task/plan.js

@@ -17,6 +17,13 @@ export function getPlan(id) {
   })
 }
 
+export function getAllPlan() {
+  return request({
+    url: '/task/plan/allPlan',
+    method: 'get'
+  })
+}
+
 // 新增检测计划
 export function addPlan(data) {
   return request({

ui/src/views/base/point/index.vue

@@ -330,8 +330,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="介质" prop="medium">
-              <el-input v-model="form.medium" placeholder="请输入介质"/>
+            <el-form-item label="介质状态" prop="mediumType">
+              <el-select v-model="form.mediumType" placeholder="请选择介质状态" clearable size="small"
+                         style="width: 100%">
+                <el-option
+                  v-for="dict in mediumTypeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -350,23 +358,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="公称直径(mm)" prop="dia">
-              <el-input v-model="form.dia" placeholder="请输入公称直径(mm)"/>
+            <el-form-item label="介质" prop="medium">
+              <el-input v-model="form.medium" placeholder="请输入介质"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="介质状态" prop="mediumType">
-              <el-select v-model="form.mediumType" placeholder="请选择介质状态" clearable size="small"
-                         style="width: 100%">
-                <el-option
-                  v-for="dict in mediumTypeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
+            <el-form-item label="公称直径(mm)" prop="dia">
+              <el-input v-model="form.dia" placeholder="请输入公称直径(mm)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -389,20 +389,20 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="密封点位置" prop="pointPosition">
-              <el-input v-model="form.pointPosition" placeholder="请输入密封点位置"/>
+            <el-form-item label="群组编码" prop="groupCode">
+              <el-input v-model="form.groupCode" placeholder="请输入群组编码"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="群组编码" prop="groupCode">
-              <el-input v-model="form.groupCode" placeholder="请输入群组编码"/>
+            <el-form-item label="扩展编码" prop="extendCode">
+              <el-input v-model="form.extendCode" placeholder="请输入扩展编码"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="扩展编码" prop="extendCode">
-              <el-input v-model="form.extendCode" placeholder="请输入扩展编码"/>
+            <el-form-item label="密封点位置" prop="pointPosition">
+              <el-input v-model="form.pointPosition" placeholder="请输入密封点位置"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -651,19 +651,28 @@ export default {
       // 表单校验
       rules: {
         plantId: [
-          {required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "blur"}
+          {required: true, message: this.$t('请选择') + this.$t('装置'), trigger: "blur"}
         ],
         regionId: [
-          {required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "blur"}
+          {required: true, message: this.$t('请选择') + this.$t('区域'), trigger: "blur"}
         ],
         devId: [
-          {required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "blur"}
+          {required: true, message: this.$t('请选择') + this.$t('设备'), trigger: "blur"}
         ],
         groupCode: [
           {required: true, message: this.$t('群组编码') + this.$t('不能为空'), trigger: "blur"}
         ],
         extendCode: [
-          {required: true, message: this.$t('扩展编码') + this.$t('不能为空'), trigger: "blur"}
+          {required: true, message: this.$t('密封点扩展号编码') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        pointType: [
+          {required: true, message: this.$t('请选择') + this.$t('密封点类型'), trigger: "blur"}
+        ],
+        unarrive: [
+          {required: true, message: this.$t('请选择') + this.$t('是否不可达点'), trigger: "blur"}
+        ],
+        mediumType: [
+          {required: true, message: this.$t('请选择') + this.$t('介质状态'), trigger: "blur"}
         ],
       }
     };

ui/src/views/check/instrument/index.vue

@@ -0,0 +1,355 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仪器类型编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入仪器类型编号"
+          clearable
+          @change="handleQuery"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['check:instrument:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['check:instrument:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['check:instrument:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['check:instrument:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="instrumentList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="仪器类型编号" align="center" prop="code"/>
+      <el-table-column label="仪器类型名称" align="center" prop="name"/>
+      <el-table-column label="仪器型号" align="center" prop="model"/>
+      <el-table-column label="检测原理" align="center" prop="principle"/>
+      <el-table-column label="线性范围" align="center" prop="linearRange"/>
+      <el-table-column label="量程" align="center" prop="range"/>
+      <el-table-column label="生产厂家" align="center" prop="factory"/>
+      <el-table-column label="备注" align="center" prop="remarks"/>
+      <el-table-column label="最后维护人" align="center" prop="updater"/>
+      <el-table-column label="维护时间" align="center" prop="updatedate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="130" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="getRecordList(scope.row)"
+          >维护记录
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['check:instrument:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['check:instrument:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仪器对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="仪器编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入仪器编号"/>
+        </el-form-item>
+        <el-form-item label="仪器名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入仪器名称"/>
+        </el-form-item>
+        <el-form-item label="仪器型号" prop="model">
+          <el-input v-model="form.model" placeholder="请输入仪器型号"/>
+        </el-form-item>
+        <el-form-item label="检测原理" prop="principle">
+          <el-input v-model="form.principle" placeholder="请输入检测原理"/>
+        </el-form-item>
+        <el-form-item label="线性范围" prop="linearRange">
+          <el-input v-model="form.linearRange" placeholder="请输入线性范围"/>
+        </el-form-item>
+        <el-form-item label="量程" prop="range">
+          <el-input v-model="form.range" placeholder="请输入量程"/>
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="factory">
+          <el-input v-model="form.factory" placeholder="请输入生产厂家"/>
+        </el-form-item>
+        <el-form-item label="描述" prop="remarks">
+          <el-tooltip placement="top">
+            <div slot="content">
+              注：请在描述中，注明该仪器的所属单位（本单位或第三方所属）。
+            </div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.remarks" placeholder="请输入描述" style="width: 97.7%"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <record v-if="recordVisible" ref="recordList"></record>
+  </div>
+</template>
+
+<script>
+import {listInstrument, getInstrument, delInstrument, addInstrument, updateInstrument} from "@/api/check/instrument";
+import Record from "@/views/check/record";
+
+export default {
+  name: "Instrument",
+  components: {Record},
+  data() {
+    return {
+      recordVisible: false,
+      // 页面高度
+      clientHeight: 300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 仪器表格数据
+      instrumentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        name: null,
+        model: null,
+        principle: null,
+        linearRange: null,
+        range: null,
+        factory: null,
+        remarks: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        code: [
+          {required: true, message: '仪器编号不能为空', trigger: "blur"}
+        ],
+        name: [
+          {required: true, message: '仪器名称不能为空', trigger: "blur"}
+        ],
+        model: [
+          {required: true, message: '仪器型号不能为空', trigger: "blur"}
+        ],
+        principle: [
+          {required: true, message: '检测原理不能为空', trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+  },
+  methods: {
+    /** 查询仪器列表 */
+    getList() {
+      this.loading = true;
+      listInstrument(this.queryParams).then(response => {
+        this.instrumentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        code: null,
+        name: null,
+        model: null,
+        principle: null,
+        linearRange: null,
+        range: null,
+        factory: null,
+        remarks: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加仪器";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInstrument(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仪器";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInstrument(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInstrument(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除仪器编号为"' + ids + '"的数据项？').then(function () {
+        return delInstrument(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('check/instrument/export', {
+        ...this.queryParams
+      }, `instrument_${new Date().getTime()}.xlsx`)
+    },
+    getRecordList(row) {
+      this.recordVisible = true;
+      this.$nextTick(() => {
+        this.$refs.recordList.init(row)
+
+      })
+    },
+
+  }
+};
+</script>

ui/src/views/check/record/index.vue

@@ -0,0 +1,291 @@
+<template>
+  <el-dialog title="仪器维护记录" append-to-body :visible.sync="visible">
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['check:record:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['check:record:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['check:record:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['check:record:export']"
+        >导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="仪器类型编号" align="center" prop="code"/>
+      <el-table-column label="仪器类型名称" align="center" prop="name"/>
+      <el-table-column label="仪器型号" align="center" prop="model"/>
+      <el-table-column label="维护内容" align="center" prop="content" />
+      <el-table-column label="检定/校准单位" align="center" prop="unit" />
+      <el-table-column label="检定/校准证书编号" align="center" prop="certificate" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['check:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['check:record:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仪器维护记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="仪器" prop="instrumentId">
+          <el-select v-model="form.instrumentId" placeholder="请选择仪器" disabled clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in instrumentList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="维护内容">
+          <el-input v-model="form.content" placeholder="请输入维护内容"/>
+        </el-form-item>
+        <el-form-item label="检定/校准单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入检定/校准单位" />
+        </el-form-item>
+        <el-form-item label="检定/校准证书编号" prop="certificate">
+          <el-input v-model="form.certificate" placeholder="请输入检定/校准证书编号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/check/record";
+import {getAllInstrument} from "@/api/check/instrument";
+
+export default {
+  name: "Record",
+  data() {
+    return {
+      row:{},
+      instrumentList:[],
+      visible: false,
+      // 页面高度
+      clientHeight:300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 仪器维护记录表格数据
+      recordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        instrumentId: null,
+        content: null,
+        unit: null,
+        certificate: null,
+        remarks: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+  },
+  methods: {
+    init(row) {
+      this.recordList=[];
+      console.log(row)
+      this.row=row
+      this.visible = true
+      getAllInstrument().then(response=>{
+        this.instrumentList=response.data;
+      });
+      this.queryParams.instrumentId=row.id;
+      this.getList();
+    },
+    /** 查询仪器维护记录列表 */
+    getList() {
+      this.loading = true;
+      listRecord(this.queryParams).then(response => {
+        this.recordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        instrumentId: null,
+        content: null,
+        unit: null,
+        certificate: null,
+        remarks: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.instrumentId=this.row.id
+      console.log(this.form.instrumentId)
+      this.open = true;
+      this.title = "添加仪器维护记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getRecord(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仪器维护记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除仪器维护记录编号为"' + ids + '"的数据项？').then(function() {
+        return delRecord(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('check/record/export', {
+        ...this.queryParams
+      }, `record_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ui/src/views/check/standardgases/index.vue

@@ -0,0 +1,317 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标准气体证书编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入标准气体证书编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标准气体名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入标准气体名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['check:standardgases:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['check:standardgases:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['check:standardgases:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['check:standardgases:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="standardgasesList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标准气体证书编号" align="center" prop="code" />
+      <el-table-column label="标准气体名称" align="center" prop="name" />
+      <el-table-column label="标准气体浓度" align="center" prop="concentration" />
+      <el-table-column label="标准气体有效期" align="center" prop="lifespan" />
+      <el-table-column label="生产厂家" align="center" prop="factory" />
+      <el-table-column label="钢瓶编号" align="center" prop="cylinderCode" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="修改人" align="center" prop="updater" />
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['check:standardgases:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['check:standardgases:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改标准气体对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="标准气体证书编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入标准气体证书编号" />
+        </el-form-item>
+        <el-form-item label="标准气体名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入标准气体名称" />
+        </el-form-item>
+        <el-form-item label="标准气体浓度" prop="concentration">
+          <el-input v-model="form.concentration" placeholder="请输入标准气体浓度" />
+        </el-form-item>
+        <el-form-item label="标准气体有效期" prop="lifespan">
+          <el-input v-model="form.lifespan" placeholder="请输入标准气体有效期" />
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="factory">
+          <el-input v-model="form.factory" placeholder="请输入生产厂家" />
+        </el-form-item>
+        <el-form-item label="钢瓶编号" prop="cylinderCode">
+          <el-input v-model="form.cylinderCode" placeholder="请输入钢瓶编号" />
+        </el-form-item>
+        <el-form-item label="描述" prop="remarks">
+          <el-tooltip placement="top">
+            <div slot="content">
+              注：请在描述中，注明该仪器的所属单位（本单位或第三方所属）。
+            </div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="form.remarks" placeholder="请输入描述" style="width: 97.7%"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listStandardgases, getStandardgases, delStandardgases, addStandardgases, updateStandardgases } from "@/api/check/standardgases";
+
+export default {
+  name: "Standardgases",
+  data() {
+    return {
+      // 页面高度
+      clientHeight:300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 标准气体表格数据
+      standardgasesList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        name: null,
+        concentration: null,
+        lifespan: null,
+        factory: null,
+        cylinderCode: null,
+        remarks: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+  },
+  methods: {
+    /** 查询标准气体列表 */
+    getList() {
+      this.loading = true;
+      listStandardgases(this.queryParams).then(response => {
+        this.standardgasesList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        code: null,
+        name: null,
+        concentration: null,
+        lifespan: null,
+        factory: null,
+        cylinderCode: null,
+        remarks: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加标准气体";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getStandardgases(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改标准气体";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStandardgases(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStandardgases(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除标准气体编号为"' + ids + '"的数据项？').then(function() {
+        return delStandardgases(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('check/standardgases/export', {
+        ...this.queryParams
+      }, `standardgases_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ui/src/views/task/inspection/index.vue

@@ -0,0 +1,441 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input
+          v-model="queryParams.taskName"
+          placeholder="请输入任务名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务起始时间" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择任务起始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="任务截止时间" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择任务截止时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['task:inspection:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['task:inspection:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['task:inspection:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-check"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDivide"
+          v-hasPermi="['task:inspection:edit']"
+        >确认分配
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border :cell-style="tableCellStyle">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="状态" align="center" prop="status" fixed="left" width="85" :formatter="divideFormat"/>
+      <el-table-column label="是否超时" align="center" prop="timeOut" fixed="left" width="85"/>
+      <el-table-column label="装置名称" align="center" prop="plantName" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="计划名称" align="center" prop="planName" :show-overflow-tooltip="true" width="280"/>
+      <el-table-column label="任务名称" align="center" prop="taskName" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="任务编号" align="center" prop="taskCode" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="任务类型" align="center" prop="taskType" :show-overflow-tooltip="true" :formatter="taskTypeFormat"
+       width="130"/>
+      <el-table-column label="任务起始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务截止时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收人" align="center" prop="recipient" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="任务点数" align="center" prop="taskNum" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="已检测点数" align="center" prop="taskDoneNum" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="未检测点数" align="center" prop="taskUndoneNum" :show-overflow-tooltip="true"
+                       width="100"/>
+      <el-table-column label="完成率" align="center" width="250" prop="percentage">
+        <template slot-scope="scope">
+          <el-progress :text-inside="true" :stroke-width="14" :percentage="scope.row.percentage"
+                       status="success"></el-progress>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['task:inspection:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['task:inspection:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改检测任务对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="检测计划" prop="planId">
+          <el-select v-model="form.planId" placeholder="请选择计划" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in planOperation"
+              :key="dict.id"
+              :label="dict.inspectionPlanName"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务名称" prop="taskName">
+          <el-input v-model="form.taskName" placeholder="请输入任务名称"/>
+        </el-form-item>
+        <el-form-item label="任务编号" prop="taskCode">
+          <el-input v-model="form.taskCode" placeholder="请输入任务编号"/>
+        </el-form-item>
+        <el-form-item label="任务类型" prop="planId">
+          <el-select v-model="form.taskType" placeholder="请选择任务类型" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in taskTypeOperation"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务起始时间" prop="startTime">
+          <el-date-picker clearable style="width: 100%"
+                          v-model="form.startTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择任务起始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="任务截止时间" prop="endTime">
+          <el-date-picker clearable style="width: 100%"
+                          v-model="form.endTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择任务截止时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="接收人" prop="recipient">
+          <el-input v-model="form.recipient" placeholder="请输入接收人"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addInspection,
+  delInspection,
+  divideInspection,
+  getInspection,
+  listInspection,
+  updateInspection
+} from "@/api/task/inspection";
+import {getAllPlan} from "@/api/task/plan";
+
+export default {
+  name: "Inspection",
+  data() {
+    return {
+      taskTypeOperation: [],
+      planOperation: [],
+      divideOperation: [],
+      // 页面高度
+      clientHeight: 300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      status: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 检测任务表格数据
+      inspectionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        plantId: null,
+        planId: null,
+        taskName: null,
+        taskCode: null,
+        taskType: null,
+        startTime: null,
+        endTime: null,
+        recipient: null,
+        taskNum: null,
+        taskDoneNum: null,
+        taskUndoneNum: null,
+        status: null,
+        remarks: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+    this.getDicts("task_type").then(response => {
+      this.taskTypeOperation = response.data;
+    });
+    this.getDicts("divide_status").then(response => {
+      this.divideOperation = response.data;
+    });
+    getAllPlan().then(response => {
+      this.planOperation = response.data;
+    });
+  },
+  methods: {
+    tableCellStyle({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 1 && row.status == 0) {
+        return "color:#ff0000;";
+      }
+      if (columnIndex === 1 && row.status == 1) {
+        return "color:#00cc00;";
+      }
+    },
+    taskTypeFormat(row, column) {
+      return this.selectDictLabel(this.taskTypeOperation, row.taskType);
+    },
+    divideFormat(row, column) {
+      return this.selectDictLabel(this.divideOperation, row.status);
+    },
+    /** 查询检测任务列表 */
+    getList() {
+      this.loading = true;
+      listInspection(this.queryParams).then(response => {
+        this.inspectionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        plantId: null,
+        planId: null,
+        taskName: null,
+        taskCode: null,
+        taskType: null,
+        startTime: null,
+        endTime: null,
+        recipient: null,
+        taskNum: null,
+        taskDoneNum: null,
+        taskUndoneNum: null,
+        status: "0",
+        percentage: 0,
+        remarks: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.status = selection.map(item => item.status)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加检测任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInspection(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改检测任务";
+      });
+    },
+    handleDivide() {
+      console.log(this.status)
+      for (const statusKey in this.status) {
+        if (statusKey === "1") {
+          this.$alert('已分配的任务不可再次分配！', '注意！', {
+            confirmButtonText: '确定',
+          });
+          return
+        }
+      }
+      this.reset();
+      const ids =  this.ids
+      this.$modal.confirm('是否确认分配？').then(function () {
+        return divideInspection(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("分配成功");
+      }).catch(() => {
+        this.$modal.msg("取消分配");
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInspection(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInspection(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除数据项？').then(function () {
+        return delInspection(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('task/inspection/export', {
+        ...this.queryParams
+      }, `inspection_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>