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

。。

This commit is contained in:
wangliwen 2022-07-14 13:37:01 +08:00
parent e3f451b375
commit 712fdf8265
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,8 +96,13 @@ public class TAbilityApplicationController {
PageData<TAbilityApplicationDTO> page = tAbilityApplicationService.page(params);
List<TAbilityApplicationDTO> list =
page.getList().stream().map(index -> {
Integer inStanceId =
jdbcTemplate.queryForObject(String.format("SELECT DISTINCT instance_id FROM t_ability_application WHERE apply_flag = '%s' LIMIT 1", index.getApplyFlag()), Integer.class);
if (inStanceId == null) {
return index;
}
List<TAbilityApplicationDTO> dtos =
tAbilityApplicationService.getByInstanceId(index.getInstanceId());
tAbilityApplicationService.getByInstanceId(inStanceId + "");
if (!dtos.isEmpty()) {
dtos.stream()
.limit(1l)

4
renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
View File

@ -32,12 +32,10 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
params.keySet().stream().filter(index -> null != params.get(index)).forEach(index -> {
switch (index) { //
case "abilityprocess_v2":
wrapper.select("DISTINCT apply_flag,instance_id,apply_number");
wrapper.select("DISTINCT apply_flag,apply_number");
wrapper.isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_flag")
.isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "instance_id")
.isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_number");
wrapper.groupBy(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_flag")
.groupBy(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "instance_id")
.groupBy(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_number");
wrapper.orderByDesc("apply_number"); // 流程排序
break;