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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-13 18:12:13 +08:00
parent c3531a5b8f a0a238b894
commit c0676abb1b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java
View File

@ -130,6 +130,7 @@ public class AbilityCenterControllerV2 {
tAbilityApplicationDTO.setApplicationSystem(abilityBatchApplicationDTO.getApplicationSystem());
tAbilityApplicationDTO.setEffectWish(abilityBatchApplicationDTO.getEffectWish());
tAbilityApplicationDTO.setEnclosureName(abilityBatchApplicationDTO.getEnclosureName());
tAbilityApplicationDTO.setCreateDate(new Date());
// 归为同一次申请
tAbilityApplicationDTO.setApplyFlag(abilityBatchApplicationDTO.getApplyFlag());

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

@ -32,11 +32,14 @@ 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");
wrapper.isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "apply_flag");
wrapper.isNotNull(Boolean.valueOf(params.get("abilityprocess_v2").toString()), "instance_id");
wrapper.select("DISTINCT apply_flag,instance_id,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("instance_id");
.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;
case "user_id":
wrapper.eq(params.get("user_id") != null, "user_id", Long.valueOf(params.get("user_id").toString()));
@ -46,7 +49,7 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
break;
}
});
wrapper.orderByDesc("instance_id"); // 流程排序
// wrapper.orderByDesc("cre"); // 流程排序
return wrapper;
}