c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-12-15 09:45:21 +08:00
parent 31170a294a
commit 2a2a285793
2 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java
+2
View File
@@ -496,6 +496,8 @@ public class TeacherCongressDelegateManageController {
dao.update(delegate); dao.update(delegate);
Sys_user_role userRole = new Sys_user_role(); Sys_user_role userRole = new Sys_user_role();
userRole.setTcDelegationId(delegation_unit.getDelegationId()); userRole.setTcDelegationId(delegation_unit.getDelegationId());
userRole.setUserId(delegate.getUserId());
userRole.setTcSessionId(delegate.getSessionId());
Sys_role sys_role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name())); Sys_role sys_role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()));
if (sys_role.getId().equals(delegate.getRoleId())) { if (sys_role.getId().equals(delegate.getRoleId())) {
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+9 -25
View File
@@ -600,45 +600,29 @@ public class TeacherCongressDelegatePushController {
t.finishTime, t.finishTime,
t.taskParentId, t.taskParentId,
t.variable taskVariable, t.variable taskVariable,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
IF(rt.id IS NOT NULL, 1, 0) AS canRevoke (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
FROM FROM
wf_process_task t teacher_congress_delegate_push info
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
LEFT JOIN teacher_congress_delegate_push info ON info.id = ins.businessNo LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
$condition $condition
"""); """);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801"); cnd.andEX("info.sessionId", "=", sessionId);
// cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("info.pushUnionId", "=", unionId);
if (!"全部".equals(isFormalOrAttendance)) { if (!"全部".equals(isFormalOrAttendance)) {
cnd.and("info.representativeType", "=", isFormalOrAttendance); cnd.and("info.representativeType", "=", isFormalOrAttendance);
} }
cnd.andEX("info.sessionId", "=", sessionId);
cnd.andEX("info.unionId", "=", unionId);
cnd.and("ins.state", "=", 20);
// if (approval) {
// cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
// } else {
// cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
// }
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup(); SqlExpressionGroup group = new SqlExpressionGroup();
group.orLike("info.userName", pageForm.getSearchKeyword()); group.orLike("info.userName", pageForm.getSearchKeyword());
group.orLike("info.loginName", pageForm.getSearchKeyword()); group.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(group); cnd.and(group);
} }
cnd.desc("info.createdAt");
cnd.groupBy("t.id");
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("t.createdAt");
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
sql.setCondition(cnd); sql.setCondition(cnd);
return sql; return sql;
} }