车辆外采流程办理

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java

@@ -121,11 +121,11 @@ public interface BaseOutsourcingApplicationFeign {
 
     @ApiOperation(value = "获取下一个环节")
     @PostMapping(value = "/getNextNodesForSubmit")
-    ResultBean getNextNodesForSubmit(@ApiParam(value = "变量集合,json对象") @RequestBody GetNextNodeDto gnnd);
+    ResultBean getNextNodesForSubmit(@ApiParam(value = "变量集合,json对象") @RequestBody BaseOutsourcingApplicationDto dto);
 
     @ApiOperation(value = "获取上一个环节")
     @PostMapping(value = "/getPreviousNodesForReject")
-    ResultBean getPreviousNodesForReject(@ApiParam(value = "变量集合,json对象") @RequestBody GetNextNodeDto gnnd);
+    ResultBean getPreviousNodesForReject(@ApiParam(value = "变量集合,json对象") @RequestBody BaseOutsourcingApplicationDto dto);
 
     @ApiOperation(value = "撤回流程")
     @PostMapping(value = "/revokeProcess")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java

@@ -138,12 +138,12 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA
 	}
 
 	@Override
-	public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) {
+	public ResultBean getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) {
 		return null;
 	}
 
 	@Override
-	public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) {
+	public ResultBean getPreviousNodesForReject(BaseOutsourcingApplicationDto dto) {
 		return null;
 	}
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java

@@ -140,6 +140,7 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
 		bv.setComment(bvd.getComment());
 		bv.setBusinessSid(bvd.getBusinessSid());*/
 		bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
+		bv.setFormVariables(BeanUtil.beanToMap(bvd));
 		return baseOutsourcingApplicationService.complete(bv);
 	}
 
@@ -174,12 +175,13 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
 	}
 
 	@Override
-	public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) {
-		return baseOutsourcingApplicationService.getNextNodesForSubmit(gnnd);
+	public ResultBean getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) {
+		return baseOutsourcingApplicationService.getNextNodesForSubmit(dto);
 	}
 
 	@Override
-	public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) {
-		return baseOutsourcingApplicationService.getPreviousNodesForReject(gnnd);
+	public ResultBean getPreviousNodesForReject(BaseOutsourcingApplicationDto dto) {
+
+		return baseOutsourcingApplicationService.getPreviousNodesForReject(dto);
 	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -545,22 +545,22 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         return processCirculationNodesByMap;
     }
 
-    public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) {
+    public ResultBean getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) {
         BusinessVariables bv = new BusinessVariables();
         bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
-        bv.setTaskDefKey(gnnd.getTaskDefKey());
-        bv.setFormVariables(gnnd.getFormVariables());
+        bv.setTaskDefKey(dto.getTaskDefKey());
+        bv.setFormVariables(BeanUtil.beanToMap(dto));
         ResultBean processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
         processCirculationNodesByMap.setCode("200");
         processCirculationNodesByMap.setSuccess(true);
         return processCirculationNodesByMap;
     }
 
-    public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) {
+    public ResultBean getPreviousNodesForReject(BaseOutsourcingApplicationDto dto) {
         BusinessVariables bv = new BusinessVariables();
-        bv.setTaskDefKey(gnnd.getTaskDefKey());
+        bv.setTaskDefKey(dto.getTaskDefKey());
         bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
-        bv.setFormVariables(gnnd.getFormVariables());
+        bv.setFormVariables(BeanUtil.beanToMap(dto));
         ResultBean processCirculationNodesByMap = flowTaskFeign.getPreviousNodesForReject(bv);
         processCirculationNodesByMap.setCode("200");
         processCirculationNodesByMap.setSuccess(true);

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -49,6 +49,8 @@ import io.swagger.annotations.ApiParam;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.DelegationState;
 import org.flowable.task.api.Task;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -209,7 +211,7 @@ public class FlowableRest implements FlowableFeign {
         return rb.success().setData(vo);
     }
 
-
+Logger log= LoggerFactory.getLogger(FlowableRest.class);
     @Override
     public ResultBean<UpdateFlowFieldVo> handleProsess(BusinessVariables dto) {
         UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
@@ -258,7 +260,9 @@ public class FlowableRest implements FlowableFeign {
         } else {
             taskService.addComment(taskId, instanceId,
                     FlowComment.NORMAL.getType(), comment);
-            //taskService.setAssignee(taskId, userSid);
+            log.error("taskid:{}，userSid:{}",taskId, userSid);
+            log.error("formVariables:{}",JSON.toJSONString(formVariables));
+            taskService.setAssignee(taskId, userSid);
             //formVariables.remove("userSid");
             taskService.complete(taskId, formVariables);
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -724,8 +724,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setCreateTime(date);
             flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
             if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
-                ResultBean<SysUserInfoVo> assignee_ = sysUserFeign.selectUserInfoByUserSid(histTask.get("ASSIGNEE_").toString());
-                flowTask.setAssigneeName(assignee_.getData().getStaffName());
+                ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
+                StringBuilder userName=new StringBuilder();
+                List<SysUserVo> data1 = assignee_.getData();
+                for( SysUserVo data:data1){
+                    userName.append(data.getName()).append(",");
+                }
+                String userName_str="";
+                userName_str=userName.substring(0,userName.length()-1);
+                flowTask.setAssigneeName(userName_str);
             }
 
             flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -6,6 +6,7 @@
 			<div>外采申请表详情</div>
 			<!-- start 详情按钮 -->
       <div>
+        {{formobj.userSid}}
         <el-button type="primary" @click="openAgree">同 意</el-button>
         <el-button type="danger" @click="openReject">驳 回</el-button>
         <el-button type="danger" @click="openStop">终 止</el-button>
@@ -247,25 +248,6 @@ export default {
       this.nodeDialogVisible = false
       this.nodeDialogVisibleForReject=false
     },
-    //根据环节上配置的角色查询用户
-    selectUser() {
-        this.nodeUserDialogVisible=true
-        req.getUsers(this.nextNode.candidateGroups[0]).then(res => {
-          var users = res.data
-          var sid="";
-          for(var i=0;i<users.length;i++){
-            sid=sid+users[i].sid+",";
-          }
-          sid=sid.substr(0,str.length - 1)
-          this.userSid = sid
-        })
-    },
-    //选中下一环节的用户
-    checkedUser(val) {
-      this.userName = val.name
-      this.userSid = val.sid
-      this.nodeUserDialogVisible = false
-    },
     /** xml 文件 */
     getModelDetail(deployId) {
       // 发送请求，获取xml