Commit 0d0d0be2a2776737203a8af811329bc001791989
1 parent
89b2df1d
m
Showing
5 changed files
with
6 additions
and
6 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
| ... | ... | @@ -228,7 +228,9 @@ public class ActTaskServiceImpl implements IActTaskService { |
| 228 | 228 | |
| 229 | 229 | |
| 230 | 230 | List<HistoricProcessInstance> processInstanceList; |
| 231 | - HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username).orderByProcessInstanceStartTime().desc(); | |
| 231 | + | |
| 232 | + | |
| 233 | + HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username).finished().orderByProcessInstanceStartTime().desc(); | |
| 232 | 234 | |
| 233 | 235 | if(name != null) |
| 234 | 236 | query.processInstanceNameLike("%"+name+"%"); |
| ... | ... | @@ -268,6 +270,7 @@ public class ActTaskServiceImpl implements IActTaskService { |
| 268 | 270 | |
| 269 | 271 | list.add(dto);} |
| 270 | 272 | catch (Exception e) { |
| 273 | + System.out.println(p.getBusinessKey()); | |
| 271 | 274 | e.printStackTrace(); |
| 272 | 275 | } |
| 273 | 276 | } | ... | ... |
trash-ui/src/main.js
| ... | ... | @@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree |
| 37 | 37 | Vue.prototype.parseStatus = parseStatus |
| 38 | 38 | Vue.prototype.checkPer = checkPermi |
| 39 | 39 | |
| 40 | -// Vue.prototype.remoteFrame = "http://183.66.242.6:14601" | |
| 41 | -Vue.prototype.remoteFrame = "http://175.6.47.84:8008" | |
| 40 | +Vue.prototype.remoteFrame = "http://183.66.242.6:14601" | |
| 41 | +// Vue.prototype.remoteFrame = "http://175.6.47.84:8008" | |
| 42 | 42 | |
| 43 | 43 | Vue.prototype.msgSuccess = function (msg) { |
| 44 | 44 | this.$message({ showClose: true, message: msg, type: "success" }); | ... | ... |
trash-ui/src/views/activiti/task/bd.css
trash-ui/src/views/h5/task/constructsiteInfo.vue