-邮件

master/src/main/java/com/ruoyi/framework/task/TodoTask.java

@@ -30,7 +30,7 @@ public class TodoTask extends BaseController {
                 ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
                 List<Task> taskList = processEngine.getTaskService()//获取任务service
                         .createTaskQuery()//创建查询对象
-                        .processDefinitionId("reserveInvoice")//根据任务流程id查询
+                        .processDefinitionName("预约开票审批流程")//根据任务流程id查询
                         .taskCandidateOrAssigned(item.getUserId().toString())
                         //                .taskAssignee(getUserId().toString())
                         .orderByTaskCreateTime().desc().list();//参与者，组任务查询

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

@@ -59,6 +59,7 @@
         <where>
             <if test="devNo != null  and devNo != ''"> and dev_no like concat(concat('%', #{devNo}), '%')</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="lockNo != null  and lockNo != ''"> and lock_no = #{lockNo}</if>
             <if test="offlineReason != null  and offlineReason != ''"> and offline_reason like concat(concat('%', #{offlineReason}), '%')</if>
             <if test="safa != null  and safa != ''"> and safa = #{safa}</if>
             <if test="disassembly != null "> and disassembly = #{disassembly}</if>

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

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="changeDescribe != null  and changeDescribe != ''"> and change_describe like concat(concat('%', #{changeDescribe}), '%')</if>
             <if test="changeReason != null  and changeReason != ''"> and change_reason = #{changeReason}</if>
+            <if test="lockNo != null  and lockNo != ''"> and lock_no = #{lockNo}</if>
             <if test="applicant != null  and applicant != ''"> and applicant = #{applicant}</if>
             <if test="applicantName != null  and applicantName != ''"> and applicant_name like concat(concat('%', #{applicantName}), '%')</if>
             <if test="applicationTime != null "> and application_time = #{applicationTime}</if>

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

@@ -41,6 +41,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="破锁编号" prop="lockNo" label-width="130px">
+        <el-input
+          v-model="queryParams.lockNo"
+          placeholder="请输入破锁编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small" @change="handleQuery">
@@ -216,7 +225,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="单元" prop="unit">
-          <el-select v-model="form.unit" placeholder="请选择单元" clearable size="small" filterable style="width: 100%" @change="getLocks(form.unit)">
+          <el-select v-model="form.unit" placeholder="请选择单元" clearable size="small" filterable style="width: 100%"
+                     @change="getLocks(form.unit)">
             <el-option
               v-for="dict in unitOptions"
               :key="dict.name"
@@ -573,6 +583,7 @@ export default {
     }
   },
   created() {
+    this.queryParams.lockNo = this.$route.query.lockNo;
     listUserPost({
       actualposts: "20,36,10,11,28,30,32,38,15,12,34",
       deptId: 103
@@ -603,7 +614,7 @@ export default {
   },
   methods: {
     getLocks(unit) {
-      listAllLock({lockPost: unit,status:0}).then(res => {
+      listAllLock({lockPost: unit, status: 0}).then(res => {
         this.lockList = res.data;
       })
     },