m

youxiw2000
1 parent 9408fae7
Showing 15 changed files with 185 additions and 141 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskHistoryController.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-admin/src/main/resources/application-dev.yml
trash-ui/dist.rar
trash-ui/src/api/dict.js
trash-ui/src/api/three_step.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/activiti/task/taskCard.vue
trash-ui/src/views/activiti/taskhistory/index.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/h5/task/taskCard.vue
trash-ui/src/views/h5/taskhistory/index.vue
@@ -39,27 +39,27 @@ public class TaskHistoryController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectRuntimeTaskHistoryDefinitionList(pageDomain);
-        List<String> allNames =  actReDeploymentMapper.selectTitles(null);
-        
-        List<ActTaskDTO> list = hashMaps.getResult();
-        List<String> names =  new ArrayList<String>();
-        
-        for(String str:allNames){
-        	for(ActTaskDTO dto:hashMaps.getResult()){
-        		if(str.equals(dto.getInstanceName())){
-        			names.add(str);
-        		}
-        	}
-        }
+//        List<String> allNames =  actReDeploymentMapper.selectTitles(null);
+//        
+//        List<ActTaskDTO> list = hashMaps.getResult();
+//        List<String> names =  new ArrayList<String>();
+//        
+//        for(String str:allNames){
+//        	for(ActTaskDTO dto:hashMaps.getResult()){
+//        		if(str.equals(dto.getInstanceName())){
+//        			names.add(str);
+//        		}
+//        	}
+//        }
         TableDataInfo info = getDataTable(hashMaps);
-        if(list.size() > pageDomain.getPageNum() * pageDomain.getPageSize()){
-        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), pageDomain.getPageNum()* pageDomain.getPageSize());
-        }else{
-        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), list.size());
-        }
-        info.setRows(list);
-        info.setNames(names);
+//        if(list.size() > pageDomain.getPageNum() * pageDomain.getPageSize()){
+//        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), pageDomain.getPageNum()* pageDomain.getPageSize());
+//        }else{
+//        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), list.size());
+//        }
+//        info.setRows(list);
+//        info.setNames(names);
         return info;
     }
@@ -68,28 +68,28 @@ public class TaskHistoryController extends BaseController {
     public TableDataInfo getEndTasks() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Page<ActTaskDTO> hashMaps = actTaskService.selectTaskEndHistoryDefinitionList(pageDomain);
-        List<String> allNames =  actReDeploymentMapper.selectHistTitles(null);
-        List<String> names =  new ArrayList<String>();
-
-        List<ActTaskDTO> list = hashMaps.getResult();
-        
-        for(String str:allNames){
-        	for(ActTaskDTO dto:hashMaps.getResult()){
-        		if(str.equals(dto.getInstanceName())){
-        			names.add(str);
-        		}
-        	}
-        }
+//        List<String> allNames =  actReDeploymentMapper.selectHistTitles(null);
+//        List<String> names =  new ArrayList<String>();
+//
+//        List<ActTaskDTO> list = hashMaps.getResult();
+//        
+//        for(String str:allNames){
+//        	for(ActTaskDTO dto:hashMaps.getResult()){
+//        		if(str.equals(dto.getInstanceName())){
+//        			names.add(str);
+//        		}
+//        	}
+//        }
         TableDataInfo info = getDataTable(hashMaps);
-        if(list.size() > pageDomain.getPageNum() * pageDomain.getPageSize()){
-        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), pageDomain.getPageNum()* pageDomain.getPageSize());
-        }else{
-        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), list.size());
-        }
-        info.setNames(names);
-        info.setRows(list);
+//        if(list.size() > pageDomain.getPageNum() * pageDomain.getPageSize()){
+//        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), pageDomain.getPageNum()* pageDomain.getPageSize());
+//        }else{
+//        	list = list.subList((pageDomain.getPageNum()-1)* pageDomain.getPageSize(), list.size());
+//        }
+//        info.setNames(names);
+//        info.setRows(list);
          return info;
@@ -33,6 +33,7 @@ import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricProcessInstanceQuery;
+import org.activiti.engine.query.QueryProperty;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.IdentityLink;
@@ -158,29 +159,11 @@ public class ActTaskServiceImpl implements IActTaskService {
 				Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
-				ProcessInstanceQuery  query = runtimeService.createProcessInstanceQuery();
+				if(processInstanceIdIds.size() > 0){
+					
-				if(name != null && !name.isEmpty()){
-					query.processInstanceNameLike(name);
-				}
-				if(keys.size()>0){
-					query.processDefinitionKeys(keys);
-				}
-				
-				
-				List<ProcessInstance> processInstanceList = query.processInstanceIds(processInstanceIdIds).list();
-
-				
-				Set<String> idString = new HashSet<String>();
-				for (ProcessInstance pi : processInstanceList) {
-					idString.add(pi.getBusinessKey());
-				}
-				
-				if(idString.size() == 0){
-					return list;
-				}
-
-				List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
+					
+					List<Map<String, Object>> maps = actMapper.selectWorkByIds(processInstanceIdIds);
 					for(Map<String, Object> map:maps){
@@ -196,6 +179,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 							e.printStackTrace();
 						}
 					}
+				}
 			}
 			if(prev != null){
@@ -217,6 +201,10 @@ public class ActTaskServiceImpl implements IActTaskService {
 	@Override
 	public Page<ActTaskDTO> selectTaskEndHistoryDefinitionList(PageDomain pageDomain) {
+		
+		int pageNum = pageDomain.getPageNum();
+		int pageSize = pageDomain.getPageSize();
+		
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
 		ProcessEngine pes = ProcessEngines.getDefaultProcessEngine();
@@ -240,14 +228,25 @@ public class ActTaskServiceImpl implements IActTaskService {
 			List<HistoricProcessInstance> processInstanceList;
-			HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username);
+			HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username).orderByProcessInstanceStartTime().desc();
 			if(name != null)
-				query.processInstanceNameLike(name);
-
+				query.processInstanceNameLike("%"+name+"%");
+			
+			if(type != null && !type.isEmpty()){
+				List<String> types = new ArrayList<String>();
+ 				for(String string :type.split(",")){
+ 					types.add(string);
+ 				}
+				query.processDefinitionKeyIn(types);
+			}
+			
+			
+			list.setTotal(query.count());
+			
+			processInstanceList = query.listPage((pageNum-1) * pageSize,pageSize);
-			processInstanceList = query.list();
 //			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
@@ -265,11 +264,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 						ActTaskDTO dto = new ActTaskDTO(p, 
 								maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
-						
-							if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
-								continue;
-							}
-							
+			
 						list.add(dto);} 
 					catch (Exception e) {
@@ -280,19 +275,18 @@ 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());
+//		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());
-		list.setTotal(list.size());
 		return list;
 	}
@@ -301,6 +295,8 @@ public class ActTaskServiceImpl implements IActTaskService {
 	public Page<ActTaskDTO> selectRuntimeTaskHistoryDefinitionList(PageDomain pageDomain) {
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
+		int pageNum = pageDomain.getPageNum();
+		int pageSize = pageDomain.getPageSize();
 		String username = securityManager.getAuthenticatedUserId();
 		Map map = new HashedMap<>();
@@ -316,7 +312,25 @@ public class ActTaskServiceImpl implements IActTaskService {
 		}
-		List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().involvedUser(username).list();
+		ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().involvedUser(username);
+		
+		
+		if(name != null)
+			query.processInstanceNameLike("%"+name+"%");
+				
+		if(type != null && !type.isEmpty()){
+			Set<String> types = new HashSet<String>();
+				for(String string :type.split(",")){
+					types.add(string);
+				}
+			query.processDefinitionKeys(types);
+		}
+		
+		List<ProcessInstance> processInstanceList = query.list();
+		
+		list.setTotal(query.count());
+		
+		processInstanceList = query.listPage((pageNum-1) * pageSize,pageSize);
 		if (processInstanceList.size() > 0) {
@@ -338,10 +352,6 @@ public class ActTaskServiceImpl implements IActTaskService {
 								dataList.parallelStream().filter(pi ->  p.getBusinessKey().equals(pi.getBusinessKey())).findAny().get());
-						if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
-							continue;
-						}
-						
 						list.add(dto);
 					} catch (Exception e) {
 						// TODO: handle exception
@@ -350,19 +360,7 @@ 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());
-
-		list.setTotal(list.size());
 		return list;
 	}
@@ -43,7 +43,18 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     public List<ActWorkflowFormData> historyDataShow(String businessKey) {
         List<ActWorkflowFormData> returnHistoryFromDataDTOS=new ArrayList<>();
-        List<Task> tasks =taskService.createTaskQuery().processInstanceBusinessKey(businessKey).list();
+        List<Task> tasks = null;
+        
+        if(businessKey.contains("constructsite")){
+        	String id = businessKey.split(":")[1];
+            tasks =taskService.createTaskQuery().processInstanceBusinessKey("workflow_constructsite_edit:" + id).list();
+            tasks.addAll(taskService.createTaskQuery().processInstanceBusinessKey("workflow_constructsite:" + id).list());
+        }else{
+
+            tasks =taskService.createTaskQuery().processInstanceBusinessKey(businessKey).list();
+        }
+        	
+        
 		if(tasks.size() > 0){
@@ -169,10 +169,7 @@ public class myTaskServiceImpl implements myTaskService {
 		ProcessInstanceQuery  query = runtimeService.createProcessInstanceQuery();
 		if(name != null && !name.isEmpty()){
-			query.processInstanceNameLike(name);
-
-			List<ProcessInstance> pList = query.list();
-			
+			query.processInstanceNameLike("%"+name+"%");
 		}
 		if(defKey.size()>0){
 			query.processDefinitionKeys(defKey);
@@ -24,7 +24,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
 	<select id="selectWorkByIds"  parameterType="String" resultType="java.util.Map">
-	   	select id,title,start_time as startTime,end_time as endTime, reason,type,instance_id,create_time  as createTime,create_by,state from workflow where id in
+	   	select id,title,start_time as startTime,end_time as endTime, reason,type,instance_id,create_time  as createTime,create_by,state from workflow where instance_id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -33,7 +33,7 @@ spring:
             # 主库数据源
             master:
                 #url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-                url: jdbc:mysql://192.168.168.141:3306/trash1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
@@ -59,6 +59,23 @@ export function earthsitesList(data) {
     data: data
   });
 }
+
+export function constructionsitesLedgerList(data) {
+  return requestRemote({
+    url: '/api/siteservice/cs/constructionsites/ledger/list',
+    method: 'post',
+    data: data
+  });
+}
+
+export function earthsitesLedgerList(data) {
+  return requestRemote({
+    url: '/api/siteservice/cs/earthsites/ledger/list',
+    method: 'post',
+    data: data
+  });
+}
+
 export function updateEarthsites(data) {
   return requestRemote({
     url: '/api/siteservice/cs/earthsites/status',
@@ -21,8 +21,8 @@ import {
 } from "@/utils/auth";
 import {
-  earthsitesList,
-  constructionsitesList,
+  earthsitesLedgerList,
+  constructionsitesLedgerList,
   getDict,
   getArea,
   truckList,
@@ -291,9 +291,13 @@ export default {
       if(this.form.type){
         if (this.form.type == "0") {
           if(this.remoteQueryData.areaCode)
-            this.remoteQueryData.areaCode = this.remoteQueryData.areaCode + "";
+              this.remoteQueryData.areaCode = this.remoteQueryData.areaCode + "";
-          constructionsitesList(this.remoteQueryData).then(res => {
+
+
+
+            this.remoteQueryData.limitStatus = 0;
+          constructionsitesLedgerList(this.remoteQueryData).then(res => {
             for(let i in  res.result.list){
               this.remoteData.push(res.result.list[i]);
@@ -314,7 +318,10 @@ export default {
         } else {
           if(this.remoteQueryData.areaCode)
             this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
-            earthsitesList(this.remoteQueryData).then(res => {
+
+
+            this.remoteQueryData.overdue = 0;
+            earthsitesLedgerList(this.remoteQueryData).then(res => {
               for(let i in  res.result.list){
                 this.remoteData.push(res.result.list[i]);
                 if(res.result.list[i].name == this.form.name){
@@ -11,10 +11,11 @@
       </el-option>
     </el-select>
-    <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
+    <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
+   <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
       <el-option v-for="item in names" :label="item" :value="item">
       </el-option>
-    </el-select>
+    </el-select> -->
     <el-select v-model="queryParams.prev" filterable reserve-keyword  placeholder="上一节点">
       <el-option v-for="item in prev" :label="item.name" :value="item.name">
@@ -784,8 +785,6 @@
       };
     },
     created() {
-      console.log(this);
-      console.log(this.$refs["form"]);
       let dep = {type: "CSUserDepartmentType"};
       getDict(dep).then(res => {
@@ -4,28 +4,28 @@
       :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='2',agree:task.checkStatus=='1'}">
       {{task.checkStatus? task.checkStatus=="1"?"已同意":"已拒绝" : "待审批"}}</div>
     <el-row class="card_row">
-      <el-col :span="20" class="card_grid">
+      <el-col :span="20" >
         <div class="card_title">{{task.instanceName}}</div>
       </el-col>
-      <el-col :span="4" class="card_grid">
+      <el-col :span="4" >
         <a @click="sendToParent(task)" style="float: right;">详情>></a>
       </el-col>
     </el-row>
-    <el-row class="card_row" v-if="task.checkStatus == 0">
-      <el-col :span="8" class="card_grid">
+    <el-row class="card_row" v-if="!task.checkStatus">
+      <el-col :span="8" >
         <div >上一节点: {{task.prev}}</div>
       </el-col>
-      <el-col :span="8" class="card_grid" v-if="task.name">
+      <el-col :span="8"  v-if="task.name">
         <div >当前节点: {{task.name}}</div>
       </el-col>
-      <el-col :span="8" class="card_grid">
+      <el-col :span="8" >
         <div >下一节点: {{task.next}}</div>
       </el-col>
     </el-row>
     <el-row class="card_row">
-        <el-col :span="12" class="card_grid">
+        <el-col :span="12" >
           <div>申请类型: {{task.type}}</div>
         </el-col>
       <el-col :span="12" class="card_grid right">
 <template>
   <div class="app-container">
+
+   <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
+      <el-option v-for="item in names" :label="item" :value="item">
+      </el-option>
+    </el-select> -->
+
+    <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
+<!--
     <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
       <el-option v-for="item in names" :label="item" :value="item">
       </el-option>
-    </el-select>
+    </el-select> -->
     <el-select v-model="queryParams.type" filterable reserve-keyword>
       <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
@@ -10,10 +10,8 @@
                 :value="item.code" :key="item.code">
      </el-option>
    </el-select>
-<el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
-      <el-option v-for="item in names" :label="item" :value="item">
-      </el-option>
-    </el-select>
+
+    <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
     <el-select v-model="queryParams.prev" filterable reserve-keyword  placeholder="上一节点">
       <el-option v-for="item in prev" :label="item.name" :value="item.name">
@@ -781,7 +779,7 @@ export default {
       options: [],
       usersName: [],
       deptName:null,
-
+      prev:[],
       slides: [],
       slidesArys: [],
       videos:[],
@@ -797,18 +795,29 @@ export default {
     };
   },
   created() {
-    let dep = {type: "CSUserDepartmentType"};
+   let dep = {type: "CSUserDepartmentType"};
+
+   getDict(dep).then(res => {
+     this.depts = res.result;
+     for(let i in res.result){
+       if(res.result[i].name.indexOf("渣土办") < 1){
+         this.prev.push(res.result[i]);
+       }
+     }
+   });
-    getDict(dep).then(res => {
-      this.depts = res.result;
-    });
+   let role = {type: "CSUserPostType"};
-    let role = {type: "CSUserPostType"};
+   getDict(role).then(res => {
+     this.roles = res.result;
+   });
-    getDict(role).then(res => {
-      this.roles = res.result;
-    });
-    this.getList();
+   listTask(this.queryParams).then(response => {
+     this.taskList = response.rows;
+     this.names = response.names;
+     this.total = response.total;
+     this.loading = false;
+   });
   },
   methods: {
   },
@@ -6,7 +6,7 @@
     <el-row class="card_row">
       <div class="card_title">{{task.instanceName}}</div>
     </el-row>
-    <el-row class="card_row" v-if="task.checkStatus == 0">
+    <el-row class="card_row" v-if="!task.checkStatus">
       <el-col :span="24" class="card_grid">
         <div >上一节点: {{task.prev}}</div>
       </el-col>
 <template>
   <div class="app-container">
-    <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
-      <el-option v-for="item in names" :label="item" :value="item">
-      </el-option>
-    </el-select>
+
+    <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
     <el-select v-model="queryParams.type" filterable reserve-keyword>
       <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>