m

youxiw2000
1 parent 04f65edd
Showing 9 changed files with 190 additions and 46 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskHistoryController.java
trash-activiti/src/main/java/com/trash/activiti/domain/dto/ActTaskDTO.java
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-ui/src/views/activiti/task/taskCard.vue
trash-ui/src/views/activiti/taskhistory/index.vue
trash-workFlow/src/main/java/com/trash/workflow/controller/WorkflowController.java
trash-workFlow/src/main/java/com/trash/workflow/listener/baseDataListener.java
@@ -9,6 +9,7 @@ import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.core.page.TableSupport;
 import com.trash.activiti.domain.dto.ActTaskDTO;
 import com.trash.activiti.domain.dto.ActWorkflowFormDataDTO;
+import com.trash.activiti.mapper.ActReDeploymentMapper;
 import com.trash.activiti.service.IActTaskService;
 import org.activiti.api.task.runtime.TaskRuntime;
@@ -28,12 +29,17 @@ public class TaskHistoryController extends BaseController {
     @Autowired
     private IActTaskService actTaskService;
+    @Autowired
+    private ActReDeploymentMapper actReDeploymentMapper;
+    
     //获取我的代办任务
     @GetMapping(value = "/list")
     public TableDataInfo getTasks() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectRuntimeTaskHistoryDefinitionList(pageDomain);
+        List<String> names =  actReDeploymentMapper.selectTitles();
+        
         List<ActTaskDTO> list = hashMaps.getResult();
         TableDataInfo info = getDataTable(hashMaps);
@@ -44,6 +50,7 @@ public class TaskHistoryController extends BaseController {
         	list = list.subList((pageDomain.getPageNum()-1), list.size());
         }
         info.setRows(list);
+        info.setNames(names);
         return info;
     }
@@ -52,6 +59,7 @@ public class TaskHistoryController extends BaseController {
     public TableDataInfo getEndTasks() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectTaskEndHistoryDefinitionList(pageDomain);
+        List<String> names =  actReDeploymentMapper.selectHistTitles();
         List<ActTaskDTO> list = hashMaps.getResult();
         TableDataInfo info = getDataTable(hashMaps);
@@ -61,6 +69,7 @@ public class TaskHistoryController extends BaseController {
         }else{
         	list = list.subList((pageDomain.getPageNum()-1), list.size());
         }
+        info.setNames(names);
         info.setRows(list);
@@ -85,10 +85,14 @@ public class ActTaskDTO
         this.definitionKey=processInstance.getProcessDefinitionKey();
         this.businessKey=processInstance.getBusinessKey();
-       
-        
+        getPrevNext(task, processInstance);
+ 
+        getData(map);
+
+    }
-        BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(processInstance.getProcessDefinitionId());
+	private void getPrevNext(Task task, ProcessInstance processInstance) {
+		BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(processInstance.getProcessDefinitionId());
         org.activiti.engine.task.Task et = SpringUtils.getBean(TaskService.class).createTaskQuery().taskId(this.id).singleResult();
@@ -200,10 +204,7 @@ public class ActTaskDTO
 					}
 			}
         }
- 
-        getData(map);
-
-    }
+	}
 	private void getData(Map<String, String> map) {
 		try {
@@ -16,24 +16,20 @@ import java.util.Set;
  */
 public interface ActReDeploymentMapper {
-
         public List<ActReDeploymentVO> selectActReDeploymentByIds(@Param("ids") Set<String> ids);
-
         public  List<Map<String, String>> selectWorkByIds(@Param("ids") Set<String> idString);
         public List<Map<String, String>> selectHistoryWorkByPIds(@Param("ids") Set<String> id);
-        
-        
         public Set<String> selectUnCompleteWorkByUsername(@Param("username") String username);
         public List<String> selectCompleteWorkByUsername(@Param("username") String username);
-
 		public Map<String, String> selectHistoryWorkByPId(String id);
-
 		public List<String> selectTitles();
+		
+		public List<String> selectHistTitles();
 }
@@ -3,6 +3,7 @@ package com.trash.activiti.service.impl;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -121,11 +122,33 @@ public class ActTaskServiceImpl implements IActTaskService {
 			}
 			List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);
-
-			List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t,
-							processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
-							maps.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get())).collect(Collectors.toList());
-			
+			List<ActTaskDTO> actTaskDTOS = new ArrayList<>();
+			try {
+				
+				
+				for(Task t:tasks){
+					for(ProcessInstance pInstance : processInstanceList){
+						if(pInstance.getId().equals(t.getProcessInstanceId())){
+							for(Map map:maps){
+								if(pInstance.getId().equals(map.get("instance_id"))){
+									ActTaskDTO atc = new ActTaskDTO(t, pInstance, map);
+									
+									actTaskDTOS.add(atc);
+									break;
+								}
+							}
+
+						}
+					}
+				}
+//				actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t,
+//							processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
+//							maps.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.)).findAny().get())).collect(Collectors.toList());
+				
+				
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
@@ -160,6 +183,10 @@ public class ActTaskServiceImpl implements IActTaskService {
 		List<String> collect = actMapper.selectCompleteWorkByUsername(username);
+		String type = ServletUtils.getParameter("type");
+		String prev = ServletUtils.getParameter("prev");
+		String name = ServletUtils.getParameter("name");
+		
 		if (collect.size() > 0) {
 			Set<String> set = new HashSet(collect);
@@ -178,10 +205,20 @@ public class ActTaskServiceImpl implements IActTaskService {
 			if (processInstanceList.size() > 0) {
 				for (HistoricProcessInstance p : processInstanceList) {
 					try {
-						ActTaskDTO actTaskDTOS = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
-						getCheckData(actTaskDTOS);
-	
-						list.add(actTaskDTOS);} 
+						ActTaskDTO dto = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
+						getCheckData(dto);
+						
+							if(name != null && !name.isEmpty() && !name.equals(dto.getInstanceName())){
+								continue;
+							}
+							if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
+								continue;
+							}							
+
+							list.add(dto);
+						
+						
+						list.add(dto);} 
 					catch (Exception e) {
 						// TODO: handle exception
 					}
@@ -190,6 +227,16 @@ public class ActTaskServiceImpl implements IActTaskService {
 			}
 		}
+		list.sort(new Comparator<ActTaskDTO>() {
+
+			@Override
+			public int compare(ActTaskDTO o1, ActTaskDTO o2) {
+				// TODO Auto-generated method stub
+				return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
+			}
+		});
+		
+		
 		list.setPageNum(pageDomain.getPageNum());
 		list.setPageSize(pageDomain.getPageSize());
@@ -203,11 +250,13 @@ public class ActTaskServiceImpl implements IActTaskService {
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
 		Set<String> collect = actMapper.selectUnCompleteWorkByUsername(securityManager.getAuthenticatedUserId());
-
+		
+		String type = ServletUtils.getParameter("type");
+		String name = ServletUtils.getParameter("name");
+		
 		if (collect.size() > 0) {
-			List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery()
-					.processInstanceIds(collect).list();
+			List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(collect).list();
 			list.setTotal(processInstanceList.size());
@@ -221,14 +270,19 @@ public class ActTaskServiceImpl implements IActTaskService {
 			if (processInstanceList.size() > 0) {
 				for (ProcessInstance p : processInstanceList) {
 					try {
-						
-
-						ActTaskDTO actTaskDTOS = new ActTaskDTO(p, maps.parallelStream()
-								.filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get());
-	
-						getCheckData(actTaskDTOS);
+						ActTaskDTO dto = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get());
-						list.add(actTaskDTOS);
+						getCheckData(dto);
+						
+						if(name != null && !name.isEmpty() && !name.equals(dto.getInstanceName())){
+							continue;
+						}
+						
+						if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
+							continue;
+						}
+						
+						list.add(dto);
 					} catch (Exception e) {
 						// TODO: handle exception
 					}
@@ -236,7 +290,15 @@ public class ActTaskServiceImpl implements IActTaskService {
 			}
 		}
+		list.sort(new Comparator<ActTaskDTO>() {
+			@Override
+			public int compare(ActTaskDTO o1, ActTaskDTO o2) {
+				// TODO Auto-generated method stub
+				return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
+			}
+		});
+		
 		list.setPageNum(pageDomain.getPageNum());
 		list.setPageSize(pageDomain.getPageSize());
@@ -249,9 +311,12 @@ public class ActTaskServiceImpl implements IActTaskService {
 		ActWorkflowFormData.setBusinessKey(actTaskDTOS.getBusinessKey());
 		ActWorkflowFormData.setCreateBy(securityManager.getAuthenticatedUserId());
 		ActWorkflowFormData.setControlName("审批");
+		
+		ActWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataList(ActWorkflowFormData).get(0);
-		actTaskDTOS.setCheckStatus(actWorkflowFormDataService.selectActWorkflowFormDataList(ActWorkflowFormData).get(0)
-				.getControlValue().equals("通过") ? "0" : "1");
+		actTaskDTOS.setCheckStatus(ActWorkflowFormData.getControlValue().equals("通过") ? "0" : "1");
+		actTaskDTOS.setCreatedDate(ActWorkflowFormData.getCreateTime());
+		
 	}
 	SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
@@ -41,6 +41,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	<select id="selectTitles"  parameterType="String" resultType="java.lang.String">
 			select DISTINCT title from workflow
 	</select>
+		<select id="selectHistTitles"  parameterType="String" resultType="java.lang.String">
+			select DISTINCT title from workflow_hi
+	</select>
@@ -20,8 +20,8 @@
       </el-col>
     </el-row>
     <el-row class="card_row">
-      <el-col :span="24" class="card_grid">
-        <div>当前节点: {{task.name}}</div>
+      <el-col :span="24" class="card_grid" v-if="task.name">
+        <div >当前节点: {{task.name}}</div>
       </el-col>
     </el-row>
 <template>
   <div class="app-container">
+    <el-select v-model="queryParams.name" filterable  reserve-keyword @change="getList" placeholder="名称">
+       <el-option label="全部" value="" />
+        <el-option v-for="item in names" :label="item" :value="item" >
+        </el-option>
+      </el-select>
+
+     <!-- <el-select v-model="queryParams.prev" filterable  reserve-keyword @change="getList" placeholder="上一节点">
+       <el-option label="全部" value="" />
+        <el-option v-for="item in depts" :label="item.name" :value="item.name" >
+        </el-option>
+      </el-select> -->
+    <el-select v-model="queryParams.type" filterable  reserve-keyword @change="getList">
+       <el-option label="全部" value="" />
+       <el-option label="建筑垃圾许可证审批" value="workflow_constructsite" />
+       <el-option label="消纳合同申报备案" value="workflow_conract" />
+       <el-option label="处理场所备案" value="workflow_earthsites" />
+       <el-option label="运输企业准入流程" value="workflow_company" />
+       <el-option label="运输车辆准入流程" value="workflow_vehicle" />
+       <el-option label="驾驶员信息审批" value="workflow_driver" />
+       <el-option label="交办案卷" value="workflow_caseoffline" />
+       <el-option label="违规案卷处置流程" value="workflow_casefile" />
+       <el-option label="平台预警信息" value="violation_warning" />
+       <el-option label="办文办事" value="handleAffairs" />
+       <el-option label="后勤管理" value="logistics" />
+       <el-option label="会议事务" value="conference" />
+       <el-option label="假勤管理" value="workflow_leave" />
+       <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc" />
+     </el-select>
+
     <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
@@ -207,6 +236,7 @@ export default {
       company:false,
       driver:false,
       vehicle:false,
+      names:null,
     };
   },
   created() {
@@ -232,12 +262,14 @@ export default {
           this.taskList = response.rows;
           this.total = response.total;
           this.loading = false;
+          this.names = response.names;
         });
       } else {
         listTask(this.queryParams).then(response => {
           this.taskList = response.rows;
           this.total = response.total;
           this.loading = false;
+          this.names = response.names;
         });
       }
     },
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.domain.entity.SysUser;
@@ -37,6 +38,7 @@ public class WorkflowController extends BaseController {
     /**
      * 查询请假列表
      */
+    @RepeatSubmit
     @RequestMapping("/add")
     public AjaxResult add(@RequestBody Map<String,Object> map) {
     	String username = null;
@@ -56,7 +58,6 @@ public class WorkflowController extends BaseController {
         }else{
         	return AjaxResult.error("create work flow error");
         }
-        
     }
     /**
@@ -2,6 +2,7 @@ package com.trash.workflow.listener;
 import com.trash.office.domain.Conference;
 import com.trash.office.mapper.ConferenceMapper;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.spring.SpringUtils;
@@ -13,11 +14,15 @@ import java.util.Map;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 public class baseDataListener implements ExecutionListener {
     private Expression state;
+    private static final Logger log = LoggerFactory.getLogger(baseDataListener.class);
+    
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -30,16 +35,48 @@ public class baseDataListener implements ExecutionListener {
     	list.add(map);
-    	if(delegateExecution.getProcessInstanceBusinessKey().contains("company")){
-    		RemoteServerUtils.updateCompanyAudit(list);
-    	}
-    	if(delegateExecution.getProcessInstanceBusinessKey().contains("vehicle")){
-    		RemoteServerUtils.updateTruckAudit(list);
-    	}
-    	if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
-    		RemoteServerUtils.updateDriverAudit(list);
-    	}
+    	new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				while(true){
+					
+				   	Object object = null;
+			    	
+			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("company")){
+			    		object = RemoteServerUtils.updateCompanyAudit(list);
+			    	}
+			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("vehicle")){
+			    		object = RemoteServerUtils.updateTruckAudit(list);
+			    	}
+			    	if(delegateExecution.getProcessInstanceBusinessKey().contains("driver")){
+			    		object = RemoteServerUtils.updateDriverAudit(list);
+			    	}
+			    	
+			    	JSONObject jsonObject = (JSONObject)object;
+			    	
+			    	if(jsonObject.getBoolean("result")){
+			    		break;
+			    	}
+			    	
+			    	try {
+				          log.info("baseDataListener:" + object.toString());
+						Thread.sleep(3000);
+					} catch (InterruptedException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+		    	
+				}
+				
+			}
+		}).start();
+ 
+    	
     	workflowUtils.sendDataToHisTory(delegateExecution, state);
     }
+    
+    
+    
 }