PSSR导出

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

@@ -1,35 +1,38 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.math.BigDecimal;
-import java.util.*;
-
+import com.ruoyi.common.utils.DateUtils;
+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.TPssrAirtight;
 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.ITPssrAirtightService;
 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.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 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.TPssrAirtight;
-import com.ruoyi.project.pssr.service.ITPssrAirtightService;
-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;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * 气密Controller
@@ -39,8 +42,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/airtight")
-public class TPssrAirtightController extends BaseController
-{
+public class TPssrAirtightController extends BaseController {
     @Autowired
     private ITPssrAirtightService tPssrAirtightService;
 
@@ -55,8 +57,7 @@ public class TPssrAirtightController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:airtight:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrAirtight tPssrAirtight)
-    {
+    public TableDataInfo list(TPssrAirtight tPssrAirtight) {
         startPage();
         List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
         return getDataTable(list);
@@ -68,11 +69,9 @@ public class TPssrAirtightController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:airtight:export')")
     @Log(title = "气密", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrAirtight tPssrAirtight)
-    {
+    public AjaxResult export(TPssrAirtight tPssrAirtight) {
         List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
-        ExcelUtil<TPssrAirtight> util = new ExcelUtil<TPssrAirtight>(TPssrAirtight.class);
-        return util.exportExcel(list, "airtight");
+        return AjaxResult.success(exportTmpl(list));
     }
 
     /**
@@ -80,8 +79,7 @@ public class TPssrAirtightController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:airtight:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPssrAirtightService.selectTPssrAirtightById(id));
     }
 
@@ -91,8 +89,7 @@ public class TPssrAirtightController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:airtight:add')")
     @Log(title = "气密", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrAirtight tPssrAirtight)
-    {
+    public AjaxResult add(@RequestBody TPssrAirtight tPssrAirtight) {
         tPssrAirtight.setApproveStatus(0L);
         try {
             String initialPressure = tPssrAirtight.getInitialPressure();//初始压力
@@ -100,9 +97,9 @@ public class TPssrAirtightController extends BaseController
             //泄漏率=(初始压力-最终压力)/初始压力*100%
             BigDecimal leakageRate = new BigDecimal(initialPressure).subtract(new BigDecimal(finalPressure)).divide(new BigDecimal(initialPressure), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
             tPssrAirtight.setLeakageRate(String.valueOf(leakageRate.doubleValue()));//设置泄漏率
-            if(leakageRate.compareTo(new BigDecimal(tPssrAirtight.getStandard()))<=0){//判断是否满足标准
+            if (leakageRate.compareTo(new BigDecimal(tPssrAirtight.getStandard())) <= 0) {//判断是否满足标准
                 tPssrAirtight.setUptoStandard("是");
-            }else {
+            } else {
                 tPssrAirtight.setUptoStandard("否");
             }
         } catch (Exception e) {
@@ -117,8 +114,7 @@ public class TPssrAirtightController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:airtight:edit')")
     @Log(title = "气密", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrAirtight tPssrAirtight)
-    {
+    public AjaxResult edit(@RequestBody TPssrAirtight tPssrAirtight) {
 
         try {
             String initialPressure = tPssrAirtight.getInitialPressure();//初始压力
@@ -126,9 +122,9 @@ public class TPssrAirtightController extends BaseController
             //泄漏率=(初始压力-最终压力)/初始压力*100%
             BigDecimal leakageRate = new BigDecimal(initialPressure).subtract(new BigDecimal(finalPressure)).divide(new BigDecimal(initialPressure), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
             tPssrAirtight.setLeakageRate(String.valueOf(leakageRate.doubleValue()));//设置泄漏率
-            if(leakageRate.compareTo(new BigDecimal(tPssrAirtight.getStandard()))<=0){//判断是否满足标准
+            if (leakageRate.compareTo(new BigDecimal(tPssrAirtight.getStandard())) <= 0) {//判断是否满足标准
                 tPssrAirtight.setUptoStandard("是");
-            }else {
+            } else {
                 tPssrAirtight.setUptoStandard("否");
             }
         } catch (Exception e) {
@@ -142,9 +138,8 @@ public class TPssrAirtightController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:airtight:remove')")
     @Log(title = "气密", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrAirtightService.deleteTPssrAirtightByIds(ids));
     }
 
@@ -174,7 +169,7 @@ public class TPssrAirtightController extends BaseController
             for (Long id : tPssrAirtight.getIds()) {
                 TPssrAirtight item = tPssrAirtightService.selectTPssrAirtightById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrAirtightService.updateTPssrAirtight(item);
@@ -184,7 +179,7 @@ public class TPssrAirtightController extends BaseController
             lock.setSubId(tPssrAirtight.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAirtight item : tPssrAirtightService.selectTPssrAirtightList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -208,7 +203,7 @@ public class TPssrAirtightController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrAirtight.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
@@ -285,4 +280,67 @@ public class TPssrAirtightController extends BaseController
         }
         return AjaxResult.error();
     }
+
+    public String exportTmpl(List<TPssrAirtight> list) {
+        OutputStream out = null;
+        String filename =null;
+        try {
+            String tempUrl = "static/word/pssr/qm.xlsx"; // 模板文件
+            InputStream is = null;
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+            XSSFWorkbook wb1 = null;
+            wb1 = new XSSFWorkbook(is);
+            SXSSFWorkbook wb = new SXSSFWorkbook(wb1, 1000);
+
+            Sheet sheet;
+            if (wb instanceof SXSSFWorkbook) {
+                SXSSFWorkbook sxssfWorkbook = (SXSSFWorkbook) wb;
+                sheet = sxssfWorkbook.getXSSFWorkbook().getSheetAt(0);
+            } else {
+                sheet = wb.getSheetAt(0);
+            }
+
+            //填充数据
+            int rowIndex = 3;
+            int num = 1;
+
+            Row originalRow = sheet.getRow(3);
+            Cell originalcell = originalRow.getCell(0);
+            // 获取单元格样式
+            CellStyle originalStyle = originalcell.getCellStyle();
+
+            for (TPssrAirtight t : list            ) {
+                Row row = sheet.createRow(rowIndex);
+                row.createCell(0).setCellValue(num);
+                row.createCell(1).setCellValue(t.getUnit());
+                row.createCell(2).setCellValue(t.getSystemName());
+                row.createCell(3).setCellValue(t.getAirtightMedium());
+                row.createCell(4).setCellValue(t.getAirtightPressure());
+                row.createCell(5).setCellValue(t.getInitialPressure());
+                row.createCell(6).setCellValue(t.getFinalPressure());
+                row.createCell(7).setCellValue(t.getStandard());
+                row.createCell(8).setCellValue(t.getUptoStandard());
+                row.createCell(9).setCellValue(t.getConfirm1Name());
+                row.createCell(10).setCellValue(t.getConfirm2Name());
+                row.createCell(11).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(12).setCellValue(t.getRemarks());
+
+
+                //渲染样式
+                for (int i = 0; i < 13; i++) {
+                    row.getCell(i).setCellStyle(originalStyle);
+                }
+                num++;
+                rowIndex++;
+            }
+            filename = ExcelUtil.encodingFilename("Airtight");
+            out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+            wb.write(out);
+            wb.close();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return filename;
+    }
 }

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

@@ -15,10 +15,19 @@ import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import org.activiti.engine.*;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 
 /**

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

@@ -44,6 +44,7 @@ public class TPssrAboveall extends BaseEntity
     /** 确认人 */
     @Excel(name = "确认人")
     private String confirm;
+    private String confirmName;
 
     /** 确认时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
@@ -77,9 +78,9 @@ public class TPssrAboveall extends BaseEntity
     
     private String deptName;
 
-    private Long plantMgr;
-    private Long ctaMgr;
-    private Long ctmMgr;
+    private Long plantMgr;//装置经理
+    private Long ctaMgr;//CTA经理
+    private Long ctmMgr;//CTM经理
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date plantConfirmdate;
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
@@ -90,6 +91,14 @@ public class TPssrAboveall extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date drivingTime;
 
+    public String getConfirmName() {
+        return confirmName;
+    }
+
+    public void setConfirmName(String confirmName) {
+        this.confirmName = confirmName;
+    }
+
     public Date getDrivingTime() {
         return drivingTime;
     }

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

@@ -111,6 +111,24 @@ public class TPssrAirtight extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")
@@ -123,7 +141,6 @@ public class TPssrAirtight extends BaseEntity
     private Long[] ids;
 
     private Long taskType;
-
     private String uptoStandard;
 
     public String getUptoStandard() {

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

@@ -78,6 +78,24 @@ public class TPssrAlarm extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     public void setId(Long id)
     {

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

@@ -99,6 +99,24 @@ public class TPssrAnalyzer extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -39,6 +39,24 @@ public class TPssrApprove extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 子表确认人 */
     @Excel(name = "子表确认人")

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

@@ -171,6 +171,24 @@ public class TPssrBlind extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -123,6 +123,24 @@ public class TPssrCircuit extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -103,6 +103,24 @@ public class TPssrCleaning extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -78,6 +78,24 @@ public class TPssrContentModel extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private String forShort;
     private String deptUnit;

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

@@ -119,6 +119,24 @@ public class TPssrFrame extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -95,6 +95,24 @@ public class TPssrFranklinism extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -99,6 +99,24 @@ public class TPssrGasdetector extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -91,6 +91,24 @@ public class TPssrHygiene extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -103,6 +103,24 @@ public class TPssrInstrumentCalibration extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -78,6 +78,24 @@ public class TPssrInstrumentTest extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     public void setId(Long id)
     {

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

@@ -93,6 +93,24 @@ public class TPssrLaboratory extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -95,6 +95,24 @@ public class TPssrLighting extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -136,6 +136,24 @@ public class TPssrLock extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -96,6 +96,24 @@ public class TPssrMaterial extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
     private Long[] ids;
 
     private Long taskType;

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

@@ -97,6 +97,24 @@ public class TPssrMaterialRaw extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
     private Long[] ids;
 
     private Long taskType;

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

@@ -20,6 +20,24 @@ public class TPssrMeasure extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 位号 */
     @Excel(name = "位号")

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

@@ -97,6 +97,24 @@ public class TPssrMoc extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private String deptName;
 

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

@@ -99,6 +99,24 @@ public class TPssrMotor extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -104,6 +104,24 @@ public class TPssrNitrogen extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -97,6 +97,24 @@ public class TPssrOverhaulExchanger extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long ids[];
 

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

@@ -108,6 +108,24 @@ public class TPssrOverhaulFilter extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long ids[];
 

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

@@ -92,6 +92,24 @@ public class TPssrOverhaulPipe extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long ids[];
 

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

@@ -96,6 +96,24 @@ public class TPssrOverhaulPump extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long ids[];
 

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

@@ -96,6 +96,24 @@ public class TPssrOverhaulTower extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long ids[];
 

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

@@ -140,6 +140,24 @@ public class TPssrOverhaulValve extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long ids[];
 

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

@@ -91,6 +91,24 @@ public class TPssrPatrol extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     public void setId(Long id)
     {

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

@@ -110,6 +110,24 @@ public class TPssrPipe extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
     private Long taskType;
 
     public Long getTaskType() {

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

@@ -73,6 +73,24 @@ public class TPssrPower extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -110,6 +110,24 @@ public class TPssrProgramme extends BaseEntity {
      */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private String unit;
     private String writeDone;

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

@@ -91,6 +91,24 @@ public class TPssrProtection extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -87,6 +87,24 @@ public class TPssrPublic extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -107,6 +107,24 @@ public class TPssrPumpCleaning extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
     private Long[] ids;
 
     private Long taskType;

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

@@ -107,6 +107,24 @@ public class TPssrPumpFill extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
     private Long[] ids;
 
     private Long taskType;

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

@@ -99,6 +99,24 @@ public class TPssrPumpOverhaul extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
     private Long[] ids;
 
     private Long taskType;

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

@@ -148,6 +148,24 @@ public class TPssrSafetyBleed extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     public void setId(Long id)
     {

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

@@ -148,6 +148,24 @@ public class TPssrSafetyBreath extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     public void setId(Long id)
     {

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

@@ -118,6 +118,24 @@ public class TPssrSafetyBrust extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
 
     private Long[] ids;

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

@@ -102,6 +102,24 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -122,6 +122,24 @@ public class TPssrSafetyValve extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long[] ids;
 

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

@@ -107,6 +107,24 @@ public class TPssrSubcontent extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     private Long status;
 

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

@@ -91,6 +91,24 @@ public class TPssrTorchvoc extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 确认人1 */
     @Excel(name = "确认人1")

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

@@ -20,6 +20,24 @@ public class TPssrVessel extends BaseEntity
     /** 审批状态 */
     @Excel(name = "审批状态")
     private Long approveStatus;
+    private String confirm1Name;
+    private String confirm2Name;
+
+    public String getConfirm1Name() {
+        return confirm1Name;
+    }
+
+    public void setConfirm1Name(String confirm1Name) {
+        this.confirm1Name = confirm1Name;
+    }
+
+    public String getConfirm2Name() {
+        return confirm2Name;
+    }
+
+    public void setConfirm2Name(String confirm2Name) {
+        this.confirm2Name = confirm2Name;
+    }
 
     /** 单元号 */
     @Excel(name = "单元号")

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="unit"    column="unit"    />
         <result property="confirm"    column="confirm"    />
+        <result property="confirmName"    column="confirm_name"    />
         <result property="confirmationDate"    column="confirmation_date"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
@@ -39,8 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.cta_confirmdate,
                d.ctm_confirmdate,
                d.driving_time,
-            d.id, d.approve_id, d.region, d.approve_status, d.unit, d.confirm, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.include_public, d.unit_des ,s.dept_name from t_pssr_aboveall d
+            d.id, d.approve_id, d.region, d.approve_status, d.unit, d.confirm, u.NICK_NAME confirm_name , d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.include_public, d.unit_des ,s.dept_name from t_pssr_aboveall d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u on u.USER_ID = d.CONFIRM
     </sql>
 
     <select id="selectTPssrAboveallList" parameterType="TPssrAboveall" resultMap="TPssrAboveallResult">

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

@@ -29,12 +29,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
         <result property="uptoStandard"    column="upto_standard"    />
     </resultMap>
 
     <sql id="selectTPssrAirtightVo">
-        select d.id,d.upto_standard, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.system_name, d.airtight_medium, d.airtight_pressure, d.initial_pressure, d.final_pressure, d.leakage_rate, d.standard, d.identifying_person, 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_airtight d
+        select d.id,d.upto_standard, u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.system_name, d.airtight_medium, d.airtight_pressure, d.initial_pressure, d.final_pressure, d.leakage_rate, d.standard, d.identifying_person, 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_airtight d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrAirtightList" parameterType="TPssrAirtight" resultMap="TPssrAirtightResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrAnalyzerVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.dev_no, d.visual_inspection, d.functional_check, d.sp_checker, d.process_validator, 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_analyzer d
+        select d.id,  u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.dev_no, d.visual_inspection, d.functional_check, d.sp_checker, d.process_validator, 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_analyzer d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrAnalyzerList" parameterType="TPssrAnalyzer" resultMap="TPssrAnalyzerResult">

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

@@ -47,11 +47,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startupStatus" column="startup_status" />
         <result property="actualStatus" column="actual_status" />
         <result property="satisfy" column="satisfy" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrBlindVo">
         select d.blind_type,d.startup_status,d.actual_status,d.satisfy,d.INSTALL_STATUS,d.REMOVE_STATUS,d.id, d.sub_id, d.approve_id, d.unit_no, d.pid_no, d.pipeline_no, d.medium, d.blind_no, d.location, d.iso_type, d.tag_no, d.blind_size, d.pressure_rate, d.pressurized, d.figure, d.install_date, d.in_process, d.in_coordinator, d.in_contractor, d.in_confirm1, d.in_confirm2, d.removed_date, d.re_process, d.re_coordinator, d.re_contractor, d.re_confirm1, d.re_confirm2, 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_blind d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.IN_CONFIRM1
+      left join sys_user u2 on u2.user_id = d.IN_CONFIRM2
     </sql>
 
     <select id="selectTPssrBlindList" parameterType="TPssrBlind" resultMap="TPssrBlindResult">

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

@@ -30,11 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrCircuitVo">
-        select d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.pipeline_no, d.circuit_type, d.medium, d.position, d.circuit_size, d.right_status, d.current_status, d.confirm1, d.current_status_right, 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_circuit d
+        select d.id,u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.pid_no, d.pipeline_no, d.circuit_type, d.medium, d.position, d.circuit_size, d.right_status, d.current_status, d.confirm1, d.current_status_right, 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_circuit d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrCircuitList" parameterType="TPssrCircuit" resultMap="TPssrCircuitResult">

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

@@ -25,11 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrCleaningVo">
-        select d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.serial_number, d.check_content, d.check_result, 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_cleaning d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.dev_no, d.serial_number, d.check_content, d.check_result, 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_cleaning d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrCleaningList" parameterType="TPssrCleaning" resultMap="TPssrCleaningResult">

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

@@ -32,11 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
         <result property="examiner"    column="examiner"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrFrameVo">
-        select d.id, d.confirm1, d.confirm2, d.examiner, d.sub_id, d.approve_id, d.region, d.bracket_number, d.pipeline_number, d.dev_no, d.support_type, d.frame_pipe, d.frame_root, d.functional_part, d.connector, d.processing_result, d.confirm, 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_frame d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.examiner, d.sub_id, d.approve_id, d.region, d.bracket_number, d.pipeline_number, d.dev_no, d.support_type, d.frame_pipe, d.frame_root, d.functional_part, d.connector, d.processing_result, d.confirm, 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_frame d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrFrameList" parameterType="TPssrFrame" resultMap="TPssrFrameResult">

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

@@ -25,11 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrFranklinismVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.check_content, d.check_result, d.check_des, d.change_result, d.confirm, 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_franklinism d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.check_content, d.check_result, d.check_des, d.change_result, d.confirm, 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_franklinism d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrFranklinismList" parameterType="TPssrFranklinism" resultMap="TPssrFranklinismResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrGasdetectorVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.dev_no, d.visual_inspection, d.raincover_check, d.display_check, d.meter_checker, d.process_validator, 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_gasdetector d
+        select d.id,  u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.dev_no, d.visual_inspection, d.raincover_check, d.display_check, d.meter_checker, d.process_validator, 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_gasdetector d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrGasdetectorList" parameterType="TPssrGasdetector" resultMap="TPssrGasdetectorResult">

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

@@ -22,11 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrHygieneVo">
-        select d.id, d.sub_id, d.approve_id, d.check_content, d.check_result, 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_hygiene d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.check_content, d.check_result, 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_hygiene d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrHygieneList" parameterType="TPssrHygiene" resultMap="TPssrHygieneResult">

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

@@ -27,11 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrInstrumentCalibrationVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.dev_no, d.visual_inspection, d.installation_inspection, d.functional_check, d.meter_checker, d.process_validator, 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_instrument_calibration d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.dev_no, d.visual_inspection, d.installation_inspection, d.functional_check, d.meter_checker, d.process_validator, 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_instrument_calibration d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrInstrumentCalibrationList" parameterType="TPssrInstrumentCalibration" resultMap="TPssrInstrumentCalibrationResult">

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

@@ -25,11 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_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
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, 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
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrLaboratoryList" parameterType="TPssrLaboratory" resultMap="TPssrLaboratoryResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
         <result property="lightingType"    column="lighting_type"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrLightingVo">
-        select d.id, d.confirm1, d.confirm2, d.lighting_type, d.sub_id, d.approve_id, d.check_content, d.check_result, d.check_des, d.change_result, d.confirm, 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_lighting d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.lighting_type, d.sub_id, d.approve_id, d.check_content, d.check_result, d.check_des, d.change_result, d.confirm, 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_lighting d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrLightingList" parameterType="TPssrLighting" resultMap="TPssrLightingResult">

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

@@ -37,11 +37,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="medium" column="medium" />
         <result property="riskLevel" column="risk_level" />
         <result property="codeAccord" column="code_accord" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrLockVo">
-        select d.id,d.lock_post,d.lock_code,d.medium,d.risk_level,d.code_accord, d.sub_id, d.approve_id, d.unit, d.pid_no, d.position, d.lock_size, d.pid_status, d.unlocker, d.unlock_date, d.lockeder, d.locked_date, d.position_right, d.status_right, d.fastening, d.no_damage, d.confirm, 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_lock d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.lock_post,d.lock_code,d.medium,d.risk_level,d.code_accord, d.sub_id, d.approve_id, d.unit, d.pid_no, d.position, d.lock_size, d.pid_status, d.unlocker, d.unlock_date, d.lockeder, d.locked_date, d.position_right, d.status_right, d.fastening, d.no_damage, d.confirm, 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_lock d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.lockeder
+      left join sys_user u2 on u2.user_id = d.confirm
     </sql>
 
     <select id="selectTPssrLockList" parameterType="TPssrLock" resultMap="TPssrLockResult">

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

@@ -24,11 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrMaterialVo">
-        select d.id, d.sub_id, d.approve_id, d.utility_quantity, d.quantity, d.unit, d.note, 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_material d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.utility_quantity, d.quantity, d.unit, d.note, 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_material d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrMaterialList" parameterType="TPssrMaterial" resultMap="TPssrMaterialResult">

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

@@ -24,11 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrMaterialRawVo">
-        select d.id, d.sub_id, d.approve_id, d.raw_material, d.quantity, d.unit, d.note, 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_material_raw d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.raw_material, d.quantity, d.unit, d.note, 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_material_raw d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrMaterialRawList" parameterType="TPssrMaterialRaw" resultMap="TPssrMaterialRawResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrMeasureVo">
-        select d.approve_status, d.dev_no, d.dev_name, d.pro_measure, d.no_damage, d.locked, d.no_worn, d.confirm1, d.confirm2, d.confirmation_date, d.remarks, d.approve_id, d.id, d.sub_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_pssr_measure d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.approve_status, d.dev_no, d.dev_name, d.pro_measure, d.no_damage, d.locked, d.no_worn, d.confirm1, d.confirm2, d.confirmation_date, d.remarks, d.approve_id, d.id, d.sub_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_pssr_measure d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrMeasureList" parameterType="TPssrMeasure" resultMap="TPssrMeasureResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_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
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, 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
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrMocList" parameterType="TPssrMoc" resultMap="TPssrMocResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrMotorVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.dev_no, d.visual_inspection, d.functional_check, d.motor_checker, d.process_validator, 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_motor d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.unit, d.dev_no, d.visual_inspection, d.functional_check, d.motor_checker, d.process_validator, 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_motor d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrMotorList" parameterType="TPssrMotor" resultMap="TPssrMotorResult">

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

@@ -25,11 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrNitrogenVo">
-        select d.id, d.sub_id, d.approve_id, d.system_name, d.sampling_date, d.sample_name, d.oxygen, d.standard, 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_nitrogen d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.system_name, d.sampling_date, d.sample_name, d.oxygen, d.standard, 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_nitrogen d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrNitrogenList" parameterType="TPssrNitrogen" resultMap="TPssrNitrogenResult">

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

@@ -22,11 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
     </resultMap>
 
     <sql id="selectTPssrPatrolVo">
-        select d.id, d.sub_id, d.approve_id, d.plan_id, d.plan_type, d.plan_status, d.confirmer, d.confirm_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_patrol d
+        select d.id,  u1.nick_name confirm1_name, d.sub_id, d.approve_id, d.plan_id, d.plan_type, d.plan_status, d.confirmer, d.confirm_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_patrol d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER
     </sql>
 
     <select id="selectTPssrPatrolList" parameterType="TPssrPatrol" resultMap="TPssrPatrolResult">

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

@@ -26,11 +26,14 @@
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrPipeVo">
-        select d.id, d.sub_id, d.approve_id, d.unit, d.pipeline_name, d.pipeline_no, d.checked, d.require, d.validity, d.confirmer1, d.confirmer2, 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_pipe d
-                                                                                                                                                                                                                                                                                                             left join sys_dept s on s.dept_id = d.dept_id
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.pipeline_name, d.pipeline_no, d.checked, d.require, d.validity, d.confirmer1, d.confirmer2, 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_pipe d
+           left join sys_user u1 on u1.user_id = d.CONFIRMER1
+           left join sys_user u2 on u2.user_id = d.CONFIRMER2                                                                                                                                                                                                                                                                                               left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
     <select id="selectTPssrPipeList" parameterType="TPssrPipe" resultMap="TPssrPipeResult">

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

@@ -22,11 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrPowerVo">
-        select d.id, d.sub_id, d.approve_id, d.check_content, d.check_result, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.confirm1, d.confirm2 from t_pssr_power d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.check_content, d.check_result, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.confirm1, d.confirm2 from t_pssr_power d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrPowerList" parameterType="TPssrPower" resultMap="TPssrPowerResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trainDone" column="train_done" />
         <result property="confirm1" column="confirm1" />
         <result property="confirm2" column="confirm2" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrProgrammeVo">
-        select d.unit,d.write_done,d.check_done,d.train_done,d.confirm1,d.confirm2,d.id, d.sub_id, d.approve_id, d.training_id, d.file_url, d.file_name, 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_programme d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.unit,d.write_done,d.check_done,d.train_done,d.confirm1,d.confirm2,d.id, d.sub_id, d.approve_id, d.training_id, d.file_url, d.file_name, 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_programme d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrProgrammeList" parameterType="TPssrProgramme" resultMap="TPssrProgrammeResult">

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

@@ -22,11 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrProtectionVo">
-        select d.id, d.sub_id, d.approve_id, d.check_content, d.check_result, 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_protection d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.check_content, d.check_result, 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_protection d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrProtectionList" parameterType="TPssrProtection" resultMap="TPssrProtectionResult">

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

@@ -23,11 +23,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrPublicVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.check_content, d.check_result, d.confirm, 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_public d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.check_content, d.check_result, d.confirm, 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_public d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrPublicList" parameterType="TPssrPublic" resultMap="TPssrPublicResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrPumpCleaningVo">
-        select d.id, d.sub_id, d.approve_id, d.unit, d.position, d.pid_no, d.filter_number, d.cleaning, d.back_loading, d.confirmer1, d.confirmer2, 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_pump_cleaning d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.position, d.pid_no, d.filter_number, d.cleaning, d.back_loading, d.confirmer1, d.confirmer2, 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_pump_cleaning d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrPumpCleaningList" parameterType="TPssrPumpCleaning" resultMap="TPssrPumpCleaningResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrPumpFillVo">
-        select d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.lubricating_part, d.filling_complete, d.lubricating_leak, d.liquid_normal, d.confirmer1, d.confirmer2, 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_pump_fill d
+        select d.id,u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.dev_no, d.lubricating_part, d.filling_complete, d.lubricating_leak, d.liquid_normal, d.confirmer1, d.confirmer2, 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_pump_fill d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrPumpFillList" parameterType="TPssrPumpFill" resultMap="TPssrPumpFillResult">

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

@@ -24,11 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrPumpOverhaulVo">
-        select d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.back_loading, d.overhaul_done, d.confirmer1, d.confirmer2, 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_pump_overhaul d
+        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.dev_no, d.back_loading, d.overhaul_done, d.confirmer1, d.confirmer2, 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_pump_overhaul d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrPumpOverhaulList" parameterType="TPssrPumpOverhaul" resultMap="TPssrPumpOverhaulResult">

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

@@ -30,11 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
         <result property="putUse" column="put_use" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrSafetyBleedVo">
-        select d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.dev_no, d.verify, d.in_validity, d.install_location, d.install_accuracy, d.set_pressure, d.uniform_pressure, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_bleed d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.dev_no, d.verify, d.in_validity, d.install_location, d.install_accuracy, d.set_pressure, d.uniform_pressure, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_bleed d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrSafetyBleedList" parameterType="TPssrSafetyBleed" resultMap="TPssrSafetyBleedResult">

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

@@ -30,11 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
         <result property="putUse" column="put_use" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrSafetyBreathVo">
-        select d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.dev_no, d.verify, d.in_validity, d.install_location, d.install_accuracy, d.set_pressure, d.uniform_pressure, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_breath d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.dev_no, d.verify, d.in_validity, d.install_location, d.install_accuracy, d.set_pressure, d.uniform_pressure, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_breath d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrSafetyBreathList" parameterType="TPssrSafetyBreath" resultMap="TPssrSafetyBreathResult">

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

@@ -30,11 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
         <result property="putUse" column="put_use" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrSafetyBrustVo">
-        select d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.safety_dev, d.install_location, d.install_accuracy, d.right_direction, d.set_pressure, d.uniform_pressure, d.is_0kpa, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_brust d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.safety_dev, d.install_location, d.install_accuracy, d.right_direction, d.set_pressure, d.uniform_pressure, d.is_0kpa, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_brust d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrSafetyBrustList" parameterType="TPssrSafetyBrust" resultMap="TPssrSafetyBrustResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
         <result property="putUse" column="put_use" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrSafetyFlamearresterVo">
-        select d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.install_location, d.uniform_flow, d.corrosion, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_flamearrester d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.dev_no, d.install_location, d.uniform_flow, d.corrosion, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_flamearrester d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrSafetyFlamearresterList" parameterType="TPssrSafetyFlamearrester" resultMap="TPssrSafetyFlamearresterResult">

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

@@ -31,11 +31,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
         <result property="putUse" column="put_use" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrSafetyValveVo">
-        select d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.dev_no, d.safety_dev, d.verify, d.in_validity, d.install_location, d.install_accuracy, d.set_pressure, d.uniform_pressure, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_valve d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.put_use,d.id, d.sub_id, d.approve_id, d.unit, d.pid_no, d.dev_no, d.safety_dev, d.verify, d.in_validity, d.install_location, d.install_accuracy, d.set_pressure, d.uniform_pressure, d.confirmer1, d.confirmer2, d.confirmation_time, 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_safety_valve d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrSafetyValveList" parameterType="TPssrSafetyValve" resultMap="TPssrSafetyValveResult">

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

@@ -24,11 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1"    column="confirm1"    />
         <result property="confirm2"    column="confirm2"    />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrTorchvocVo">
-        select d.id, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.torchvoc_type, d.content, d.procedure_status, d.confirm, 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_torchvoc d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.sub_id, d.approve_id, d.torchvoc_type, d.content, d.procedure_status, d.confirm, 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_torchvoc d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRM1
+      left join sys_user u2 on u2.user_id = d.CONFIRM2
     </sql>
 
     <select id="selectTPssrTorchvocList" parameterType="TPssrTorchvoc" resultMap="TPssrTorchvocResult">

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

@@ -26,11 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName" column="dept_name" />
+        <result property="confirm1Name"    column="confirm1_name"    />
+        <result property="confirm2Name"    column="confirm2_name"    />
     </resultMap>
 
     <sql id="selectTPssrVesselVo">
-        select d.approve_status, d.unit, d.vessel_name, d.vessel_no, d.checked, d.require, d.validity, d.confirmer1, d.confirmer2, d.confirmation_date, d.remarks, d.sub_id, d.id, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_pssr_vessel d
+        select u1.nick_name confirm1_name, u2.nick_name confirm2_name,d.approve_status, d.unit, d.vessel_name, d.vessel_no, d.checked, d.require, d.validity, d.confirmer1, d.confirmer2, d.confirmation_date, d.remarks, d.sub_id, d.id, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_pssr_vessel d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join sys_user u1 on u1.user_id = d.CONFIRMER1
+      left join sys_user u2 on u2.user_id = d.CONFIRMER2
     </sql>
 
     <select id="selectTPssrVesselList" parameterType="TPssrVessel" resultMap="TPssrVesselResult">

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

@@ -97,11 +97,7 @@
                     :show-type="getTagType(scope.row.approveStatus)"/>
         </template>
       </el-table-column>
-      <el-table-column label="确认人" align="center" prop="confirm" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ userFormat(scope.row.confirm) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="确认人" align="center" prop="confirmName" :show-overflow-tooltip="true"/>
       <el-table-column label="确认时间" align="center" prop="confirmationDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>

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

@@ -63,6 +63,7 @@
     <el-table v-loading="loading" :data="subcontentList" @selection-change="handleSelectionChange"
               :height="ch" border>
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="部门" align="center" prop="deptUnit" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="项目" align="center" prop="item" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true" width="700"/>