转办

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -1,17 +1,15 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcCarService;
 import com.ruoyi.oa.service.ICmcProjectService;
 import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -168,26 +166,20 @@ public class CmcCarApprovalController extends BaseController
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
             cmcCarApproval.setDispatchTime(new Date());
-        }
-        if (formDataJson.getJSONArray("cars").size() > 0 && formDataJson.getJSONArray("drivers").size() > 0) {
-            cmcCarApproval.setDispatcher(getLoginUser().getUserId());
-            cmcCarApproval.setKilometers(formDataJson.getString("kilometers"));
             cmcCarApproval.setReturnDate(formDataJson.getDate("returnDate"));
+            cmcCarApproval.setKilometers(formDataJson.getString("kilometers"));
+        }
+        if (formDataJson.getJSONArray("cars").size() > 0) {
             String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
             cmcCarApproval.setCars(carString);
-            cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
             if (formDataJson.getString("projectId") != null && !formDataJson.getString("projectId").equals("")) {
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                if (project.getDrivers() != null && !project.getDrivers().equals(cmcCarApproval.getDrivers()))
-                    project.setDrivers(project.getDrivers() + "," + cmcCarApproval.getDrivers());
-                if (project.getDrivers() == null)
-                    project.setDrivers(cmcCarApproval.getDrivers());
-                if (project.getCars() != null && !project.getCars().equals(carString))
-                    project.setCars(project.getCars() + "," + carString);
-                if (project.getCars() == null)
-                    project.setCars(carString);
+                String[] projectCars = project.getCars().split(",");
+                String[] cars = carString.split(",");
+                Collection union = CollectionUtils.union(Arrays.asList(projectCars), Arrays.asList(cars));
+                project.setCars(String.join(",",union));
                 cmcProjectService.updateCmcProject(project);
             }
             String[] cars = carString.split(",");
@@ -199,6 +191,19 @@ public class CmcCarApprovalController extends BaseController
             }
             cmcCarApproval.setEstimateCost(estimateCost);
         }
+        if (formDataJson.getJSONArray("drivers").size() > 0) {
+            cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
+            if (formDataJson.getString("projectId") != null && !formDataJson.getString("projectId").equals("")) {
+                CmcProject cmcProject = new CmcProject();
+                cmcProject.setProjectId(formDataJson.getString("projectId"));
+                CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
+                String[] projectDrivers = project.getDrivers().split(",");
+                String[] drivers = formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1).split(",");
+                Collection union = CollectionUtils.union(Arrays.asList(projectDrivers), Arrays.asList(drivers));
+                project.setDrivers(String.join(",",union));
+                cmcProjectService.updateCmcProject(project);
+            }
+        }
         cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval);
         return AjaxResult.success("修改用车审批表成功");
     }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -10,6 +12,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.ICmcDeviceService;
 import com.ruoyi.oa.service.ICmcProjectService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -140,17 +143,17 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
             cmcDeviceApproval.setDispatchTime(new Date());
         }
-        if (formDataJson.getJSONArray("modifyDevices").size() > 0) {
+        if (formDataJson.getJSONArray("modifyDevices").size() > 0 && formDataJson.getString("managerComment") == null) {
             String deviceString = formDataJson.getString("modifyDevices").substring(1, formDataJson.getString("modifyDevices").length() - 1);
             cmcDeviceApproval.setModifyDevices(deviceString);
             if (!formDataJson.getString("projectId").equals("")) {
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());
-                if (project.getDevices() != null && !project.getDevices().equals(cmcDeviceApproval.getModifyDevices()))
-                    project.setDevices(project.getDevices() + "," + cmcDeviceApproval.getModifyDevices());
-                if (project.getDevices() == null)
-                    project.setDevices(cmcDeviceApproval.getModifyDevices());
+                String[] projectDevices = project.getDevices().split(",");
+                String[] devices = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1).split(",");
+                Collection union = CollectionUtils.union(Arrays.asList(projectDevices), Arrays.asList(devices));
+                project.setDevices(String.join(",",union));
                 cmcProjectService.updateCmcProject(project);
             }
             String[] devices = deviceString.split(",");

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

@@ -735,19 +735,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             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(lastHistoricTaskDefinitionKey)
-//                    .list();
-//            String taskAssignee = "";
-//            for (HistoricTaskInstance hti: htiTargetList) {
-//                if (!hti.getId().equals(currentTaskId)) {
-//                    taskAssignee = hti.getAssignee();
-//                    break;
-//                }
-//            }
-//            taskService.setAssignee(currentTaskId, taskAssignee);
+            List<Task> taskQuery = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
+            String currentTaskId = "";
+            if (taskQuery.size() == 1)
+                currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
+            List<HistoricTaskInstance> htiTargetList = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(task.getProcessInstanceId())
+                    .taskDefinitionKey(lastHistoricTaskDefinitionKey)
+                    .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/api/flowable/todo.js

@@ -28,6 +28,15 @@ export function delegate(data) {
   })
 }
 
+// 转办任务
+export function assignTask(data) {
+  return request({
+    url: '/flowable/task/assignTask',
+    method: 'post',
+    data: data
+  })
+}
+
 // 退回任务
 export function returnTask(data) {
   return request({

oa-ui/src/views/flowable/task/todo/index.vue

@@ -38,30 +38,43 @@
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
           <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
-              }}</el-tag></label>
+          }}</el-tag></label>
         </template>
       </el-table-column>
       <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理</el-button>
+          <el-button size="mini" type="text" icon="el-icon-share" @click="handleAssign(scope.row)">转办</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
+    <!--选择流程接收人-->
+    <el-dialog :title="taskTitle" :visible.sync="taskOpen" width="65%" append-to-body>
+      <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect" />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="taskOpen = false">取 消</el-button>
+        <el-button type="primary" @click="submitTask">提 交</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { todoList, complete, returnList, returnTask, rejectTask, getDeployment, delDeployment, exportDeployment } from "@/api/flowable/todo";
+import { todoList, complete, returnList, returnTask, rejectTask, assignTask, getDeployment, delDeployment, exportDeployment } from "@/api/flowable/todo";
 import { getProcessVariables } from "@/api/flowable/definition"
 import { getProject, addProject, delProject } from "@/api/oa/project/project";
+import FlowUser from '@/components/flow/User'
+import FlowRole from '@/components/flow/Role'
 export default {
   name: "Deploy",
-  components: {},
+  components: {
+    FlowUser,
+    FlowRole,
+  },
   data() {
     return {
       // 遮罩层
@@ -94,6 +107,12 @@ export default {
       // 表单校验
       rules: {},
       dataShow: true,
+      taskTitle: null,
+      taskOpen: false,
+      checkSendUser: false, // 是否展示人员选择模块
+      checkType: '', // 选择类型
+      checkValues: null, // 选中任务接收人员数据
+      taskId: ''
     };
   },
   created() {
@@ -114,10 +133,10 @@ export default {
         if (res.data) {
           getProject(res.data.formId).then(result => {
             if (res.data) {
-              let name = result.data.projectNumber +'-' + result.data.projectName
+              let name = result.data.projectNumber + '-' + result.data.projectName
               this.todoList.map(item => {
                 if (item.taskId == row.taskId) {
-                 this.$set(item,'project',name)
+                  this.$set(item, 'project', name)
                 }
               })
             }
@@ -125,6 +144,31 @@ export default {
         }
       })
     },
+    handleAssign(row) {
+      this.taskOpen = true;
+      this.taskTitle = "选择任务接收";
+      this.checkSendUser = true;
+      this.checkType = "single";
+      this.taskId = row.taskId;
+    },
+    /** 提交流程 */
+    submitTask() {
+      if (!this.checkValues && this.checkSendUser) {
+        this.$modal.msgError("请选择任务接收!");
+        return;
+      }
+      assignTask({ taskId: this.taskId, assignee: this.checkValues }).then(res => {
+        this.$modal.msgSuccess(res.msg);
+        this.taskOpen = false;
+        this.getList();
+      })
+    },
+    // 用户信息选中数据
+    handleUserSelect(selection) {
+      if (selection) {
+        this.checkValues = selection.userId;
+      }
+    },
     // 跳转到处理页面
     handleProcess(row) {
       let path = this.getRoutePath(row);