PSSR实验室

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

@@ -97,6 +97,9 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private ITPssrAirtightService tPssrAirtightService;
 
+    @Autowired
+    private ITPssrLaboratoryService tPssrLaboratoryService;
+
     /**
      * 查询pssr审批管理列表
      */
@@ -191,6 +194,7 @@ public class TPssrApproveController extends BaseController {
                 doSksgApprove(tPssrSubcontent);
                 break;
             case "sys"://实验室
+                doSysApprove(tPssrSubcontent);
                 break;
             case "dj"://短接
                 break;
@@ -1138,4 +1142,92 @@ public class TPssrApproveController extends BaseController {
         }
 
     }
+
+    // 实验室流程发起申请
+    public void doSysApprove(TPssrSubcontent sub) {
+        String userId = getUserId().toString();
+        //修改状态
+        TPssrLaboratory tPssrLaboratory = new TPssrLaboratory();
+        tPssrLaboratory.setApproveStatus(0L);
+        tPssrLaboratory.setSubId(sub.getId());
+        Set<String> installer = new HashSet<>();
+        Set<String> remover = new HashSet<>();
+        for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory)) {
+            item.setApproveStatus(1L);
+            item.setUpdatedate(new Date());
+            item.setUpdaterCode(userId);
+            tPssrLaboratoryService.updateTPssrLaboratory(item);
+
+            // 安装人员
+            installer.add(item.getConfirm1());
+
+            //拆除人员
+            remover.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);
+
+            // 开始申请流程
+            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);
+        } else {
+            // 已存在流程时，删除旧流程，重新发起
+            TPssrApprove approve = tPssrApproves.get(0);
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+                historyService.deleteHistoricProcessInstance(approve.getProcessId());
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
+
+            tPssrLaboratory = new TPssrLaboratory();
+            tPssrLaboratory.setApproveStatus(1L);
+            tPssrLaboratory.setSubId(sub.getId());
+            for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory)) {
+                // 安装人员
+                installer.add(item.getConfirm1());
+
+                //拆除人员
+                remover.add(item.getConfirm1());
+            }
+
+            // 开始申请流程
+            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);
+        }
+
+    }
+
 }

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

@@ -0,0 +1,259 @@
+package com.ruoyi.project.pssr.controller;
+
+import java.util.*;
+
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrCleaning;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
+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.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.pssr.domain.TPssrLaboratory;
+import com.ruoyi.project.pssr.service.ITPssrLaboratoryService;
+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("/pssr/laboratory")
+public class TPssrLaboratoryController extends BaseController
+{
+    @Autowired
+    private ITPssrLaboratoryService tPssrLaboratoryService;
+
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
+
+    @Autowired
+    private ITPssrSubcontentService tPssrSubcontentService;
+
+    /**
+     * 查询实验室列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPssrLaboratory tPssrLaboratory)
+    {
+        startPage();
+        List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出实验室列表
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:export')")
+    @Log(title = "实验室", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPssrLaboratory tPssrLaboratory)
+    {
+        List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
+        ExcelUtil<TPssrLaboratory> util = new ExcelUtil<TPssrLaboratory>(TPssrLaboratory.class);
+        return util.exportExcel(list, "laboratory");
+    }
+
+    /**
+     * 获取实验室详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tPssrLaboratoryService.selectTPssrLaboratoryById(id));
+    }
+
+    /**
+     * 新增实验室
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:add')")
+    @Log(title = "实验室", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPssrLaboratory tPssrLaboratory)
+    {
+        tPssrLaboratory.setApproveStatus(0L);
+        return toAjax(tPssrLaboratoryService.insertTPssrLaboratory(tPssrLaboratory));
+    }
+
+    /**
+     * 修改实验室
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:edit')")
+    @Log(title = "实验室", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPssrLaboratory tPssrLaboratory)
+    {
+        return toAjax(tPssrLaboratoryService.updateTPssrLaboratory(tPssrLaboratory));
+    }
+
+    /**
+     * 删除实验室
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:remove')")
+    @Log(title = "实验室", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tPssrLaboratoryService.deleteTPssrLaboratoryByIds(ids));
+    }
+
+    /**
+     * 确认实验室
+     */
+    @PreAuthorize("@ss.hasPermi('pssr:laboratory:edit')")
+    @Log(title = "实验室", businessType = BusinessType.UPDATE)
+    @PutMapping("/confirmLaboratory")
+    public AjaxResult confirmLaboratory(@RequestBody TPssrLaboratory tPssrLaboratory) {
+        long queryStatus = 0;
+        long approveStatus = 0;
+        Date date = null;
+        if (tPssrLaboratory.getTaskType() == 4) {
+            //拆锁确认
+            queryStatus = 1;
+            approveStatus = 3;
+            date = new Date();
+        } else if (tPssrLaboratory.getTaskType() == 5) {
+            //上锁确认
+            queryStatus = 3;
+            approveStatus = 2;
+            date = new Date();
+        }
+        // 修改状态
+        if (tPssrLaboratory.getIds() != null && tPssrLaboratory.getIds().length > 0) {
+            for (Long id : tPssrLaboratory.getIds()) {
+                TPssrLaboratory item = tPssrLaboratoryService.selectTPssrLaboratoryById(id);
+                item.setApproveStatus(approveStatus);
+                if (item.getConfirmationDate()==null && queryStatus==3) {
+                    item.setConfirmationDate(date);
+                }
+                tPssrLaboratoryService.updateTPssrLaboratory(item);
+            }
+        } else {
+            TPssrLaboratory lock = new TPssrLaboratory();
+            lock.setSubId(tPssrLaboratory.getSubId());
+            lock.setApproveStatus(queryStatus);
+            for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(lock)) {
+                if (item.getConfirmationDate()==null && queryStatus==3) {
+                    item.setConfirmationDate(date);
+                }
+                item.setApproveStatus(approveStatus);
+                tPssrLaboratoryService.updateTPssrLaboratory(item);
+            }
+        }
+        //查询当前待审批的确认人
+        TPssrLaboratory entity = new TPssrLaboratory();
+        entity.setSubId(tPssrLaboratory.getSubId());
+        entity.setApproveStatus(queryStatus);
+        for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(entity)) {
+            if (tPssrLaboratory.getTaskType() == 4) {
+                if (item.getConfirm1().equals(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            } else if (tPssrLaboratory.getTaskType() == 5) {
+                if (item.getConfirm2().equals(getUserId().toString())) {
+                    return AjaxResult.success();
+                }
+            }
+        }
+
+        //无待审批任务结束当前用户流程
+        TPssrApprove approve = new TPssrApprove();
+        approve.setSubId(tPssrLaboratory.getSubId());
+        // 因为流程关系所以approve一定会有且只有一条数据
+        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveList(approve).get(0);
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
+        return AjaxResult.success();
+
+    }
+
+    /**
+     * 驳回实验室
+     */
+    @PutMapping("/turnDownLaboratory")
+    public AjaxResult turnDownLaboratory(@RequestBody TPssrLaboratory tPssrLaboratory) {
+        if (tPssrLaboratory.getIds() != null) {
+            String userId = getUserId().toString();
+            // 修改已选择数据的状态
+            for (Long id : tPssrLaboratory.getIds()) {
+                TPssrLaboratory blind = new TPssrLaboratory();
+                blind.setId(id);
+                blind.setApproveStatus(1L);
+                blind.setUpdatedate(new Date());
+                blind.setUpdaterCode(getUserId().toString());
+                tPssrLaboratoryService.updateTPssrLaboratory(blind);
+            }
+            // 查询当前流程
+            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrLaboratory.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();
+
+            // 驳回 查询所有待审批的人员
+            TPssrLaboratory blind = new TPssrLaboratory();
+            blind.setSubId(tPssrLaboratory.getSubId());
+            blind.setApproveStatus(1L);
+            Set<String> installer = new HashSet<>();
+            Set<String> remover = new HashSet<>();
+            for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(blind)) {
+
+                // 安装人员
+                installer.add(item.getConfirm1());
+
+                //拆除人员
+                remover.add(item.getConfirm2());
+            }
+
+
+            //处理流程节点
+            Map<String, Object> param = new HashMap<>();
+            param.put("condition", 1);
+            param.put("confirmUsers1", new ArrayList<>(installer));
+            param.put("confirmUsers2", new ArrayList<>(remover));
+            //认领任务
+            processEngine.getTaskService().claim(taskId, userId);
+            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrLaboratory.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/TPssrLaboratory.java

@@ -0,0 +1,313 @@
+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;
+
+/**
+ * 实验室对象 t_pssr_laboratory
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+public class TPssrLaboratory 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 instrumentNumber;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 出厂序列号 */
+    @Excel(name = "出厂序列号")
+    private String serialNumber;
+
+    /** 外观检查 */
+    @Excel(name = "外观检查")
+    private String visualInspection;
+
+    /** 功能检查 */
+    @Excel(name = "功能检查")
+    private String functionalCheck;
+
+    /** 确认人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 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 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 setInstrumentNumber(String instrumentNumber)
+    {
+        this.instrumentNumber = instrumentNumber;
+    }
+
+    public String getInstrumentNumber()
+    {
+        return instrumentNumber;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSerialNumber(String serialNumber)
+    {
+        this.serialNumber = serialNumber;
+    }
+
+    public String getSerialNumber()
+    {
+        return serialNumber;
+    }
+    public void setVisualInspection(String visualInspection)
+    {
+        this.visualInspection = visualInspection;
+    }
+
+    public String getVisualInspection()
+    {
+        return visualInspection;
+    }
+    public void setFunctionalCheck(String functionalCheck)
+    {
+        this.functionalCheck = functionalCheck;
+    }
+
+    public String getFunctionalCheck()
+    {
+        return functionalCheck;
+    }
+    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("instrumentNumber", getInstrumentNumber())
+            .append("name", getName())
+            .append("serialNumber", getSerialNumber())
+            .append("visualInspection", getVisualInspection())
+            .append("functionalCheck", getFunctionalCheck())
+            .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/TPssrLaboratoryMapper.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.TPssrLaboratory;
+
+/**
+ * 实验室Mapper接口
+ * 
+ * @author ssy
+ * @date 2024-10-30
+ */
+public interface TPssrLaboratoryMapper 
+{
+    /**
+     * 查询实验室
+     * 
+     * @param id 实验室ID
+     * @return 实验室
+     */
+    public TPssrLaboratory selectTPssrLaboratoryById(Long id);
+
+    /**
+     * 查询实验室列表
+     * 
+     * @param tPssrLaboratory 实验室
+     * @return 实验室集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TPssrLaboratory> selectTPssrLaboratoryList(TPssrLaboratory tPssrLaboratory);
+
+    /**
+     * 新增实验室
+     * 
+     * @param tPssrLaboratory 实验室
+     * @return 结果
+     */
+    public int insertTPssrLaboratory(TPssrLaboratory tPssrLaboratory);
+
+    /**
+     * 修改实验室
+     * 
+     * @param tPssrLaboratory 实验室
+     * @return 结果
+     */
+    public int updateTPssrLaboratory(TPssrLaboratory tPssrLaboratory);
+
+    /**
+     * 删除实验室
+     * 
+     * @param id 实验室ID
+     * @return 结果
+     */
+    public int deleteTPssrLaboratoryById(Long id);
+
+    /**
+     * 批量删除实验室
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPssrLaboratoryByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.project.pssr.service;
+
+import java.util.List;
+import com.ruoyi.project.pssr.domain.TPssrLaboratory;
+
+/**
+ * 实验室Service接口
+ * 
+ * @author ssy
+ * @date 2024-10-30
+ */
+public interface ITPssrLaboratoryService 
+{
+    /**
+     * 查询实验室
+     * 
+     * @param id 实验室ID
+     * @return 实验室
+     */
+    public TPssrLaboratory selectTPssrLaboratoryById(Long id);
+
+    /**
+     * 查询实验室列表
+     * 
+     * @param tPssrLaboratory 实验室
+     * @return 实验室集合
+     */
+    public List<TPssrLaboratory> selectTPssrLaboratoryList(TPssrLaboratory tPssrLaboratory);
+
+    /**
+     * 新增实验室
+     * 
+     * @param tPssrLaboratory 实验室
+     * @return 结果
+     */
+    public int insertTPssrLaboratory(TPssrLaboratory tPssrLaboratory);
+
+    /**
+     * 修改实验室
+     * 
+     * @param tPssrLaboratory 实验室
+     * @return 结果
+     */
+    public int updateTPssrLaboratory(TPssrLaboratory tPssrLaboratory);
+
+    /**
+     * 批量删除实验室
+     * 
+     * @param ids 需要删除的实验室ID
+     * @return 结果
+     */
+    public int deleteTPssrLaboratoryByIds(Long[] ids);
+
+    /**
+     * 删除实验室信息
+     * 
+     * @param id 实验室ID
+     * @return 结果
+     */
+    public int deleteTPssrLaboratoryById(Long id);
+}

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrLaboratoryServiceImpl.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.TPssrLaboratoryMapper;
+import com.ruoyi.project.pssr.domain.TPssrLaboratory;
+import com.ruoyi.project.pssr.service.ITPssrLaboratoryService;
+
+/**
+ * 实验室Service业务层处理
+ *
+ * @author ssy
+ * @date 2024-10-30
+ */
+@Service
+public class TPssrLaboratoryServiceImpl implements ITPssrLaboratoryService
+{
+    @Autowired
+    private TPssrLaboratoryMapper tPssrLaboratoryMapper;
+
+    /**
+     * 查询实验室
+     *
+     * @param id 实验室ID
+     * @return 实验室
+     */
+    @Override
+    public TPssrLaboratory selectTPssrLaboratoryById(Long id)
+    {
+        return tPssrLaboratoryMapper.selectTPssrLaboratoryById(id);
+    }
+
+    /**
+     * 查询实验室列表
+     *
+     * @param tPssrLaboratory 实验室
+     * @return 实验室
+     */
+    @Override
+    public List<TPssrLaboratory> selectTPssrLaboratoryList(TPssrLaboratory tPssrLaboratory)
+    {
+        return tPssrLaboratoryMapper.selectTPssrLaboratoryList(tPssrLaboratory);
+    }
+
+    /**
+     * 新增实验室
+     *
+     * @param tPssrLaboratory 实验室
+     * @return 结果
+     */
+    @Override
+    public int insertTPssrLaboratory(TPssrLaboratory tPssrLaboratory)
+    {
+        return tPssrLaboratoryMapper.insertTPssrLaboratory(tPssrLaboratory);
+    }
+
+    /**
+     * 修改实验室
+     *
+     * @param tPssrLaboratory 实验室
+     * @return 结果
+     */
+    @Override
+    public int updateTPssrLaboratory(TPssrLaboratory tPssrLaboratory)
+    {
+        return tPssrLaboratoryMapper.updateTPssrLaboratory(tPssrLaboratory);
+    }
+
+    /**
+     * 批量删除实验室
+     *
+     * @param ids 需要删除的实验室ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrLaboratoryByIds(Long[] ids)
+    {
+        return tPssrLaboratoryMapper.deleteTPssrLaboratoryByIds(ids);
+    }
+
+    /**
+     * 删除实验室信息
+     *
+     * @param id 实验室ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPssrLaboratoryById(Long id)
+    {
+        return tPssrLaboratoryMapper.deleteTPssrLaboratoryById(id);
+    }
+}

master/src/main/resources/application.yml

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

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

@@ -0,0 +1,151 @@
+<?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.TPssrLaboratoryMapper">
+    
+    <resultMap type="TPssrLaboratory" id="TPssrLaboratoryResult">
+        <result property="id"    column="id"    />
+        <result property="subId"    column="sub_id"    />
+        <result property="approveId"    column="approve_id"    />
+        <result property="instrumentNumber"    column="instrument_number"    />
+        <result property="name"    column="name"    />
+        <result property="serialNumber"    column="serial_number"    />
+        <result property="visualInspection"    column="visual_inspection"    />
+        <result property="functionalCheck"    column="functional_check"    />
+        <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="selectTPssrLaboratoryVo">
+        select d.id, d.sub_id, d.approve_id, d.instrument_number, d.name, d.serial_number, d.visual_inspection, d.functional_check, 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 from t_pssr_laboratory d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTPssrLaboratoryList" parameterType="TPssrLaboratory" resultMap="TPssrLaboratoryResult">
+        <include refid="selectTPssrLaboratoryVo"/>
+        <where>  
+            <if test="subId != null "> and sub_id = #{subId}</if>
+            <if test="approveId != null "> and approve_id = #{approveId}</if>
+            <if test="instrumentNumber != null  and instrumentNumber != ''"> and instrument_number = #{instrumentNumber}</if>
+            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
+            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
+            <if test="visualInspection != null  and visualInspection != ''"> and visual_inspection = #{visualInspection}</if>
+            <if test="functionalCheck != null  and functionalCheck != ''"> and functional_check = #{functionalCheck}</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="selectTPssrLaboratoryById" parameterType="Long" resultMap="TPssrLaboratoryResult">
+        <include refid="selectTPssrLaboratoryVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTPssrLaboratory" parameterType="TPssrLaboratory">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_pssr_laboratory.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_pssr_laboratory
+        <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="instrumentNumber != null">instrument_number,</if>
+            <if test="name != null">name,</if>
+            <if test="serialNumber != null">serial_number,</if>
+            <if test="visualInspection != null">visual_inspection,</if>
+            <if test="functionalCheck != null">functional_check,</if>
+            <if test="confirm1 != null">confirm1,</if>
+            <if test="confirm2 != null">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="instrumentNumber != null">#{instrumentNumber},</if>
+            <if test="name != null">#{name},</if>
+            <if test="serialNumber != null">#{serialNumber},</if>
+            <if test="visualInspection != null">#{visualInspection},</if>
+            <if test="functionalCheck != null">#{functionalCheck},</if>
+            <if test="confirm1 != null">#{confirm1},</if>
+            <if test="confirm2 != null">#{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="updateTPssrLaboratory" parameterType="TPssrLaboratory">
+        update t_pssr_laboratory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subId != null">sub_id = #{subId},</if>
+            <if test="approveId != null">approve_id = #{approveId},</if>
+            <if test="instrumentNumber != null">instrument_number = #{instrumentNumber},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
+            <if test="visualInspection != null">visual_inspection = #{visualInspection},</if>
+            <if test="functionalCheck != null">functional_check = #{functionalCheck},</if>
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">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="deleteTPssrLaboratoryById" parameterType="Long">
+        update t_pssr_laboratory set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTPssrLaboratoryByIds" parameterType="String">
+        update t_pssr_laboratory set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/pssr/laboratory.js

@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 确认实验室
+export function handleConfirmLaboratory(data) {
+  return request({
+    url: '/pssr/laboratory/confirmLaboratory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 驳回实验室
+export function handleTurnDownLaboratory(data) {
+  return request({
+    url: '/pssr/laboratory/turnDownLaboratory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询实验室列表
+export function listLaboratory(query) {
+  return request({
+    url: '/pssr/laboratory/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询实验室详细
+export function getLaboratory(id) {
+  return request({
+    url: '/pssr/laboratory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增实验室
+export function addLaboratory(data) {
+  return request({
+    url: '/pssr/laboratory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改实验室
+export function updateLaboratory(data) {
+  return request({
+    url: '/pssr/laboratory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除实验室
+export function delLaboratory(id) {
+  return request({
+    url: '/pssr/laboratory/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出实验室
+export function exportLaboratory(query) {
+  return request({
+    url: '/pssr/laboratory/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -0,0 +1,766 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--<el-form-item label="从表id" prop="subId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.subId"-->
+          <!--placeholder="请输入从表id"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="审批id" prop="approveId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.approveId"-->
+          <!--placeholder="请输入审批id"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <el-form-item label="仪器编号" prop="instrumentNumber">
+        <el-input
+          v-model="queryParams.instrumentNumber"
+          placeholder="请输入仪器编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出厂序列号" prop="serialNumber">
+        <el-input
+          v-model="queryParams.serialNumber"
+          placeholder="请输入出厂序列号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外观检查" prop="visualInspection">
+        <el-input
+          v-model="queryParams.visualInspection"
+          placeholder="请输入外观检查"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="功能检查" prop="functionalCheck">
+        <el-input
+          v-model="queryParams.functionalCheck"
+          placeholder="请输入功能检查"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="确认人1" prop="confirm1">
+        <el-input
+          v-model="queryParams.confirm1"
+          placeholder="请输入确认人1"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="确认人2" prop="confirm2">
+        <el-input
+          v-model="queryParams.confirm2"
+          placeholder="请输入确认人2"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="确认时间" prop="confirmationDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.confirmationDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择确认时间">
+        </el-date-picker>
+      </el-form-item>
+      <!--<el-form-item label="创建人" prop="createrCode">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.createrCode"-->
+          <!--placeholder="请输入创建人"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="创建时间" prop="createdate">-->
+        <!--<el-date-picker clearable size="small" style="width: 200px"-->
+          <!--v-model="queryParams.createdate"-->
+          <!--type="date"-->
+          <!--value-format="yyyy-MM-dd"-->
+          <!--placeholder="选择创建时间">-->
+        <!--</el-date-picker>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="修改人" prop="updaterCode">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.updaterCode"-->
+          <!--placeholder="请输入修改人"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="修改时间" prop="updatedate">-->
+        <!--<el-date-picker clearable size="small" style="width: 200px"-->
+          <!--v-model="queryParams.updatedate"-->
+          <!--type="date"-->
+          <!--value-format="yyyy-MM-dd"-->
+          <!--placeholder="选择修改时间">-->
+        <!--</el-date-picker>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item label="部门编号" prop="deptId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.deptId"-->
+          <!--placeholder="请输入部门编号"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审批状态" prop="approveStatus">
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable size="small">
+          <el-option label="请选择字典生成" 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="['pssr:laboratory: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:laboratory: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:laboratory: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:laboratory: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:laboratory: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:laboratory: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:laboratory: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:laboratory: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>实验室仪器检查确认清单</H2>
+    </div>
+
+    <el-table v-loading="loading" :data="laboratoryList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="从表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
+        <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="instrumentNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="名称" align="center" prop="name" :show-overflow-tooltip="true"/>
+      <el-table-column label="出厂序列号" align="center" prop="serialNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="外观检查" align="center" prop="visualInspection" :show-overflow-tooltip="true"/>
+      <el-table-column label="功能检查" align="center" prop="functionalCheck" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirm1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true"
+                       width="150">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirm2) }}</span>
+        </template>
+      </el-table-column>
+      <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="createrCode" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
+        <!--<template slot-scope="scope">-->
+          <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
+      <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
+        <!--<template slot-scope="scope">-->
+          <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <!--<el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['pssr:laboratory:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pssr:laboratory: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="从表id" prop="subId">-->
+          <!--<el-input v-model="form.subId" placeholder="请输入从表id" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="审批id" prop="approveId">-->
+          <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
+        <!--</el-form-item>-->
+        <el-form-item label="仪器编号" prop="instrumentNumber">
+          <el-input v-model="form.instrumentNumber" placeholder="请输入仪器编号" />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="出厂序列号" prop="serialNumber">
+          <el-input v-model="form.serialNumber" placeholder="请输入出厂序列号" />
+        </el-form-item>
+        <el-form-item label="外观检查" prop="visualInspection">
+          <el-input v-model="form.visualInspection" placeholder="请输入外观检查" />
+        </el-form-item>
+        <el-form-item label="功能检查" prop="functionalCheck">
+          <el-input v-model="form.functionalCheck" placeholder="请输入功能检查" />
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     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" clearable filterable style="width: 100%;"
+                     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="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.confirmationDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择确认时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <!--<el-form-item label="创建人" prop="createrCode">-->
+          <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="创建时间" prop="createdate">-->
+          <!--<el-date-picker clearable size="small" style="width: 200px"-->
+            <!--v-model="form.createdate"-->
+            <!--type="date"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--placeholder="选择创建时间">-->
+          <!--</el-date-picker>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="修改人" prop="updaterCode">-->
+          <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="修改时间" prop="updatedate">-->
+          <!--<el-date-picker clearable size="small" style="width: 200px"-->
+            <!--v-model="form.updatedate"-->
+            <!--type="date"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--placeholder="选择修改时间">-->
+          <!--</el-date-picker>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="部门编号" prop="deptId">-->
+          <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
+        <!--</el-form-item>-->
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+        <!--<el-form-item label="审批状态">-->
+          <!--<el-radio-group v-model="form.approveStatus">-->
+            <!--<el-radio label="1">请选择字典生成</el-radio>-->
+          <!--</el-radio-group>-->
+        <!--</el-form-item>-->
+          <!--<el-form-item label="归属部门" prop="deptId">-->
+              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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 { listLaboratory, getLaboratory, delLaboratory, addLaboratory, updateLaboratory, exportLaboratory, importTemplate, handleConfirmLaboratory, handleTurnDownLaboratory } from "@/api/pssr/laboratory";
+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 {
+  dicts:['pssr_approve_status'],
+  name: "Laboratory",
+  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,
+      // 实验室表格数据
+      laboratoryList: [],
+      // 弹出层标题
+      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/laboratory/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        subId: null,
+        approveId: null,
+        instrumentNumber: null,
+        name: null,
+        serialNumber: null,
+        visualInspection: null,
+        functionalCheck: 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: "人员不可为空", trigger: "blur"}],
+        confirm2: [{required: true, message: "人员不可为空", trigger: "blur"}],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+    listUserNoPage({}).then(res => {
+      this.userOptions = res.data
+    });
+    console.log("--->" + this.isApprove)
+  },
+  methods: {
+    /** 查询实验室列表 */
+    getList() {
+      this.loading = true;
+      listLaboratory(this.queryParams).then(response => {
+        this.laboratoryList = 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,
+        instrumentNumber: null,
+        name: null,
+        serialNumber: null,
+        visualInspection: null,
+        functionalCheck: null,
+        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 = "添加实验室";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLaboratory(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) {
+            updateLaboratory(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLaboratory(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 delLaboratory(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有实验室数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportLaboratory(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
+      }
+      handleConfirmLaboratory(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
+        }
+        handleTurnDownLaboratory(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/subitem/index.vue

@@ -123,6 +123,9 @@
     <div v-if="sn=='zxfxy'">
       <analyzer :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
+    <div v-if="sn=='sys'">
+      <laboratory :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -163,6 +166,7 @@ import Analyzer from "@/views/pssr/analyzer/index.vue";
 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";
 
 export default {
   name: "Subitem",
@@ -197,7 +201,8 @@ export default {
     Protection,
     Airtight,
     Blind,
-    Programme, OverhaulFilter, OverhaulValve, OverhaulTower, OverhaulExchanger, OverhaulPump, OverhaulPipe
+    Programme, OverhaulFilter, OverhaulValve, OverhaulTower, OverhaulExchanger, OverhaulPump, OverhaulPipe,
+    Laboratory
   },
   props: {
     subId: {