OpenGitLink
/
snow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11

This commit is contained in:
jinqiming 2021-01-21 19:52:59 +08:00
parent 1af5c7d779
commit a7f100ddfd
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java
View File

@ -151,6 +151,10 @@ public class FlowController extends BaseController {
return prefix +"/myStartProcessDetail";
}
/**
* 我参与的任务
* @return
*/
@RequiresPermissions("flow:process:getMyTakePartInProcess")
@GetMapping("/toMyTakePartInProcess")
public String getMyTakePartInProcess()

3
snow-admin/src/main/resources/templates/flow/myStartProcess.html
View File

@ -13,7 +13,7 @@
<div class="row">
<ul>
<li>
<label>&nbsp;&nbsp; 流程名称：</label>
<label>流程名称：</label>
<input type="text" name="processDefinitionName"/>
</li>
<li>
@ -40,7 +40,6 @@
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('system:flow:myStartProcessDetail')}]];
var processInstanceStatusDatas = [[${@dict.getType('process_instance_status')}]];
var prefixFlow = ctx + "flow";
$(function() {

5
snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java
View File

@ -620,6 +620,9 @@ public class FlowableServiceImpl implements FlowableService {
if(!StringUtils.isEmpty(processInstanceDTO.getStartedUserId())){
historicProcessInstanceQuery.startedBy(processInstanceDTO.getStartedUserId());
}
if(!StringUtils.isEmpty(processInstanceDTO.getProcessDefinitionName())){
historicProcessInstanceQuery.processDefinitionName(processInstanceDTO.getProcessDefinitionName());
}
historicProcessInstanceQuery.includeProcessVariables();
long count = historicProcessInstanceQuery.
orderByProcessInstanceStartTime().
@ -683,7 +686,7 @@ public class FlowableServiceImpl implements FlowableService {
}
);
if(!StringUtils.isEmpty(historicTaskInstanceDTO.getBusinessKeyLike())){
historicTaskInstanceQuery.processInstanceBusinessKeyLike(historicTaskInstanceDTO.getBusinessKeyLike());
historicTaskInstanceQuery.processInstanceBusinessKeyLike("%"+historicTaskInstanceDTO.getBusinessKeyLike()+"%");
}
if(!StringUtils.isEmpty(historicTaskInstanceDTO.getBusinessKey())){
historicTaskInstanceQuery.processInstanceBusinessKey(historicTaskInstanceDTO.getBusinessKey());