Merge remote-tracking branch 'origin/dev' into dev

273548560@qq.com
2 parents 7b5936e1 6d4ef200
Showing 6 changed files with 197 additions and 95 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-admin/src/main/resources/application-dev.yml
trash-ui/src/views/activiti/task/index.vue
trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -7,6 +7,7 @@ import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.core.page.TableSupport;
+import com.trash.common.utils.ServletUtils;
 import com.trash.activiti.domain.dto.ActTaskDTO;
 import com.trash.activiti.domain.dto.ActWorkflowFormDataDTO;
 import com.trash.activiti.service.IActTaskService;
@@ -26,9 +26,13 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricProcessInstanceQuery;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.IdentityLink;
+import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.trash.activiti.domain.ActWorkflowFormData;
 import com.trash.activiti.domain.dto.ActTaskDTO;
@@ -38,7 +42,11 @@ import com.trash.activiti.service.IActTaskService;
 import com.trash.activiti.service.IActWorkflowFormDataService;
 import com.trash.activiti.service.myTaskService;
 import com.trash.common.core.page.PageDomain;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.RouteUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.ServletUtils;
+import com.trash.common.utils.spring.SpringUtils;
 @Service
 public class ActTaskServiceImpl implements IActTaskService {
@@ -54,9 +62,11 @@ public class ActTaskServiceImpl implements IActTaskService {
 	@Autowired
 	private RuntimeService runtimeService;
+	
 	@Autowired
 	private IActWorkflowFormDataService actWorkflowFormDataService;
+
 	@Autowired
 	private ActReDeploymentMapper actMapper;
@@ -69,17 +79,21 @@ public class ActTaskServiceImpl implements IActTaskService {
 	HistoricProcessInstanceQuery processInstanceQuery;
-
 	@Override
 	public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
-//		List<String> posts = new ArrayList<>();
-//		posts.add("4");
-//		SecurityUtils.getLoginUser().getUser().setPostIds(posts);
-//		List<String> roles = new ArrayList<>();
-//		posts.add("7");
-//		SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
+
+		if(ServletUtils.getParameter("role") != null){
+			List<String> posts = new ArrayList<>();
+			posts.add(ServletUtils.getParameter("role"));
+			SecurityUtils.getLoginUser().getUser().setPostIds(posts);
+		}
+		if(ServletUtils.getParameter("dept") != null){
+			List<String> roles = new ArrayList<>();
+			roles.add(ServletUtils.getParameter("dept"));
+			SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
+		}
 		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
@@ -218,9 +232,13 @@ public class ActTaskServiceImpl implements IActTaskService {
 	@Override
 	public int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException {
 		Task task = taskRuntime.task(taskID);
+		
+		
 		ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
 				.processInstanceId(task.getProcessInstanceId()).singleResult();
-
+		
+		String desc = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult().getDescription();
+		
 		Boolean hasVariables = false;// 没有任何参数
 		HashMap<String, Object> variables = new HashMap<String, Object>();
 		// 前端传来的字符串，拆分成每个控件
@@ -246,14 +264,56 @@ public class ActTaskServiceImpl implements IActTaskService {
 		}		
-    	List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list(); //测试 当前用户为审批用户
-
-
+		updateThreesetpTask(processInstance,desc);
+		
+		
 		// 写入数据库
 		return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
 	}
+
+
+	private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
+
+		org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+		
+		if(task == null)
+			return;
+		
+		task.setDescription(placeCode);
+		
+		if(processInstance.getProcessDefinitionKey().equals("workflow_threestep") ){
+			if(task.getName().equals("巡查")){
+    			List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
+
+    			for(IdentityLink identityLink:list){
+//    				if(identityLink.getGroupId() != null)
+//    					taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());
+    				if(identityLink.getUserId() != null)
+	    				taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());
+    			}
+
+    			taskService.addCandidateUser(task.getId(), placeCode);
+    			
+    			task.setDescription(placeCode);
+			}
+		}else if(processInstance.getProcessDefinitionKey().equals("workflow_leave") ){
+    			List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
+    			
+    			if(list.size() == 1){
+        			taskService.addCandidateUser(task.getId(), placeCode);
+    			}
+
+    			
+    			task.setDescription(placeCode);
+		}
+
+		taskService.saveTask(task);
+		
+	}
+	
+
 	@Override
 	public void deleteProcessById(String type) {
 		runtimeService.deleteProcessInstance(type, "删除");
@@ -27,8 +27,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-#                password: root
-                password: asd0731.
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -82,7 +81,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: bsth123
+        password: 
         # 连接超时时间
         timeout: 10s
         database: 10
 <template>
   <div class="app-container">
+    <el-select v-model="queryParams.dept" filterable clearable reserve-keyword @change="getList">
+      <el-option v-for="item in depts" :label="item.name"
+                  :value="item.code" :key="item.code" >
+      </el-option>
+    </el-select>
+    <el-select v-model="queryParams.role" filterable clearable reserve-keyword @change="getList">
+      <el-option v-for="item in roles" :label="item.name"
+                  :value="item.code" :key="item.code" >
+      </el-option>
+    </el-select>
+
     <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
@@ -246,6 +257,8 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
+          role:null,
+          dept:null,
         },
         // 表单参数
         form: {
@@ -281,12 +294,24 @@
         conferenceOpen: false,
         idInfo:null,
         leaveApplicationOpen:false,
-        areas:{},
+        areas:[],
         roles:[],
-        depts:{},
+        depts:[],
       };
     },
     created() {
+      let dep =  {type:"CSUserDepartmentType"};
+
+      getDict(dep).then(res=>{
+          this.depts = res.result;
+      });
+
+      let role =  {type:"CSUserPostType"};
+
+      getDict(role).then(res=>{
+          this.roles = res.result;
+      });
+
       this.getList();
     },
     methods: {
@@ -3,6 +3,8 @@ package com.trash.workflow.service;
 import java.util.List;
 import java.util.Map;
+import org.activiti.api.process.model.ProcessInstance;
+
 import com.trash.activiti.domain.dto.HistoryDataDTO;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.workflow.domain.Workflow;
@@ -77,7 +79,10 @@ public interface IWorkflowService
 	int createLeaveWorkFlow(Workflow workflow,int index);
     Workflow selectWorkflowByInstanceId(String instanceId);
+    
 	int createThreeStepWorkFlow(SupervisionThreestep supervision);
 	public void deleteWorkflowByName(String string);
+
+	public void PorcThreeStepTask(String pId,String place);
 }
@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.SupervisionThreestep;
+import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -60,9 +61,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Autowired
 	RuntimeService runTImeService;
+	@Autowired
+	ISupervisionThreestepService server;
+
 	@Override
 	@Transactional
-	public int createWorkFlow(Map<String, Object> data) {
+	public int createWorkFlow(Map<String, Object> data) { //第三方通用接收接口
 		String flowType = data.get("type").toString();
@@ -82,12 +86,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType)
 					.withName(title).withBusinessKey(businessKey).build());
-			// Task task =
-			// taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
-			//
-			// task.setAssignee(SecurityUtils.getUsername());
-			//
-			// taskService.saveTask(task);
 			Workflow workflow = new Workflow();
 			workflow.setId(businessKey);
@@ -125,19 +123,18 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	                .withBusinessKey("workflow_leave:"+workflow.getId())
                     .withVariable("route",index)
 	                .build());
+			
+			
+			Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+			
+			if(task != null){
+				
+				task.setDescription(SecurityUtils.getLoginUser().getUser().getRoleIds().get(0));
+	    		taskService.saveTask(task);
+			}
+			
-
-
-
-//	    	Workflow workflow = new Workflow();
-//	    	workflow.setId(businessKey);
-//	    	workflow.setTitle(title);
-//	    	workflow.setReason(reason);
-//	    	workflow.setStartTime(startTime);
-//	    	workflow.setEndTime(endTime);
-//	    	workflow.setType(siteType[Integer.parseInt(map.get("type").toString())]);
 			workflow.setInstanceId(processInstance.getId());
-//	    	workflow.setState("0");
 	        return workflowMapper.insertWorkflow(workflow);
     	} catch (Exception e) {
@@ -152,7 +149,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
     @Override
     @Transactional
-    public int createThreeStepWorkFlow(SupervisionThreestep supervision){
+    public int createThreeStepWorkFlow(SupervisionThreestep supervision){ //三查
     	ProcessInstance processInstance = null;
     	try {
 	    	processInstance = processRuntime.start(ProcessPayloadBuilder
@@ -162,66 +159,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	                .withBusinessKey("workflow_threestep:" + supervision.getId())
 	                .build());
-	    	JSONArray array = RemoteServerUtils.getAreas();
-
-	    	Map map = new HashedMap<>();
-
-	    	map.put("type", "CSUserDepartmentType");
-
-	    	JSONArray array2 = RemoteServerUtils.getDict(map);
-
-	    	String placeName = null;
-
-	    	for(Object obj:array){
-	    		if(((JSONObject)(obj)).getString("code").equals(supervision.getPlace())){
-
-	    			placeName = ((JSONObject)(obj)).getString("name");
-
-	    			break;
-	    		}
-
-	    	}
-
-	    	if(placeName != null){
-
-	    		String placeCode = null;
-	    		String code = null;
-
-	    		for(Object obj:array2){
-	    			if(((JSONObject)obj).getString("name").equals("渣土办")){
-	    				code = ((JSONObject)(obj)).getString("code");
-	    			}
-		    		if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){
-		    			placeCode = ((JSONObject)(obj)).getString("code");
-
-		    			if(code != null){
-		    				break;
-		    			}
-		    		}
-
-		    	}
-
-
-//	    		List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
-
-	    		if(placeCode != null){
-	    			Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
-
-
-	    			List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
-
-	    			for(IdentityLink identityLink:list){
-//	    				if(identityLink.getGroupId() != null)
-//	    					taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());
-	    				if(identityLink.getUserId() != null)
-		    				taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());
-	    			}
-
-	    			taskService.addCandidateUser(task.getId(), placeCode);
-
-		    		taskService.saveTask(task);
-	    		}
-	    	}
+	    		PorcThreeStepTask(processInstance,supervision.getPlace());
 		    	Workflow workflow = new Workflow();
@@ -242,6 +180,73 @@ public class WorkflowServiceImpl implements IWorkflowService {
     	return 0;
     }
+    
+    
+    
+	public void PorcThreeStepTask(ProcessInstance processInstance,String place) {
+				
+		JSONArray array = RemoteServerUtils.getAreas();
+
+    	Map map = new HashedMap<>();
+
+    	map.put("type", "CSUserDepartmentType");
+
+    	JSONArray array2 = RemoteServerUtils.getDict(map);
+
+    	String placeName = null;
+
+    	for(Object obj:array){
+    		if(((JSONObject)(obj)).getString("code").equals(place)){
+
+    			placeName = ((JSONObject)(obj)).getString("name");
+
+    			break;
+    		}
+
+    	}
+
+    	if(placeName != null){
+
+    		String placeCode = null;
+    		String code = null;
+
+    		for(Object obj:array2){
+    			if(((JSONObject)obj).getString("name").equals("渣土办")){
+    				code = ((JSONObject)(obj)).getString("code");
+    			}
+	    		if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){
+	    			placeCode = ((JSONObject)(obj)).getString("code");
+
+	    			if(code != null){
+	    				break;
+	    			}
+	    		}
+
+	    	}
+
+    		if(placeCode != null){
+    			Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+
+
+    			List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
+
+    			for(IdentityLink identityLink:list){
+//    				if(identityLink.getGroupId() != null)
+//    					taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());
+    				if(identityLink.getUserId() != null)
+	    				taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());
+    			}
+
+    			taskService.addCandidateUser(task.getId(), placeCode);
+    			
+    			task.setDescription(placeCode);
+    			
+	    		taskService.saveTask(task);
+    		}
+    	}
+		
+	}
+
 	/**
 	 * 查询请假
@@ -365,4 +370,11 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return workflowMapper.selectWorkflowByInstanceId(instanceId);
 	}
+
+
+	@Override
+	public void PorcThreeStepTask(String pId, String place) {
+		// TODO Auto-generated method stub
+		
+	}
 }