wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-01 15:47:53 +08:00
parent 37ca5ade65 3a87c7381d
commit 9f9ff3fd27
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -180,6 +180,23 @@ public class TAbilityApplicationController {
Boolean ended = jdbcTemplate.queryForObject(sql, Boolean.class); Boolean ended = jdbcTemplate.queryForObject(sql, Boolean.class);
index.setEnded(Boolean.TRUE.equals(ended)); index.setEnded(Boolean.TRUE.equals(ended));
} }
/**
* 判断该次申请是否存在驳回的子单
*/
// 该条申请的实例id列表
String inStanceIdsSql = String.format("SELECT DISTINCT instance_id FROM t_ability_application WHERE apply_flag = '%s';", index.getApplyFlag());
List<Map<String, Object>> inStanceIds = jdbcTemplate.queryForList(inStanceIdsSql);
index.setBackToFirst(inStanceIds.stream().map(inStanceId_ -> {
List<Task> listTask = taskService.createTaskQuery().processInstanceId(inStanceId_.get("instance_id").toString())
.includeProcessVariables().includeTaskLocalVariables().list();
return listTask.stream().anyMatch(task ->
task.getProcessVariables().containsKey("backToFirst") ?
(task.getProcessVariables().get("backToFirst") != null ? Boolean.valueOf(task.getProcessVariables().get("backToFirst").toString()) : Boolean.FALSE)
: Boolean.FALSE
);
}).filter(i -> i).findAny().isPresent()); // 子单内是否存在驳回流程
/** /**
* 处理催办条件与催办信息 * 处理催办条件与催办信息
*/ */