流程撤回、回退

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

             runtimeService.createChangeActivityStateBuilder()
                     .processInstanceId(task.getProcessInstanceId())
                     .moveActivityIdsToSingleActivityId(currentIds, flowTaskVo.getTargetKey()).changeState();
-//            String currentTaskId = taskService.createTaskQuery().singleResult().getId();
-//            List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
-//                    .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
-//                    .list();
-//            String taskAssignee = "";
-//            for (HistoricTaskInstance hti: htiList) {
-//                if (!hti.getId().equals(currentTaskId)) {
-//                    taskAssignee = hti.getAssignee();
-//                    break;
-//                }
-//            }
-//            taskService.setAssignee(currentTaskId, taskAssignee);
+            String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
+            List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
+                    .list();
+            String taskAssignee = "";
+            for (HistoricTaskInstance hti: htiList) {
+                if (!hti.getId().equals(currentTaskId)) {
+                    taskAssignee = hti.getAssignee();
+                    break;
+                }
+            }
+            taskService.setAssignee(currentTaskId, taskAssignee);
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {
             runtimeService.createChangeActivityStateBuilder()
                     .processInstanceId(task.getProcessInstanceId())
                     .moveActivityIdsToSingleActivityId(currentIds, lastHistoricTaskDefinitionKey).changeState();
+            String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
+            List<HistoricTaskInstance> htiTargetList = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(task.getProcessInstanceId())
+                    .taskDefinitionKey(flowTaskVo.getTargetKey())
+                    .list();
+            String taskAssignee = "";
+            for (HistoricTaskInstance hti: htiTargetList) {
+                if (!hti.getId().equals(currentTaskId)) {
+                    taskAssignee = hti.getAssignee();
+                    break;
+                }
+            }
+            taskService.setAssignee(currentTaskId, taskAssignee);
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {

oa-ui/src/views/oa/device/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="出厂编号" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入出厂编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
 
       <el-form-item label="设备名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
+      <el-form-item label="规格型号" prop="series">
+        <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>

oa-ui/src/views/oa/supply/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="出厂编号" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入出厂编号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备状态" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-
       <el-form-item label="设备名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="设备品牌" prop="brand">
+        <el-input v-model="queryParams.brand" placeholder="请输入设备品牌" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="series">
+        <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
+      <el-table-column label="设备状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag :type="statusTypeStyle(scope.row.status)">{{ statusTypeText(scope.row.status) }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="出厂编号" align="center" prop="code" />
       <el-table-column label="设备名称" align="center" prop="name" />
       <el-table-column label="设备类别" align="center" prop="type" />
+      <el-table-column label="设备品牌" align="center" prop="brand" />
       <el-table-column label="规格型号" align="center" prop="series" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" width="180">
         <template slot-scope="scope">
       </el-table-column>
       <el-table-column label="购买价格（元）" align="center" prop="cost" />
       <el-table-column label="预计使用年限" align="center" prop="expectLife" />
-      <el-table-column label="设备品牌" align="center" prop="brand" />
       <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" />
       <el-table-column label="管理部门" align="center" prop="dept.deptName" />
       this.download('oa/device/export', {
         ...this.queryParams
       }, `device_${new Date().getTime()}.xlsx`)
+    },
+    statusTypeText(row) {
+      if (row == '0') {
+        return '被领用'
+      }
+      if (row == '1') {
+        return '可领用'
+      }
+      if (row == '2') {
+        return '维修中'
+      }
+      if (row == '3') {
+        return '已停用'
+      }
+    },
+    statusTypeStyle(row) {
+      if (row == '0') {
+        return 'warning'
+      }
+      if (row == '1') {
+        return 'success'
+      }
+      if (row == '2') {
+        return 'danger'
+      }
+      if (row == '3') {
+        return 'info'
+      }
     }
   }
 };