-申请单导出

master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -94,8 +94,8 @@ public class TApplyOfflinevalveController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('apply:offlinevalve:export')")
     @Log(title = "安全阀离线切出申请", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TApplyOfflinevalve tApplyOfflinevalve) {
+    @PutMapping("/export")
+    public AjaxResult export(@RequestBody TApplyOfflinevalve tApplyOfflinevalve) {
         List<TApplyOfflinevalve> list = tApplyOfflinevalveService.selectTApplyOfflinevalveList(tApplyOfflinevalve);
         ExcelUtil<TApplyOfflinevalve> util = new ExcelUtil<TApplyOfflinevalve>(TApplyOfflinevalve.class);
         return util.exportExcel(list, "offlinevalve");

master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -105,8 +105,8 @@ public class TApplySafetychangeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('apply:safetychange:export')")
     @Log(title = "组织保护措施状态变更申请", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TApplySafetychange tApplySafetychange) {
+    @PutMapping("/export")
+    public AjaxResult export(@RequestBody TApplySafetychange tApplySafetychange) {
         List<TApplySafetychange> list = tApplySafetychangeService.selectTApplySafetychangeList(tApplySafetychange);
         ExcelUtil<TApplySafetychange> util = new ExcelUtil<TApplySafetychange>(TApplySafetychange.class);
         return util.exportExcel(list, "safetychange");

master/src/main/java/com/ruoyi/project/apply/domain/TApplyOfflinevalve.java

@@ -14,161 +14,229 @@ import java.util.Date;
  * @author ruoyi
  * @date 2023-02-08
  */
-public class TApplyOfflinevalve extends BaseEntity
-{
+public class TApplyOfflinevalve extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 唯一标识ID */
+    /**
+     * 唯一标识ID
+     */
     private Long id;
 
-    /** 安全阀位号 */
+    private Long[] ids;
+
+    /**
+     * 安全阀位号
+     */
     @Excel(name = "安全阀位号")
     private String devNo;
 
-    /** 单元 */
+    /**
+     * 单元
+     */
     @Excel(name = "单元")
     private String unit;
 
-    /** 离线原因 */
+    /**
+     * 申请状态1：申请中，2：已通过，3：已拒绝
+     */
+    @Excel(name = "申请状态", readConverterExp = "1=申请中,2=已通过,3=已拒绝")
+    private String approveStatus;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", readConverterExp = "0=未完成,1=已完成")
+    private Long status;
+
+    /**
+     * 破锁编号
+     */
+    @Excel(name = "破锁编号")
+    private String lockNo;
+
+    /**
+     * 离线原因
+     */
     @Excel(name = "离线原因")
     private String offlineReason;
 
-    /** 安全评估以及临时措施执行 */
-    @Excel(name = "安全评估以及临时措施执行")
-    private String safa;
-
-    /** 安全阀锁开是否拆解 */
+    /**
+     * 安全阀锁开是否拆解
+     */
     @Excel(name = "安全阀锁开是否拆解")
     private String disassembly;
 
-    /** 临时措施执行人 */
-    @Excel(name = "临时措施执行人")
+    /**
+     * 安全评估以及临时措施执行
+     */
+    private String safa;
+
+    /**
+     * 临时措施执行人
+     */
+
     private String executor;
 
-    /** 临时措施确认人 */
-    @Excel(name = "临时措施确认人")
+    /**
+     * 执行人姓名
+     */
+    @Excel(name = "临时措施执行人")
+    private String executorName;
+
+    /**
+     * 临时措施执行时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private Date executionTime;
+
+    /**
+     * 临时措施确认人
+     */
     private String confirmer;
 
-    /** 申请人 */
-    @Excel(name = "申请人")
+    /**
+     * 确认人姓名
+     */
+    @Excel(name = "临时措施确认人")
+    private String confirmerName;
+
+    /**
+     * 临时措施确认时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private Date temporaryTime;
+
+    /**
+     * 申请人
+     */
     private String applicant;
 
-    /** 申请时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
+    @Excel(name = "申请人")
+    private String applicantName;
+
+    /**
+     * 申请时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date applicationTime;
 
-    /** 批准人 */
-    @Excel(name = "批准人")
+    /**
+     * 批准人
+     */
+
     private String approver;
 
-    /** 批准时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
+    /**
+     * 批准人姓名
+     */
+    @Excel(name = "批准人")
+    private String approverName;
+
+
+    /**
+     * 批准时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @Excel(name = "批准时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date approveTime;
 
-    /** 离线安全阀是否已经复位 */
-    @Excel(name = "离线安全阀是否已经复位")
+    /**
+     * 离线安全阀是否已经复位
+     */
     private String resetConfirm;
 
-    /** 离线安全阀复位后现场是否存在泄漏 */
-    @Excel(name = "离线安全阀复位后现场是否存在泄漏")
+    /**
+     * 离线安全阀复位后现场是否存在泄漏
+     */
     private String leakConfirm;
 
-    /** 离线安全复位后，之前采取的安全措施是否已撤销 */
-    @Excel(name = "离线安全复位后，之前采取的安全措施是否已撤销")
+    /**
+     * 离线安全复位后，之前采取的安全措施是否已撤销
+     */
     private String revokeConfirm;
 
-    /** 离线安全复位后，是否已经重新上锁 */
-    @Excel(name = "离线安全复位后，是否已经重新上锁")
+    /**
+     * 离线安全复位后，是否已经重新上锁
+     */
     private String lockConfirm;
 
-    /** 是否上锁确认人1 */
-    @Excel(name = "是否上锁确认人1")
+    /**
+     * 是否上锁确认人1
+     */
     private String lockConfirmer1;
 
-    /** 是否上锁确认人2 */
-    @Excel(name = "是否上锁确认人2")
+    /**
+     * 是否上锁确认人2
+     */
     private String lockConfirmer2;
 
-    /** 信息确认人 */
-    @Excel(name = "信息确认人")
+    /**
+     * 信息确认人
+     */
     private String infoConfirmer;
 
-    /** 确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    /**
+     * 确认时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date confirmTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @Excel(name = "备注")
     private String remarks;
 
-    /** 临时措施确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "临时措施确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
-    private Date temporaryTime;
-
-    /** 临时措施执行时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "临时措施执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
-    private Date executionTime;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private Long status;
-
-    /** 状态 1 ：正常 ；0：删除 */
+    /**
+     * 状态 1 ：正常 ；0：删除
+     */
     private Long delFlag;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
+    /**
+     * 创建人
+     */
     private String createrCode;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdate;
 
-    /** 修改人 */
-    @Excel(name = "修改人")
+    /**
+     * 修改人
+     */
     private Long updaterCode;
 
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updatedate;
 
-    /** 部门编号 */
-    @Excel(name = "部门编号")
+    /**
+     * 部门编号
+     */
     private Long deptId;
 
-    /** 申请状态 */
-    @Excel(name = "申请状态")
-    private String approveStatus;
-
-    /**上锁确认人1姓名*/
+    /**
+     * 上锁确认人1姓名
+     */
     private String lockConfirmer1Name;
 
-    /**上锁确认人2姓名*/
+    /**
+     * 上锁确认人2姓名
+     */
     private String lockConfirmer2Name;
 
-    /**信息确认人姓名*/
+    /**
+     * 信息确认人姓名
+     */
     private String infoConfirmerName;
 
-    /**执行人姓名*/
-    private String executorName;
-
-    /**确认人姓名*/
-    private String confirmerName;
-
-    /**批准人姓名*/
-    private String approverName;
-
-    /**申请人姓名*/
-    private String applicantName;
-
-
     /**
      * 流程id
      */
@@ -181,11 +249,6 @@ public class TApplyOfflinevalve extends BaseEntity
 
     private String deptName;
 
-    /**
-     * 破锁编号
-     */
-    private String lockNo;
-
     public String getLockNo() {
         return lockNo;
     }
@@ -274,320 +337,296 @@ public class TApplyOfflinevalve extends BaseEntity
         this.applicantName = applicantName;
     }
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setDevNo(String devNo)
-    {
+
+    public void setDevNo(String devNo) {
         this.devNo = devNo;
     }
 
-    public String getDevNo()
-    {
+    public String getDevNo() {
         return devNo;
     }
-    public void setUnit(String unit)
-    {
+
+    public void setUnit(String unit) {
         this.unit = unit;
     }
 
-    public String getUnit()
-    {
+    public String getUnit() {
         return unit;
     }
-    public void setOfflineReason(String offlineReason)
-    {
+
+    public void setOfflineReason(String offlineReason) {
         this.offlineReason = offlineReason;
     }
 
-    public String getOfflineReason()
-    {
+    public String getOfflineReason() {
         return offlineReason;
     }
-    public void setSafa(String safa)
-    {
+
+    public void setSafa(String safa) {
         this.safa = safa;
     }
 
-    public String getSafa()
-    {
+    public String getSafa() {
         return safa;
     }
-    public void setDisassembly(String disassembly)
-    {
+
+    public void setDisassembly(String disassembly) {
         this.disassembly = disassembly;
     }
 
-    public String getDisassembly()
-    {
+    public String getDisassembly() {
         return disassembly;
     }
-    public void setExecutor(String executor)
-    {
+
+    public void setExecutor(String executor) {
         this.executor = executor;
     }
 
-    public String getExecutor()
-    {
+    public String getExecutor() {
         return executor;
     }
-    public void setConfirmer(String confirmer)
-    {
+
+    public void setConfirmer(String confirmer) {
         this.confirmer = confirmer;
     }
 
-    public String getConfirmer()
-    {
+    public String getConfirmer() {
         return confirmer;
     }
-    public void setApplicant(String applicant)
-    {
+
+    public void setApplicant(String applicant) {
         this.applicant = applicant;
     }
 
-    public String getApplicant()
-    {
+    public String getApplicant() {
         return applicant;
     }
-    public void setApplicationTime(Date applicationTime)
-    {
+
+    public void setApplicationTime(Date applicationTime) {
         this.applicationTime = applicationTime;
     }
 
-    public Date getApplicationTime()
-    {
+    public Date getApplicationTime() {
         return applicationTime;
     }
-    public void setApprover(String approver)
-    {
+
+    public void setApprover(String approver) {
         this.approver = approver;
     }
 
-    public String getApprover()
-    {
+    public String getApprover() {
         return approver;
     }
-    public void setApproveTime(Date approveTime)
-    {
+
+    public void setApproveTime(Date approveTime) {
         this.approveTime = approveTime;
     }
 
-    public Date getApproveTime()
-    {
+    public Date getApproveTime() {
         return approveTime;
     }
-    public void setResetConfirm(String resetConfirm)
-    {
+
+    public void setResetConfirm(String resetConfirm) {
         this.resetConfirm = resetConfirm;
     }
 
-    public String getResetConfirm()
-    {
+    public String getResetConfirm() {
         return resetConfirm;
     }
-    public void setLeakConfirm(String leakConfirm)
-    {
+
+    public void setLeakConfirm(String leakConfirm) {
         this.leakConfirm = leakConfirm;
     }
 
-    public String getLeakConfirm()
-    {
+    public String getLeakConfirm() {
         return leakConfirm;
     }
-    public void setRevokeConfirm(String revokeConfirm)
-    {
+
+    public void setRevokeConfirm(String revokeConfirm) {
         this.revokeConfirm = revokeConfirm;
     }
 
-    public String getRevokeConfirm()
-    {
+    public String getRevokeConfirm() {
         return revokeConfirm;
     }
-    public void setLockConfirm(String lockConfirm)
-    {
+
+    public void setLockConfirm(String lockConfirm) {
         this.lockConfirm = lockConfirm;
     }
 
-    public String getLockConfirm()
-    {
+    public String getLockConfirm() {
         return lockConfirm;
     }
-    public void setLockConfirmer1(String lockConfirmer1)
-    {
+
+    public void setLockConfirmer1(String lockConfirmer1) {
         this.lockConfirmer1 = lockConfirmer1;
     }
 
-    public String getLockConfirmer1()
-    {
+    public String getLockConfirmer1() {
         return lockConfirmer1;
     }
-    public void setLockConfirmer2(String lockConfirmer2)
-    {
+
+    public void setLockConfirmer2(String lockConfirmer2) {
         this.lockConfirmer2 = lockConfirmer2;
     }
 
-    public String getLockConfirmer2()
-    {
+    public String getLockConfirmer2() {
         return lockConfirmer2;
     }
-    public void setInfoConfirmer(String infoConfirmer)
-    {
+
+    public void setInfoConfirmer(String infoConfirmer) {
         this.infoConfirmer = infoConfirmer;
     }
 
-    public String getInfoConfirmer()
-    {
+    public String getInfoConfirmer() {
         return infoConfirmer;
     }
-    public void setConfirmTime(Date confirmTime)
-    {
+
+    public void setConfirmTime(Date confirmTime) {
         this.confirmTime = confirmTime;
     }
 
-    public Date getConfirmTime()
-    {
+    public Date getConfirmTime() {
         return confirmTime;
     }
-    public void setRemarks(String remarks)
-    {
+
+    public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
 
-    public String getRemarks()
-    {
+    public String getRemarks() {
         return remarks;
     }
-    public void setTemporaryTime(Date temporaryTime)
-    {
+
+    public void setTemporaryTime(Date temporaryTime) {
         this.temporaryTime = temporaryTime;
     }
 
-    public Date getTemporaryTime()
-    {
+    public Date getTemporaryTime() {
         return temporaryTime;
     }
-    public void setExecutionTime(Date executionTime)
-    {
+
+    public void setExecutionTime(Date executionTime) {
         this.executionTime = executionTime;
     }
 
-    public Date getExecutionTime()
-    {
+    public Date getExecutionTime() {
         return executionTime;
     }
-    public void setStatus(Long status)
-    {
+
+    public void setStatus(Long status) {
         this.status = status;
     }
 
-    public Long getStatus()
-    {
+    public Long getStatus() {
         return status;
     }
-    public void setDelFlag(Long delFlag)
-    {
+
+    public void setDelFlag(Long delFlag) {
         this.delFlag = delFlag;
     }
 
-    public Long getDelFlag()
-    {
+    public Long getDelFlag() {
         return delFlag;
     }
-    public void setCreaterCode(String createrCode)
-    {
+
+    public void setCreaterCode(String createrCode) {
         this.createrCode = createrCode;
     }
 
-    public String getCreaterCode()
-    {
+    public String getCreaterCode() {
         return createrCode;
     }
-    public void setCreatedate(Date createdate)
-    {
+
+    public void setCreatedate(Date createdate) {
         this.createdate = createdate;
     }
 
-    public Date getCreatedate()
-    {
+    public Date getCreatedate() {
         return createdate;
     }
-    public void setUpdaterCode(Long updaterCode)
-    {
+
+    public void setUpdaterCode(Long updaterCode) {
         this.updaterCode = updaterCode;
     }
 
-    public Long getUpdaterCode()
-    {
+    public Long getUpdaterCode() {
         return updaterCode;
     }
-    public void setUpdatedate(Date updatedate)
-    {
+
+    public void setUpdatedate(Date updatedate) {
         this.updatedate = updatedate;
     }
 
-    public Date getUpdatedate()
-    {
+    public Date getUpdatedate() {
         return updatedate;
     }
-    public void setDeptId(Long deptId)
-    {
+
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
-    public void setApproveStatus(String approveStatus)
-    {
+
+    public void setApproveStatus(String approveStatus) {
         this.approveStatus = approveStatus;
     }
 
-    public String getApproveStatus()
-    {
+    public String getApproveStatus() {
         return approveStatus;
     }
 
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("devNo", getDevNo())
-            .append("unit", getUnit())
-            .append("offlineReason", getOfflineReason())
-            .append("safa", getSafa())
-            .append("disassembly", getDisassembly())
-            .append("executor", getExecutor())
-            .append("confirmer", getConfirmer())
-            .append("applicant", getApplicant())
-            .append("applicationTime", getApplicationTime())
-            .append("approver", getApprover())
-            .append("approveTime", getApproveTime())
-            .append("resetConfirm", getResetConfirm())
-            .append("leakConfirm", getLeakConfirm())
-            .append("revokeConfirm", getRevokeConfirm())
-            .append("lockConfirm", getLockConfirm())
-            .append("lockConfirmer1", getLockConfirmer1())
-            .append("lockConfirmer2", getLockConfirmer2())
-            .append("infoConfirmer", getInfoConfirmer())
-            .append("confirmTime", getConfirmTime())
-            .append("remarks", getRemarks())
-            .append("temporaryTime", getTemporaryTime())
-            .append("executionTime", getExecutionTime())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createrCode", getCreaterCode())
-            .append("createdate", getCreatedate())
-            .append("updaterCode", getUpdaterCode())
-            .append("updatedate", getUpdatedate())
-            .append("deptId", getDeptId())
-            .append("approveStatus", getApproveStatus())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("devNo", getDevNo())
+                .append("unit", getUnit())
+                .append("offlineReason", getOfflineReason())
+                .append("safa", getSafa())
+                .append("disassembly", getDisassembly())
+                .append("executor", getExecutor())
+                .append("confirmer", getConfirmer())
+                .append("applicant", getApplicant())
+                .append("applicationTime", getApplicationTime())
+                .append("approver", getApprover())
+                .append("approveTime", getApproveTime())
+                .append("resetConfirm", getResetConfirm())
+                .append("leakConfirm", getLeakConfirm())
+                .append("revokeConfirm", getRevokeConfirm())
+                .append("lockConfirm", getLockConfirm())
+                .append("lockConfirmer1", getLockConfirmer1())
+                .append("lockConfirmer2", getLockConfirmer2())
+                .append("infoConfirmer", getInfoConfirmer())
+                .append("confirmTime", getConfirmTime())
+                .append("remarks", getRemarks())
+                .append("temporaryTime", getTemporaryTime())
+                .append("executionTime", getExecutionTime())
+                .append("status", getStatus())
+                .append("delFlag", getDelFlag())
+                .append("createrCode", getCreaterCode())
+                .append("createdate", getCreatedate())
+                .append("updaterCode", getUpdaterCode())
+                .append("updatedate", getUpdatedate())
+                .append("deptId", getDeptId())
+                .append("approveStatus", getApproveStatus())
+                .toString();
     }
 }

master/src/main/java/com/ruoyi/project/apply/domain/TApplySafetychange.java

@@ -21,20 +21,36 @@ public class TApplySafetychange extends BaseEntity
     /** 唯一标识ID */
     private Long id;
 
+    private Long[] ids;
+
     /** 组织保护措施变更描述 */
-    @Excel(name = "组织保护措施变更描述")
+    @Excel(width = 20,name = "组织保护措施变更描述")
     private String changeDescribe;
 
+    /**
+     申请状态1：申请中，2：已通过，3：已拒绝 */
+    @Excel(name = "申请状态",readConverterExp = "1=申请中,2=已通过,3=已拒绝")
+    private String approveStatus;
+
+    /** 状态 */
+    @Excel(name = "状态",readConverterExp = "0=未完成,1=已完成")
+    private Long status;
+
     /** 状态变更原因 */
     @Excel(name = "状态变更原因")
     private String changeReason;
 
+    /**
+     * 破锁编号
+     */
+    @Excel(name = "破锁编号")
+    private String lockNo;
+
     /** 申请人id */
-    @Excel(name = "申请人id")
     private String applicant;
 
     /** 申请人姓名 */
-    @Excel(name = "申请人姓名")
+    @Excel(name = "申请人")
     private String applicantName;
 
     /** 申请时间 */
@@ -43,28 +59,26 @@ public class TApplySafetychange extends BaseEntity
     private Date applicationTime;
 
     /** 安全评估及临时的安全措施 */
-    @Excel(name = "安全评估及临时的安全措施")
+    @Excel(width = 30,name = "安全评估及临时的安全措施")
     private String safa;
 
     /** 安全评估人id */
-    @Excel(name = "安全评估人id")
     private String safaer;
 
     /** 安全评估人姓名 */
-    @Excel(name = "安全评估人姓名")
+    @Excel(name = "安全评估人")
     private String safaerName;
 
     /** 安全评估时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "安全评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    @Excel(name = "评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date safaTime;
 
     /** 批准人id */
-    @Excel(name = "批准人id")
     private String approver;
 
     /** 批准人姓名 */
-    @Excel(name = "批准人姓名")
+    @Excel(name = "批准人")
     private String approverName;
 
     /** 批准时间 */
@@ -73,41 +87,38 @@ public class TApplySafetychange extends BaseEntity
     private Date approveTime;
 
     /** 临时安全措施执行人id */
-    @Excel(name = "临时安全措施执行人id")
     private String executor;
 
     /** 临时安全措施执行人姓名 */
-    @Excel(name = "临时安全措施执行人姓名")
+    @Excel(name = "临时安全措施执行人")
     private String executorName;
 
     /** 临时安全措施执行时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "临时安全措施执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date executionTime;
 
     /** 临时安全措施确认人id */
-    @Excel(name = "临时安全措施确认人id")
     private String confirmer;
 
     /** 临时安全措施确认人姓名 */
-    @Excel(name = "临时安全措施确认人姓名")
+    @Excel(name = "临时安全措施确认人")
     private String confirmerName;
 
     /** 临时安全措施确认时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "临时安全措施确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date confirmTime;
 
     /** 组织保护措施状态变更执行 */
-    @Excel(name = "组织保护措施状态变更执行")
+    @Excel(width = 30,name = "组织保护措施状态变更执行")
     private String changeExecution;
 
     /** 执行人id */
-    @Excel(name = "执行人id")
     private String changeExecutor;
 
     /** 执行人姓名 */
-    @Excel(name = "执行人姓名")
+    @Excel(name = "执行人")
     private String changeExecutorName;
 
     /** 执行时间 */
@@ -116,77 +127,56 @@ public class TApplySafetychange extends BaseEntity
     private Date changeExecutorTime;
 
     /** 组织保护措施是否已经恢复至变更前的状态 */
-    @Excel(name = "组织保护措施是否已经恢复至变更前的状态")
     private String resetConfirm;
 
     /** 状态恢复，确认人1id */
-    @Excel(name = "状态恢复，确认人1id")
     private String resetConfirmer1;
 
     /** 状态恢复，确认人1姓名 */
-    @Excel(name = "状态恢复，确认人1姓名")
     private String resetConfirmerName1;
 
     /** 状态恢复，确认时间1 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "状态恢复，确认时间1", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date resetConfirmTime1;
 
     /** 状态恢复，确认人2id */
-    @Excel(name = "状态恢复，确认人2id")
     private String resetConfirmer2;
 
     /** 状态恢复，确认人2姓名 */
-    @Excel(name = "状态恢复，确认人2姓名")
     private String resetConfirmerName2;
 
     /** 状态恢复，确认时间2 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
-    @Excel(name = "状态恢复，确认时间2", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date resetConfirmTime2;
 
     /** 状态恢复后，之前采取的安全措施是否已撤销: */
-    @Excel(name = "状态恢复后，之前采取的安全措施是否已撤销:")
     private String revokeConfirm;
 
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
-    /** 状态 */
-    @Excel(name = "状态")
-    private Long status;
 
     /** 状态 0 ：正常 ；1：删除 */
     private Long delFlag;
 
     /** 创建人 */
-    @Excel(name = "创建人")
     private String createrCode;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 
     /** 修改人 */
-    @Excel(name = "修改人")
     private Long updaterCode;
 
     /** 修改时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     /** 部门编号 */
-    @Excel(name = "部门编号")
     private Long deptId;
 
-    /**
-申请状态0：待申请，1：申请中，2：已通过，3：已驳回，4：已拒绝 */
-    @Excel(name = "申请状态")
-    private String approveStatus;
-
 
     /**
      * 流程id
@@ -200,10 +190,13 @@ public class TApplySafetychange extends BaseEntity
 
     private String deptName;
 
-    /**
-     * 破锁编号
-     */
-    private String lockNo;
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
 
     public String getLockNo() {
         return lockNo;

master/src/main/resources/mybatis/apply/TApplyOfflinevalveMapper.xml

@@ -94,6 +94,11 @@
             <if test="confirmerName != null  and confirmerName != ''"> and confirmer_name like concat(concat('%', #{confirmerName}), '%')</if>
             <if test="approverName != null  and approverName != ''"> and approver_name like concat(concat('%', #{approverName}), '%')</if>
             <if test="applicantName != null  and applicantName != ''"> and applicant_name like concat(concat('%', #{applicantName}), '%')</if>
+            <if test="ids != null"> and id in
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/apply/TApplySafetychangeMapper.xml

@@ -98,6 +98,11 @@ 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="approveStatus != null  and approveStatus != ''"> and d.approve_status = #{approveStatus}</if>
+            <if test="ids != null and ids.length > 0"> and id in
+                <foreach item="id" collection="ids" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ui/src/api/apply/offlinevalve.js

@@ -65,8 +65,8 @@ export function delOfflinevalve(id) {
 export function exportOfflinevalve(query) {
   return request({
     url: '/apply/offlinevalve/export',
-    method: 'get',
-    params: query
+    method: 'put',
+    data: query
   })
 }
 

ui/src/api/apply/safetychange.js

@@ -76,8 +76,8 @@ export function delSafetychange(id) {
 export function exportSafetychange(query) {
   return request({
     url: '/apply/safetychange/export',
-    method: 'get',
-    params: query
+    method: 'put',
+    data: query
   })
 }
 

ui/src/views/apply/offlinevalve/index.vue

@@ -120,16 +120,26 @@
               >导入
               </el-button>
             </el-col>-->
-      <!--      <el-col :span="1.5">
+            <el-col :span="1.5">
               <el-button
                 type="warning"
                 icon="el-icon-download"
                 size="mini"
                 @click="handleExport"
                 v-hasPermi="['apply:offlinevalve:export']"
-              >导出
+              >导出全部
               </el-button>
-            </el-col>-->
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExportAtSelect"
+                v-hasPermi="['apply:offlinevalve:export']"
+              >导出选中项
+              </el-button>
+            </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -806,6 +816,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
+      queryParams.ids=null;
       this.$confirm('是否确认导出所有安全阀离线切出申请表数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -816,6 +827,26 @@ export default {
         this.download(response.msg);
       })
     },
+    /** 导出按钮操作 */
+    handleExportAtSelect() {
+      if (this.ids.length==0){
+        return this.$alert('请选择要导出的数据项！', "警告", {
+          confirmButtonText: "确定",
+          type: "warning"
+        })
+      }
+      const queryParams = this.queryParams;
+      queryParams.ids=this.ids;
+      this.$confirm('是否确认导出选中的安全阀离线切出申请表数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportOfflinevalve(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "用户导入";

ui/src/views/apply/safetychange/index.vue

@@ -97,16 +97,26 @@
                           v-hasPermi="['apply:safetychange:edit']"
                   >导入</el-button>
               </el-col>-->
-      <!--      <el-col :span="1.5">
+            <el-col :span="1.5">
               <el-button
                 type="warning"
                 icon="el-icon-download"
                 size="mini"
                 @click="handleExport"
                 v-hasPermi="['apply:safetychange:export']"
-              >导出
+              >导出全部
               </el-button>
-            </el-col>-->
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExportAtSelect"
+                v-hasPermi="['apply:safetychange:export']"
+              >导出选中数据
+              </el-button>
+            </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -849,6 +859,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
+      queryParams.ids=null;
       this.$confirm('是否确认导出所有组织保护措施状态变更申请数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -859,6 +870,26 @@ export default {
         this.download(response.msg);
       })
     },
+    /** 导出按钮操作 */
+    handleExportAtSelect() {
+      if (this.ids.length==0){
+        return this.$alert('请选择要导出的数据项！', "警告", {
+          confirmButtonText: "确定",
+          type: "warning"
+        })
+      }
+      const queryParams = this.queryParams;
+      queryParams.ids=this.ids;
+      this.$confirm('是否确认导出选中的组织保护措施状态变更申请数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportSafetychange(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "用户导入";