-添加破锁编号

-fix 预览报错

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

@@ -122,7 +122,9 @@ public class TApplySafetychangeController extends BaseController {
         tApplySafetychange.setApplicationTime(new Date());
         tApplySafetychange.setCreatedate(new Date());
         tApplySafetychange.setCreaterCode(getUserId().toString());
-        tApplySafetychange.setConfirmer(tApplySafetychange.getSafaer());
+        String safaerIds = tApplySafetychange.getSafaer();
+        tApplySafetychange.setSafaer(null);
+        // tApplySafetychange.setConfirmer(tApplySafetychange.getSafaer());
 //        tApplySafetychange.setConfirmerName(tApplySafetychange.getSafaerName());
         if(StringUtils.isNotEmpty(tApplySafetychange.getRemarks())&&(!tApplySafetychange.getRemarks().endsWith("；")||!tApplySafetychange.getRemarks().endsWith(";")))
             tApplySafetychange.setRemarks("申请人-" + tApplySafetychange.getRemarks()+"；");
@@ -135,9 +137,8 @@ public class TApplySafetychangeController extends BaseController {
         Authentication.setAuthenticatedUserId(userId);//设置当前申请人
         Map<String, Object> variables = new HashMap<>();
         variables.put("applyuser", userId);
-        String confirmers = tApplySafetychange.getConfirmer();
         StringBuilder confirmer= new StringBuilder();
-        for (String staffId : confirmers.split(",")) {
+        for (String staffId : safaerIds.split(",")) {
             SysUser user = userService.selectUserByStaffId(staffId);
             confirmer.append(user.getUserId()).append(",");
         }

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

@@ -181,6 +181,19 @@ public class TApplyOfflinevalve extends BaseEntity
 
     private String deptName;
 
+    /**
+     * 破锁编号
+     */
+    private String lockNo;
+
+    public String getLockNo() {
+        return lockNo;
+    }
+
+    public void setLockNo(String lockNo) {
+        this.lockNo = lockNo;
+    }
+
     public String getDeptName() {
         return deptName;
     }

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

@@ -200,6 +200,19 @@ public class TApplySafetychange extends BaseEntity
 
     private String deptName;
 
+    /**
+     * 破锁编号
+     */
+    private String lockNo;
+
+    public String getLockNo() {
+        return lockNo;
+    }
+
+    public void setLockNo(String lockNo) {
+        this.lockNo = lockNo;
+    }
+
     public String getDeptName() {
         return deptName;
     }

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

@@ -46,10 +46,11 @@
         <result property="apNo"    column="ap_no"    />
         <result property="processId"    column="process_id"    />
         <result property="deptName" column="dept_name" />
+        <result property="lockNo" column="lock_no" />
     </resultMap>
 
     <sql id="selectTApplyOfflinevalveVo">
-        select d.ap_no,d.process_id,d.id, d.dev_no, d.unit, d.offline_reason, d.safa, d.disassembly, d.executor, d.confirmer, d.applicant, d.application_time, d.approver, d.approve_time, d.reset_confirm, d.leak_confirm, d.revoke_confirm, d.lock_confirm, d.lock_confirmer1, d.lock_confirmer2, d.info_confirmer, d.confirm_time, d.remarks, d.temporary_time, d.execution_time, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.approve_status, d.lock_confirmer1_name, d.lock_confirmer2_name, d.info_confirmer_name, d.executor_name, d.confirmer_name, d.approver_name, d.applicant_name ,s.dept_name from t_apply_offlinevalve d
+        select d.lock_no,d.ap_no,d.process_id,d.id, d.dev_no, d.unit, d.offline_reason, d.safa, d.disassembly, d.executor, d.confirmer, d.applicant, d.application_time, d.approver, d.approve_time, d.reset_confirm, d.leak_confirm, d.revoke_confirm, d.lock_confirm, d.lock_confirmer1, d.lock_confirmer2, d.info_confirmer, d.confirm_time, d.remarks, d.temporary_time, d.execution_time, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.approve_status, d.lock_confirmer1_name, d.lock_confirmer2_name, d.info_confirmer_name, d.executor_name, d.confirmer_name, d.approver_name, d.applicant_name ,s.dept_name from t_apply_offlinevalve d
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -148,6 +149,7 @@
             <if test="confirmerName != null">confirmer_name,</if>
             <if test="approverName != null">approver_name,</if>
             <if test="applicantName != null">applicant_name,</if>
+            <if test="lockNo != null">lock_no,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -188,6 +190,7 @@
             <if test="confirmerName != null">#{confirmerName},</if>
             <if test="approverName != null">#{approverName},</if>
             <if test="applicantName != null">#{applicantName},</if>
+            <if test="lockNo != null">#{lockNo},</if>
         </trim>
     </insert>
 

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

@@ -48,10 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="apNo"    column="ap_no"    />
         <result property="processId"    column="process_id"    />
         <result property="deptName" column="dept_name" />
+        <result property="lockNo" column="lock_no" />
     </resultMap>
 
     <sql id="selectTApplySafetychangeVo">
-        select d.ap_no,d.process_id,d.id, d.change_describe, d.change_reason, d.applicant, d.applicant_name, d.application_time, d.safa, d.safaer, d.safaer_name, d.safa_time, d.approver, d.approver_name, d.approve_time, d.executor, d.executor_name, d.execution_time, d.confirmer, d.confirmer_name, d.confirm_time, d.change_execution, d.change_executor, d.change_executor_name, d.change_executor_time, d.reset_confirm, d.reset_confirmer1, d.reset_confirmer_name1, d.reset_confirm_time1, d.reset_confirmer2, d.reset_confirmer_name2, d.reset_confirm_time2, d.revoke_confirm, d.remarks, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.approve_status ,s.dept_name from t_apply_safetychange d
+        select d.lock_no,d.ap_no,d.process_id,d.id, d.change_describe, d.change_reason, d.applicant, d.applicant_name, d.application_time, d.safa, d.safaer, d.safaer_name, d.safa_time, d.approver, d.approver_name, d.approve_time, d.executor, d.executor_name, d.execution_time, d.confirmer, d.confirmer_name, d.confirm_time, d.change_execution, d.change_executor, d.change_executor_name, d.change_executor_time, d.reset_confirm, d.reset_confirmer1, d.reset_confirmer_name1, d.reset_confirm_time1, d.reset_confirmer2, d.reset_confirmer_name2, d.reset_confirm_time2, d.revoke_confirm, d.remarks, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.approve_status ,s.dept_name from t_apply_safetychange d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -164,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="lockNo != null">lock_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -206,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="lockNo != null">#{lockNo},</if>
          </trim>
     </insert>
 

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

@@ -232,6 +232,9 @@
             ></el-option>
           </el-select>
         </el-form-item>-->
+        <el-form-item label="破锁编号" prop="lockNo">
+          <el-input  v-model="form.lockNo" placeholder="请输入破锁编号"/>
+        </el-form-item>
         <el-form-item label="临时措施确认人" prop="confirmer">
           <el-select v-model="form.confirmer" placeholder="请选择临时措施确认人" clearable size="small" filterable style="width: 100%">
             <el-option
@@ -504,7 +507,8 @@ export default {
         executorName: null,
         confirmerName: null,
         approverName: null,
-        applicantName: null
+        applicantName: null,
+        lockNo:null
       },
       pdf: {
         title: '',
@@ -702,6 +706,7 @@ export default {
         executorName: null,
         confirmerName: null,
         approverName: null,
+        lockNo:null,
         applicantName: null
       };
       this.resetForm("form");

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

@@ -209,6 +209,9 @@
         <el-form-item label="状态变更的原因" prop="changeReason">
           <el-input type="textarea" v-model="form.changeReason" placeholder="请输入状态变更的原因"/>
         </el-form-item>
+        <el-form-item label="破锁编号" prop="lockNo">
+          <el-input  v-model="form.lockNo" placeholder="请输入破锁编号"/>
+        </el-form-item>
         <el-form-item label="安全评估人" prop="safaer">
           <el-select v-model="form.safaer" placeholder="请选择临时措施执行人" clearable size="small" filterable
                      style="width: 100%">
@@ -508,6 +511,7 @@ export default {
         updaterCode: null,
         updatedate: null,
         deptId: null,
+        lockNo:null,
         approveStatus: null
       },
       pdf: {
@@ -704,6 +708,7 @@ export default {
         updaterCode: null,
         updatedate: null,
         deptId: null,
+        lockNo:null,
         approveStatus: "1"
       };
       this.resetForm("form");