diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java index 9d67f241..8d14aa43 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java @@ -147,7 +147,7 @@ public class ExecutiveCommitteeDelegationOnePushController { Cnd cnd = Cnd.NEW(); cnd.andEX("db.sessionId", "=", teacherMeetId); cnd.andEX("db.userId", "not in", userIds); - cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); +// cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); cnd.and("db.delegationId", "=", db.getDelegationId()); Sql sql = Sqls.create(""" SELECT diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushDwSjAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushDwSjAuditController.java index b63bae36..ad789f01 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushDwSjAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushDwSjAuditController.java @@ -107,6 +107,7 @@ public class ExecutiveCommitteePushDwSjAuditController { wf_process_task t LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId LEFT JOIN executive_committee_union_push_info info ON info.id = ins.businessNo + left join sys_user us on us.id=info.userId LEFT JOIN teacher_congress_delegate tcd on tcd.sessionId=@sessionId and tcd.userId=info.userId LEFT JOIN teacher_congress_delegation ion on ion.id=tcd.delegationId LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id @@ -129,8 +130,8 @@ public class ExecutiveCommitteePushDwSjAuditController { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup group = new SqlExpressionGroup(); - group.orLike("info.userName", pageForm.getSearchKeyword()); - group.orLike("info.loginName", pageForm.getSearchKeyword()); + group.orLike("us.userName", pageForm.getSearchKeyword()); + group.orLike("us.loginName", pageForm.getSearchKeyword()); cnd.and(group); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java index 5385f127..d26ac22d 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java @@ -19,7 +19,6 @@ import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeConfig; -import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeOnePush; import com.budwk.app.zhgh.democratic.executiveCommittee.models.ExecutiveCommitteeUnionPushInfo; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import io.swagger.annotations.Api; @@ -43,7 +42,6 @@ import org.nutz.mvc.annotation.Param; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @author zhf @@ -109,6 +107,7 @@ public class ExecutiveCommitteeUnionPushController { (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId FROM executive_committee_union_push_info info + left join sys_user us on us.id=info.userId LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id 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 @@ -122,8 +121,8 @@ public class ExecutiveCommitteeUnionPushController { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup group = new SqlExpressionGroup(); - group.orLike("info.userName", pageForm.getSearchKeyword()); - group.orLike("info.loginName", pageForm.getSearchKeyword()); + group.orLike("us.userName", pageForm.getSearchKeyword()); + group.orLike("us.loginName", pageForm.getSearchKeyword()); cnd.and(group); } cnd.desc("info.createdAt"); @@ -158,19 +157,19 @@ public class ExecutiveCommitteeUnionPushController { if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) { return Result.error("一次预选已结束"); } - List userValue = dao.query(ExecutiveCommitteeOnePush.class, + /* List userValue = dao.query(ExecutiveCommitteeOnePush.class, Cnd.where("teacherMeetId", "=", teacherMeetId)); List onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW()); - List userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList()); + List userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList());*/ List pushInfoList = dao.query(ExecutiveCommitteeUnionPushInfo.class, Cnd.where(ExecutiveCommitteeUnionPushInfo::getTeacherMeetId, "=", teacherMeetId)); - List unionPushUserIds = pushInfoList.stream().map(v -> v.getUserId()).toList(); + List unionPushUserIds = pushInfoList.stream().map(ExecutiveCommitteeUnionPushInfo::getUserId).toList(); Cnd cnd = Cnd.NEW(); cnd.andEX("db.sessionId", "=", teacherMeetId); - cnd.andEX("db.userId", "not in", userIds); +// cnd.andEX("db.userId", "not in", userIds); cnd.andEX("db.userId", "not in", unionPushUserIds); // cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); @@ -192,9 +191,9 @@ public class ExecutiveCommitteeUnionPushController { List unionQuotaList = config.getUnionQuotaList(); NutMap unionQuota = unionQuotaList.stream().filter(v -> v.getString("unionId").equals(SecurityUtil.getUnionId())).findFirst().orElse(null); if (Lang.isNotEmpty(unionQuota)) { - return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", unionQuota.getInt("quotaCount"))); + return Result.success(Map.of("userData", userData, "userValue", pushInfoList, "quotaCount", unionQuota.getInt("quotaCount"))); } - return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", 0)); + return Result.success(Map.of("userData", userData, "userValue", pushInfoList, "quotaCount", 0)); } diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html index 6aeca207..5c3f4ef7 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html @@ -10,8 +10,8 @@ layout("/layouts/platform.html"){ - - + + + + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html index e3199c39..e57cb6f5 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html @@ -10,22 +10,29 @@ layout("/layouts/platform.html"){ - - - - - + + + + + + + + + +