pssr设计变更

pssr发起申请抽公共方法

master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAidkitController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.project.patrol.dev.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.patrol.dev.domain.TDevAidkit;
+import com.ruoyi.project.patrol.dev.service.ITDevAidkitService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 急救箱Controller
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+@RestController
+@RequestMapping("/dev/aidkit")
+public class TDevAidkitController extends BaseController
+{
+    @Autowired
+    private ITDevAidkitService tDevAidkitService;
+
+    /**
+     * 查询急救箱列表
+     */
+    @PreAuthorize("@ss.hasPermi('dev:aidkit:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDevAidkit tDevAidkit)
+    {
+        startPage();
+        List<TDevAidkit> list = tDevAidkitService.selectTDevAidkitList(tDevAidkit);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出急救箱列表
+     */
+    @PreAuthorize("@ss.hasPermi('dev:aidkit:export')")
+    @Log(title = "急救箱", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDevAidkit tDevAidkit)
+    {
+        List<TDevAidkit> list = tDevAidkitService.selectTDevAidkitList(tDevAidkit);
+        ExcelUtil<TDevAidkit> util = new ExcelUtil<TDevAidkit>(TDevAidkit.class);
+        return util.exportExcel(list, "aidkit");
+    }
+
+    /**
+     * 获取急救箱详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dev:aidkit:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tDevAidkitService.selectTDevAidkitById(id));
+    }
+
+    /**
+     * 新增急救箱
+     */
+    @PreAuthorize("@ss.hasPermi('dev:aidkit:add')")
+    @Log(title = "急救箱", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDevAidkit tDevAidkit)
+    {
+        return toAjax(tDevAidkitService.insertTDevAidkit(tDevAidkit));
+    }
+
+    /**
+     * 修改急救箱
+     */
+    @PreAuthorize("@ss.hasPermi('dev:aidkit:edit')")
+    @Log(title = "急救箱", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDevAidkit tDevAidkit)
+    {
+        return toAjax(tDevAidkitService.updateTDevAidkit(tDevAidkit));
+    }
+
+    /**
+     * 删除急救箱
+     */
+    @PreAuthorize("@ss.hasPermi('dev:aidkit:remove')")
+    @Log(title = "急救箱", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tDevAidkitService.deleteTDevAidkitByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/patrol/dev/domain/TDevAidkit.java

@@ -0,0 +1,180 @@
+package com.ruoyi.project.patrol.dev.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 急救箱对象 t_dev_aidkit
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+public class TDevAidkit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 位置 */
+    @Excel(name = "位置")
+    private String position;
+
+    /** 删除标识0未删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 设备类型 */
+    @Excel(name = "设备类型")
+    private String patrolType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    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 setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setPatrolType(String patrolType)
+    {
+        this.patrolType = patrolType;
+    }
+
+    public String getPatrolType()
+    {
+        return patrolType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("position", getPosition())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("status", getStatus())
+            .append("patrolType", getPatrolType())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/patrol/dev/mapper/TDevAidkitMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.patrol.dev.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.patrol.dev.domain.TDevAidkit;
+
+/**
+ * 急救箱Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-10-30
+ */
+public interface TDevAidkitMapper 
+{
+    /**
+     * 查询急救箱
+     * 
+     * @param id 急救箱ID
+     * @return 急救箱
+     */
+    public TDevAidkit selectTDevAidkitById(Long id);
+
+    /**
+     * 查询急救箱列表
+     * 
+     * @param tDevAidkit 急救箱
+     * @return 急救箱集合
+     */
+    public List<TDevAidkit> selectTDevAidkitList(TDevAidkit tDevAidkit);
+
+    /**
+     * 新增急救箱
+     * 
+     * @param tDevAidkit 急救箱
+     * @return 结果
+     */
+    public int insertTDevAidkit(TDevAidkit tDevAidkit);
+
+    /**
+     * 修改急救箱
+     * 
+     * @param tDevAidkit 急救箱
+     * @return 结果
+     */
+    public int updateTDevAidkit(TDevAidkit tDevAidkit);
+
+    /**
+     * 删除急救箱
+     * 
+     * @param id 急救箱ID
+     * @return 结果
+     */
+    public int deleteTDevAidkitById(Long id);
+
+    /**
+     * 批量删除急救箱
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDevAidkitByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/patrol/dev/service/ITDevAidkitService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.patrol.dev.service;
+
+import java.util.List;
+import com.ruoyi.project.patrol.dev.domain.TDevAidkit;
+
+/**
+ * 急救箱Service接口
+ * 
+ * @author ssy
+ * @date 2024-10-30
+ */
+public interface ITDevAidkitService 
+{
+    /**
+     * 查询急救箱
+     * 
+     * @param id 急救箱ID
+     * @return 急救箱
+     */
+    public TDevAidkit selectTDevAidkitById(Long id);
+
+    /**
+     * 查询急救箱列表
+     * 
+     * @param tDevAidkit 急救箱
+     * @return 急救箱集合
+     */
+    public List<TDevAidkit> selectTDevAidkitList(TDevAidkit tDevAidkit);
+
+    /**
+     * 新增急救箱
+     * 
+     * @param tDevAidkit 急救箱
+     * @return 结果
+     */
+    public int insertTDevAidkit(TDevAidkit tDevAidkit);
+
+    /**
+     * 修改急救箱
+     * 
+     * @param tDevAidkit 急救箱
+     * @return 结果
+     */
+    public int updateTDevAidkit(TDevAidkit tDevAidkit);
+
+    /**
+     * 批量删除急救箱
+     * 
+     * @param ids 需要删除的急救箱ID
+     * @return 结果
+     */
+    public int deleteTDevAidkitByIds(Long[] ids);
+
+    /**
+     * 删除急救箱信息
+     * 
+     * @param id 急救箱ID
+     * @return 结果
+     */
+    public int deleteTDevAidkitById(Long id);
+}

master/src/main/java/com/ruoyi/project/patrol/dev/service/impl/TDevAidkitServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.patrol.dev.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.patrol.dev.mapper.TDevAidkitMapper;
+import com.ruoyi.project.patrol.dev.domain.TDevAidkit;
+import com.ruoyi.project.patrol.dev.service.ITDevAidkitService;
+
+/**
+ * 急救箱Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+@Service
+public class TDevAidkitServiceImpl implements ITDevAidkitService
+{
+    @Autowired
+    private TDevAidkitMapper tDevAidkitMapper;
+
+    /**
+     * 查询急救箱
+     *
+     * @param id 急救箱ID
+     * @return 急救箱
+     */
+    @Override
+    public TDevAidkit selectTDevAidkitById(Long id)
+    {
+        return tDevAidkitMapper.selectTDevAidkitById(id);
+    }
+
+    /**
+     * 查询急救箱列表
+     *
+     * @param tDevAidkit 急救箱
+     * @return 急救箱
+     */
+    @Override
+    public List<TDevAidkit> selectTDevAidkitList(TDevAidkit tDevAidkit)
+    {
+        return tDevAidkitMapper.selectTDevAidkitList(tDevAidkit);
+    }
+
+    /**
+     * 新增急救箱
+     *
+     * @param tDevAidkit 急救箱
+     * @return 结果
+     */
+    @Override
+    public int insertTDevAidkit(TDevAidkit tDevAidkit)
+    {
+        return tDevAidkitMapper.insertTDevAidkit(tDevAidkit);
+    }
+
+    /**
+     * 修改急救箱
+     *
+     * @param tDevAidkit 急救箱
+     * @return 结果
+     */
+    @Override
+    public int updateTDevAidkit(TDevAidkit tDevAidkit)
+    {
+        return tDevAidkitMapper.updateTDevAidkit(tDevAidkit);
+    }
+
+    /**
+     * 批量删除急救箱
+     *
+     * @param ids 需要删除的急救箱ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDevAidkitByIds(Long[] ids)
+    {
+        return tDevAidkitMapper.deleteTDevAidkitByIds(ids);
+    }
+
+    /**
+     * 删除急救箱信息
+     *
+     * @param id 急救箱ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDevAidkitById(Long id)
+    {
+        return tDevAidkitMapper.deleteTDevAidkitById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAidkitController.java

@@ -0,0 +1,111 @@
+package com.ruoyi.project.patrol.fire.controller;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.patrol.fire.domain.TFireAidkit;
+import com.ruoyi.project.patrol.fire.service.ITFireAidkitService;
+import com.ruoyi.project.patrol.patrol.domain.TPatrolPlan;
+import com.ruoyi.project.patrol.patrol.service.ITPatrolPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 急救箱检查记录Controller
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+@RestController
+@RequestMapping("/fire/aidkit")
+public class TFireAidkitController extends BaseController {
+    @Autowired
+    private ITFireAidkitService tFireAidkitService;
+
+    @Autowired
+    private ITPatrolPlanService tPatrolPlanService;
+
+    /**
+     * 查询急救箱检查记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('fire:aidkit:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TFireAidkit tFireAidkit) {
+        startPage();
+        List<TFireAidkit> list = tFireAidkitService.selectTFireAidkitList(tFireAidkit);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出急救箱检查记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('fire:aidkit:export')")
+    @Log(title = "急救箱检查记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TFireAidkit tFireAidkit) {
+        List<TFireAidkit> list = tFireAidkitService.selectTFireAidkitList(tFireAidkit);
+        ExcelUtil<TFireAidkit> util = new ExcelUtil<TFireAidkit>(TFireAidkit.class);
+        return util.exportExcel(list, "aidkit");
+    }
+
+    /**
+     * 获取急救箱检查记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fire:aidkit:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(tFireAidkitService.selectTFireAidkitById(id));
+    }
+
+    /**
+     * 新增急救箱检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('fire:aidkit:add')")
+    @Log(title = "急救箱检查记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TFireAidkit tFireAidkit) {
+        return toAjax(tFireAidkitService.insertTFireAidkit(tFireAidkit));
+    }
+
+    /**
+     * 修改急救箱检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('fire:aidkit:edit')")
+    @Log(title = "急救箱检查记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TFireAidkit tFireAidkit) {
+        TFireAidkit item = tFireAidkitService.selectTFireAidkitById(tFireAidkit.getId());
+        TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(tFireAidkit.getPlanId());
+        if (tPatrolPlan.getStatus() == 1) {
+            return AjaxResult.error("当前选择的计划已确认！");
+        }
+        if (!"1".equals(item.getCheckStatus())) {
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() - 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() + 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
+        }
+        tFireAidkit.setUpdatedate(new Date());
+        tFireAidkit.setUpdaterCode(getUserId().toString());
+        tFireAidkit.setCheckStatus("1");
+        tFireAidkit.setCheckDate(new Date());
+        tFireAidkit.setIssuesStatus("0");
+        return toAjax(tFireAidkitService.updateTFireAidkit(tFireAidkit));
+    }
+
+    /**
+     * 删除急救箱检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('fire:aidkit:remove')")
+    @Log(title = "急救箱检查记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(tFireAidkitService.deleteTFireAidkitByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/patrol/fire/domain/TFireAidkit.java

@@ -0,0 +1,349 @@
+package com.ruoyi.project.patrol.fire.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 急救箱检查记录对象 t_fire_aidkit
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+public class TFireAidkit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 位置 */
+    @Excel(name = "位置")
+    private String position;
+
+    /** 急救箱外观 */
+    @Excel(name = "急救箱外观")
+    private String aidkitAppearance;
+
+    /** 内部物品是否按要求检查 */
+    @Excel(name = "内部物品是否按要求检查")
+    private String requireCheck;
+
+    /** 封条是否完整 */
+    @Excel(name = "封条是否完整")
+    private String sealIntegrity;
+
+    /** 确认人 */
+    @Excel(name = "确认人")
+    private String confirmed;
+
+    /** 检查状态 */
+    @Excel(name = "检查状态")
+    private String checkStatus;
+
+    /** 检查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkDate;
+
+    /** 月度 */
+    @Excel(name = "月度")
+    private Long month;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Long year;
+
+    /** 删除标识0未删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 计划id */
+    @Excel(name = "计划id")
+    private Long planId;
+
+    /** 问题文件地址 */
+    @Excel(name = "问题文件地址")
+    private String problemFileUrl;
+
+    /** 文件地址 */
+    @Excel(name = "文件地址")
+    private String fileUrl;
+
+    /** 检测是否有问题(1:是,0:否) */
+    @Excel(name = "检测是否有问题(1:是,0:否)")
+    private String issuesStatus;
+
+    /** 是否为问题记录数据 */
+    @Excel(name = "是否为问题记录数据")
+    private String issuesFlag;
+
+    /** 问题修复附件 */
+    @Excel(name = "问题修复附件")
+    private String repairFile;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setAidkitAppearance(String aidkitAppearance)
+    {
+        this.aidkitAppearance = aidkitAppearance;
+    }
+
+    public String getAidkitAppearance()
+    {
+        return aidkitAppearance;
+    }
+    public void setRequireCheck(String requireCheck)
+    {
+        this.requireCheck = requireCheck;
+    }
+
+    public String getRequireCheck()
+    {
+        return requireCheck;
+    }
+    public void setSealIntegrity(String sealIntegrity)
+    {
+        this.sealIntegrity = sealIntegrity;
+    }
+
+    public String getSealIntegrity()
+    {
+        return sealIntegrity;
+    }
+    public void setConfirmed(String confirmed)
+    {
+        this.confirmed = confirmed;
+    }
+
+    public String getConfirmed()
+    {
+        return confirmed;
+    }
+    public void setCheckStatus(String checkStatus)
+    {
+        this.checkStatus = checkStatus;
+    }
+
+    public String getCheckStatus()
+    {
+        return checkStatus;
+    }
+    public void setCheckDate(Date checkDate)
+    {
+        this.checkDate = checkDate;
+    }
+
+    public Date getCheckDate()
+    {
+        return checkDate;
+    }
+    public void setMonth(Long month)
+    {
+        this.month = month;
+    }
+
+    public Long getMonth()
+    {
+        return month;
+    }
+    public void setYear(Long year)
+    {
+        this.year = year;
+    }
+
+    public Long getYear()
+    {
+        return year;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    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 setPlanId(Long planId)
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId()
+    {
+        return planId;
+    }
+    public void setProblemFileUrl(String problemFileUrl)
+    {
+        this.problemFileUrl = problemFileUrl;
+    }
+
+    public String getProblemFileUrl()
+    {
+        return problemFileUrl;
+    }
+    public void setFileUrl(String fileUrl)
+    {
+        this.fileUrl = fileUrl;
+    }
+
+    public String getFileUrl()
+    {
+        return fileUrl;
+    }
+    public void setIssuesStatus(String issuesStatus)
+    {
+        this.issuesStatus = issuesStatus;
+    }
+
+    public String getIssuesStatus()
+    {
+        return issuesStatus;
+    }
+    public void setIssuesFlag(String issuesFlag)
+    {
+        this.issuesFlag = issuesFlag;
+    }
+
+    public String getIssuesFlag()
+    {
+        return issuesFlag;
+    }
+    public void setRepairFile(String repairFile)
+    {
+        this.repairFile = repairFile;
+    }
+
+    public String getRepairFile()
+    {
+        return repairFile;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("position", getPosition())
+            .append("aidkitAppearance", getAidkitAppearance())
+            .append("requireCheck", getRequireCheck())
+            .append("sealIntegrity", getSealIntegrity())
+            .append("confirmed", getConfirmed())
+            .append("checkStatus", getCheckStatus())
+            .append("checkDate", getCheckDate())
+            .append("month", getMonth())
+            .append("year", getYear())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("remarks", getRemarks())
+            .append("deptId", getDeptId())
+            .append("planId", getPlanId())
+            .append("problemFileUrl", getProblemFileUrl())
+            .append("fileUrl", getFileUrl())
+            .append("issuesStatus", getIssuesStatus())
+            .append("issuesFlag", getIssuesFlag())
+            .append("repairFile", getRepairFile())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/patrol/fire/mapper/TFireAidkitMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.patrol.fire.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.patrol.fire.domain.TFireAidkit;
+
+/**
+ * 急救箱检查记录Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-10-30
+ */
+public interface TFireAidkitMapper 
+{
+    /**
+     * 查询急救箱检查记录
+     * 
+     * @param id 急救箱检查记录ID
+     * @return 急救箱检查记录
+     */
+    public TFireAidkit selectTFireAidkitById(Long id);
+
+    /**
+     * 查询急救箱检查记录列表
+     * 
+     * @param tFireAidkit 急救箱检查记录
+     * @return 急救箱检查记录集合
+     */
+    public List<TFireAidkit> selectTFireAidkitList(TFireAidkit tFireAidkit);
+
+    /**
+     * 新增急救箱检查记录
+     * 
+     * @param tFireAidkit 急救箱检查记录
+     * @return 结果
+     */
+    public int insertTFireAidkit(TFireAidkit tFireAidkit);
+
+    /**
+     * 修改急救箱检查记录
+     * 
+     * @param tFireAidkit 急救箱检查记录
+     * @return 结果
+     */
+    public int updateTFireAidkit(TFireAidkit tFireAidkit);
+
+    /**
+     * 删除急救箱检查记录
+     * 
+     * @param id 急救箱检查记录ID
+     * @return 结果
+     */
+    public int deleteTFireAidkitById(Long id);
+
+    /**
+     * 批量删除急救箱检查记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTFireAidkitByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/patrol/fire/service/ITFireAidkitService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.patrol.fire.service;
+
+import java.util.List;
+import com.ruoyi.project.patrol.fire.domain.TFireAidkit;
+
+/**
+ * 急救箱检查记录Service接口
+ * 
+ * @author ssy
+ * @date 2024-10-30
+ */
+public interface ITFireAidkitService 
+{
+    /**
+     * 查询急救箱检查记录
+     * 
+     * @param id 急救箱检查记录ID
+     * @return 急救箱检查记录
+     */
+    public TFireAidkit selectTFireAidkitById(Long id);
+
+    /**
+     * 查询急救箱检查记录列表
+     * 
+     * @param tFireAidkit 急救箱检查记录
+     * @return 急救箱检查记录集合
+     */
+    public List<TFireAidkit> selectTFireAidkitList(TFireAidkit tFireAidkit);
+
+    /**
+     * 新增急救箱检查记录
+     * 
+     * @param tFireAidkit 急救箱检查记录
+     * @return 结果
+     */
+    public int insertTFireAidkit(TFireAidkit tFireAidkit);
+
+    /**
+     * 修改急救箱检查记录
+     * 
+     * @param tFireAidkit 急救箱检查记录
+     * @return 结果
+     */
+    public int updateTFireAidkit(TFireAidkit tFireAidkit);
+
+    /**
+     * 批量删除急救箱检查记录
+     * 
+     * @param ids 需要删除的急救箱检查记录ID
+     * @return 结果
+     */
+    public int deleteTFireAidkitByIds(Long[] ids);
+
+    /**
+     * 删除急救箱检查记录信息
+     * 
+     * @param id 急救箱检查记录ID
+     * @return 结果
+     */
+    public int deleteTFireAidkitById(Long id);
+}

master/src/main/java/com/ruoyi/project/patrol/fire/service/impl/TFireAidkitServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.patrol.fire.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.patrol.fire.mapper.TFireAidkitMapper;
+import com.ruoyi.project.patrol.fire.domain.TFireAidkit;
+import com.ruoyi.project.patrol.fire.service.ITFireAidkitService;
+
+/**
+ * 急救箱检查记录Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+@Service
+public class TFireAidkitServiceImpl implements ITFireAidkitService
+{
+    @Autowired
+    private TFireAidkitMapper tFireAidkitMapper;
+
+    /**
+     * 查询急救箱检查记录
+     *
+     * @param id 急救箱检查记录ID
+     * @return 急救箱检查记录
+     */
+    @Override
+    public TFireAidkit selectTFireAidkitById(Long id)
+    {
+        return tFireAidkitMapper.selectTFireAidkitById(id);
+    }
+
+    /**
+     * 查询急救箱检查记录列表
+     *
+     * @param tFireAidkit 急救箱检查记录
+     * @return 急救箱检查记录
+     */
+    @Override
+    public List<TFireAidkit> selectTFireAidkitList(TFireAidkit tFireAidkit)
+    {
+        return tFireAidkitMapper.selectTFireAidkitList(tFireAidkit);
+    }
+
+    /**
+     * 新增急救箱检查记录
+     *
+     * @param tFireAidkit 急救箱检查记录
+     * @return 结果
+     */
+    @Override
+    public int insertTFireAidkit(TFireAidkit tFireAidkit)
+    {
+        return tFireAidkitMapper.insertTFireAidkit(tFireAidkit);
+    }
+
+    /**
+     * 修改急救箱检查记录
+     *
+     * @param tFireAidkit 急救箱检查记录
+     * @return 结果
+     */
+    @Override
+    public int updateTFireAidkit(TFireAidkit tFireAidkit)
+    {
+        return tFireAidkitMapper.updateTFireAidkit(tFireAidkit);
+    }
+
+    /**
+     * 批量删除急救箱检查记录
+     *
+     * @param ids 需要删除的急救箱检查记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTFireAidkitByIds(Long[] ids)
+    {
+        return tFireAidkitMapper.deleteTFireAidkitByIds(ids);
+    }
+
+    /**
+     * 删除急救箱检查记录信息
+     *
+     * @param id 急救箱检查记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTFireAidkitById(Long id)
+    {
+        return tFireAidkitMapper.deleteTFireAidkitById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolPlanController.java

@@ -87,6 +87,9 @@ public class TPatrolPlanController extends BaseController {
     @Autowired
     private ITFireDoorService tFireDoorService;
 
+    @Autowired
+    private ITFireAidkitService tFireAidkitService;
+
     @Autowired
     private ITCommonuseTesterService TCommonuseTesterService;
 
@@ -267,6 +270,9 @@ public class TPatrolPlanController extends BaseController {
     }
 
     private void updatePatrolMain(TPatrolPlan tPatrolPlan, TPatrolMain tPatrolMain) {
+        if (tPatrolPlan.getPatrolType().equals("27")) {
+            return;
+        }
         TPatrolMain main = tPatrolMainService.selectTPatrolMainList(tPatrolMain).get(0);
         String checkCycle = main.getCheckCycle();
         if (tPatrolPlan.getPlanQuarter() == 1) {
@@ -655,6 +661,16 @@ public class TPatrolPlanController extends BaseController {
                     TCommonuseWaterPumpService.updateTCommonuseWaterPump(item);
                 }
                 break;
+            case "27":
+                TFireAidkit aidkit = new TFireAidkit();
+                aidkit.setPlanId(tPatrolPlan.getId());
+                for (TFireAidkit item : tFireAidkitService.selectTFireAidkitList(aidkit)) {
+                    item.setConfirmed(getNickName());
+                    item.setCheckDate(new Date());
+                    item.setCheckStatus("1");
+                    tFireAidkitService.updateTFireAidkit(item);
+                }
+                break;
         }
     }
 
@@ -669,6 +685,8 @@ public class TPatrolPlanController extends BaseController {
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(id);
             if (tPatrolPlan.getPlanName().contains("固定计划")) {
                 return AjaxResult.error("固定计划不可删除！");
+            }if (tPatrolPlan.getPlanName().contains("PSSR临时计划")) {
+                return AjaxResult.error("PSSR临时计划不可删除！");
             } else if (tPatrolPlan.getStatus() == 1) {
                 return AjaxResult.error("已确认的计划不可删除！");
             }
@@ -1011,6 +1029,13 @@ public class TPatrolPlanController extends BaseController {
                         }
                     }
                     break;
+                case "27":
+                    TFireAidkit aidkit = new TFireAidkit();
+                    aidkit.setPlanId(tPatrolPlan.getId());
+                    for (TFireAidkit item : tFireAidkitService.selectTFireAidkitList(aidkit)) {
+                        tFireAidkitService.selectTFireAidkitById(item.getId());
+                    }
+                    break;
             }
 
         }

master/src/main/java/com/ruoyi/project/patrol/patrol/service/impl/TPatrolPlanServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.patrol.patrol.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.project.patrol.commonuse.domain.*;
@@ -110,6 +111,9 @@ public class TPatrolPlanServiceImpl implements ITPatrolPlanService {
     @Autowired
     private TDevWaterPumpMapper tDevWaterPumpMapper;
 
+    @Autowired
+    private TDevAidkitMapper tDevAidkitMapper;
+
     @Autowired
     private TEmergencyEyewashMapper tEmergencyEyewashMapper;
 
@@ -161,6 +165,9 @@ public class TPatrolPlanServiceImpl implements ITPatrolPlanService {
     @Autowired
     private TFireWeathervaneMapper tFireWeathervaneMapper;
 
+    @Autowired
+    private TFireAidkitMapper tFireAidkitMapper;
+
     @Autowired
     private TCommonuseTesterMapper tCommonuseTesterMapper;
 
@@ -571,6 +578,26 @@ public class TPatrolPlanServiceImpl implements ITPatrolPlanService {
                     tPatrolPlan.setCheckedNum(0L);
                     tPatrolPlan.setDeadline(DateUtils.getLastMonthDay(cd.getTime()));
                     break;
+                case "27":
+                    TDevAidkit aidkit = new TDevAidkit();
+                    aidkit.setStatus("1");
+                    List<TDevAidkit> tDevAidkits = tDevAidkitMapper.selectTDevAidkitList(aidkit);
+                    for (TDevAidkit dev : tDevAidkits) {
+                        TFireAidkit tFireAidkit = new TFireAidkit();
+                        tFireAidkit.setPosition(dev.getPosition());
+                        tFireAidkit.setMonth(tPatrolPlan.getPlanQuarter());
+                        tFireAidkit.setYear(tPatrolPlan.getPlanYear());
+                        tFireAidkit.setPlanId(tPatrolPlan.getId());
+                        tFireAidkit.setCreaterCode(userId);
+                        tFireAidkit.setCreatedate(new Date());
+                        tFireAidkitMapper.insertTFireAidkit(tFireAidkit);
+                    }
+                    tPatrolPlan.setDevNum((long) tDevAidkits.size());
+                    tPatrolPlan.setUncheckedNum((long) tDevAidkits.size());
+                    tPatrolPlan.setCheckedNum(0L);
+                    tPatrolPlan.setDeadline(DateUtils.getLastMonthDay(cd.getTime()));
+                    System.err.println("===================tPatrolPlan=================:"+ JSON.toJSONString(tPatrolPlan));
+                    break;
             }
             updateTPatrolPlan(tPatrolPlan);
             tPatrolPlan.setDevNum(0L);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -128,6 +128,7 @@ public class TPssrAboveallController extends BaseController {
                         tPssrPatrols.add(getEntity(15L, subcontent.getId()));
 //                        蒸汽幕检查记录,16
                         tPssrPatrols.add(getEntity(16L, subcontent.getId()));
+                        tPssrPatrols.add(getEntity(27L, subcontent.getId()));
                         for (TPssrPatrol pssrPatrol : tPssrPatrols) {
                             tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
                         }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -100,6 +100,9 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private ITPssrLaboratoryService tPssrLaboratoryService;
 
+    @Autowired
+    private ITPssrMocService tPssrMocService;
+
     @Autowired
     private ITPssrCircuitService tPssrCircuitService;
 
@@ -178,6 +181,7 @@ public class TPssrApproveController extends BaseController {
             case "kgfa"://开工方案
                 break;
             case "sjbg"://设计变更
+                doMocApprove(tPssrSubcontent);
                 break;
             case "mb"://盲板
                 doMbApprove(tPssrSubcontent);
@@ -205,13 +209,15 @@ public class TPssrApproveController extends BaseController {
             case "dqzh"://氮气置换
                 break;
             case "xqf"://消气防设施
-                doXqfApprove(tPssrSubcontent);
+                doPatrolApprove(tPssrSubcontent);
                 break;
             case "aqss"://安全设施
                 break;
             case "txjk"://通讯监控
+                doPatrolApprove(tPssrSubcontent);
                 break;
             case "bxsjcy"://便携式检测仪
+                doPatrolApprove(tPssrSubcontent);
                 break;
             case "gygc"://公用工程
                 break;
@@ -376,12 +382,7 @@ public class TPssrApproveController extends BaseController {
             tPssrApproveService.updateTPssrApprove(approve);
 
         } else {
-            try {
-                runtimeService.deleteProcessInstance(exist.getProcessId(), "pssrMgrConfirm");
-                historyService.deleteHistoricProcessInstance(exist.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(exist.getProcessId(), "pssrMgrConfirm");
 
             // 开始申请流程
             long businessKey = exist.getApproveId();
@@ -496,6 +497,11 @@ public class TPssrApproveController extends BaseController {
         }
         logger.info("=======================confirmers:{}", confirmers);
 
+        List<String> confirmersList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(confirmers)) {
+            confirmersList = Arrays.asList(confirmers.split(","));
+        }
+
         TPssrApprove exist = new TPssrApprove();
         exist.setSubId(sub.getId());
         List<TPssrApprove> tPssrApproves = tPssrApproveService.selectTPssrApproveList(exist);
@@ -510,49 +516,12 @@ public class TPssrApproveController extends BaseController {
             approve.setCreaterCode(userId);
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            if(StringUtils.isNotEmpty(confirmers)){
-                variables.put("confirmers", Arrays.asList(confirmers.split(",")));
-            }else {
-                variables.put("confirmUsers", new ArrayList<>());
-            }
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr1confirm(approve, confirmersList, sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            List<String> confirmersList = new ArrayList<>();
-            if (StringUtils.isNotEmpty(confirmers)) {
-                confirmersList = Arrays.asList(confirmers.split(","));
-            }
-            variables.put("confirmUsers", confirmersList);
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            delProcess(approve.getProcessId(), "pssr1confirm");
+            pssr1confirm(approve, confirmersList, sub.getConfirm());
         }
     }
 
@@ -601,29 +570,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreaterCode(userId);
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrBlind = new TPssrBlind();
             tPssrBlind.setApproveStatus(1L);
@@ -643,20 +594,7 @@ public class TPssrApproveController extends BaseController {
                 remover.add(item.getReProcess());
                 remover.add(item.getReCoordinator());
             }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         }
 
     }
@@ -696,29 +634,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreaterCode(userId);
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(lockeders));
-            variables.put("confirmUsers2", new ArrayList<>(confirmers));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(lockeders), new ArrayList<>(confirmers), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
-            historyService.deleteHistoricProcessInstance(approve.getProcessId());
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrLock = new TPssrLock();
             tPssrLock.setApproveStatus(1L);
@@ -731,20 +651,7 @@ public class TPssrApproveController extends BaseController {
                 // 确认人2
                 confirmers.add(item.getConfirm());
             }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(lockeders));
-            variables.put("confirmUsers2", new ArrayList<>(confirmers));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(lockeders), new ArrayList<>(confirmers), sub.getConfirm());
         }
 
     }
@@ -787,28 +694,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
-            historyService.deleteHistoricProcessInstance(approve.getProcessId());
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrPipe = new TPssrPipe();
             tPssrPipe.setApproveStatus(1L);
@@ -819,25 +709,13 @@ public class TPssrApproveController extends BaseController {
                 //拆除人员
                 remover.add(item.getConfirmer2());
             }
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         }
 
     }
 
-    //消气防审批流程发起申请
-    public void doXqfApprove(TPssrSubcontent sub) {
+    //巡检审批流程发起申请
+    public void doPatrolApprove(TPssrSubcontent sub) {
         String userId = getUserId().toString();
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(sub.getId());
         if (tPssrApprove == null) {
@@ -850,38 +728,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers", new ArrayList<String>());
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr1confirm(tPssrApprove, new ArrayList<>(), sub.getConfirm());
         } else {
-            try {
-                runtimeService.deleteProcessInstance(tPssrApprove.getProcessId(), "pssr1confirm");
-                historyService.deleteHistoricProcessInstance(tPssrApprove.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(tPssrApprove.getProcessId(), "pssr1confirm");
 
-            // 开始申请流程
-            long businessKey = tPssrApprove.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers", new ArrayList<String>());
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
-            tPssrApprove.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(tPssrApprove);
+            pssr1confirm(tPssrApprove, new ArrayList<>(), sub.getConfirm());
 
         }
     }
@@ -922,28 +773,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrHygiene = new TPssrHygiene();
             tPssrHygiene.setApproveStatus(1L);
@@ -953,22 +787,9 @@ public class TPssrApproveController extends BaseController {
                 installer.add(item.getConfirm1());
 
                 //拆除人员
-                remover.add(item.getConfirm1());
+                remover.add(item.getConfirm2());
             }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         }
 
     }
@@ -1008,29 +829,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreaterCode(userId);
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrCleaning = new TPssrCleaning();
             tPssrCleaning.setApproveStatus(1L);
@@ -1040,22 +843,9 @@ public class TPssrApproveController extends BaseController {
                 installer.add(item.getConfirm1());
 
                 //拆除人员
-                remover.add(item.getConfirm1());
+                remover.add(item.getConfirm2());
             }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         }
 
     }
@@ -1095,29 +885,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreaterCode(userId);
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrAirtight = new TPssrAirtight();
             tPssrAirtight.setApproveStatus(1L);
@@ -1127,22 +899,9 @@ public class TPssrApproveController extends BaseController {
                 installer.add(item.getConfirm1());
 
                 //拆除人员
-                remover.add(item.getConfirm1());
+                remover.add(item.getConfirm2());
             }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         }
 
     }
@@ -1182,29 +941,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreaterCode(userId);
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrLaboratory = new TPssrLaboratory();
             tPssrLaboratory.setApproveStatus(1L);
@@ -1214,22 +955,9 @@ public class TPssrApproveController extends BaseController {
                 installer.add(item.getConfirm1());
 
                 //拆除人员
-                remover.add(item.getConfirm1());
+                remover.add(item.getConfirm2());
             }
-
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         }
 
     }
@@ -1270,28 +998,11 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
-                historyService.deleteHistoricProcessInstance(approve.getProcessId());
-            } catch (Exception e) {
-                logger.info("无运行时流程");
-            }
+            delProcess(approve.getProcessId(), "pssr2confirm");
 
             tPssrCircuit = new TPssrCircuit();
             tPssrCircuit.setApproveStatus(1L);
@@ -1301,24 +1012,145 @@ public class TPssrApproveController extends BaseController {
                 installer.add(item.getConfirm1());
 
                 //拆除人员
-                remover.add(item.getConfirm1());
+                remover.add(item.getConfirm2());
             }
 
-            // 开始申请流程
-            long businessKey = approve.getApproveId();
-            //开始工作流、监听
-            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
-            Map<String, Object> variables = new HashMap<>();
-            variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(installer));
-            variables.put("confirmUsers2", new ArrayList<>(remover));
-            variables.put("chargePerson", sub.getConfirm());
-            //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
-            approve.setProcessId(pi.getProcessInstanceId());
-            tPssrApproveService.updateTPssrApprove(approve);
+            pssr2confirm(approve, new ArrayList<>(installer), new ArrayList<>(remover), sub.getConfirm());
+        }
+    }
+
+    /**
+     * 设计变更发起流程
+     */
+    private void doMocApprove(TPssrSubcontent sub) {
+        String userId = getUserId().toString();
+        //修改状态
+        TPssrMoc tPssrMoc = new TPssrMoc();
+        tPssrMoc.setApproveStatus(0L);
+        tPssrMoc.setSubId(sub.getId());
+        Set<String> confirm1 = new HashSet<>();
+        Set<String> confirm2 = new HashSet<>();
+        for (TPssrMoc item : tPssrMocService.selectTPssrMocList(tPssrMoc)) {
+            item.setApproveStatus(1L);
+            item.setUpdatedate(new Date());
+            item.setUpdaterCode(userId);
+            tPssrMocService.updateTPssrMoc(item);
+
+            // 安装人员
+            confirm1.add(item.getConfirm1());
+
+            //拆除人员
+            confirm2.add(item.getConfirm2());
         }
 
+        TPssrApprove exist = new TPssrApprove();
+        exist.setSubId(sub.getId());
+        List<TPssrApprove> tPssrApproves = tPssrApproveService.selectTPssrApproveList(exist);
+        if (CollectionUtil.isEmpty(tPssrApproves)) {
+            //新增审批数据
+            TPssrApprove approve = new TPssrApprove();
+            approve.setSubId(sub.getId());
+            approve.setApNo(DateUtils.dateTimeNow() + userId);
+            approve.setApproveStatus(1L);
+            approve.setSubCharge(sub.getConfirm());
+            approve.setCreaterCode(userId);
+            approve.setCreatedate(new Date());
+            tPssrApproveService.insertTPssrApprove(approve);
+
+            pssr2confirm(approve, new ArrayList<>(confirm1), new ArrayList<>(confirm2), sub.getConfirm());
+        } else {
+            // 已存在流程时，删除旧流程，重新发起
+            TPssrApprove approve = tPssrApproves.get(0);
+            delProcess(approve.getProcessId(), "pssr2confirm");
+
+            tPssrMoc = new TPssrMoc();
+            tPssrMoc.setApproveStatus(1L);
+            tPssrMoc.setSubId(sub.getId());
+            for (TPssrMoc item : tPssrMocService.selectTPssrMocList(tPssrMoc)) {
+                // 安装人员
+                confirm1.add(item.getConfirm1());
+
+                //拆除人员
+                confirm2.add(item.getConfirm2());
+            }
+
+            pssr2confirm(approve, new ArrayList<>(confirm1), new ArrayList<>(confirm2), sub.getConfirm());
+        }
+    }
+
+    /**
+     * 单确认人发起流程
+     */
+    private void pssr1confirm(TPssrApprove approve, List<String> confirmUsers, String confirm) {
+        String userId = getUserId().toString();
+
+        // 开始申请流程
+        long businessKey = approve.getApproveId();
+        //开始工作流、监听
+        Authentication.setAuthenticatedUserId(userId);//设置当前申请人
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("applyUser", userId);
+        variables.put("confirmUsers", confirmUsers);
+        variables.put("chargePerson", confirm);
+        //采用key来启动流程定义并设置流程变量，返回流程实例
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
+        approve.setProcessId(pi.getProcessInstanceId());
+        tPssrApproveService.updateTPssrApprove(approve);
+    }
+
+    /**
+     * 双确认人发起流程
+     */
+    private void pssr2confirm(TPssrApprove approve, List<String> confirmUsers1, List<String> confirmUsers2, String confirm) {
+        String userId = getUserId().toString();
+
+        // 开始申请流程
+        long businessKey = approve.getApproveId();
+        //开始工作流、监听
+        Authentication.setAuthenticatedUserId(userId);//设置当前申请人
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("applyUser", userId);
+        variables.put("confirmUsers1", confirmUsers1);
+        variables.put("confirmUsers2", confirmUsers2);
+        variables.put("chargePerson", confirm);
+        //采用key来启动流程定义并设置流程变量，返回流程实例
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
+        approve.setProcessId(pi.getProcessInstanceId());
+        tPssrApproveService.updateTPssrApprove(approve);
+    }
+
+    /**
+     * 三确认人发起流程
+     */
+    private void pssr3confirm(TPssrApprove approve, List<String> confirmUsers1, List<String> confirmUsers2, List<String> confirmUsers3, String confirm) {
+        String userId = getUserId().toString();
+
+        // 开始申请流程
+        long businessKey = approve.getApproveId();
+        //开始工作流、监听
+        Authentication.setAuthenticatedUserId(userId);//设置当前申请人
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("applyUser", userId);
+        variables.put("confirmUsers1", confirmUsers1);
+        variables.put("confirmUsers2", confirmUsers2);
+        variables.put("confirmUsers3", confirmUsers3);
+        variables.put("chargePerson", confirm);
+        //采用key来启动流程定义并设置流程变量，返回流程实例
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr3confirm", String.valueOf(businessKey), variables);
+        approve.setProcessId(pi.getProcessInstanceId());
+        tPssrApproveService.updateTPssrApprove(approve);
+    }
+
+    /**
+     * 删除已存在流程
+     */
+    private void delProcess(String processId, String processName) {
+        try {
+            runtimeService.deleteProcessInstance(processId, processName);
+            historyService.deleteHistoricProcessInstance(processId);
+        } catch (Exception e) {
+            logger.info("无运行时流程");
+        }
     }
 
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -0,0 +1,244 @@
+package com.ruoyi.project.pssr.controller;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrMoc;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrMocService;
+import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.task.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * MOC完成确认清单Controller
+ *
+ * @author ssy
+ * @date 2024-10-31
+ */
+@RestController
+@RequestMapping("/pssr/moc")
+public class TPssrMocController extends BaseController {
+    @Autowired
+    private ITPssrMocService tPssrMocService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
+    @Autowired
+    private ITPssrSubcontentService tPssrSubcontentService;
+
+    /**
+     * 查询MOC完成确认清单列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPssrMoc tPssrMoc) {
+        startPage();
+        List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(tPssrMoc);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出MOC完成确认清单列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:export')")
+    @Log(title = "MOC完成确认清单", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPssrMoc tPssrMoc) {
+        List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(tPssrMoc);
+        ExcelUtil<TPssrMoc> util = new ExcelUtil<TPssrMoc>(TPssrMoc.class);
+        return util.exportExcel(list, "moc");
+    }
+
+    /**
+     * 获取MOC完成确认清单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(tPssrMocService.selectTPssrMocById(id));
+    }
+
+    /**
+     * 新增MOC完成确认清单
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:add')")
+    @Log(title = "MOC完成确认清单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPssrMoc tPssrMoc) {
+        return toAjax(tPssrMocService.insertTPssrMoc(tPssrMoc));
+    }
+
+    /**
+     * 修改MOC完成确认清单
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:edit')")
+    @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPssrMoc tPssrMoc) {
+        return toAjax(tPssrMocService.updateTPssrMoc(tPssrMoc));
+    }
+
+    /**
+     * 删除MOC完成确认清单
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:remove')")
+    @Log(title = "MOC完成确认清单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(tPssrMocService.deleteTPssrMocByIds(ids));
+    }
+
+
+    /**
+     * 确认实验室
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:moc:edit')")
+    @Log(title = "实验室", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmMoc")
+    public AjaxResult confirmMoc(@RequestBody TPssrMoc tPssrMoc) {
+        long queryStatus = 0;
+        long approveStatus = 0;
+        Date date = null;
+        if (tPssrMoc.getTaskType() == 4) {
+            //确认人1确认
+            queryStatus = 1;
+            approveStatus = 3;
+            date = new Date();
+        } else if (tPssrMoc.getTaskType() == 5) {
+            //确认人2确认
+            queryStatus = 3;
+            approveStatus = 2;
+            date = new Date();
+        }
+        // 修改状态
+        if (tPssrMoc.getIds() != null && tPssrMoc.getIds().length > 0) {
+            for (Long id : tPssrMoc.getIds()) {
+                TPssrMoc item = tPssrMocService.selectTPssrMocById(id);
+                item.setApproveStatus(approveStatus);
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                    item.setConfirmationDate(date);
+                }
+                tPssrMocService.updateTPssrMoc(item);
+            }
+        } else {
+            TPssrMoc lock = new TPssrMoc();
+            lock.setSubId(tPssrMoc.getSubId());
+            lock.setApproveStatus(queryStatus);
+            for (TPssrMoc item : tPssrMocService.selectTPssrMocList(lock)) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                    item.setConfirmationDate(date);
+                }
+                item.setApproveStatus(approveStatus);
+                tPssrMocService.updateTPssrMoc(item);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrMoc entity = new TPssrMoc();
+        entity.setSubId(tPssrMoc.getSubId());
+        entity.setApproveStatus(queryStatus);
+        for (TPssrMoc item : tPssrMocService.selectTPssrMocList(entity)) {
+            if (tPssrMoc.getTaskType() == 4) {
+                if (item.getConfirm1().equals(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            } else if (tPssrMoc.getTaskType() == 5) {
+                if (item.getConfirm2().equals(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            }
+        }
+
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrMoc.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
+        return AjaxResult.success();
+
+    }
+
+    /**
+     * 驳回实验室
+     */
+    @PutMapping("/turnDownMoc")
+    public AjaxResult turnDownMoc(@RequestBody TPssrMoc tPssrMoc) {
+        if (tPssrMoc.getIds() != null) {
+            String userId = getUserId().toString();
+            // 修改已选择数据的状态
+            for (Long id : tPssrMoc.getIds()) {
+                TPssrMoc blind = new TPssrMoc();
+                blind.setId(id);
+                blind.setApproveStatus(1L);
+                blind.setUpdatedate(new Date());
+                blind.setUpdaterCode(getUserId().toString());
+                tPssrMocService.updateTPssrMoc(blind);
+            }
+            // 查询当前流程
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMoc.getSubId());
+
+            ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+            TaskService taskService = processEngine.getTaskService();
+            Task task = processEngine.getTaskService()//获取任务service
+                    .createTaskQuery()//创建查询对象
+                    .taskAssignee(userId)
+                    .processInstanceId(approve.getProcessId()).singleResult();
+            String taskId = task.getId();
+
+            // 驳回 查询所有待审批的人员
+            TPssrMoc blind = new TPssrMoc();
+            blind.setSubId(tPssrMoc.getSubId());
+            blind.setApproveStatus(1L);
+            Set<String> confirm1 = new HashSet<>();
+            Set<String> confirm2 = new HashSet<>();
+            for (TPssrMoc item : tPssrMocService.selectTPssrMocList(blind)) {
+
+                // 确认人1
+                confirm1.add(item.getConfirm1());
+
+                // 确认人2
+                confirm2.add(item.getConfirm2());
+            }
+
+
+            //处理流程节点
+            Map<String, Object> param = new HashMap<>();
+            param.put("condition", 1);
+            param.put("confirmUsers1", new ArrayList<>(confirm1));
+            param.put("confirmUsers2", new ArrayList<>(confirm2));
+            //认领任务
+            processEngine.getTaskService().claim(taskId, userId);
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrMoc.getRemarks());
+            taskService.complete(taskId, param);
+
+            // 修改审批表和sub表
+            approve.setApproveStatus(1L);
+            approve.setUpdatedate(new Date());
+            approve.setUpdaterCode(getUserId().toString());
+            tPssrApproveService.updateTPssrApprove(approve);
+
+            TPssrSubcontent subcontent = new TPssrSubcontent();
+            subcontent.setId(approve.getSubId());
+            subcontent.setApproveStatus(1L);
+            subcontent.setUpdatedate(new Date());
+            subcontent.setUpdaterCode(getUserId().toString());
+            tPssrSubcontentService.updateTPssrSubcontent(subcontent);
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
+}

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMoc.java

@@ -0,0 +1,337 @@
+package com.ruoyi.project.pssr.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * MOC完成确认清单对象 t_pssr_moc
+ *
+ * @author ssy
+ * @date 2024-10-31
+ */
+public class TPssrMoc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 从表id */
+    @Excel(name = "从表id")
+    private Long subId;
+
+    /** 审批id */
+    @Excel(name = "审批id")
+    private Long approveId;
+
+    /** 区域 */
+    @Excel(name = "区域")
+    private String region;
+
+    /** MOC编号 */
+    @Excel(name = "MOC编号")
+    private String mocNo;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 相关文档更新 */
+    @Excel(name = "相关文档更新")
+    private String docUpdate;
+
+    /** 培训 */
+    @Excel(name = "培训")
+    private String training;
+
+    /** PSSR */
+    @Excel(name = "PSSR")
+    private String pssr;
+
+    /** 确认人1 */
+    @Excel(name = "确认人1")
+    private String confirm1;
+
+    /** 确认人2 */
+    @Excel(name = "确认人2")
+    private String confirm2;
+
+    /** 确认时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date confirmationDate;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
+    private String deptName;
+
+    private Long[] ids;
+
+    private Long taskType;
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
+    public Long getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Long taskType) {
+        this.taskType = taskType;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setSubId(Long subId)
+    {
+        this.subId = subId;
+    }
+
+    public Long getSubId()
+    {
+        return subId;
+    }
+    public void setApproveId(Long approveId)
+    {
+        this.approveId = approveId;
+    }
+
+    public Long getApproveId()
+    {
+        return approveId;
+    }
+    public void setRegion(String region)
+    {
+        this.region = region;
+    }
+
+    public String getRegion()
+    {
+        return region;
+    }
+    public void setMocNo(String mocNo)
+    {
+        this.mocNo = mocNo;
+    }
+
+    public String getMocNo()
+    {
+        return mocNo;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setDocUpdate(String docUpdate)
+    {
+        this.docUpdate = docUpdate;
+    }
+
+    public String getDocUpdate()
+    {
+        return docUpdate;
+    }
+    public void setTraining(String training)
+    {
+        this.training = training;
+    }
+
+    public String getTraining()
+    {
+        return training;
+    }
+    public void setPssr(String pssr)
+    {
+        this.pssr = pssr;
+    }
+
+    public String getPssr()
+    {
+        return pssr;
+    }
+    public void setConfirm1(String confirm1)
+    {
+        this.confirm1 = confirm1;
+    }
+
+    public String getConfirm1()
+    {
+        return confirm1;
+    }
+    public void setConfirm2(String confirm2)
+    {
+        this.confirm2 = confirm2;
+    }
+
+    public String getConfirm2()
+    {
+        return confirm2;
+    }
+    public void setConfirmationDate(Date confirmationDate)
+    {
+        this.confirmationDate = confirmationDate;
+    }
+
+    public Date getConfirmationDate()
+    {
+        return confirmationDate;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("subId", getSubId())
+            .append("approveId", getApproveId())
+            .append("region", getRegion())
+            .append("mocNo", getMocNo())
+            .append("title", getTitle())
+            .append("docUpdate", getDocUpdate())
+            .append("training", getTraining())
+            .append("pssr", getPssr())
+            .append("confirm1", getConfirm1())
+            .append("confirm2", getConfirm2())
+            .append("confirmationDate", getConfirmationDate())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMocMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.pssr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.pssr.domain.TPssrMoc;
+
+/**
+ * MOC完成确认清单Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-10-31
+ */
+public interface TPssrMocMapper 
+{
+    /**
+     * 查询MOC完成确认清单
+     * 
+     * @param id MOC完成确认清单ID
+     * @return MOC完成确认清单
+     */
+    public TPssrMoc selectTPssrMocById(Long id);
+
+    /**
+     * 查询MOC完成确认清单列表
+     * 
+     * @param tPssrMoc MOC完成确认清单
+     * @return MOC完成确认清单集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TPssrMoc> selectTPssrMocList(TPssrMoc tPssrMoc);
+
+    /**
+     * 新增MOC完成确认清单
+     * 
+     * @param tPssrMoc MOC完成确认清单
+     * @return 结果
+     */
+    public int insertTPssrMoc(TPssrMoc tPssrMoc);
+
+    /**
+     * 修改MOC完成确认清单
+     * 
+     * @param tPssrMoc MOC完成确认清单
+     * @return 结果
+     */
+    public int updateTPssrMoc(TPssrMoc tPssrMoc);
+
+    /**
+     * 删除MOC完成确认清单
+     * 
+     * @param id MOC完成确认清单ID
+     * @return 结果
+     */
+    public int deleteTPssrMocById(Long id);
+
+    /**
+     * 批量删除MOC完成确认清单
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPssrMocByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrMocService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.pssr.service;
+
+import java.util.List;
+import com.ruoyi.project.pssr.domain.TPssrMoc;
+
+/**
+ * MOC完成确认清单Service接口
+ * 
+ * @author ssy
+ * @date 2024-10-31
+ */
+public interface ITPssrMocService 
+{
+    /**
+     * 查询MOC完成确认清单
+     * 
+     * @param id MOC完成确认清单ID
+     * @return MOC完成确认清单
+     */
+    public TPssrMoc selectTPssrMocById(Long id);
+
+    /**
+     * 查询MOC完成确认清单列表
+     * 
+     * @param tPssrMoc MOC完成确认清单
+     * @return MOC完成确认清单集合
+     */
+    public List<TPssrMoc> selectTPssrMocList(TPssrMoc tPssrMoc);
+
+    /**
+     * 新增MOC完成确认清单
+     * 
+     * @param tPssrMoc MOC完成确认清单
+     * @return 结果
+     */
+    public int insertTPssrMoc(TPssrMoc tPssrMoc);
+
+    /**
+     * 修改MOC完成确认清单
+     * 
+     * @param tPssrMoc MOC完成确认清单
+     * @return 结果
+     */
+    public int updateTPssrMoc(TPssrMoc tPssrMoc);
+
+    /**
+     * 批量删除MOC完成确认清单
+     * 
+     * @param ids 需要删除的MOC完成确认清单ID
+     * @return 结果
+     */
+    public int deleteTPssrMocByIds(Long[] ids);
+
+    /**
+     * 删除MOC完成确认清单信息
+     * 
+     * @param id MOC完成确认清单ID
+     * @return 结果
+     */
+    public int deleteTPssrMocById(Long id);
+}

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrMocServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.pssr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.pssr.mapper.TPssrMocMapper;
+import com.ruoyi.project.pssr.domain.TPssrMoc;
+import com.ruoyi.project.pssr.service.ITPssrMocService;
+
+/**
+ * MOC完成确认清单Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-10-31
+ */
+@Service
+public class TPssrMocServiceImpl implements ITPssrMocService
+{
+    @Autowired
+    private TPssrMocMapper tPssrMocMapper;
+
+    /**
+     * 查询MOC完成确认清单
+     *
+     * @param id MOC完成确认清单ID
+     * @return MOC完成确认清单
+     */
+    @Override
+    public TPssrMoc selectTPssrMocById(Long id)
+    {
+        return tPssrMocMapper.selectTPssrMocById(id);
+    }
+
+    /**
+     * 查询MOC完成确认清单列表
+     *
+     * @param tPssrMoc MOC完成确认清单
+     * @return MOC完成确认清单
+     */
+    @Override
+    public List<TPssrMoc> selectTPssrMocList(TPssrMoc tPssrMoc)
+    {
+        return tPssrMocMapper.selectTPssrMocList(tPssrMoc);
+    }
+
+    /**
+     * 新增MOC完成确认清单
+     *
+     * @param tPssrMoc MOC完成确认清单
+     * @return 结果
+     */
+    @Override
+    public int insertTPssrMoc(TPssrMoc tPssrMoc)
+    {
+        return tPssrMocMapper.insertTPssrMoc(tPssrMoc);
+    }
+
+    /**
+     * 修改MOC完成确认清单
+     *
+     * @param tPssrMoc MOC完成确认清单
+     * @return 结果
+     */
+    @Override
+    public int updateTPssrMoc(TPssrMoc tPssrMoc)
+    {
+        return tPssrMocMapper.updateTPssrMoc(tPssrMoc);
+    }
+
+    /**
+     * 批量删除MOC完成确认清单
+     *
+     * @param ids 需要删除的MOC完成确认清单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrMocByIds(Long[] ids)
+    {
+        return tPssrMocMapper.deleteTPssrMocByIds(ids);
+    }
+
+    /**
+     * 删除MOC完成确认清单信息
+     *
+     * @param id MOC完成确认清单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrMocById(Long id)
+    {
+        return tPssrMocMapper.deleteTPssrMocById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrPatrolServiceImpl.java

@@ -92,6 +92,9 @@ public class TPssrPatrolServiceImpl implements ITPssrPatrolService
 
     // 根据巡检类型生成计划名称
     private String getPlanName(String planType, Calendar calendar) {
+        if (planType.equals("27")){
+            return calendar.get(Calendar.YEAR) + "年-" + (calendar.get(Calendar.MONTH) + 1) + "月-PSSR临时计划-急救箱检查记录";
+        }
         TPatrolMain tPatrolMain = new TPatrolMain();
         tPatrolMain.setPatrolType(planType);
         tPatrolMain.setYear(String.valueOf(calendar.get(Calendar.YEAR)));

master/src/main/resources/mybatis/patrol/dev/TDevAidkitMapper.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.patrol.dev.mapper.TDevAidkitMapper">
+    
+    <resultMap type="TDevAidkit" id="TDevAidkitResult">
+        <result property="id"    column="id"    />
+        <result property="position"    column="position"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="status"    column="status"    />
+        <result property="patrolType"    column="patrol_type"    />
+    </resultMap>
+
+    <sql id="selectTDevAidkitVo">
+        select d.id, d.position, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.status, d.patrol_type  from t_dev_aidkit d
+    </sql>
+
+    <select id="selectTDevAidkitList" parameterType="TDevAidkit" resultMap="TDevAidkitResult">
+        <include refid="selectTDevAidkitVo"/>
+        <where>  
+            <if test="position != null  and position != ''"> and position = #{position}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="patrolType != null  and patrolType != ''"> and patrol_type = #{patrolType}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+    
+    <select id="selectTDevAidkitById" parameterType="Long" resultMap="TDevAidkitResult">
+        <include refid="selectTDevAidkitVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTDevAidkit" parameterType="TDevAidkit">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_dev_aidkit.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_dev_aidkit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="position != null">position,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="status != null">status,</if>
+            <if test="patrolType != null">patrol_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="position != null">#{position},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="status != null">#{status},</if>
+            <if test="patrolType != null">#{patrolType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDevAidkit" parameterType="TDevAidkit">
+        update t_dev_aidkit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="position != null">position = #{position},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="patrolType != null">patrol_type = #{patrolType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTDevAidkitById" parameterType="Long">
+        update t_dev_aidkit set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTDevAidkitByIds" parameterType="String">
+        update t_dev_aidkit set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/patrol/fire/TFireAidkitMapper.xml

@@ -0,0 +1,167 @@
+<?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.patrol.fire.mapper.TFireAidkitMapper">
+    
+    <resultMap type="TFireAidkit" id="TFireAidkitResult">
+        <result property="id"    column="id"    />
+        <result property="position"    column="position"    />
+        <result property="aidkitAppearance"    column="aidkit_appearance"    />
+        <result property="requireCheck"    column="require_check"    />
+        <result property="sealIntegrity"    column="seal_integrity"    />
+        <result property="confirmed"    column="confirmed"    />
+        <result property="checkStatus"    column="check_status"    />
+        <result property="checkDate"    column="check_date"    />
+        <result property="month"    column="month"    />
+        <result property="year"    column="year"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="planId"    column="plan_id"    />
+        <result property="problemFileUrl"    column="problem_file_url"    />
+        <result property="fileUrl"    column="file_url"    />
+        <result property="issuesStatus"    column="issues_status"    />
+        <result property="issuesFlag"    column="issues_flag"    />
+        <result property="repairFile"    column="repair_file"    />
+    </resultMap>
+
+    <sql id="selectTFireAidkitVo">
+        select d.id, d.position, d.aidkit_appearance, d.require_check, d.seal_integrity, d.confirmed, d.check_status, d.check_date, d.month, d.year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.plan_id, d.problem_file_url, d.file_url, d.issues_status, d.issues_flag, d.repair_file  from t_fire_aidkit d
+    </sql>
+
+    <select id="selectTFireAidkitList" parameterType="TFireAidkit" resultMap="TFireAidkitResult">
+        <include refid="selectTFireAidkitVo"/>
+        <where>  
+            <if test="position != null  and position != ''"> and position = #{position}</if>
+            <if test="aidkitAppearance != null  and aidkitAppearance != ''"> and aidkit_appearance = #{aidkitAppearance}</if>
+            <if test="requireCheck != null  and requireCheck != ''"> and require_check = #{requireCheck}</if>
+            <if test="sealIntegrity != null  and sealIntegrity != ''"> and seal_integrity = #{sealIntegrity}</if>
+            <if test="confirmed != null  and confirmed != ''"> and confirmed = #{confirmed}</if>
+            <if test="checkStatus != null  and checkStatus != ''"> and check_status = #{checkStatus}</if>
+            <if test="checkDate != null "> and check_date = #{checkDate}</if>
+            <if test="month != null "> and month = #{month}</if>
+            <if test="year != null "> and year = #{year}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="planId != null "> and plan_id = #{planId}</if>
+            <if test="problemFileUrl != null  and problemFileUrl != ''"> and problem_file_url = #{problemFileUrl}</if>
+            <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
+            <if test="issuesStatus != null  and issuesStatus != ''"> and issues_status = #{issuesStatus}</if>
+            <if test="issuesFlag != null  and issuesFlag != ''"> and issues_flag = #{issuesFlag}</if>
+            <if test="repairFile != null  and repairFile != ''"> and repair_file = #{repairFile}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+    
+    <select id="selectTFireAidkitById" parameterType="Long" resultMap="TFireAidkitResult">
+        <include refid="selectTFireAidkitVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTFireAidkit" parameterType="TFireAidkit">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_fire_aidkit.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_fire_aidkit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="position != null">position,</if>
+            <if test="aidkitAppearance != null">aidkit_appearance,</if>
+            <if test="requireCheck != null">require_check,</if>
+            <if test="sealIntegrity != null">seal_integrity,</if>
+            <if test="confirmed != null">confirmed,</if>
+            <if test="checkStatus != null">check_status,</if>
+            <if test="checkDate != null">check_date,</if>
+            <if test="month != null">month,</if>
+            <if test="year != null">year,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="planId != null">plan_id,</if>
+            <if test="problemFileUrl != null">problem_file_url,</if>
+            <if test="fileUrl != null">file_url,</if>
+            <if test="issuesStatus != null">issues_status,</if>
+            <if test="issuesFlag != null">issues_flag,</if>
+            <if test="repairFile != null">repair_file,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="position != null">#{position},</if>
+            <if test="aidkitAppearance != null">#{aidkitAppearance},</if>
+            <if test="requireCheck != null">#{requireCheck},</if>
+            <if test="sealIntegrity != null">#{sealIntegrity},</if>
+            <if test="confirmed != null">#{confirmed},</if>
+            <if test="checkStatus != null">#{checkStatus},</if>
+            <if test="checkDate != null">#{checkDate},</if>
+            <if test="month != null">#{month},</if>
+            <if test="year != null">#{year},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="planId != null">#{planId},</if>
+            <if test="problemFileUrl != null">#{problemFileUrl},</if>
+            <if test="fileUrl != null">#{fileUrl},</if>
+            <if test="issuesStatus != null">#{issuesStatus},</if>
+            <if test="issuesFlag != null">#{issuesFlag},</if>
+            <if test="repairFile != null">#{repairFile},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTFireAidkit" parameterType="TFireAidkit">
+        update t_fire_aidkit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="position != null">position = #{position},</if>
+            <if test="aidkitAppearance != null">aidkit_appearance = #{aidkitAppearance},</if>
+            <if test="requireCheck != null">require_check = #{requireCheck},</if>
+            <if test="sealIntegrity != null">seal_integrity = #{sealIntegrity},</if>
+            <if test="confirmed != null">confirmed = #{confirmed},</if>
+            <if test="checkStatus != null">check_status = #{checkStatus},</if>
+            <if test="checkDate != null">check_date = #{checkDate},</if>
+            <if test="month != null">month = #{month},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="planId != null">plan_id = #{planId},</if>
+            <if test="problemFileUrl != null">problem_file_url = #{problemFileUrl},</if>
+            <if test="fileUrl != null">file_url = #{fileUrl},</if>
+            <if test="issuesStatus != null">issues_status = #{issuesStatus},</if>
+            <if test="issuesFlag != null">issues_flag = #{issuesFlag},</if>
+            <if test="repairFile != null">repair_file = #{repairFile},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTFireAidkitById" parameterType="Long">
+        update t_fire_aidkit set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTFireAidkitByIds" parameterType="String">
+        update t_fire_aidkit set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -0,0 +1,156 @@
+<?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.pssr.mapper.TPssrMocMapper">
+    
+    <resultMap type="TPssrMoc" id="TPssrMocResult">
+        <result property="id"    column="id"    />
+        <result property="subId"    column="sub_id"    />
+        <result property="approveId"    column="approve_id"    />
+        <result property="region"    column="region"    />
+        <result property="mocNo"    column="moc_no"    />
+        <result property="title"    column="title"    />
+        <result property="docUpdate"    column="doc_update"    />
+        <result property="training"    column="training"    />
+        <result property="pssr"    column="pssr"    />
+        <result property="confirm1"    column="confirm1"    />
+        <result property="confirm2"    column="confirm2"    />
+        <result property="confirmationDate"    column="confirmation_date"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTPssrMocVo">
+        select d.id, d.sub_id, d.approve_id, d.region, d.moc_no, d.title, d.doc_update, d.training, d.pssr, d.confirm1, d.confirm2, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_moc d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTPssrMocList" parameterType="TPssrMoc" resultMap="TPssrMocResult">
+        <include refid="selectTPssrMocVo"/>
+        <where>  
+            <if test="subId != null "> and sub_id = #{subId}</if>
+            <if test="approveId != null "> and approve_id = #{approveId}</if>
+            <if test="region != null  and region != ''"> and region = #{region}</if>
+            <if test="mocNo != null  and mocNo != ''"> and moc_no = #{mocNo}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="docUpdate != null  and docUpdate != ''"> and doc_update = #{docUpdate}</if>
+            <if test="training != null  and training != ''"> and training = #{training}</if>
+            <if test="pssr != null  and pssr != ''"> and pssr = #{pssr}</if>
+            <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
+            <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
+            <if test="confirmationDate != null "> and confirmation_date = #{confirmationDate}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTPssrMocById" parameterType="Long" resultMap="TPssrMocResult">
+        <include refid="selectTPssrMocVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTPssrMoc" parameterType="TPssrMoc">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_pssr_moc.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_pssr_moc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="approveId != null">approve_id,</if>
+            <if test="region != null">region,</if>
+            <if test="mocNo != null">moc_no,</if>
+            <if test="title != null">title,</if>
+            <if test="docUpdate != null">doc_update,</if>
+            <if test="training != null">training,</if>
+            <if test="pssr != null">pssr,</if>
+            <if test="confirm1 != null and confirm1 != ''">confirm1,</if>
+            <if test="confirm2 != null and confirm2 != ''">confirm2,</if>
+            <if test="confirmationDate != null">confirmation_date,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="approveId != null">#{approveId},</if>
+            <if test="region != null">#{region},</if>
+            <if test="mocNo != null">#{mocNo},</if>
+            <if test="title != null">#{title},</if>
+            <if test="docUpdate != null">#{docUpdate},</if>
+            <if test="training != null">#{training},</if>
+            <if test="pssr != null">#{pssr},</if>
+            <if test="confirm1 != null and confirm1 != ''">#{confirm1},</if>
+            <if test="confirm2 != null and confirm2 != ''">#{confirm2},</if>
+            <if test="confirmationDate != null">#{confirmationDate},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPssrMoc" parameterType="TPssrMoc">
+        update t_pssr_moc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subId != null">sub_id = #{subId},</if>
+            <if test="approveId != null">approve_id = #{approveId},</if>
+            <if test="region != null">region = #{region},</if>
+            <if test="mocNo != null">moc_no = #{mocNo},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="docUpdate != null">doc_update = #{docUpdate},</if>
+            <if test="training != null">training = #{training},</if>
+            <if test="pssr != null">pssr = #{pssr},</if>
+            <if test="confirm1 != null and confirm1 != ''">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null and confirm2 != ''">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTPssrMocById" parameterType="Long">
+        update t_pssr_moc set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTPssrMocByIds" parameterType="String">
+        update t_pssr_moc set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/patrol/dev/aidkit.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询急救箱列表
+export function listAidkit(query) {
+  return request({
+    url: '/dev/aidkit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询急救箱详细
+export function getAidkit(id) {
+  return request({
+    url: '/dev/aidkit/' + id,
+    method: 'get'
+  })
+}
+
+// 新增急救箱
+export function addAidkit(data) {
+  return request({
+    url: '/dev/aidkit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改急救箱
+export function updateAidkit(data) {
+  return request({
+    url: '/dev/aidkit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除急救箱
+export function delAidkit(id) {
+  return request({
+    url: '/dev/aidkit/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出急救箱
+export function exportAidkit(query) {
+  return request({
+    url: '/dev/aidkit/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/patrol/fire/aidkit.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询急救箱检查记录列表
+export function listAidkit(query) {
+  return request({
+    url: '/fire/aidkit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询急救箱检查记录详细
+export function getAidkit(id) {
+  return request({
+    url: '/fire/aidkit/' + id,
+    method: 'get'
+  })
+}
+
+// 新增急救箱检查记录
+export function addAidkit(data) {
+  return request({
+    url: '/fire/aidkit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改急救箱检查记录
+export function updateAidkit(data) {
+  return request({
+    url: '/fire/aidkit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除急救箱检查记录
+export function delAidkit(id) {
+  return request({
+    url: '/fire/aidkit/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出急救箱检查记录
+export function exportAidkit(query) {
+  return request({
+    url: '/fire/aidkit/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/pssr/moc.js

@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 确认MOC完成确认清单
+export function handleConfirmMoc(data) {
+  return request({
+    url: '/pssr/moc/confirmMoc',
+    method: 'put',
+    data: data
+  })
+}
+
+// 驳回MOC完成确认清单
+export function handleTurnDownMoc(data) {
+  return request({
+    url: '/pssr/moc/turnDownMoc',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询MOC完成确认清单列表
+export function listMoc(query) {
+  return request({
+    url: '/pssr/moc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询MOC完成确认清单详细
+export function getMoc(id) {
+  return request({
+    url: '/pssr/moc/' + id,
+    method: 'get'
+  })
+}
+
+// 新增MOC完成确认清单
+export function addMoc(data) {
+  return request({
+    url: '/pssr/moc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改MOC完成确认清单
+export function updateMoc(data) {
+  return request({
+    url: '/pssr/moc',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除MOC完成确认清单
+export function delMoc(id) {
+  return request({
+    url: '/pssr/moc/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出MOC完成确认清单
+export function exportMoc(query) {
+  return request({
+    url: '/pssr/moc/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/patrol/dev/aidkit/index.vue

@@ -0,0 +1,389 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="位置" prop="position">
+        <el-input
+          v-model="queryParams.position"
+          placeholder="请输入位置"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" clearable placeholder="请选择状态" @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.dev_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['dev:aidkit:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['dev:aidkit:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['dev:aidkit:remove']"
+        >删除</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="aidkitList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="位置" align="center" prop="position" :show-overflow-tooltip="true"/>
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.dev_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right"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="['dev:aidkit:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['dev:aidkit: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="位置" prop="position">
+          <el-input v-model="form.position" placeholder="请输入位置" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.dev_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </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 :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAidkit, getAidkit, delAidkit, addAidkit, updateAidkit, exportAidkit, importTemplate} from "@/api/patrol/dev/aidkit";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Aidkit",
+  dicts: ['dev_status'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 急救箱表格数据
+      aidkitList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/dev/aidkit/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        position: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        status: null,
+        patrolType: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识0未删除不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询急救箱列表 */
+    getList() {
+      this.loading = true;
+      listAidkit(this.queryParams).then(response => {
+        this.aidkitList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        position: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        status: "0",
+        patrolType: 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
+      getAidkit(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) {
+            updateAidkit(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAidkit(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delAidkit(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有急救箱数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportAidkit(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

ui/src/views/patrol/fire/aidkit/index.vue

@@ -0,0 +1,380 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="位置" prop="position">
+        <el-input
+          v-model="queryParams.position"
+          placeholder="请输入位置"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['fire:aidkit:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['fire:aidkit:remove']"
+        >删除</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="aidkitList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="位置" align="center" prop="position" :show-overflow-tooltip="true"/>
+      <el-table-column label="急救箱外观" align="center" prop="aidkitAppearance" :show-overflow-tooltip="true"/>
+      <el-table-column label="内部物品是否按要求检查" align="center" prop="requireCheck" :show-overflow-tooltip="true"/>
+      <el-table-column label="封条是否完整" align="center" prop="sealIntegrity" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right"  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="['fire:aidkit:edit']"
+          >修改</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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="170px">
+        <el-form-item label="急救箱外观" prop="aidkitAppearance">
+          <el-radio v-model="form.aidkitAppearance" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.aidkitAppearance" label="✖" border>✖</el-radio>
+        </el-form-item>
+        <el-form-item label="内部物品是否按要求检查" prop="requireCheck">
+          <el-radio v-model="form.requireCheck" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.requireCheck" label="✖" border>✖</el-radio>
+        </el-form-item>
+        <el-form-item label="封条是否完整" prop="sealIntegrity">
+          <el-radio v-model="form.sealIntegrity" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.sealIntegrity" label="✖" border>✖</el-radio>
+        </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 :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAidkit, getAidkit, delAidkit, addAidkit, updateAidkit, exportAidkit, importTemplate} from "@/api/patrol/fire/aidkit";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Aidkit",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 急救箱检查记录表格数据
+      aidkitList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/fire/aidkit/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        position: null,
+        aidkitAppearance: null,
+        requireCheck: null,
+        sealIntegrity: null,
+        confirmed: null,
+        checkStatus: null,
+        checkDate: null,
+        month: null,
+        year: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        planId: null,
+        problemFileUrl: null,
+        fileUrl: null,
+        issuesStatus: null,
+        issuesFlag: null,
+        repairFile: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识0未删除不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询急救箱检查记录列表 */
+    getList() {
+      this.loading = true;
+      listAidkit(this.queryParams).then(response => {
+        this.aidkitList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        position: null,
+        aidkitAppearance: null,
+        requireCheck: null,
+        sealIntegrity: null,
+        confirmed: null,
+        checkStatus: "0",
+        checkDate: null,
+        month: null,
+        year: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        remarks: null,
+        deptId: null,
+        planId: null,
+        problemFileUrl: null,
+        fileUrl: null,
+        issuesStatus: "0",
+        issuesFlag: null,
+        repairFile: 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
+      getAidkit(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) {
+            updateAidkit(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAidkit(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delAidkit(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有急救箱检查记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportAidkit(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>

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

@@ -450,6 +450,12 @@ export default {
             query: {month: this.month.getMonth(), year: this.year.getFullYear(), planId: id}
           });
           break;
+        case '27':
+          this.$router.push({
+            path: '/patrol/record/fire/aidkit',
+            query: {month: this.month.getMonth(), year: this.year.getFullYear(), planId: id}
+          });
+          break;
       }
     },
     handleConform(row) {

ui/src/views/pssr/moc/index.vue

@@ -0,0 +1,605 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="区域" prop="region">
+        <el-input
+          v-model="queryParams.region"
+          placeholder="请输入区域"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="MOC编号" prop="mocNo">
+        <el-input
+          v-model="queryParams.mocNo"
+          placeholder="请输入MOC编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pssr:moc:add']"
+          v-if="isApprove==0"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pssr:moc:edit']"
+          v-if="isApprove==0"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pssr:moc:remove']"
+          v-if="isApprove==0"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['pssr:moc:edit']"
+          v-if="isApprove==0"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['pssr:moc:export']"
+          v-if="isApprove==0"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-s-promotion"
+          size="mini"
+          @click="handleApprove"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:moc:edit']"
+        >发起审批
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          v-if="isApprove==4||isApprove==5"
+          @click="handleConfirmApprove"
+          v-hasPermi="['pssr:moc:edit']"
+        >确认
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-refresh-left"
+          size="mini"
+          v-if="isApprove==2"
+          :disabled="multiple"
+          @click="handleTurnDown"
+          v-hasPermi="['pssr:moc:edit']"
+        >驳回
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+
+    <div style="width: 100%;text-align: center;margin-bottom: 15px">
+      <H2>MOC完成确认清单</H2>
+      <br/>
+      <span>检查确认MOC相关文档更新完成，培训和PSSR完成。填写“Y”表示已完成，“N"表示未完成，“NA"表示不适用。</span>
+    </div>
+
+    <el-table v-loading="loading" :data="mocList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
+          <el-tag v-if="scope.row.approveStatus==1" type="warning">待确认</el-tag>
+          <el-tag v-if="scope.row.approveStatus==3" type="success">已确认1</el-tag>
+          <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="区域" align="center" prop="region" :show-overflow-tooltip="true"/>
+      <el-table-column label="MOC编号" align="center" prop="mocNo" :show-overflow-tooltip="true"/>
+      <el-table-column label="标题" align="center" prop="title" :show-overflow-tooltip="true"/>
+      <el-table-column label="相关文档更新" align="center" prop="docUpdate" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训" align="center" prop="training" :show-overflow-tooltip="true"/>
+      <el-table-column label="PSSR" align="center" prop="pssr" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <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="['pssr:moc:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pssr:moc: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"
+    />
+
+    <!-- 添加或修改MOC完成确认清单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="区域" prop="region">
+          <el-input v-model="form.region" placeholder="请输入区域"/>
+        </el-form-item>
+        <el-form-item label="MOC编号" prop="mocNo">
+          <el-input v-model="form.mocNo" placeholder="请输入MOC编号"/>
+        </el-form-item>
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题"/>
+        </el-form-item>
+        <el-form-item label="相关文档更新">
+          <el-radio-group v-model="form.docUpdate">
+            <el-radio label="Y">Y</el-radio>
+            <el-radio label="N">N</el-radio>
+            <el-radio label="NA">NA</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="培训">
+          <el-radio-group v-model="form.training">
+            <el-radio label="Y">Y</el-radio>
+            <el-radio label="N">N</el-radio>
+            <el-radio label="NA">NA</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="PSSR">
+          <el-radio-group v-model="form.pssr">
+            <el-radio label="Y">Y</el-radio>
+            <el-radio label="N">N</el-radio>
+            <el-radio label="NA">NA</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1">
+          <el-select v-model="form.confirm1" filterable placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2">
+          <el-select v-model="form.confirm2" filterable placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </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 :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addMoc,
+  delMoc,
+  exportMoc,
+  getMoc,
+  handleConfirmMoc,
+  handleTurnDownMoc,
+  importTemplate,
+  listMoc,
+  updateMoc
+} from "@/api/pssr/moc";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listUserNoPage} from "@/api/system/user";
+import {doApprove} from "@/api/pssr/approve";
+
+export default {
+  name: "Moc",
+  components: {Treeselect},
+  props: {
+    subId: {
+      type: Number,
+      default: 0
+    },
+    isApprove: {
+      type: Number,
+      default: 0
+    },
+  },
+  data() {
+    return {
+      userOptions: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // MOC完成确认清单表格数据
+      mocList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pssr/moc/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        subId: null,
+        approveId: null,
+        region: null,
+        mocNo: null,
+        title: null,
+        docUpdate: null,
+        training: null,
+        pssr: null,
+        confirm1: null,
+        confirm2: null,
+        confirmationDate: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null,
+        approveStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        confirm1: [
+          {required: true, message: "确认人1不能为空", trigger: "change"}
+        ],
+        confirm2: [
+          {required: true, message: "确认人2不能为空", trigger: "change"}
+        ],
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 320
+    })
+    this.getList();
+    this.getTreeselect();
+    listUserNoPage({}).then(res => {
+      this.userOptions = res.data
+    });
+  },
+  methods: {
+    /** 查询MOC完成确认清单列表 */
+    getList() {
+      this.loading = true;
+      listMoc(this.queryParams).then(response => {
+        this.mocList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        subId: this.subId,
+        approveId: null,
+        region: null,
+        mocNo: null,
+        title: null,
+        docUpdate: "0",
+        training: "0",
+        pssr: "0",
+        confirm1: null,
+        confirm2: null,
+        confirmationDate: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null,
+        approveStatus: 0
+      };
+      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 = "添加MOC完成确认清单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMoc(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改MOC完成确认清单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMoc(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMoc(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delMoc(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有MOC完成确认清单数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportMoc(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    /** 确认按钮操作*/
+    handleApprove() {
+      doApprove(this.subId).then(res => {
+        this.msgSuccess("已发起确认流程");
+      })
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+        taskType: this.isApprove
+      }
+      handleConfirmMoc(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+        this.$emit('refreshHisList');
+      })
+    },
+    handleTurnDown(val) {
+      this.$prompt('请输入驳回原因', '提示', {
+        confirmButtonText: '确认驳回',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let data = {
+          ids: this.ids,
+          subId: this.subId,
+          remarks: value
+        }
+        handleTurnDownMoc(data).then(res => {
+          this.msgSuccess("驳回成功");
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消驳回'
+        });
+      });
+    },
+    userFormat(userId) {
+      for (let item of this.userOptions) {
+        if (item.userId == userId) {
+          return item.nickName
+        }
+      }
+    },
+  }
+};
+</script>

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -282,7 +282,7 @@
                  :on-progress="handleFileDocProgress"
                  :on-success="handleFileDocSuccess"
                  :auto-upload="true"
-                 drag
+                 drag 
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">

ui/src/views/pssr/patrol/index.vue

@@ -215,6 +215,9 @@ export default {
           devName= item.devName
         }
       })
+      if (row.planType=='27'){
+        return "急救箱检查记录"
+      }
       return devName;
     },
     getMainList() {

ui/src/views/pssr/subitem/index.vue

@@ -126,6 +126,9 @@
     <div v-if="sn=='sys'">
       <laboratory :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
+    <div v-if="sn=='sjbg'">
+      <Moc :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -167,10 +170,12 @@ import PumpCleaning from "@/views/pssr/pumpCleaning/index.vue";
 import PumpOverhaul from "@/views/pssr/pumpOverhaul/index.vue";
 import PumpFill from "@/views/pssr/pumpFill/index.vue";
 import Laboratory from "@/views/pssr/laboratory/index.vue";
+import Moc from "@/views/pssr/moc/index.vue";
 
 export default {
   name: "Subitem",
   components: {
+    Moc,
     PumpFill,
     PumpOverhaul,
     PumpCleaning,