youxiw2000 / trash · Commits

Commit f73c0838c6b1e9c369d44b2eb97cd36c283151c8

Authored by youxiw2000
1 parent 9b89bea3
build: skipped

m

Inline Side-by-side
Showing 3 changed files with 39 additions and 40 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
  View file @f73c083
... ... @@ -107,9 +107,8 @@ public class myTaskServiceImpl implements myTaskService {
107 107 @Override
108 108 public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
109 109  
110   - TaskQuery crossQuery = taskService.createTaskQuery();
111   -
112 110  
  111 + TaskQuery crossQuery = taskService.createTaskQuery();
113 112 TaskQuery crossQuery1 = taskService.createTaskQuery();
114 113  
115 114 TaskQuery userQuery = taskService.createTaskQuery();
... ... @@ -118,6 +117,9 @@ public class myTaskServiceImpl implements myTaskService {
118 117  
119 118 TaskQuery taskQuery = taskService.createTaskQuery();
120 119  
  120 +
  121 + List<String> pid = new ArrayList<>();
  122 +
121 123 List<String> posts = SecurityUtils.getLoginUser().getUser().getPostIds();
122 124 List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
123 125  
... ... @@ -126,37 +128,34 @@ public class myTaskServiceImpl implements myTaskService {
126 128 crossQuery.taskCandidateOrAssigned(SecurityUtils.getUsername());
127 129 crossQuery1.taskCandidateOrAssigned(SecurityUtils.getUsername());
128 130 }else{
129   - crossQuery.taskCandidateUser(roles.get(0));
130   - crossQuery1.taskCandidateGroupIn(posts);
131   - }
132   -
133   - List<org.activiti.engine.task.Task> list1 = crossQuery.list();
134   - List<org.activiti.engine.task.Task> list2 = crossQuery1.list();
135   -
136   - List<String> pid = new ArrayList<>();
137   - for(org.activiti.engine.task.Task t2:list2){
138   - if(taskService.getIdentityLinksForTask(t2.getId()).size() == 1){
139   - pid.add(t2.getProcessInstanceId());
140   - continue;
141   - }
142   - }
143   -
144   -
145   - for(org.activiti.engine.task.Task t1:list1){
146   -
147   - for(org.activiti.engine.task.Task t2:list2){
148   -
149   - if(t1.getId().equals(t2.getId())){
150   - pid.add(t1.getProcessInstanceId());
151   - }
  131 +
  132 + for(int i = 0;i<roles.size();i++){
  133 +
  134 + crossQuery = taskService.createTaskQuery();
  135 + crossQuery1 = taskService.createTaskQuery();
  136 +
  137 + crossQuery.taskCandidateUser(roles.get(i));
  138 + crossQuery1.taskCandidateGroup(posts.get(i));
  139 +
  140 +
  141 + List<org.activiti.engine.task.Task> list1 = crossQuery.list();
  142 + List<org.activiti.engine.task.Task> list2 = crossQuery1.list();
  143 +
  144 + for(org.activiti.engine.task.Task t1:list1){
  145 +
  146 + for(org.activiti.engine.task.Task t2:list2){
  147 +
  148 + if(t1.getId().equals(t2.getId())){
  149 + pid.add(t1.getProcessInstanceId());
  150 + }
  151 + }
  152 + }
152 153 }
153 154 }
154   -
155 155  
156 156 for(org.activiti.engine.task.Task tasks : userQuery.list()){
157 157 pid.add(tasks.getProcessInstanceId());
158 158 }
159   -
160 159  
161 160 if(pid.size() > 0){
162 161 taskQuery.processInstanceIdIn(pid).orderByTaskCreateTime().desc();
... ...
trash-ui/src/layout/index6.vue renamed to trash-ui/src/layout/index5.vue
  View file @f73c083
trash-ui/src/views/activiti/task/index.vue
  View file @f73c083
1 1 <template>
2 2 <div class="app-container">
3   -<!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">-->
4   -<!-- <el-option v-for="item in depts" :label="item.name"-->
5   -<!-- :value="item.code" :key="item.code">-->
6   -<!-- </el-option>-->
7   -<!-- </el-select>-->
8   -<!-- <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">-->
9   -<!-- <el-option v-for="item in roles" :label="item.name"-->
10   -<!-- :value="item.code" :key="item.code">-->
11   -<!-- </el-option>-->
12   -<!-- </el-select>-->
  3 + <!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
  4 + <el-option v-for="item in depts" :label="item.name"
  5 + :value="item.code" :key="item.code">
  6 + </el-option>
  7 + </el-select>
  8 + <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">
  9 + <el-option v-for="item in roles" :label="item.name"
  10 + :value="item.code" :key="item.code">
  11 + </el-option>
  12 + </el-select> -->
13 13  
14 14  
15 15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
... ... @@ -17,7 +17,7 @@
17 17 <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
18 18 @pagination="getList"/>
19 19  
20   - <!-- 审批对话框 -->
  20 + <!-- 审批对话框
21 21 <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
22 22  
23 23 <div slot="footer" class="dialog-footer">
... ... @@ -175,7 +175,7 @@
175 175 <img src="../../../assets/logo/logo.jpg" width="100%" height="800px"/>
176 176 </el-dialog>
177 177  
178   - <!-- 会议管理 -->
  178 + <!-- 会议管理
179 179 <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
180 180 <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
181 181 <div slot="footer" class="dialog-footer">
... ... @@ -184,7 +184,7 @@
184 184 </div>
185 185 </el-dialog>
186 186  
187   - <!-- 请假申请 -->
  187 + <!-- 请假申请
188 188 <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
189 189 :close-on-click-modal="false">
190 190 <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
... ...