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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-04-02 10:41:29 +08:00
parent fc3ff8fbb1
commit 05aed69739
5 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationOnePushController.java
+1 -1
View File
@@ -147,7 +147,7 @@ public class ExecutiveCommitteeDelegationOnePushController {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.andEX("db.sessionId", "=", teacherMeetId); cnd.andEX("db.sessionId", "=", teacherMeetId);
cnd.andEX("db.userId", "not in", userIds); 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()); cnd.and("db.delegationId", "=", db.getDelegationId());
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushDwSjAuditController.java
+3 -2
View File
@@ -107,6 +107,7 @@ public class ExecutiveCommitteePushDwSjAuditController {
wf_process_task t wf_process_task t
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId 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 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_delegate tcd on tcd.sessionId=@sessionId and tcd.userId=info.userId
LEFT JOIN teacher_congress_delegation ion on ion.id=tcd.delegationId LEFT JOIN teacher_congress_delegation ion on ion.id=tcd.delegationId
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
@@ -129,8 +130,8 @@ public class ExecutiveCommitteePushDwSjAuditController {
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("us.userName", pageForm.getSearchKeyword());
group.orLike("info.loginName", pageForm.getSearchKeyword()); group.orLike("us.loginName", pageForm.getSearchKeyword());
cnd.and(group); cnd.and(group);
} }
src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java
+9 -10
View File
@@ -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.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil; 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.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.executiveCommittee.models.ExecutiveCommitteeUnionPushInfo;
import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -43,7 +42,6 @@ import org.nutz.mvc.annotation.Param;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* @author zhf * @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 (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
FROM FROM
executive_committee_union_push_info info 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_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 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
@@ -122,8 +121,8 @@ public class ExecutiveCommitteeUnionPushController {
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("us.userName", pageForm.getSearchKeyword());
group.orLike("info.loginName", pageForm.getSearchKeyword()); group.orLike("us.loginName", pageForm.getSearchKeyword());
cnd.and(group); cnd.and(group);
} }
cnd.desc("info.createdAt"); cnd.desc("info.createdAt");
@@ -158,19 +157,19 @@ public class ExecutiveCommitteeUnionPushController {
if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) { if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
return Result.error("一次预选已结束"); return Result.error("一次预选已结束");
} }
List<ExecutiveCommitteeOnePush> userValue = dao.query(ExecutiveCommitteeOnePush.class, /* List<ExecutiveCommitteeOnePush> userValue = dao.query(ExecutiveCommitteeOnePush.class,
Cnd.where("teacherMeetId", "=", teacherMeetId)); Cnd.where("teacherMeetId", "=", teacherMeetId));
List<ExecutiveCommitteeOnePush> onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW()); List<ExecutiveCommitteeOnePush> onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW());
List<String> userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList()); List<String> userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList());*/
List<ExecutiveCommitteeUnionPushInfo> pushInfoList = dao.query(ExecutiveCommitteeUnionPushInfo.class, Cnd.where(ExecutiveCommitteeUnionPushInfo::getTeacherMeetId, "=", teacherMeetId)); List<ExecutiveCommitteeUnionPushInfo> pushInfoList = dao.query(ExecutiveCommitteeUnionPushInfo.class, Cnd.where(ExecutiveCommitteeUnionPushInfo::getTeacherMeetId, "=", teacherMeetId));
List<String> unionPushUserIds = pushInfoList.stream().map(v -> v.getUserId()).toList(); List<String> unionPushUserIds = pushInfoList.stream().map(ExecutiveCommitteeUnionPushInfo::getUserId).toList();
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.andEX("db.sessionId", "=", teacherMeetId); 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", "not in", unionPushUserIds);
// cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); // cnd.andEX("db.userId", "!=", SecurityUtil.getUserId());
cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
@@ -192,9 +191,9 @@ public class ExecutiveCommitteeUnionPushController {
List<NutMap> unionQuotaList = config.getUnionQuotaList(); List<NutMap> unionQuotaList = config.getUnionQuotaList();
NutMap unionQuota = unionQuotaList.stream().filter(v -> v.getString("unionId").equals(SecurityUtil.getUnionId())).findFirst().orElse(null); NutMap unionQuota = unionQuotaList.stream().filter(v -> v.getString("unionId").equals(SecurityUtil.getUnionId())).findFirst().orElse(null);
if (Lang.isNotEmpty(unionQuota)) { 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));
} }
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html
+9 -2
View File
@@ -10,8 +10,8 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable> <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
</el-input> </el-input>
</search-item> </search-item>
<search-item label="教代会"> <search-item label="教代会">
<el-select <el-select
v-model="pageForm.teacherMeetId" v-model="pageForm.teacherMeetId"
filterable filterable
placeholder="请选择教代会" placeholder="请选择教代会"
@@ -26,6 +26,13 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属工会">
<el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option>
</el-select>
</search-item>
</search> </search>
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html
+23 -16
View File
@@ -10,22 +10,29 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable> <el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
</el-input> </el-input>
</search-item> </search-item>
<search-item label="教代会"> <search-item label="教代会">
<el-select <el-select
v-model="pageForm.teacherMeetId" v-model="pageForm.teacherMeetId"
filterable filterable
placeholder="请选择教代会" placeholder="请选择教代会"
style="width:100%;" style="width:100%;"
@change="getAllDelegation(pageForm.teacherMeetId);doSearch()" @change="getAllDelegation(pageForm.teacherMeetId);doSearch()"
> >
<el-option <el-option
v-for="item in teacherMeets" v-for="item in teacherMeets"
:key="item.id" :key="item.id"
:label="item.fullName" :label="item.fullName"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属工会">
<el-select clearable filterable placeholder="请选择所属工会" style="width: 100%"
v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option>
</el-select>
</search-item>
</search> </search>