PSSR:

-添加检修项目创建流程

master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -161,6 +161,10 @@ public class ActivitiConfig {
         Resource spec17 = resourceLoader.getResource("classpath:/processes/bccnew/dsdtNoPass.bpmn"); //加载流程图资源文件
         deploymentBuilder17.enableDuplicateFiltering().addInputStream(spec17.getFilename(), spec17.getInputStream()).name("导师带徒学员成绩不合格审批").deploy();//按流程id部署
 
+        DeploymentBuilder pssr1Db = repositoryService().createDeployment();
+        Resource pssr1 = resourceLoader.getResource("classpath:/processes/pssr/pssr1confirm.bpmn"); //加载流程图资源文件
+        pssr1Db.enableDuplicateFiltering().addInputStream(pssr1.getFilename(), pssr1.getInputStream()).name("单确认人审批流程").deploy();//按流程id部署
+
     }
 }
 

master/src/main/java/com/ruoyi/project/approve/controller/TApproveController.java

@@ -32,6 +32,8 @@ import com.ruoyi.project.listener.RecorderTaskCreateListener;
 import com.ruoyi.project.listener.VerificationTaskCreateListener;
 import com.ruoyi.project.production.domain.TSaiApply;
 import com.ruoyi.project.production.service.ITSaiApplyService;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.reliability.domain.TKekaoApprove;
 import com.ruoyi.project.reliability.service.ITKekaoApproveService;
 import com.ruoyi.project.sems.domain.TApprove;
@@ -134,6 +136,8 @@ public class TApproveController extends BaseController {
     private ITSpecWeekcheckService tSpecWeekcheckService;
     @Autowired
     private ITTsApproveService tTsApproveService;
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
 
 
 
@@ -249,6 +253,10 @@ public class TApproveController extends BaseController {
                         TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApNo(t.getApNo());
                         devProcess.setApproveObject(t);
+                    } else if (pi.getProcessDefinitionName().equals("PSSR单确认人确认流程")) {
+                        TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApNo(t.getApNo());
+                        devProcess.setApproveObject(t);
                     }
                 } catch (Exception e) {
                     logger.error(e.toString());

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -33,6 +33,8 @@ import com.ruoyi.project.listener.RecorderTaskCreateListener;
 import com.ruoyi.project.listener.VerificationTaskCreateListener;
 import com.ruoyi.project.production.domain.TSaiApply;
 import com.ruoyi.project.production.service.ITSaiApplyService;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.reliability.domain.TKekaoApprove;
 import com.ruoyi.project.reliability.service.ITKekaoApproveService;
 import com.ruoyi.project.sems.domain.TApprove;
@@ -134,6 +136,8 @@ public class TApproveDangerController extends BaseController {
     private ITSpecWeekcheckService tSpecWeekcheckService;
     @Autowired
     private ITTsApproveService tTsApproveService;
+    @Autowired
+    private ITPssrApproveService tPssrApproveService;
 
     /**
      * 任务申请
@@ -335,6 +339,10 @@ public class TApproveDangerController extends BaseController {
                         TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApNo(t.getApNo());
                         devProcess.setApproveObject(t);
+                    } else if (pi.getProcessDefinitionName().equals("PSSR单确认人确认流程")) {
+                        TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApNo(t.getApNo());
+                        devProcess.setApproveObject(t);
                     }
                 } catch (Exception e) {
                     logger.error(e.toString());
@@ -482,6 +490,10 @@ public class TApproveDangerController extends BaseController {
                     TTsApprove t = tTsApproveService.selectTTsApproveById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setApNo(t.getApNo());
                     devTask.setApproveObject(t);
+                } else if (pi.getProcessDefinitionName().equals("PSSR单确认人确认流程")) {
+                    TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
+                    devTask.setApNo(t.getApNo());
+                    devTask.setApproveObject(t);
                 }
                 list.add(devTask);
             }
@@ -619,6 +631,12 @@ public class TApproveDangerController extends BaseController {
                     devProcess.setApNo(t.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(t);
+                } else if (pi.getProcessDefinitionName().equals("PSSR单确认人确认流程")) {
+                    TPssrApprove t = tPssrApproveService.selectTPssrApproveById(Long.parseLong(pi.getBusinessKey()));
+                    SysUser user = sysUserService.selectUserById(Long.valueOf(t.getCreaterCode()));
+                    devProcess.setApName(user.getNickName());
+                    devProcess.setApNo(t.getApNo());
+                    devProcess.setApproveObject(t);
                 } else {
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approveDanger.getRecorderId());

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

@@ -82,6 +82,7 @@ public class TPssrAboveallController extends BaseController {
                 subcontent.setRegion(tPssrAboveall.getRegion());
                 subcontent.setUnit(tPssrAboveall.getUnit());
                 subcontent.setUnitDes(tPssrAboveall.getUnitDes());
+                subcontent.setApproveStatus(0L);
                 subcontent.setCreatedate(new Date());
                 subcontent.setCreaterCode(getUserId().toString());
                 tPssrSubcontentService.insertTPssrSubcontent(subcontent);

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

@@ -134,6 +134,8 @@ public class TPssrApproveController extends BaseController {
     @PostMapping("/doPssrApprove/{subId}")
     public AjaxResult doApprove(@PathVariable Long subId) {
         TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(subId);
+        tPssrSubcontent.setApproveStatus(1L);
+        tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
         switch (tPssrSubcontent.getSerialNumber()) {
             case "01":
                 do01Approve(tPssrSubcontent);

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 气密对象 t_pssr_airtight
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrAirtight extends BaseEntity
 {
@@ -98,6 +98,10 @@ public class TPssrAirtight extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -278,6 +282,15 @@ public class TPssrAirtight extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -302,6 +315,7 @@ public class TPssrAirtight extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 报警联锁值确认对象 t_pssr_alarm
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrAlarm extends BaseEntity
 {
@@ -65,6 +65,10 @@ public class TPssrAlarm extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -173,6 +177,15 @@ public class TPssrAlarm extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -189,6 +202,7 @@ public class TPssrAlarm extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 在线分析仪对象 t_pssr_analyzer
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrAnalyzer extends BaseEntity
 {
@@ -86,6 +86,10 @@ public class TPssrAnalyzer extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -239,6 +243,15 @@ public class TPssrAnalyzer extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -260,6 +273,7 @@ public class TPssrAnalyzer extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * pssr审批管理对象 t_pssr_approve
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrApprove extends BaseEntity
 {

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 盲板对象 t_pssr_blind
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrBlind extends BaseEntity
 {
@@ -155,6 +155,10 @@ public class TPssrBlind extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -461,6 +465,15 @@ public class TPssrBlind extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -499,6 +512,7 @@ public class TPssrBlind extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 短接对象 t_pssr_circuit
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrCircuit extends BaseEntity
 {
@@ -110,6 +110,10 @@ public class TPssrCircuit extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -317,6 +321,15 @@ public class TPssrCircuit extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -344,6 +357,7 @@ public class TPssrCircuit extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 设备清洁对象 t_pssr_cleaning
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrCleaning extends BaseEntity
 {
@@ -90,6 +90,10 @@ public class TPssrCleaning extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -252,6 +256,15 @@ public class TPssrCleaning extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -274,6 +287,7 @@ public class TPssrCleaning extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 开车条件确认模板对象 t_pssr_content_model
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrContentModel extends BaseEntity
 {
@@ -65,6 +65,10 @@ public class TPssrContentModel extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -173,6 +177,15 @@ public class TPssrContentModel extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -189,6 +202,7 @@ public class TPssrContentModel extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 支（吊）架对象 t_pssr_frame
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrFrame extends BaseEntity
 {
@@ -106,6 +106,10 @@ public class TPssrFrame extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -304,6 +308,15 @@ public class TPssrFrame extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -330,6 +343,7 @@ public class TPssrFrame extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 静电接地，跨接对象 t_pssr_franklinism
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrFranklinism extends BaseEntity
 {
@@ -82,6 +82,10 @@ public class TPssrFranklinism extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +230,15 @@ public class TPssrFranklinism extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -246,6 +259,7 @@ public class TPssrFranklinism extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 气体检测器对象 t_pssr_gasdetector
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrGasdetector extends BaseEntity
 {
@@ -86,6 +86,10 @@ public class TPssrGasdetector extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -239,6 +243,15 @@ public class TPssrGasdetector extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -260,6 +273,7 @@ public class TPssrGasdetector extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 现场卫生对象 t_pssr_hygiene
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrHygiene extends BaseEntity
 {
@@ -74,6 +74,10 @@ public class TPssrHygiene extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -200,6 +204,15 @@ public class TPssrHygiene extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -218,6 +231,7 @@ public class TPssrHygiene extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 仪校验对象 t_pssr_instrument_calibration
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrInstrumentCalibration extends BaseEntity
 {
@@ -90,6 +90,10 @@ public class TPssrInstrumentCalibration extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -252,6 +256,15 @@ public class TPssrInstrumentCalibration extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -274,6 +287,7 @@ public class TPssrInstrumentCalibration extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 仪联锁测试对象 t_pssr_instrument_test
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrInstrumentTest extends BaseEntity
 {
@@ -65,6 +65,10 @@ public class TPssrInstrumentTest extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -173,6 +177,15 @@ public class TPssrInstrumentTest extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -189,6 +202,7 @@ public class TPssrInstrumentTest extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 照明对象 t_pssr_lighting
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrLighting extends BaseEntity
 {
@@ -82,6 +82,10 @@ public class TPssrLighting extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +230,15 @@ public class TPssrLighting extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -246,6 +259,7 @@ public class TPssrLighting extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 锁开锁关阀门状态对象 t_pssr_lock
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrLock extends BaseEntity
 {
@@ -120,6 +120,10 @@ public class TPssrLock extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -345,6 +349,15 @@ public class TPssrLock extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -374,6 +387,7 @@ public class TPssrLock extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 原料对象 t_pssr_material
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrMaterial extends BaseEntity
 {
@@ -82,6 +82,10 @@ public class TPssrMaterial extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +230,15 @@ public class TPssrMaterial extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -246,6 +259,7 @@ public class TPssrMaterial extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 电机设备对象 t_pssr_motor
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrMotor extends BaseEntity
 {
@@ -86,6 +86,10 @@ public class TPssrMotor extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -239,6 +243,15 @@ public class TPssrMotor extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -260,6 +273,7 @@ public class TPssrMotor extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 系统氮气置换对象 t_pssr_nitrogen
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrNitrogen extends BaseEntity
 {
@@ -90,6 +90,10 @@ public class TPssrNitrogen extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -252,6 +256,15 @@ public class TPssrNitrogen extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -274,6 +287,7 @@ public class TPssrNitrogen extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 检修项目-换热器对象 t_pssr_overhaul_exchanger
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrOverhaulExchanger extends BaseEntity
 {
@@ -82,6 +82,10 @@ public class TPssrOverhaulExchanger extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +230,15 @@ public class TPssrOverhaulExchanger extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -246,6 +259,7 @@ public class TPssrOverhaulExchanger extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 检修项目-过滤器对象 t_pssr_overhaul_filter
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrOverhaulFilter extends BaseEntity
 {
@@ -94,6 +94,10 @@ public class TPssrOverhaulFilter extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -265,6 +269,15 @@ public class TPssrOverhaulFilter extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -288,6 +301,7 @@ public class TPssrOverhaulFilter extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 检修项目-管线对象 t_pssr_overhaul_pipe
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrOverhaulPipe extends BaseEntity
 {
@@ -78,6 +78,10 @@ public class TPssrOverhaulPipe extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -213,6 +217,15 @@ public class TPssrOverhaulPipe extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -232,6 +245,7 @@ public class TPssrOverhaulPipe extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 检修项目-泵对象 t_pssr_overhaul_pump
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrOverhaulPump extends BaseEntity
 {
@@ -82,6 +82,10 @@ public class TPssrOverhaulPump extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +230,15 @@ public class TPssrOverhaulPump extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -246,6 +259,7 @@ public class TPssrOverhaulPump extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 检修项目-塔罐对象 t_pssr_overhaul_tower
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrOverhaulTower extends BaseEntity
 {
@@ -82,6 +82,10 @@ public class TPssrOverhaulTower extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +230,15 @@ public class TPssrOverhaulTower extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -246,6 +259,7 @@ public class TPssrOverhaulTower extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 检修项目-阀门对象 t_pssr_overhaul_valve
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrOverhaulValve extends BaseEntity
 {
@@ -126,6 +126,10 @@ public class TPssrOverhaulValve extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -369,6 +373,15 @@ public class TPssrOverhaulValve extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -386,7 +399,7 @@ public class TPssrOverhaulValve extends BaseEntity
             .append("vavleInfoDes", getVavleInfoDes())
             .append("type", getType())
             .append("pipeSize", getPipeSize())
-            .append("class", getClass())
+            .append("valveClass", getValveClass())
             .append("quantityRequired", getQuantityRequired())
             .append("faultCommon", getFaultCommon())
             .append("medium", getMedium())
@@ -400,6 +413,7 @@ public class TPssrOverhaulValve extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 巡检对象 t_pssr_patrol
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrPatrol extends BaseEntity
 {
@@ -78,6 +78,10 @@ public class TPssrPatrol extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -213,6 +217,15 @@ public class TPssrPatrol extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -232,6 +245,7 @@ public class TPssrPatrol extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 管道对象 t_pssr_pipe
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrPipe extends BaseEntity
 {
@@ -94,6 +94,10 @@ public class TPssrPipe extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -265,29 +269,39 @@ public class TPssrPipe extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("subId", getSubId())
-            .append("approveId", getApproveId())
-            .append("unit", getUnit())
-            .append("pipelineName", getPipelineName())
-            .append("pipelineNo", getPipelineNo())
-            .append("checked", getChecked())
-            .append("require", getRequire())
-            .append("validity", getValidity())
-            .append("confirmer1", getConfirmer1())
-            .append("confirmer2", getConfirmer2())
-            .append("confirmationDate", getConfirmationDate())
-            .append("delFlag", getDelFlag())
-            .append("createrCode", getCreaterCode())
-            .append("createdate", getCreatedate())
-            .append("updaterCode", getUpdaterCode())
-            .append("updatedate", getUpdatedate())
-            .append("deptId", getDeptId())
-            .append("remarks", getRemarks())
-            .toString();
+                .append("id", getId())
+                .append("subId", getSubId())
+                .append("approveId", getApproveId())
+                .append("unit", getUnit())
+                .append("pipelineName", getPipelineName())
+                .append("pipelineNo", getPipelineNo())
+                .append("checked", getChecked())
+                .append("require", getRequire())
+                .append("validity", getValidity())
+                .append("confirmer1", getConfirmer1())
+                .append("confirmer2", getConfirmer2())
+                .append("confirmationDate", getConfirmationDate())
+                .append("delFlag", getDelFlag())
+                .append("createrCode", getCreaterCode())
+                .append("createdate", getCreatedate())
+                .append("updaterCode", getUpdaterCode())
+                .append("updatedate", getUpdatedate())
+                .append("deptId", getDeptId())
+                .append("remarks", getRemarks())
+                .append("approveStatus", getApproveStatus())
+                .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 开工方案对象 t_pssr_programme
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrProgramme extends BaseEntity
 {
@@ -69,6 +69,10 @@ public class TPssrProgramme extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -186,6 +190,15 @@ public class TPssrProgramme extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -203,6 +216,7 @@ public class TPssrProgramme extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 人身防护对象 t_pssr_protection
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrProtection extends BaseEntity
 {
@@ -78,6 +78,10 @@ public class TPssrProtection extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -213,6 +217,15 @@ public class TPssrProtection extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -232,6 +245,7 @@ public class TPssrProtection extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 公用工程对象 t_pssr_public
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrPublic extends BaseEntity
 {
@@ -74,6 +74,10 @@ public class TPssrPublic extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -200,6 +204,15 @@ public class TPssrPublic extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -218,6 +231,7 @@ public class TPssrPublic extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 机泵过滤器清理工作清单对象 t_pssr_pump_cleaning
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrPumpCleaning extends BaseEntity
 {
@@ -94,6 +94,10 @@ public class TPssrPumpCleaning extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -265,6 +269,15 @@ public class TPssrPumpCleaning extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -288,6 +301,7 @@ public class TPssrPumpCleaning extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 机泵润滑油加注确认清单对象 t_pssr_pump_fill
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrPumpFill extends BaseEntity
 {
@@ -94,6 +94,10 @@ public class TPssrPumpFill extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -265,6 +269,15 @@ public class TPssrPumpFill extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -288,6 +301,7 @@ public class TPssrPumpFill extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 机泵检修完成确认清单对象 t_pssr_pump_overhaul
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrPumpOverhaul extends BaseEntity
 {
@@ -86,6 +86,10 @@ public class TPssrPumpOverhaul extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -239,6 +243,15 @@ public class TPssrPumpOverhaul extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -260,6 +273,7 @@ public class TPssrPumpOverhaul extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * pssr区域管理对象 t_pssr_region
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrRegion extends BaseEntity
 {

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 安全设施-紧急泄放阀对象 t_pssr_safety_bleed
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrSafetyBleed extends BaseEntity
 {
@@ -105,6 +105,10 @@ public class TPssrSafetyBleed extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -303,6 +307,15 @@ public class TPssrSafetyBleed extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -329,6 +342,7 @@ public class TPssrSafetyBleed extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 安全设施-呼吸阀对象 t_pssr_safety_breath
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrSafetyBreath extends BaseEntity
 {
@@ -105,6 +105,10 @@ public class TPssrSafetyBreath extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -303,6 +307,15 @@ public class TPssrSafetyBreath extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -329,6 +342,7 @@ public class TPssrSafetyBreath extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 安全设施-爆破片对象 t_pssr_safety_brust
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrSafetyBrust extends BaseEntity
 {
@@ -105,6 +105,10 @@ public class TPssrSafetyBrust extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -303,6 +307,15 @@ public class TPssrSafetyBrust extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -329,6 +342,7 @@ public class TPssrSafetyBrust extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 安全设施-阻火器对象 t_pssr_safety_flamearrester
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrSafetyFlamearrester extends BaseEntity
 {
@@ -89,6 +89,10 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -251,6 +255,15 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -273,6 +286,7 @@ public class TPssrSafetyFlamearrester extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 安全设施-安全阀对象 t_pssr_safety_valve
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrSafetyValve extends BaseEntity
 {
@@ -109,6 +109,10 @@ public class TPssrSafetyValve extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -316,6 +320,15 @@ public class TPssrSafetyValve extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -343,6 +356,7 @@ public class TPssrSafetyValve extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 开车条件确认对象 t_pssr_subcontent
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrSubcontent extends BaseEntity
 {
@@ -28,15 +28,6 @@ public class TPssrSubcontent extends BaseEntity
     @Excel(name = "主表id")
     private Long aboveallId;
 
-    /**区域*/
-    private String region;
-
-    /**单元*/
-    private String unit;
-
-    /**单元说明*/
-    private String unitDes;
-
     /** 序号 */
     @Excel(name = "序号")
     private String serialNumber;
@@ -53,6 +44,8 @@ public class TPssrSubcontent extends BaseEntity
     @Excel(name = "确认人")
     private String confirm;
 
+    private String confirmName;
+
     /** 确认时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -87,30 +80,30 @@ public class TPssrSubcontent extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    private Long status;
+    /** 单元描述 */
+    @Excel(name = "单元描述")
+    private String unitDes;
 
-    public String getRegion() {
-        return region;
-    }
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
 
-    public void setRegion(String region) {
-        this.region = region;
-    }
+    /** 区域 */
+    @Excel(name = "区域")
+    private String region;
 
-    public String getUnit() {
-        return unit;
-    }
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
 
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
+    private Long status;
 
-    public String getUnitDes() {
-        return unitDes;
+    public String getConfirmName() {
+        return confirmName;
     }
 
-    public void setUnitDes(String unitDes) {
-        this.unitDes = unitDes;
+    public void setConfirmName(String confirmName) {
+        this.confirmName = confirmName;
     }
 
     public Long getStatus() {
@@ -256,6 +249,42 @@ public class TPssrSubcontent extends BaseEntity
     {
         return remarks;
     }
+    public void setUnitDes(String unitDes)
+    {
+        this.unitDes = unitDes;
+    }
+
+    public String getUnitDes()
+    {
+        return unitDes;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setRegion(String region)
+    {
+        this.region = region;
+    }
+
+    public String getRegion()
+    {
+        return region;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -275,6 +304,10 @@ public class TPssrSubcontent extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("unitDes", getUnitDes())
+            .append("unit", getUnit())
+            .append("region", getRegion())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 火炬，VOC系统对象 t_pssr_torchvoc
  *
  * @author ssy
- * @date 2024-09-18
+ * @date 2024-09-23
  */
 public class TPssrTorchvoc extends BaseEntity
 {
@@ -78,6 +78,10 @@ public class TPssrTorchvoc extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private Long approveStatus;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -213,6 +217,15 @@ public class TPssrTorchvoc extends BaseEntity
     {
         return remarks;
     }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
 
     @Override
     public String toString() {
@@ -232,6 +245,7 @@ public class TPssrTorchvoc extends BaseEntity
             .append("updatedate", getUpdatedate())
             .append("deptId", getDeptId())
             .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
             .toString();
     }
 }

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

@@ -10,8 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="region"    column="region"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="unit"    column="unit"    />
-        <result property="unitDes"    column="unit_des"    />
-        <result property="includePublic"    column="include_public"    />
         <result property="confirm"    column="confirm"    />
         <result property="confirmationDate"    column="confirmation_date"    />
         <result property="delFlag"    column="del_flag"    />
@@ -21,11 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="includePublic"    column="include_public"    />
+        <result property="unitDes"    column="unit_des"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrAboveallVo">
-        select d.id, d.approve_id, d.include_public, d.region, d.approve_status, d.unit,d.unit_des, d.confirm, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_aboveall d
+        select 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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -36,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="region != null  and region != ''"> and region = #{region}</if>
             <if test="approveStatus != null  and approveStatus != ''"> and approve_status = #{approveStatus}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="includePublic != null  and includePublic != ''"> and include_public = #{includePublic}</if>
             <if test="confirm != null  and confirm != ''"> and confirm = #{confirm}</if>
             <if test="confirmationDate != null "> and confirmation_date = #{confirmationDate}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
@@ -45,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="includePublic != null "> and include_public = #{includePublic}</if>
+            <if test="unitDes != null  and unitDes != ''"> and unit_des = #{unitDes}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -64,11 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="approveId != null">approve_id,</if>
-            <if test="includePublic != null">include_public,</if>
             <if test="region != null">region,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="unit != null">unit,</if>
-            <if test="unitDes != null">unit_des,</if>
             <if test="confirm != null">confirm,</if>
             <if test="confirmationDate != null">confirmation_date,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -78,15 +77,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="includePublic != null">include_public,</if>
+            <if test="unitDes != null">unit_des,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="approveId != null">#{approveId},</if>
-            <if test="includePublic != null">#{includePublic},</if>
             <if test="region != null">#{region},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="unit != null">#{unit},</if>
-            <if test="unitDes != null">#{unitDes},</if>
             <if test="confirm != null">#{confirm},</if>
             <if test="confirmationDate != null">#{confirmationDate},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -96,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="includePublic != null">#{includePublic},</if>
+            <if test="unitDes != null">#{unitDes},</if>
          </trim>
     </insert>
 
@@ -104,10 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="approveId != null">approve_id = #{approveId},</if>
             <if test="region != null">region = #{region},</if>
-            <if test="includePublic != null">include_public = #{includePublic},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="unit != null">unit = #{unit},</if>
-            <if test="unitDes != null">unit_des = #{unitDes},</if>
             <if test="confirm != null">confirm = #{confirm},</if>
             <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -117,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="includePublic != null">include_public = #{includePublic},</if>
+            <if test="unitDes != null">unit_des = #{unitDes},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -25,11 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrAirtightVo">
-        select d.id, 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 ,s.dept_name from t_pssr_airtight d
+        select d.id, 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
     </sql>
 
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -113,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -138,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -17,11 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrAlarmVo">
-        select d.id, d.sub_id, d.approve_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 ,s.dept_name from t_pssr_alarm d
+        select d.id, d.sub_id, d.approve_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_alarm d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrAnalyzerVo">
-        select d.id, 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 ,s.dept_name from t_pssr_analyzer d
+        select d.id, 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
     </sql>
 
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -39,11 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrBlindVo">
-        select 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 ,s.dept_name from t_pssr_blind d
+        select 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
     </sql>
 
@@ -82,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -169,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -208,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -28,11 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_circuit d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -125,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -153,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -23,11 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_cleaning d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -17,11 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrContentModelVo">
-        select d.id, d.status, d.serial_number, d.item, d.content, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_content_model d
+        select d.id, d.status, d.serial_number, d.item, d.content, 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_content_model d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -27,11 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrFrameVo">
-        select d.id, 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 ,s.dept_name from t_pssr_frame d
+        select d.id, 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
     </sql>
 
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -148,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrFranklinismVo">
-        select d.id, 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 ,s.dept_name from t_pssr_franklinism d
+        select d.id, 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
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -97,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrGasdetectorVo">
-        select d.id, 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 ,s.dept_name from t_pssr_gasdetector d
+        select d.id, 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
     </sql>
 
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrHygieneVo">
-        select d.id, 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 ,s.dept_name from t_pssr_hygiene d
+        select d.id, 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_hygiene d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -73,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -108,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -23,11 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrInstrumentCalibrationVo">
-        select d.id, 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 ,s.dept_name from t_pssr_instrument_calibration d
+        select d.id, 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
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -63,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         
     <insert id="insertTPssrInstrumentCalibration" parameterType="TPssrInstrumentCalibration">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
-            SELECT seq_t_pssr_instrument_calibra.NEXTVAL as id FROM DUAL
+            SELECT seq_t_pssr_instrument_calibration.NEXTVAL as id FROM DUAL
         </selectKey>
         insert into t_pssr_instrument_calibration
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -17,11 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrInstrumentTestVo">
-        select d.id, d.sub_id, d.approve_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 ,s.dept_name from t_pssr_instrument_test d
+        select d.id, d.sub_id, d.approve_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_instrument_test d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrLightingVo">
-        select d.id, 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 ,s.dept_name from t_pssr_lighting d
+        select d.id, 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
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -97,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -30,11 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrLockVo">
-        select d.id, 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 ,s.dept_name from t_pssr_lock d
+        select d.id, 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
     </sql>
 
@@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -106,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -163,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrMaterialVo">
-        select d.id, d.sub_id, d.approve_id, d.utility_quantity, d.quantity, d.unit, d.note, d.confirm, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_material d
+        select d.id, d.sub_id, d.approve_id, d.utility_quantity, d.quantity, d.unit, d.note, 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_material d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -97,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrMotorVo">
-        select d.id, 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 ,s.dept_name from t_pssr_motor d
+        select d.id, 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
     </sql>
 
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -23,11 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_nitrogen d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulExchangerVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_overhaul_exchanger d
+        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, 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_overhaul_exchanger d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -58,16 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectAllConfirmedPersonBySubId" parameterType="Long" resultMap="TPssrOverhaulExchangerResult">
-        SELECT LISTAGG(CONFIRMED_PERSON ,  ',') WITHIN GROUP (ORDER BY CONFIRMED_PERSON)AS result
+        SELECT LISTAGG(CONFIRMED_PERSON ,  ',') WITHIN GROUP (ORDER BY CONFIRMED_PERSON)AS CONFIRMED_PERSON
         FROM (
-                 select CONFIRMED_PERSON from T_PSSR_OVERHAUL_EXCHANGER where #{subId} union
-                 select RESP_PERSON  from T_PSSR_OVERHAUL_FILTER  where #{subId} union
-                 select CONFIRMER from T_PSSR_OVERHAUL_PIPE  where #{subId} union
-                 select CONFIRMED_PERSON from T_PSSR_OVERHAUL_PUMP  where #{subId} union
-                 select CONFIRMED_PERSON from  T_PSSR_OVERHAUL_TOWER  where #{subId} union
-                 select IDENTIFYING_PERSON  from T_PSSR_OVERHAUL_VALVE where #{subId})
+                 select CONFIRMED_PERSON from T_PSSR_OVERHAUL_EXCHANGER where sub_id= #{subId} union
+                 select RESP_PERSON  from T_PSSR_OVERHAUL_FILTER  where sub_id= #{subId} union
+                 select CONFIRMER from T_PSSR_OVERHAUL_PIPE  where sub_id= #{subId} union
+                 select CONFIRMED_PERSON from T_PSSR_OVERHAUL_PUMP  where sub_id= #{subId} union
+                 select CONFIRMED_PERSON from  T_PSSR_OVERHAUL_TOWER  where sub_id= #{subId} union
+                 select IDENTIFYING_PERSON  from T_PSSR_OVERHAUL_VALVE where sub_id= #{subId})
     </select>
-        
+
     <insert id="insertTPssrOverhaulExchanger" parameterType="TPssrOverhaulExchanger">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_exchanger.NEXTVAL as id FROM DUAL
@@ -90,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -108,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -129,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -24,11 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulFilterVo">
-        select d.id, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_overhaul_filter d
+        select d.id, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, 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_overhaul_filter d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -133,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulPipeVo">
-        select d.id, d.sub_id, d.approve_id, d.pipeline_no, d.change_reason, d.pid_no, d.confirmer, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_overhaul_pipe d
+        select d.id, d.sub_id, d.approve_id, d.pipeline_no, d.change_reason, d.pid_no, d.confirmer, 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_overhaul_pipe d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulPumpVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_overhaul_pump d
+        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, 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_overhaul_pump d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -97,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulTowerVo">
-        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_overhaul_tower d
+        select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, 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_overhaul_tower d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -97,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -32,11 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulValveVo">
-        select d.id, d.sub_id, d.approve_id, d.change_type, d.connection_form, d.itp, d.construction_team, d.item, d.plant, d.valve_position, d.vavle_info_des, d.type, d.pipe_size, d.valve_class, d.quantity_required, d.fault_common, d.medium, d.pid_no, d.done_date, d.identifying_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_overhaul_valve d
+        select d.id, d.sub_id, d.approve_id, d.change_type, d.connection_form, d.itp, d.construction_team, d.item, d.plant, d.valve_position, d.vavle_info_des, d.type, d.pipe_size, d.valve_class, d.quantity_required, d.fault_common, d.medium, d.pid_no, d.done_date, d.identifying_person, 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_overhaul_valve d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -141,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -173,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_patrol d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPipeMapper">
-    
+
     <resultMap type="TPssrPipe" id="TPssrPipeResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -24,17 +24,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_pipe d
-      left join sys_dept s on s.dept_id = d.dept_id
+        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
     </sql>
 
     <select id="selectTPssrPipeList" parameterType="TPssrPipe" resultMap="TPssrPipeResult">
         <include refid="selectTPssrPipeVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -52,17 +53,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPipeById" parameterType="Long" resultMap="TPssrPipeResult">
         <include refid="selectTPssrPipeVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrPipe" parameterType="TPssrPipe">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_pipe.NEXTVAL as id FROM DUAL
@@ -88,7 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
-         </trim>
+            <if test="approveStatus != null">approve_status,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="subId != null">#{subId},</if>
@@ -109,7 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
-         </trim>
+            <if test="approveStatus != null">#{approveStatus},</if>
+        </trim>
     </insert>
 
     <update id="updateTPssrPipe" parameterType="TPssrPipe">
@@ -133,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>
@@ -147,5 +152,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
+
 </mapper>

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

@@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrProgrammeVo">
-        select 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 ,s.dept_name from t_pssr_programme d
+        select 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
     </sql>
 
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -103,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_protection d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrPublicVo">
-        select d.id, 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 ,s.dept_name from t_pssr_public d
+        select d.id, 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
     </sql>
 
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -73,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -108,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -24,11 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_pump_cleaning d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -133,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -24,11 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_pump_fill d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -133,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="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 ,s.dept_name from t_pssr_pump_overhaul d
+        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
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -44,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by  region,id
     </select>
     
     <select id="selectTPssrRegionById" parameterType="Long" resultMap="TPssrRegionResult">

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

@@ -27,11 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrSafetyBleedVo">
-        select 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 ,s.dept_name from t_pssr_safety_bleed d
+        select 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
     </sql>
 
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -148,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -27,11 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrSafetyBreathVo">
-        select 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 ,s.dept_name from t_pssr_safety_breath d
+        select 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
     </sql>
 
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -148,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -27,11 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrSafetyBrustVo">
-        select 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 ,s.dept_name from t_pssr_safety_brust d
+        select 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
     </sql>
 
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -148,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -23,11 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrSafetyFlamearresterVo">
-        select 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 ,s.dept_name from t_pssr_safety_flamearrester d
+        select 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
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -65,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_safety_flamearrester.NEXTVAL as id FROM DUAL
         </selectKey>
-        insert into t_pssr_safety_flame
+        insert into t_pssr_safety_flamearrester
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="subId != null">sub_id,</if>
@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -28,11 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrSafetyValveVo">
-        select 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 ,s.dept_name from t_pssr_safety_valve d
+        select 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
     </sql>
 
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -125,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -153,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="item"    column="item"    />
         <result property="content"    column="content"    />
         <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"    />
@@ -20,15 +21,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
-        <result property="deptName" column="dept_name" />
-        <result property="region"    column="region"    />
-        <result property="unit"    column="unit"    />
         <result property="unitDes"    column="unit_des"    />
+        <result property="unit"    column="unit"    />
+        <result property="region"    column="region"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrSubcontentVo">
-        select d.id, d.approve_id, d.aboveall_id,d.region, d.unit,d.unit_des, d.serial_number, d.item, d.content, d.confirm, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_pssr_subcontent d
+        select d.id, d.approve_id, d.aboveall_id, d.serial_number, d.item, d.content, 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.unit_des, d.unit, d.region, d.approve_status ,s.dept_name from t_pssr_subcontent d
       left join sys_dept s on s.dept_id = d.dept_id
+        left join sys_user  u on d.CONFIRM = u.USER_ID
     </sql>
 
     <select id="selectTPssrSubcontentList" parameterType="TPssrSubcontent" resultMap="TPssrSubcontentResult">
@@ -36,9 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="aboveallId != null "> and aboveall_id = #{aboveallId}</if>
-            <if test="region != null  and region != ''"> and region = #{region}</if>
-            <if test="unitDes != null  and unitDes != ''"> and unit_des = #{unitDes}</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
             <if test="item != null  and item != ''"> and item = #{item}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
@@ -50,6 +50,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="unitDes != null  and unitDes != ''"> and unit_des = #{unitDes}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="region != null  and region != ''"> and region = #{region}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -71,9 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="approveId != null">approve_id,</if>
             <if test="aboveallId != null">aboveall_id,</if>
-            <if test="region != null">region,</if>
-            <if test="unit != null">unit,</if>
-            <if test="unitDes != null">unit_des,</if>
             <if test="serialNumber != null">serial_number,</if>
             <if test="item != null">item,</if>
             <if test="content != null">content,</if>
@@ -86,14 +87,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="unitDes != null">unit_des,</if>
+            <if test="unit != null">unit,</if>
+            <if test="region != null">region,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="approveId != null">#{approveId},</if>
             <if test="aboveallId != null">#{aboveallId},</if>
-            <if test="region != null">#{region},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="unitDes != null">#{unitDes},</if>
             <if test="serialNumber != null">#{serialNumber},</if>
             <if test="item != null">#{item},</if>
             <if test="content != null">#{content},</if>
@@ -106,6 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="unitDes != null">#{unitDes},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="region != null">#{region},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -114,9 +120,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="approveId != null">approve_id = #{approveId},</if>
             <if test="aboveallId != null">aboveall_id = #{aboveallId},</if>
-            <if test="region != null">region = #{region},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="unitDes != null">unit_des = #{unitDes},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="item != null">item = #{item},</if>
             <if test="content != null">content = #{content},</if>
@@ -129,6 +132,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="unitDes != null">unit_des = #{unitDes},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="region != null">region = #{region},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTPssrTorchvocVo">
-        select d.id, 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 ,s.dept_name from t_pssr_torchvoc d
+        select d.id, 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
     </sql>
 
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
     </insert>
 
@@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/processes/pssr/pssr1confirm.bpmn

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-  <process id="pssr1confirm" name="单确认人确认流程" isExecutable="true">
-    <startEvent id="applyUser" name="Start"></startEvent>
-    <userTask id="confirmUser" name="确认人" activiti:candidateUsers="{confirmUsers}"></userTask>
+  <process id="pssr1confirm" name="PSSR单确认人确认流程" isExecutable="true">
+    <startEvent id="applyUser" name="Start" activiti:initiator="${applyUser}"></startEvent>
+    <userTask id="confirmUser" name="确认人" activiti:candidateUsers="#{confirmUsers}"></userTask>
     <sequenceFlow id="flow1" sourceRef="applyUser" targetRef="confirmUser">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[1]]></conditionExpression>
     </sequenceFlow>
-    <userTask id="chargePerson" name="检查内容负责人" activiti:assignee="{chargePerson}"></userTask>
+    <userTask id="chargePerson" name="检查内容负责人" activiti:assignee="#{chargePerson}"></userTask>
     <sequenceFlow id="flow2" sourceRef="confirmUser" targetRef="chargePerson">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[1]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow3" sourceRef="chargePerson" targetRef="confirmUser">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
     <endEvent id="endevent1" name="End"></endEvent>
     <sequenceFlow id="flow4" sourceRef="chargePerson" targetRef="endevent1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_pssr1confirm">

ui/src/api/pssr/approve.js

@@ -55,7 +55,7 @@ export function exportApprove(query) {
 // pssr发起审批
 export function doApprove(subId) {
   return request({
-    url: '/pssr/approve/doApprove/'+subId,
+    url: '/pssr/approve/doPssrApprove/'+subId,
     method: 'post'
   })
 }

ui/src/views/approve/approveDetail/pssrApprove-detail.vue

@@ -0,0 +1,87 @@
+<template>
+  <el-dialog :close-on-click-modal="false"
+             :title="!this.taskForm.taskId == '' ? $t('处理') : $t('详情')"
+             :visible.sync="visible"
+             :append-to-body="true"
+             width="60%">
+    <el-descriptions :column="2" border size="small">
+
+    </el-descriptions>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-if="!this.taskForm.taskId == ''" type="primary"
+                 @click="dataFormSubmit(1)" :disabled="submitDisabled">通过</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''" type="danger"
+                 @click="dataFormSubmit(0)" :disabled="submitDisabled">驳回</el-button>
+      <el-button @click="visible = false">{{ $t('返回') }}</el-button>
+    </span>
+    <div>
+      <span>{{ $t('流转详情') }}</span>
+      <el-table :data="historyList" border v-loading="historyLoading" style="width: 100%;">
+        <el-table-column prop="taskName" header-align="center" align="center"
+                         :label="$t('流程进度')"></el-table-column>
+        <el-table-column prop="userName" header-align="center" align="center" :label="$t('姓名')"></el-table-column>
+        <el-table-column prop="taskCreateTime" header-align="center" align="center"
+                         :label="$t('开始时间')"></el-table-column>
+        <el-table-column prop="taskEndTime" header-align="center" align="center"
+                         :label="$t('结束时间')"></el-table-column>
+        <el-table-column prop="comment" header-align="center" align="center"
+                         :label="$t('审批意见')"></el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getHistorylist} from "@/api/ehs/approvedanger";
+import {genAppraisalFormWord, handleScore} from "@/api/training/bccnew/tsnew";
+import {getApprove} from "@/api/training/bccnew/tsApprove";
+
+export default {
+  name: "pssrApprove-detail",
+  data() {
+    return {
+      //label样式
+      labelStyle: {'width': '200px'},
+      unitOptions: [],
+      //流转列表
+      historyList: [],
+      historyLoading: true,
+      submitDisabled: false,
+      taskName: '',
+      visible: false,
+      taskForm: {
+        comment: '',
+        taskId: '',
+        files: '',
+        govDate: '',
+        govFileList: [],
+        businessKey: '',
+        tPssrApprove: {}
+      },
+      devList: [],
+      dataForm: {},
+      form: {},
+      rules: {},
+      flag: false
+    }
+  },
+  methods: {
+    init(id, taskId, processId, taskName) {
+      console.log(222)
+      this.visible = true;
+      getHistorylist({processId: processId}).then(response => {
+        this.historyList = response.rows;
+        this.historyLoading = false
+      });
+    },
+    dataFormSubmit(val){
+
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

ui/src/views/approve/myapprove/index.vue

@@ -60,6 +60,7 @@
     <sems-week-check-detail v-if="semsWeekcheckDetailVisible" ref="semsWeekcheckDetail" @refreshDataList="getList"></sems-week-check-detail>
     <dsdt-training-detail v-if="dsdtTrainingDetailVisible" ref="dsdtTrainingDetail" @refreshDataList="getList"></dsdt-training-detail>
     <dsdt-nopass-detail v-if="dsdtNopassDetailVisible" ref="dsdtNopassDetail" @refreshDataList="getList"></dsdt-nopass-detail>
+    <pssr-approve-detail v-if="pssrApproveDetailVisible" ref="pssrApproveDetail" @refreshDataList="getList"></pssr-approve-detail>
 
   </div>
 </template>
@@ -83,10 +84,12 @@
   import SemsWeekCheckDetail from "@/views/approve/approveDetail/semsWeekCheck-detail";
   import DsdtTrainingDetail from "@/views/approve/approveDetail/dsdtTraining-detail.vue";
   import DsdtNopassDetail from "@/views/approve/approveDetail/dsdtNoPass-detail.vue";
+  import PssrApproveDetail from "@/views/approve/approveDetail/pssrApprove-detail.vue";
 
   export default {
     name: "Myapprove",
     components: {
+      PssrApproveDetail,
       DsdtNopassDetail,
       DsdtTrainingDetail,
       SemsWeekCheckDetail,
@@ -112,6 +115,7 @@
         semsWeekcheckDetailVisible: false,
         dsdtTrainingDetailVisible: false,
         dsdtNopassDetailVisible: false,
+        pssrApproveDetailVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -183,6 +187,7 @@
       },
       //操作审批流程
       detailHandle (row) {
+        console.log(row)
         if (row.processName == "特种设备审核"){
           this.specDealVisible = true
           this.$nextTick(() => {
@@ -271,6 +276,12 @@
           this.$nextTick(() => {
             this.$refs.dsdtNopassDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
+        } else if (row.processName == "PSSR单确认人确认流程") {
+          console.log(111)
+          this.pssrApproveDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.pssrApproveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;

ui/src/views/approve/pending/index.vue

@@ -135,6 +135,7 @@
     <sems-week-check-detail v-if="semsWeekcheckDetailVisible" ref="semsWeekcheckDetail" @refreshDataList="getList"></sems-week-check-detail>
     <dsdt-training-detail v-if="dsdtTrainingDetailVisible" ref="dsdtTrainingDetail" @refreshDataList="getList"></dsdt-training-detail>
     <dsdt-nopass-detail v-if="dsdtNopassDetailVisible" ref="dsdtNopassDetail" @refreshDataList="getList"></dsdt-nopass-detail>
+    <pssr-approve-detail v-if="pssrApproveDetailVisible" ref="pssrApproveDetail" @refreshDataList="getList"></pssr-approve-detail>
 
   </div>
 </template>
@@ -160,10 +161,12 @@
   import SemsWeekCheckDetail from "@/views/approve/approveDetail/semsWeekCheck-detail";
   import DsdtTrainingDetail from "@/views/approve/approveDetail/dsdtTraining-detail.vue";
   import DsdtNopassDetail from "@/views/approve/approveDetail/dsdtNoPass-detail.vue";
+  import PssrApproveDetail from "@/views/approve/approveDetail/pssrApprove-detail.vue";
 
   export default {
     name: "Pending",
     components: {
+      PssrApproveDetail,
       DsdtNopassDetail,
       DsdtTrainingDetail,
       SemsWeekCheckDetail,
@@ -201,6 +204,7 @@
         semsWeekcheckDetailVisible: false,
         dsdtTrainingDetailVisible: false,
         dsdtNopassDetailVisible: false,
+        pssrApproveDetailVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -449,6 +453,11 @@
           this.$nextTick(() => {
             this.$refs.dsdtNopassDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
+        }  else if (row.processName == "PSSR单确认人确认流程") {
+          this.pssrApproveDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.pssrApproveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
         } else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;

ui/src/views/approve/taskdone/index.vue

@@ -64,6 +64,7 @@
     <sems-week-check-detail v-if="semsWeekcheckDetailVisible" ref="semsWeekcheckDetail" @refreshDataList="getList"></sems-week-check-detail>
     <dsdt-training-detail v-if="dsdtTrainingDetailVisible" ref="dsdtTrainingDetail" @refreshDataList="getList"></dsdt-training-detail>
     <dsdt-nopass-detail v-if="dsdtNopassDetailVisible" ref="dsdtNopassDetail" @refreshDataList="getList"></dsdt-nopass-detail>
+    <pssr-approve-detail v-if="dsdtNopassDetailVisible" ref="pssrApproveDetail" @refreshDataList="getList"></pssr-approve-detail>
 
   </div>
 </template>
@@ -88,10 +89,12 @@
   import SemsWeekCheckDetail from "@/views/approve/approveDetail/semsWeekCheck-detail";
   import DsdtTrainingDetail from "@/views/approve/approveDetail/dsdtTraining-detail.vue";
   import DsdtNopassDetail from "@/views/approve/approveDetail/dsdtNoPass-detail.vue";
+  import PssrApproveDetail from "@/views/approve/approveDetail/pssrApprove-detail.vue";
 
   export default {
     name: "Taskdone",
     components: {
+      PssrApproveDetail,
       DsdtNopassDetail,
       DsdtTrainingDetail,
       SemsWeekCheckDetail,
@@ -118,6 +121,7 @@
         semsWeekcheckDetailVisible: false,
         dsdtTrainingDetailVisible: false,
         dsdtNopassDetailVisible: false,
+        pssrApproveDetailVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -284,6 +288,11 @@
           this.$nextTick(() => {
             this.$refs.dsdtNopassDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
+        } else if (row.processName == "PSSR单确认人确认流程") {
+          this.pssrApproveDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.pssrApproveDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
         } else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;

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

@@ -257,6 +257,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
+import {getSubcontent} from "@/api/pssr/subcontent";
 
 export default {
   name: "OverhaulExchanger",

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

@@ -227,6 +227,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
+import {getSubcontent} from "@/api/pssr/subcontent";
 
 export default {
   name: "OverhaulPipe",

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

@@ -240,6 +240,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
+import {getSubcontent} from "@/api/pssr/subcontent";
 
 export default {
   name: "OverhaulPump",

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

@@ -242,6 +242,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
+import {getSubcontent} from "@/api/pssr/subcontent";
 
 export default {
   name: "OverhaulTower",

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

@@ -96,8 +96,7 @@
       <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"/>
-      <el-table-column label="确认人" align="center" prop="confirm" :show-overflow-tooltip="true" width="180"
-                       :formatter="userFormatter"/>
+      <el-table-column label="确认人" align="center" prop="confirmName" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="确认时间" align="center" prop="confirmationDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
@@ -306,10 +305,10 @@ export default {
     if (typeof id !== 'undefined') {
       this.queryParams.aboveallId = id
     }
+    this.getList();
+    this.getTreeselect();
     listUserNoPage({}).then(res => {
       this.userOptions = res.data
-      this.getList();
-      this.getTreeselect();
     });
   },
   methods: {
@@ -317,18 +316,6 @@ export default {
       console.log(row)
       this.$router.push({ name: 'Subitem', params: { subId: row.id,serialNumber:row.serialNumber } });
     },
-    userFormatter(row) {
-      let ids = row.confirm.split(',');
-      let nickName = '';
-      ids.forEach(id => {
-        this.userOptions.forEach(item => {
-          if (id == item.userId) {
-            nickName += item.nickName + '；';
-          }
-        })
-      })
-      return nickName.substring(0, nickName.length - 1);
-    },
     /** 查询开车条件确认列表 */
     getList() {
       this.loading = true;