-新增检测任务匹配

-新增检测计划自动生成
-新增检测点清单

master/src/main/java/com/ruoyi/project/check/controller/TCheckCheckpointsController.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.TCheckCheckpoints;
+import com.ruoyi.project.check.service.ITCheckCheckpointsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 检测点Controller
+ *
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+@RestController
+@RequestMapping("/check/checkpoints")
+public class TCheckCheckpointsController extends BaseController
+{
+    @Autowired
+    private ITCheckCheckpointsService tCheckCheckpointsService;
+
+    /**
+     * 查询检测点列表
+     */
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TCheckCheckpoints tCheckCheckpoints)
+    {
+        startPage();
+        List<TCheckCheckpoints> list = tCheckCheckpointsService.selectTCheckCheckpointsList(tCheckCheckpoints);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检测点列表
+     */
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:export')")
+    @Log(title = "检测点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TCheckCheckpoints tCheckCheckpoints)
+    {
+        List<TCheckCheckpoints> list = tCheckCheckpointsService.selectTCheckCheckpointsList(tCheckCheckpoints);
+        ExcelUtil<TCheckCheckpoints> util = new ExcelUtil<TCheckCheckpoints>(TCheckCheckpoints.class);
+        util.exportExcel(response, list, "检测点数据");
+    }
+
+    /**
+     * 获取检测点详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:query')")
+    @GetMapping(value = "/{checkId}")
+    public AjaxResult getInfo(@PathVariable("checkId") Long checkId)
+    {
+        return AjaxResult.success(tCheckCheckpointsService.selectTCheckCheckpointsByCheckId(checkId));
+    }
+
+    /**
+     * 新增检测点
+     */
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:add')")
+    @Log(title = "检测点", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TCheckCheckpoints tCheckCheckpoints)
+    {
+        return toAjax(tCheckCheckpointsService.insertTCheckCheckpoints(tCheckCheckpoints));
+    }
+
+    /**
+     * 修改检测点
+     */
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
+    @Log(title = "检测点", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TCheckCheckpoints tCheckCheckpoints)
+    {
+        return toAjax(tCheckCheckpointsService.updateTCheckCheckpointsByCheckIds(tCheckCheckpoints));
+    }
+
+    /**
+     * 删除检测点
+     */
+//    @PreAuthorize("@ss.hasPermi('check:checkpoints:remove')")
+    @Log(title = "检测点", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{checkIds}")
+    public AjaxResult remove(@PathVariable Long[] checkIds)
+    {
+        return toAjax(tCheckCheckpointsService.deleteTCheckCheckpointsByCheckIds(checkIds));
+    }
+}

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

@@ -0,0 +1,503 @@
+package com.ruoyi.project.check.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_check_checkpoints
+ *
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+public class TCheckCheckpoints extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识id
+     */
+    private Long checkId;
+
+    /**
+     * 装置id
+     */
+    private Long plantId;
+
+    /**
+     * 区域id
+     */
+    private Long regionId;
+
+    /**
+     * 设备id
+     */
+    private Long devId;
+
+    /**
+     * 密封点id
+     */
+    @Excel(name = "密封点id")
+    private Long pointId;
+
+    /**
+     * 仪器id
+     */
+    @Excel(name = "仪器id")
+    private Long instrumentId;
+
+    private Long inspectionId;
+
+    /**
+     * 检测值
+     */
+    @Excel(name = "检测值")
+    private String testValue;
+
+    /**
+     * 净检测值
+     */
+    @Excel(name = "净检测值")
+    private String netTestValue;
+
+    /**
+     * 装置名称
+     */
+    @Excel(name = "装置名称")
+    private String plantName;
+
+    /**
+     * 区域名称
+     */
+    @Excel(name = "区域名称")
+    private String regionName;
+
+    /**
+     * 平台
+     */
+    @Excel(name = "平台")
+    private String layer;
+
+    /**
+     * 设备/管线名称
+     */
+    @Excel(name = "设备/管线名称")
+    private String devName;
+
+    /**
+     * 设备/管线编号
+     */
+    @Excel(name = "设备/管线编号")
+    private String devCode;
+
+    /**
+     * 群组编码
+     */
+    @Excel(name = "群组编码")
+    private String groupCode;
+
+    /**
+     * 密封点扩展号编码
+     */
+    @Excel(name = "密封点扩展号编码")
+    private String extendCode;
+
+    /**
+     * 密封点类型
+     */
+    @Excel(name = "密封点类型")
+    private String pointType;
+
+    /**
+     * 仪器编号
+     */
+    @Excel(name = "仪器编号")
+    private String instrumentCode;
+
+    /**
+     * 泄露部位
+     */
+    @Excel(name = "泄露部位")
+    private String leakagePosition;
+
+    /**
+     * 校准人员
+     */
+    @Excel(name = "校准人员")
+    private String checker;
+
+    /**
+     * 校准日期
+     */
+    @Excel(name = "校准日期")
+    private String checkDate;
+
+    /**
+     * 泄漏程度
+     */
+    @Excel(name = "泄漏程度")
+    private String leakageDegree;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /**
+     * 审核状态
+     */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /**
+     * 审核时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /**
+     * 部门编号
+     */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /**
+     * 状态  0：正常 ；1：删除
+     */
+    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;
+
+    @TableField(exist = false)
+    private String choose;
+
+    @TableField(exist = false)
+    private Long[] checkIds;
+
+    public Long[] getCheckIds() {
+        return checkIds;
+    }
+
+    public void setCheckIds(Long[] checkIds) {
+        this.checkIds = checkIds;
+    }
+
+    public String getChoose() {
+        return choose;
+    }
+
+    public void setChoose(String choose) {
+        this.choose = choose;
+    }
+
+    public void setCheckId(Long checkId) {
+        this.checkId = checkId;
+    }
+
+    public Long getCheckId() {
+        return checkId;
+    }
+
+    public Long getPlantId() {
+        return plantId;
+    }
+
+    public void setPlantId(Long plantId) {
+        this.plantId = plantId;
+    }
+
+    public Long getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Long regionId) {
+        this.regionId = regionId;
+    }
+
+    public Long getDevId() {
+        return devId;
+    }
+
+    public void setDevId(Long devId) {
+        this.devId = devId;
+    }
+
+    public void setPointId(Long pointId) {
+        this.pointId = pointId;
+    }
+
+    public Long getPointId() {
+        return pointId;
+    }
+
+    public Long getInstrumentId() {
+        return instrumentId;
+    }
+
+    public void setInstrumentId(Long instrumentId) {
+        this.instrumentId = instrumentId;
+    }
+
+    public void setInspectionId(Long inspectionId) {
+        this.inspectionId = inspectionId;
+    }
+
+    public Long getInspectionId() {
+        return inspectionId;
+    }
+
+    public void setTestValue(String testValue) {
+        this.testValue = testValue;
+    }
+
+    public String getTestValue() {
+        return testValue;
+    }
+
+    public void setNetTestValue(String netTestValue) {
+        this.netTestValue = netTestValue;
+    }
+
+    public String getNetTestValue() {
+        return netTestValue;
+    }
+
+    public void setPlantName(String plantName) {
+        this.plantName = plantName;
+    }
+
+    public String getPlantName() {
+        return plantName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setLayer(String layer) {
+        this.layer = layer;
+    }
+
+    public String getLayer() {
+        return layer;
+    }
+
+    public void setDevName(String devName) {
+        this.devName = devName;
+    }
+
+    public String getDevName() {
+        return devName;
+    }
+
+    public void setDevCode(String devCode) {
+        this.devCode = devCode;
+    }
+
+    public String getDevCode() {
+        return devCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setExtendCode(String extendCode) {
+        this.extendCode = extendCode;
+    }
+
+    public String getExtendCode() {
+        return extendCode;
+    }
+
+    public void setPointType(String pointType) {
+        this.pointType = pointType;
+    }
+
+    public String getPointType() {
+        return pointType;
+    }
+
+    public void setInstrumentCode(String instrumentCode) {
+        this.instrumentCode = instrumentCode;
+    }
+
+    public String getInstrumentCode() {
+        return instrumentCode;
+    }
+
+    public void setLeakagePosition(String leakagePosition) {
+        this.leakagePosition = leakagePosition;
+    }
+
+    public String getLeakagePosition() {
+        return leakagePosition;
+    }
+
+    public void setChecker(String checker) {
+        this.checker = checker;
+    }
+
+    public String getChecker() {
+        return checker;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setLeakageDegree(String leakageDegree) {
+        this.leakageDegree = leakageDegree;
+    }
+
+    public String getLeakageDegree() {
+        return leakageDegree;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setApproveStatus(Long approveStatus) {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus() {
+        return approveStatus;
+    }
+
+    public void setApproveTime(Date approveTime) {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime() {
+        return approveTime;
+    }
+
+    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("checkId", getCheckId())
+                .append("pointId", getPointId())
+                .append("inspectionId", getInspectionId())
+                .append("testValue", getTestValue())
+                .append("netTestValue", getNetTestValue())
+                .append("plantName", getPlantName())
+                .append("regionName", getRegionName())
+                .append("layer", getLayer())
+                .append("devName", getDevName())
+                .append("devCode", getDevCode())
+                .append("groupCode", getGroupCode())
+                .append("extendCode", getExtendCode())
+                .append("pointType", getPointType())
+                .append("instrumentCode", getInstrumentCode())
+                .append("leakagePosition", getLeakagePosition())
+                .append("checker", getChecker())
+                .append("checkDate", getCheckDate())
+                .append("leakageDegree", getLeakageDegree())
+                .append("remarks", getRemarks())
+                .append("approveStatus", getApproveStatus())
+                .append("approveTime", getApproveTime())
+                .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/TCheckCheckpointsMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.check.mapper;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckCheckpoints;
+
+/**
+ * 检测点Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+public interface TCheckCheckpointsMapper
+{
+    /**
+     * 查询检测点
+     *
+     * @param checkId 检测点主键
+     * @return 检测点
+     */
+    public TCheckCheckpoints selectTCheckCheckpointsByCheckId(Long checkId);
+
+    /**
+     * 查询检测点列表
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 检测点集合
+     */
+    public List<TCheckCheckpoints> selectTCheckCheckpointsList(TCheckCheckpoints tCheckCheckpoints);
+
+    /**
+     * 新增检测点
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 结果
+     */
+    public int insertTCheckCheckpoints(TCheckCheckpoints tCheckCheckpoints);
+    public int insertTCheckCheckpointsByList(List<TCheckCheckpoints> tCheckCheckpoints);
+
+    /**
+     * 修改检测点
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 结果
+     */
+    public int updateTCheckCheckpoints(TCheckCheckpoints tCheckCheckpoints);
+    public int updateTCheckCheckpointsByCheckIds(TCheckCheckpoints tCheckCheckpoints);
+
+    /**
+     * 删除检测点
+     *
+     * @param checkId 检测点主键
+     * @return 结果
+     */
+    public int deleteTCheckCheckpointsByCheckId(Long checkId);
+
+    /**
+     * 批量删除检测点
+     *
+     * @param checkIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTCheckCheckpointsByCheckIds(Long[] checkIds);
+}

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

@@ -0,0 +1,64 @@
+package com.ruoyi.project.check.service;
+
+import java.util.List;
+import com.ruoyi.project.check.domain.TCheckCheckpoints;
+
+/**
+ * 检测点Service接口
+ *
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+public interface ITCheckCheckpointsService
+{
+    /**
+     * 查询检测点
+     *
+     * @param checkId 检测点主键
+     * @return 检测点
+     */
+    public TCheckCheckpoints selectTCheckCheckpointsByCheckId(Long checkId);
+
+    /**
+     * 查询检测点列表
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 检测点集合
+     */
+    public List<TCheckCheckpoints> selectTCheckCheckpointsList(TCheckCheckpoints tCheckCheckpoints);
+
+    /**
+     * 新增检测点
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 结果
+     */
+    public int insertTCheckCheckpoints(TCheckCheckpoints tCheckCheckpoints);
+
+    public int insertTCheckCheckpointsByList(List<TCheckCheckpoints> tCheckCheckpoints);
+
+    /**
+     * 修改检测点
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 结果
+     */
+    public int updateTCheckCheckpoints(TCheckCheckpoints tCheckCheckpoints);
+    public int updateTCheckCheckpointsByCheckIds(TCheckCheckpoints tCheckCheckpoints);
+
+    /**
+     * 批量删除检测点
+     *
+     * @param checkIds 需要删除的检测点主键集合
+     * @return 结果
+     */
+    public int deleteTCheckCheckpointsByCheckIds(Long[] checkIds);
+
+    /**
+     * 删除检测点信息
+     *
+     * @param checkId 检测点主键
+     * @return 结果
+     */
+    public int deleteTCheckCheckpointsByCheckId(Long checkId);
+}

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

@@ -0,0 +1,103 @@
+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.TCheckCheckpointsMapper;
+import com.ruoyi.project.check.domain.TCheckCheckpoints;
+import com.ruoyi.project.check.service.ITCheckCheckpointsService;
+
+/**
+ * 检测点Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-12-01
+ */
+@Service
+public class TCheckCheckpointsServiceImpl implements ITCheckCheckpointsService
+{
+    @Autowired
+    private TCheckCheckpointsMapper tCheckCheckpointsMapper;
+
+    /**
+     * 查询检测点
+     *
+     * @param checkId 检测点主键
+     * @return 检测点
+     */
+    @Override
+    public TCheckCheckpoints selectTCheckCheckpointsByCheckId(Long checkId)
+    {
+        return tCheckCheckpointsMapper.selectTCheckCheckpointsByCheckId(checkId);
+    }
+
+    /**
+     * 查询检测点列表
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 检测点
+     */
+    @Override
+    public List<TCheckCheckpoints> selectTCheckCheckpointsList(TCheckCheckpoints tCheckCheckpoints)
+    {
+        return tCheckCheckpointsMapper.selectTCheckCheckpointsList(tCheckCheckpoints);
+    }
+
+    /**
+     * 新增检测点
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 结果
+     */
+    @Override
+    public int insertTCheckCheckpoints(TCheckCheckpoints tCheckCheckpoints)
+    {
+        return tCheckCheckpointsMapper.insertTCheckCheckpoints(tCheckCheckpoints);
+    }
+    @Override
+    public int insertTCheckCheckpointsByList(List<TCheckCheckpoints> tCheckCheckpoints)
+    {
+        return tCheckCheckpointsMapper.insertTCheckCheckpointsByList(tCheckCheckpoints);
+    }
+
+    /**
+     * 修改检测点
+     *
+     * @param tCheckCheckpoints 检测点
+     * @return 结果
+     */
+    @Override
+    public int updateTCheckCheckpoints(TCheckCheckpoints tCheckCheckpoints)
+    {
+        return tCheckCheckpointsMapper.updateTCheckCheckpoints(tCheckCheckpoints);
+    }
+    @Override
+    public int updateTCheckCheckpointsByCheckIds(TCheckCheckpoints tCheckCheckpoints)
+    {
+        return tCheckCheckpointsMapper.updateTCheckCheckpointsByCheckIds(tCheckCheckpoints);
+    }
+
+    /**
+     * 批量删除检测点
+     *
+     * @param checkIds 需要删除的检测点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckCheckpointsByCheckIds(Long[] checkIds)
+    {
+        return tCheckCheckpointsMapper.deleteTCheckCheckpointsByCheckIds(checkIds);
+    }
+
+    /**
+     * 删除检测点信息
+     *
+     * @param checkId 检测点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCheckCheckpointsByCheckId(Long checkId)
+    {
+        return tCheckCheckpointsMapper.deleteTCheckCheckpointsByCheckId(checkId);
+    }
+}

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

@@ -9,11 +9,18 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.project.base.domain.TBaseDevice;
 import com.ruoyi.project.base.domain.TBasePlant;
 import com.ruoyi.project.base.domain.TBasePoint;
+import com.ruoyi.project.base.domain.TBaseRegion;
 import com.ruoyi.project.base.mapper.TBasePointMapper;
+import com.ruoyi.project.base.mapper.TBaseRegionMapper;
+import com.ruoyi.project.base.service.ITBaseDeviceService;
 import com.ruoyi.project.base.service.ITBasePlantService;
 import com.ruoyi.project.base.service.ITBasePointService;
+import com.ruoyi.project.base.service.ITBaseRegionService;
+import com.ruoyi.project.check.domain.TCheckCheckpoints;
+import com.ruoyi.project.check.service.ITCheckCheckpointsService;
 import com.ruoyi.project.task.mapper.TTaskInspectionPlanMapper;
 import com.ruoyi.system.service.ISysDictTypeService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -60,6 +67,15 @@ public class TTaskInspectionPlanController extends BaseController {
     @Autowired
     private TBasePointMapper tBasePointMapper;
 
+    @Autowired
+    private ITBaseRegionService tBaseRegionService;
+
+    @Autowired
+    private ITBaseDeviceService tBaseDeviceService;
+
+    @Autowired
+    private ITCheckCheckpointsService tCheckCheckpointsService;
+
     /**
      * 查询检测计划列表
      */
@@ -118,7 +134,7 @@ public class TTaskInspectionPlanController extends BaseController {
         String year = String.valueOf(calendar.get(Calendar.YEAR)); // 获取当前年份
         for (TBasePlant tBasePlant : tBasePlantService.selectAllPlantName()) {// 查询已审核所有装置
             // 查询今年当前季度是否有监测计划
-            QueryWrapper<TTaskInspectionPlan> plansWrapper = new QueryWrapper<TTaskInspectionPlan>().eq("year", year).eq("quarter", nowQuarter).eq("plant_id", tBasePlant.getPlantId()).eq("del_flag", 0);
+            QueryWrapper<TTaskInspectionPlan> plansWrapper = new QueryWrapper<TTaskInspectionPlan>().eq("plan_year", year).eq("plan_quarter", nowQuarter).eq("plant_id", tBasePlant.getPlantId()).eq("del_flag", 0);
             List<TTaskInspectionPlan> plans = tTaskInspectionPlanService.list(plansWrapper);
             if (CollectionUtils.isNotEmpty(plans)) {// 有则跳过
                 continue;
@@ -127,11 +143,11 @@ public class TTaskInspectionPlanController extends BaseController {
             tTaskInspectionPlan.setPlantId(tBasePlant.getPlantId());
             // 查询最后一个计划编号
             plansWrapper.clear();
-            plansWrapper.eq("del_flag", 0).orderByDesc("code");
+            plansWrapper.eq("del_flag", 0).orderByDesc("plan_code");
             plans = tTaskInspectionPlanMapper.selectList(plansWrapper);
             int code = 0;
             if (CollectionUtils.isNotEmpty(plans)) {
-                code = plans.get(0).getCode() + 1;// 当前计划编号为前一个计划编号+1
+                code = plans.get(0).getPlanCode() + 1;// 当前计划编号为前一个计划编号+1
             }
             // 检测计划编号
             tTaskInspectionPlan.setInspectionPlanNo("LTP_" + year + "_" + "0" + nowQuarter + "_" + code);
@@ -155,7 +171,7 @@ public class TTaskInspectionPlanController extends BaseController {
             QueryWrapper<TBasePoint> points = new QueryWrapper<TBasePoint>().eq("plant_id", tBasePlant.getPlantId()).eq("del_flag", 0).eq("approve_status", 2);
             // TODO: 当1、3季度时需要加上动密封点的判断
 //            if (nowQuarter == 1 && nowQuarter == 3) {
-//                points.eq("","");
+//                points.in("point_type","");
 //            }
             Integer count = tBasePointMapper.selectCount(points);
             tTaskInspectionPlan.setPointNum(count.toString());
@@ -163,12 +179,41 @@ public class TTaskInspectionPlanController extends BaseController {
             tTaskInspectionPlan.setCreatedate(new Date());
             tTaskInspectionPlan.setUpdaterCode(getUserId());
             tTaskInspectionPlan.setUpdatedate(new Date());
-            tTaskInspectionPlan.setCode(code);
-            tTaskInspectionPlan.setYear(year);
-            tTaskInspectionPlan.setQuarter(String.valueOf(nowQuarter));
+            tTaskInspectionPlan.setPlanCode(code);
+            tTaskInspectionPlan.setPlanYear(year);
+            tTaskInspectionPlan.setPlanQuarter(String.valueOf(nowQuarter));
             tTaskInspectionPlans.add(tTaskInspectionPlan);
+
+            // TODO:匹配法规标准
+            // 新增检测点
+            List<TCheckCheckpoints> tCheckCheckpoints = new ArrayList<>();
+            List<TBasePoint> tBasePoints = tBasePointMapper.selectList(points);
+            for (TBasePoint tBasePoint : tBasePoints) {
+                TCheckCheckpoints tCheckCheckpoint = new TCheckCheckpoints();
+                tCheckCheckpoint.setPointId(tBasePoint.getPointId());
+                tCheckCheckpoint.setPlantName(tBasePlant.getPlantName());
+                tCheckCheckpoint.setPlantId(tBasePlant.getPlantId());
+                // TODO:需要优化，将区域名称和设备信息在新增密封点时直接存进去
+//                tCheckCheckpoint.setRegionName(tBaseRegionService.selectTBaseRegionById(tBasePoint.getRegionId()).getRegionName());
+                tCheckCheckpoint.setRegionId(tBasePoint.getRegionId());
+                tCheckCheckpoint.setLayer(tBasePoint.getLayer());
+//                TBaseDevice tBaseDevice = tBaseDeviceService.selectTBaseDeviceById(tBasePoint.getPointId());
+//                tCheckCheckpoint.setDevName(tBaseDevice.getDevDescribe());
+//                tCheckCheckpoint.setDevCode(tBaseDevice.getDevCode());
+                tCheckCheckpoint.setDevId(tBasePoint.getDevId());
+                tCheckCheckpoint.setGroupCode(tBasePoint.getGroupCode());
+                tCheckCheckpoint.setExtendCode(tBasePoint.getExtendCode());
+                tCheckCheckpoint.setPointType(tBasePoint.getPointType());
+                tCheckCheckpoint.setCreaterCode(getUserId());
+                tCheckCheckpoint.setCreatedate(new Date());
+                tCheckCheckpoint.setUpdaterCode(getUserId());
+                tCheckCheckpoint.setUpdatedate(new Date());
+                tCheckCheckpoints.add(tCheckCheckpoint);
+            }
+            if (CollectionUtils.isNotEmpty(tCheckCheckpoints))
+                tCheckCheckpointsService.insertTCheckCheckpointsByList(tCheckCheckpoints);
         }
-        if (!tTaskInspectionPlans.isEmpty()) {
+        if (CollectionUtils.isNotEmpty(tTaskInspectionPlans)) {
             return toAjax(tTaskInspectionPlanService.insertTTaskInspectionPlanByList(tTaskInspectionPlans));
         }
         return AjaxResult.success();

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

@@ -121,40 +121,40 @@ public class TTaskInspectionPlan extends BaseEntity {
     /**
      * 季度
      */
-    private String quarter;
+    private String planQuarter;
 
     /**
      * 年份
      */
-    private String year;
+    private String planYear;
 
     /**
      * 编码
      */
-    private Integer code;
+    private Integer planCode;
 
-    public String getYear() {
-        return year;
+    public String getPlanQuarter() {
+        return planQuarter;
     }
 
-    public void setYear(String year) {
-        this.year = year;
+    public void setPlanQuarter(String planQuarter) {
+        this.planQuarter = planQuarter;
     }
 
-    public Integer getCode() {
-        return code;
+    public String getPlanYear() {
+        return planYear;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
+    public void setPlanYear(String planYear) {
+        this.planYear = planYear;
     }
 
-    public String getQuarter() {
-        return quarter;
+    public Integer getPlanCode() {
+        return planCode;
     }
 
-    public void setQuarter(String quarter) {
-        this.quarter = quarter;
+    public void setPlanCode(Integer planCode) {
+        this.planCode = planCode;
     }
 
     public String getCreater() {

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

@@ -0,0 +1,271 @@
+<?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.TCheckCheckpointsMapper">
+
+    <resultMap type="TCheckCheckpoints" id="TCheckCheckpointsResult">
+        <result property="checkId"    column="check_id"    />
+        <result property="pointId"    column="point_id"    />
+        <result property="inspectionId"    column="inspection_id"    />
+        <result property="instrumentId"    column="instrument_id"    />
+        <result property="testValue"    column="test_value"    />
+        <result property="netTestValue"    column="net_test_value"    />
+        <result property="plantId"    column="plant_id"    />
+        <result property="plantName"    column="plant_name"    />
+        <result property="regionId"    column="region_id"    />
+        <result property="regionName"    column="region_name"    />
+        <result property="layer"    column="layer"    />
+        <result property="devId"    column="dev_id"    />
+        <result property="devName"    column="dev_name"    />
+        <result property="devCode"    column="dev_code"    />
+        <result property="groupCode"    column="group_code"    />
+        <result property="extendCode"    column="extend_code"    />
+        <result property="pointType"    column="point_type"    />
+        <result property="instrumentCode"    column="instrument_code"    />
+        <result property="leakagePosition"    column="leakage_position"    />
+        <result property="checker"    column="checker"    />
+        <result property="checkDate"    column="check_date"    />
+        <result property="leakageDegree"    column="leakage_degree"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="approveTime"    column="approve_time"    />
+        <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="selectTCheckCheckpointsVo">
+        select check_id, point_id, instrument_id, inspection_id, test_value, net_test_value, plant_id,plant_name, region_id,region_name, layer, dev_id,dev_name, dev_code, group_code, extend_code, point_type, instrument_code, leakage_position, checker, check_date, leakage_degree, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_check_checkpoints
+    </sql>
+
+    <select id="selectTCheckCheckpointsList" parameterType="TCheckCheckpoints" resultMap="TCheckCheckpointsResult">
+        select d.check_id,d.point_id, d.instrument_id, d.inspection_id, d.test_value, d.net_test_value, d.plant_id,d.plant_name,
+        d.region_id, d.layer, d.dev_id, d.group_code, d.extend_code, d.point_type, d.instrument_code,
+        leakage_position, d.checker, d.check_date, d.leakage_degree, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag,
+        d.creater_code, d.createdate, d.updater_code, d.updatedate,br.region_name,bd.dev_code,bd.dev_describe as dev_name from t_check_checkpoints d
+        left join t_base_region br on d.region_id = br.region_id
+        left join t_base_device bd on d.dev_id = bd.dev_id
+        <where>
+            <if test="pointId != null "> and d.point_id = #{pointId}</if>
+            <if test="instrumentId != null "> and d.instrument_id = #{instrumentId}</if>
+            <if test="inspectionId != null "> and d.inspection_id = #{inspectionId}</if>
+            <if test="testValue != null  and testValue != ''"> and d.test_value = #{testValue}</if>
+            <if test="netTestValue != null  and netTestValue != ''"> and d.net_test_value = #{netTestValue}</if>
+            <if test="plantId != null  and plantId != ''"> and d.plant_id = #{plantId}</if>
+            <if test="plantName != null  and plantName != ''"> and d.plant_name like concat('%', #{plantName}, '%')</if>
+            <if test="regionId != null  and regionId != ''"> and d.region_id= #{regionId}</if>
+            <if test="regionName != null  and regionName != ''"> and d.region_name like concat('%', #{regionName}, '%')</if>
+            <if test="layer != null  and layer != ''"> and d.layer = #{layer}</if>
+            <if test="devId != null  and devId != ''"> and d.dev_id =  #{devId}</if>
+            <if test="devName != null  and devName != ''"> and d.dev_name like concat('%', #{devName}, '%')</if>
+            <if test="devCode != null  and devCode != ''"> and d.dev_code = #{devCode}</if>
+            <if test="groupCode != null  and groupCode != ''"> and d.group_code = #{groupCode}</if>
+            <if test="extendCode != null  and extendCode != ''"> and d.extend_code = #{extendCode}</if>
+            <if test="pointType != null  and pointType != ''"> and d.point_type = #{pointType}</if>
+            <if test="instrumentCode != null  and instrumentCode != ''"> and d.instrument_code = #{instrumentCode}</if>
+            <if test="leakagePosition != null  and leakagePosition != ''"> and d.leakage_position = #{leakagePosition}</if>
+            <if test="checker != null  and checker != ''"> and d.checker = #{checker}</if>
+            <if test="checkDate != null  and checkDate != ''"> and d.check_date = #{checkDate}</if>
+            <if test="leakageDegree != null  and leakageDegree != ''"> and d.leakage_degree = #{leakageDegree}</if>
+            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and d.approve_status = #{approveStatus}</if>
+            <if test="approveTime != null "> and d.approve_time = #{approveTime}</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>
+            <if test="choose != null "> and d.inspection_id is null</if>
+        and d.del_flag = 0
+        </where>
+    </select>
+
+    <select id="selectTCheckCheckpointsByCheckId" parameterType="Long" resultMap="TCheckCheckpointsResult">
+        <include refid="selectTCheckCheckpointsVo"/>
+        where check_id = #{checkId}
+    </select>
+
+    <insert id="insertTCheckCheckpoints" parameterType="TCheckCheckpoints" useGeneratedKeys="true" keyProperty="checkId">
+        insert into t_check_checkpoints
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="pointId != null">point_id,</if>
+            <if test="instrumentId != null">instrument_id,</if>
+            <if test="inspectionId != null">inspection_id,</if>
+            <if test="testValue != null">test_value,</if>
+            <if test="netTestValue != null">net_test_value,</if>
+            <if test="plantId != null">plant_id,</if>
+            <if test="plantName != null">plant_name,</if>
+            <if test="regionId != null">region_id,</if>
+            <if test="regionName != null">region_name,</if>
+            <if test="layer != null">layer,</if>
+            <if test="devId != null">dev_id,</if>
+            <if test="devName != null">dev_name,</if>
+            <if test="devCode != null">dev_code,</if>
+            <if test="groupCode != null">group_code,</if>
+            <if test="extendCode != null">extend_code,</if>
+            <if test="pointType != null">point_type,</if>
+            <if test="instrumentCode != null">instrument_code,</if>
+            <if test="leakagePosition != null">leakage_position,</if>
+            <if test="checker != null">checker,</if>
+            <if test="checkDate != null">check_date,</if>
+            <if test="leakageDegree != null">leakage_degree,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="approveTime != null">approve_time,</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="pointId != null">#{pointId},</if>
+            <if test="instrumentId != null">#{instrumentId},</if>
+            <if test="inspectionId != null">#{inspectionId},</if>
+            <if test="testValue != null">#{testValue},</if>
+            <if test="netTestValue != null">#{netTestValue},</if>
+            <if test="plantId != null">#{plantId},</if>
+            <if test="plantName != null">#{plantName},</if>
+            <if test="regionId != null">#{regionId},</if>
+            <if test="regionName != null">#{regionName},</if>
+            <if test="layer != null">#{layer},</if>
+            <if test="devId != null">#{devId},</if>
+            <if test="devName != null">#{devName},</if>
+            <if test="devCode != null">#{devCode},</if>
+            <if test="groupCode != null">#{groupCode},</if>
+            <if test="extendCode != null">#{extendCode},</if>
+            <if test="pointType != null">#{pointType},</if>
+            <if test="instrumentCode != null">#{instrumentCode},</if>
+            <if test="leakagePosition != null">#{leakagePosition},</if>
+            <if test="checker != null">#{checker},</if>
+            <if test="checkDate != null">#{checkDate},</if>
+            <if test="leakageDegree != null">#{leakageDegree},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="approveTime != null">#{approveTime},</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>
+
+    <insert id="insertTCheckCheckpointsByList" parameterType="TCheckCheckpoints" useGeneratedKeys="true" keyProperty="checkId">
+        insert into t_check_checkpoints
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            point_id,
+            plant_name,
+            plant_id,
+            region_id,
+            layer,
+            dev_id,
+            group_code,
+            extend_code,
+            point_type,
+            creater_code,
+            createdate,
+            updater_code,
+            updatedate,
+        </trim>
+        values
+        <foreach collection="list" index="index" separator="," item="item">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                #{item.pointId},
+                #{item.plantName},
+                #{item.plantId},
+                #{item.regionId},
+                #{item.layer},
+                #{item.devId},
+                #{item.groupCode},
+                #{item.extendCode},
+                #{item.pointType},
+                #{item.createrCode},
+                #{item.createdate},
+                #{item.updaterCode},
+                #{item.updatedate},
+            </trim>
+        </foreach>
+    </insert>
+
+    <update id="updateTCheckCheckpoints" parameterType="TCheckCheckpoints">
+        update t_check_checkpoints
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="pointId != null">point_id = #{pointId},</if>
+            <if test="inspectionId != null">inspection_id = #{inspectionId},</if>
+            <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
+            <if test="testValue != null">test_value = #{testValue},</if>
+            <if test="netTestValue != null">net_test_value = #{netTestValue},</if>
+            <if test="plantName != null">plant_name = #{plantName},</if>
+            <if test="regionName != null">region_name = #{regionName},</if>
+            <if test="layer != null">layer = #{layer},</if>
+            <if test="devName != null">dev_name = #{devName},</if>
+            <if test="devCode != null">dev_code = #{devCode},</if>
+            <if test="groupCode != null">group_code = #{groupCode},</if>
+            <if test="extendCode != null">extend_code = #{extendCode},</if>
+            <if test="pointType != null">point_type = #{pointType},</if>
+            <if test="instrumentCode != null">instrument_code = #{instrumentCode},</if>
+            <if test="leakagePosition != null">leakage_position = #{leakagePosition},</if>
+            <if test="checker != null">checker = #{checker},</if>
+            <if test="checkDate != null">check_date = #{checkDate},</if>
+            <if test="leakageDegree != null">leakage_degree = #{leakageDegree},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</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 check_id = #{checkId}
+    </update>
+
+    <delete id="deleteTCheckCheckpointsByCheckId" parameterType="Long">
+        update t_check_checkpoints set del_flag=1 where check_id = #{checkId}
+    </delete>
+
+    <delete id="deleteTCheckCheckpointsByCheckIds" parameterType="String">
+        update t_check_checkpoints set del_flag=1 where check_id in
+        <foreach item="checkId" collection="array" open="(" separator="," close=")">
+            #{checkId}
+        </foreach>
+    </delete>
+
+    <update id="updateTCheckCheckpointsByCheckIds" parameterType="TCheckCheckpoints">
+        <if test="choose == 1">
+            update t_check_checkpoints set inspection_id=#{inspectionId} where check_id in
+            <foreach item="checkId" collection="checkIds" open="(" separator="," close=")">
+                #{checkId}
+            </foreach>
+        </if>
+        <if test="choose == 2">
+            update t_check_checkpoints set inspection_id = null where check_id in
+            <foreach item="checkId" collection="checkIds" open="(" separator="," close=")">
+                #{checkId}
+            </foreach>
+        </if>
+        <if test="choose == 3">
+            update t_check_checkpoints set inspection_id = #{inspectionId} where check_id in
+            (select t.check_id from (select check_id from t_check_checkpoints d
+            <where>
+                <if test="plantId != null  and plantId != ''">and d.plant_id = #{plantId}</if>
+                <if test="regionId != null  and regionId != ''">and d.region_id= #{regionId}</if>
+                <if test="devId != null  and devId != ''">and d.dev_id = #{devId}</if>
+               and d.inspection_id is null
+            </where>
+            ) t)
+        </if>
+        <if test="choose == 4">
+            update t_check_checkpoints set inspection_id = null where inspection_id =#{inspectionId}
+        </if>
+    </update>
+
+</mapper>

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

@@ -22,13 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updaterCode"    column="updater_code"    />
         <result property="updatedate"    column="updatedate"    />
         <result property="creater"    column="creater"    />
-        <result property="quarter"    column="quarter"    />
-        <result property="year"    column="year"    />
-        <result property="code"    column="code"    />
+        <result property="planQuarter"    column="plan_quarter"    />
+        <result property="planYear"    column="plan_year"    />
+        <result property="planCode"    column="plan_code"    />
     </resultMap>
 
     <sql id="selectTTaskInspectionPlanVo">
-        select `quarter`, `year`, `code`,id, plant_id, inspection_plan_no, inspection_plan_name, detection_frequency, start_time, end_time, point_num, remarks, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_task_inspection_plan
+        select `plan_quarter`, `plan_year`, `plan_code`,id, plant_id, inspection_plan_no, inspection_plan_name, detection_frequency, start_time, end_time, point_num, remarks, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_task_inspection_plan
     </sql>
 
     <select id="selectTTaskInspectionPlanList" parameterType="TTaskInspectionPlan" resultMap="TTaskInspectionPlanResult">
@@ -49,9 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
-            <if test="quarter != null "> and d.quarter = #{quarter}</if>
-            <if test="year != null "> and d.year = #{year}</if>
-            <if test="code != null "> and d.code = #{code}</if>
+            <if test="planQuarter != null "> and d.plan_quarter = #{planQuarter}</if>
+            <if test="planYear != null "> and d.plan_year = #{planYear}</if>
+            <if test="planCode != null "> and d.plan_code = #{planCode}</if>
             and d.del_flag = 0
         </where>
     </select>
@@ -82,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate,</if>
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
-            <if test="quarter != null ">`quarter`,</if>
-            <if test="year != null ">`year`,</if>
-            <if test="code != null ">`code`,</if>
+            <if test="planQuarter != null ">`plan_quarter`,</if>
+            <if test="planYear != null ">`plan_year`,</if>
+            <if test="planCode != null ">`plan_code`,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="plantId != null">#{plantId},</if>
@@ -101,9 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">#{createdate},</if>
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
-            <if test="quarter != null ">#{quarter},</if>
-            <if test="year != null ">#{year},</if>
-            <if test="code != null ">#{code},</if>
+            <if test="planQuarter != null ">#{planQuarter},</if>
+            <if test="planYear != null ">#{planYear},</if>
+            <if test="planCode != null ">#{planCode},</if>
          </trim>
     </insert>
 
@@ -121,28 +121,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             createdate,
             updater_code,
             updatedate,
-            `quarter`,
-            `year`,
-            `code`,
+            `plan_quarter`,
+            `plan_year`,
+            `plan_code`,
         </trim>
         values
         <foreach collection="list" index="index" separator="," item="item">
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            #{item.plantId},
-            #{item.inspectionPlanNo},
-            #{item.inspectionPlanName},
-            #{item.detectionFrequency},
-            #{item.startTime},
-            #{item.endTime},
-            #{item.pointNum},
-            #{item.createrCode},
-            #{item.createdate},
-            #{item.updaterCode},
-            #{item.updatedate},
-            #{item.quarter},
-            #{item.year},
-            #{item.code},
-        </trim>
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                #{item.plantId},
+                #{item.inspectionPlanNo},
+                #{item.inspectionPlanName},
+                #{item.detectionFrequency},
+                #{item.startTime},
+                #{item.endTime},
+                #{item.pointNum},
+                #{item.createrCode},
+                #{item.createdate},
+                #{item.updaterCode},
+                #{item.updatedate},
+                #{item.planQuarter},
+                #{item.planYear},
+                #{item.planCode},
+            </trim>
         </foreach>
     </insert>
 
@@ -163,9 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="quarter != null "> `quarter` = #{quarter},</if>
-            <if test="year != null "> `year` = #{year},</if>
-            <if test="code != null "> `code` = #{code},</if>
+            <if test="planQuarter != null ">plan_quarter = #{planQuarter},</if>
+            <if test="planYear != null ">plan_year = #{planYear},</if>
+            <if test="planCode != null ">plan_code = #{planCode},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/api/check/checkpoints.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询检测点列表
+export function listCheckpoints(query) {
+  return request({
+    url: '/check/checkpoints/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询检测点详细
+export function getCheckpoints(checkId) {
+  return request({
+    url: '/check/checkpoints/' + checkId,
+    method: 'get'
+  })
+}
+
+// 新增检测点
+export function addCheckpoints(data) {
+  return request({
+    url: '/check/checkpoints',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改检测点
+export function updateCheckpoints(data) {
+  return request({
+    url: '/check/checkpoints',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除检测点
+export function delCheckpoints(checkId) {
+  return request({
+    url: '/check/checkpoints/' + checkId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,399 @@
+<template xmlns="http://www.w3.org/1999/html">
+  <div class="checkTable">
+      <el-dialog :visible.sync="dialog.dialogFormVisible" width="1800px" :close-on-click-modal="false"
+                 title='添加检测点'>
+        <el-row>
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+            <el-form-item label="装置" prop="plantId">
+              <el-select v-model="queryParams.plantId" @change="handleQuery"
+                         placeholder="请选择装置" clearable size="small" disabled>
+                <el-option
+                  v-for="plant in plantOperation"
+                  :key="plant.plantId"
+                  :label="plant.plantName"
+                  :value="plant.plantId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="群组编码" prop="groupCode">
+              <el-input
+                v-model="queryParams.groupCode"
+                placeholder="请输入群组编码"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="密封点类型" prop="pointType" label-width="90px">
+              <el-select v-model="queryParams.pointType" @change="handleQuery" placeholder="请选择密封点类型" clearable
+                         size="small">
+                <el-option
+                  v-for="dict in pointOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </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>
+        <el-row>
+
+          <el-col :span="11" style="padding-right: 5px;text-align: center">
+            <el-table :data="leftData" style="width: 100%;" height="530px" border @selection-change="saveLeft"
+                      ref="leftData">
+              <el-table-column type="selection" align="center" fixed="left"></el-table-column>
+              <!--            <el-table-column label="检测值" align="center" prop="testValue" v-if="!checkAgain" width="80"/>
+                          <el-table-column label="复测值" align="center" prop="testValue" v-else width="80"/>
+                          <el-table-column label="净检测值" align="center" prop="netTestValue" width="80"/>-->
+              <el-table-column label="装置名称" align="center" prop="plantName" width="100"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="区域名称" align="center" prop="regionName" width="100"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="平台" align="center" prop="layer" width="100" :show-overflow-tooltip="true"/>
+              <el-table-column label="设备/管线名称" align="center" prop="devName" width="130"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="设备/管线编号" align="center" prop="devCode" width="130"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="群组编码" align="center" prop="groupCode" width="100"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="密封点扩展号编码" align="center" prop="extendCode" width="150"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="密封点类型" align="center" prop="pointType" width="100"
+                               :show-overflow-tooltip="true"/>
+              <!--            <el-table-column label="仪器编号" align="center" prop="inspectionCode" width="100"
+                                           :show-overflow-tooltip="true"/>
+                          <el-table-column label="泄露部位" align="center" prop="leakagePosition" width="100"
+                                           :show-overflow-tooltip="true"/>
+                          <el-table-column label="校准人员" align="center" prop="checker" width="100" :show-overflow-tooltip="true"/>
+                          <el-table-column label="校准日期" align="center" prop="checkDate" width="100"
+                                           :show-overflow-tooltip="true"/>
+                          <el-table-column label="泄漏程度" align="center" prop="leakageDegree" width="100"
+                                           :show-overflow-tooltip="true"/>-->
+            </el-table>
+            <pagination
+              v-show="leftTotal>0"
+              :total="leftTotal"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </el-col>
+
+          <el-col :span="2" style="margin-top: 10%;text-align: center">
+            <el-tooltip class="item" effect="dark" content="添加检查点" placement="right">
+              <el-button type="primary" icon="el-icon-arrow-right" :disabled="leftMultiple" @click="add"
+                         style="margin-bottom: 10px;width: 80%"
+                         size="large"></el-button>
+            </el-tooltip>
+            <br>
+            <el-tooltip class="item" effect="dark" content="移除检查点" placement="right">
+              <el-button type="primary" icon="el-icon-arrow-left" :disabled="rightMultiple" @click="remove"
+                         style="margin-top: 10px;margin-bottom: 10px;width: 80%"
+                         size="large"></el-button>
+            </el-tooltip>
+            <br>
+            <el-tooltip class="item" effect="dark" content="添加所有检查点" placement="right">
+              <el-button type="primary" icon="el-icon-d-arrow-right" :disabled="leftAll" @click="addAll"
+                         style="margin-top: 10px;margin-bottom: 10px;width: 80%"
+                         size="large"></el-button>
+            </el-tooltip>
+            <br>
+            <el-tooltip class="item" effect="dark" content="移除所有检查点" placement="right">
+              <el-button type="primary" icon="el-icon-d-arrow-left" :disabled="rightAll" @click="removeAll"
+                         style="margin-top: 10px;width: 80%"
+                         size="large"></el-button>
+            </el-tooltip>
+          </el-col>
+
+          <el-col :span="11" style="padding-left: 5px;text-align: center">
+            <el-table :data="rightData" style="width: 100%" height="530px" border ref="rightData"
+                      @selection-change="saveRight">
+              <el-table-column type="selection" align="center" fixed="left"></el-table-column>
+              <!--            <el-table-column label="检测值" align="center" prop="testValue" v-if="!checkAgain" width="80"/>
+                          <el-table-column label="复测值" align="center" prop="testValue" v-else width="80"/>
+                          <el-table-column label="净检测值" align="center" prop="netTestValue" width="80"/>-->
+              <el-table-column label="装置名称" align="center" prop="plantName" width="100"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="区域名称" align="center" prop="regionName" width="100"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="平台" align="center" prop="layer" width="100" :show-overflow-tooltip="true"/>
+              <el-table-column label="设备/管线名称" align="center" prop="devName" width="130"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="设备/管线编号" align="center" prop="devCode" width="130"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="群组编码" align="center" prop="groupCode" width="100"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="密封点扩展号编码" align="center" prop="extendCode" width="150"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="密封点类型" align="center" prop="pointType" width="100"
+                               :show-overflow-tooltip="true"/>
+              <!--            <el-table-column label="仪器编号" align="center" prop="inspectionCode" width="100"
+                                           :show-overflow-tooltip="true"/>
+                          <el-table-column label="泄露部位" align="center" prop="leakagePosition" width="100"
+                                           :show-overflow-tooltip="true"/>
+                          <el-table-column label="校准人员" align="center" prop="checker" width="100" :show-overflow-tooltip="true"/>
+                          <el-table-column label="校准日期" align="center" prop="checkDate" width="100"
+                                           :show-overflow-tooltip="true"/>
+                          <el-table-column label="泄漏程度" align="center" prop="leakageDegree" width="100"
+                                           :show-overflow-tooltip="true"/>-->
+            </el-table>
+            <pagination
+              v-show="rightTotal>0"
+              :total="rightTotal"
+              :page.sync="rightQueryParams.pageNum"
+              :limit.sync="rightQueryParams.pageSize"
+              @pagination="getRightList"
+            />
+          </el-col>
+
+        </el-row>
+
+        <div slot="footer" class="dialog-footer" style="text-align: center">
+          <el-button @click="cancel">返回</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listCheckpoints, updateCheckpoints,
+} from "@/api/check/checkpoints";
+import {getAllPlantName} from "@/api/base/plant";
+
+export default {
+  name: "dividePoint",
+  data() {
+    return {
+      leftTotal: 0,
+      rightTotal: 0,
+      checkAgain: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pointId: null,
+        inspectionId: null,
+        testValue: null,
+        netTestValue: null,
+        plantId: null,
+        plantName: null,
+        regionId: null,
+        regionName: null,
+        layer: null,
+        devId: null,
+        devName: null,
+        devCode: null,
+        groupCode: null,
+        extendCode: null,
+        pointType: null,
+        inspectionCode: null,
+        leakagePosition: null,
+        checker: null,
+        checkId: null,
+        checkDate: null,
+        leakageDegree: null,
+        remarks: null,
+        approveStatus: null,
+        approveTime: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        choose: 1,
+      },
+      // 查询参数
+      rightQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pointId: null,
+        inspectionId: null,
+        testValue: null,
+        netTestValue: null,
+        plantId: null,
+        plantName: null,
+        regionId: null,
+        regionName: null,
+        layer: null,
+        devId: null,
+        devName: null,
+        devCode: null,
+        groupCode: null,
+        extendCode: null,
+        pointType: null,
+        inspectionCode: null,
+        leakagePosition: null,
+        checker: null,
+        checkId: null,
+        checkDate: null,
+        leakageDegree: null,
+        remarks: null,
+        approveStatus: null,
+        approveTime: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        choose: null,
+      },
+      row: {},
+      rightData: [],
+      leftData: [],
+      right: [],   //右边选中的数据
+      left: [],  //左边选中的数据
+      leftMultiple: true,
+      rightMultiple: true,
+      leftAll: this.leftData == undefined || this.leftData == null || this.leftData.length <= 0,
+      rightAll: this.rightData == undefined || this.rightData == null || this.rightData.length <= 0,
+      dialog: {
+        dialogFormVisible: false,
+      },
+      inspectionId: null,
+      pointOptions: [],
+      plantOperation: [],
+    }
+  },
+  methods: {
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    pointFormat(row, column) {
+      return this.selectDictLabel(this.pointOptions, row.pointType);
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    cancel() {
+      this.leftData = [];
+      this.rightData = [];
+      this.dialog.dialogFormVisible = false;
+    },
+    openDialog(row) {
+      this.leftData = [];
+      this.rightData = [];
+      this.row = row;
+      this.rightQueryParams.inspectionId = row.id;
+      this.queryParams.plantId = row.plantId;
+      this.dialog.dialogFormVisible = true;
+      this.checkAgain = row.taskType == 2 ? true : false;
+      this.getList();
+      this.getRightList();
+      this.getDicts("point_type").then(response => {
+        this.pointOptions = response.data;
+      });
+      getAllPlantName().then(response => {
+        this.plantOperation = response.data;
+      })
+    },
+    /** 查询检测点列表 */
+    getList() {
+      this.queryParams.inspectionId = null;
+      listCheckpoints(this.queryParams).then(response => {
+        this.leftData = response.rows;
+        this.leftTotal = response.total;
+        this.leftAll = this.leftData == undefined || this.leftData == null || this.leftData.length <= 0;
+      });
+    },
+    getRightList() {
+      listCheckpoints(this.rightQueryParams).then(response => {
+        this.rightData = response.rows;
+        this.rightTotal = response.total;
+        this.rightAll = this.rightData == undefined || this.rightData == null || this.rightData.length <= 0;
+      });
+    },
+    saveLeft(rows) {
+      this.left = [];
+      console.log(rows)
+      if (rows) {
+        this.left = rows.map(row => row.checkId);
+        this.leftMultiple = !rows.length;
+      }
+    },
+    saveRight(rows) {
+      this.right = [];
+      if (rows) {
+        this.right = rows.map(row => row.checkId);
+        this.rightMultiple = !rows.length;
+      }
+    },
+    // 左边表格选择项移到右边
+    add() {
+      let data = {};
+      data.inspectionId = this.rightQueryParams.inspectionId;
+      data.checkIds = this.left;
+      data.choose = 1;
+      console.log(data)
+      updateCheckpoints(data).then(response => {
+        this.getList();
+        this.getRightList();
+      })
+    },
+    addAll() {
+      if (this.leftData) {
+        let data = this.queryParams;
+        data.inspectionId = this.rightQueryParams.inspectionId;
+        data.choose = 3;
+        console.log(data)
+        updateCheckpoints(data).then(response => {
+          this.getList();
+          this.getRightList();
+        })
+      }
+    },
+    // 右边表格选择项移到左边
+    remove() {
+      let data = {};
+      data.inspectionId = this.rightQueryParams.inspectionId;
+      data.checkIds = this.right;
+      data.choose = 2;
+      console.log(data)
+      updateCheckpoints(data).then(response => {
+        this.getList();
+        this.getRightList();
+      })
+    },
+    removeAll() {
+      if (this.rightData !== []) {
+        let data = {};
+        data.inspectionId = this.rightQueryParams.inspectionId;
+        data.choose = 4;
+        console.log(data)
+        updateCheckpoints(data).then(response => {
+          console.log("this.queryParams")
+          console.log(this.queryParams)
+          this.getList();
+          this.getRightList();
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.checkTable .el-scrollbar {
+  height: 100%;
+}
+
+.checkTable ::-webkit-scrollbar {
+  /* 设置竖向滚动条的宽度 */
+  width: 10px;
+  /* 设置横向滚动条的高度 */
+  height: 10px;
+}
+
+.checkTable ::-webkit-scrollbar-thumb {
+  /*滚动条的背景色*/
+  background-color: rgba(144, 147, 153, .3);
+  border-radius: 35px;
+}
+</style>

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

@@ -10,7 +10,8 @@
         />
       </el-form-item>
       <el-form-item label="任务类型" prop="planId">
-        <el-select v-model="queryParams.taskType" @change="handleQuery" placeholder="请选择任务类型" clearable size="small" style="width: 100%">
+        <el-select v-model="queryParams.taskType" @change="handleQuery" placeholder="请选择任务类型" clearable
+                   size="small" style="width: 100%">
           <el-option
             v-for="dict in taskTypeOperation"
             :key="dict.dictValue"
@@ -113,8 +114,9 @@
       <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="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>
@@ -143,7 +145,7 @@
             size="mini"
             type="text"
             icon="el-icon-s-order"
-            @click=""
+            @click="openCheckPoint(scope.row)"
           >检测点清单
           </el-button>
           <el-button
@@ -231,6 +233,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <DividePoint v-if="pointVisible" ref="pointList"></DividePoint>
   </div>
 </template>
 
@@ -244,11 +247,14 @@ import {
   updateInspection
 } from "@/api/task/inspection";
 import {getAllPlan} from "@/api/task/plan";
+import DividePoint from "@/views/task/inspection/dividePoint";
 
 export default {
   name: "Inspection",
+  components: {DividePoint},
   data() {
     return {
+      pointVisible: false,
       taskTypeOperation: [],
       planOperation: [],
       divideOperation: [],
@@ -299,7 +305,29 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        planId: [
+          {required: true, message: '请选择计划任务', trigger: "blur"}
+        ],
+        taskType: [
+          {required: true, message: '请选择任务类型', trigger: "blur"}
+        ],
+        taskCode: [
+          {required: true, message: '请输入任务编号', trigger: "blur"}
+        ],
+        taskName: [
+          {required: true, message: '请输入任务名称', trigger: "blur"}
+        ],
+        startTime: [
+          {required: true, message: '请选择任务开始时间', trigger: "blur"}
+        ],
+        sendTime: [
+          {required: true, message: '请选择任务结束时间', trigger: "blur"}
+        ],
+        recipient: [
+          {required: true, message: '请选择接收人', trigger: "blur"}
+        ],
+      }
     };
   },
   created() {
@@ -319,6 +347,12 @@ export default {
     });
   },
   methods: {
+    openCheckPoint(row) {
+      this.pointVisible = true;
+      this.$nextTick(() => {
+        this.$refs.pointList.openDialog(row)
+      })
+    },
     tableCellStyle({row, column, rowIndex, columnIndex}) {
       if (columnIndex === 1 && row.status == 0) {
         return "color:#ff0000;";
@@ -435,7 +469,7 @@ export default {
         }
       }
       this.reset();
-      const ids =  this.ids
+      const ids = this.ids
       this.$modal.confirm('是否确认分配？').then(function () {
         return divideInspection(ids);
       }).then(() => {

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

@@ -69,7 +69,7 @@
 
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight"
               border>
-      <el-table-column type="selection" width="55" align="center" fixed="left"/>
+<!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
       <el-table-column label="装置名称" align="center" prop="plantName" width="130" :show-overflow-tooltip="true"/>
       <el-table-column label="检测计划编号" align="center" prop="inspectionPlanNo" width="200" :show-overflow-tooltip="true"/>
       <el-table-column label="检测计划名称" align="center" prop="inspectionPlanName" width="300" :show-overflow-tooltip="true"/>
@@ -91,8 +91,8 @@
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="130">
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="130">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -111,7 +111,7 @@
           >删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -361,7 +361,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleDoPlan() {
-      this.$modal.confirm('是否确认校验检测计划？注意！在此之后新增的检测点将记入下次监测计划！').then(() => {
+      this.$modal.confirm('是否确认校验检测计划？注意！在此之后新增的检测点将记入下次检测计划！').then(() => {
         this.checking = true;
         checkPlan().then(response => {
           this.checking = false;