diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java index b53dbf7..600c32e 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java @@ -54,21 +54,19 @@ public class ExecutiveCommitteeConfigController { ExecutiveCommitteeConfig config = committeeConfigService.fetch(Cnd.where("teacherMeetId", "=", sessionId)); if(config == null) { config = new ExecutiveCommitteeConfig(); - Sql sql = Sqls.create(""" - SELECT - dbt.id as delegationId, - dbt.name as delegationName, - dbt.code as delegationCode, - (SELECT count( 1 ) FROM vw_user where unitId IN ( SELECT unitId FROM teacher_congress_delegation_unit unit WHERE unit.delegationId = dbt.id ) and member = 1) as memberCount, - (SELECT count( 1 ) FROM teacher_congress_delegate where unitId IN ( SELECT unitId FROM teacher_congress_delegation_unit unit WHERE unit.delegationId = dbt.id ) and sessionId=@sessionId) as dbCount, - 0 as quotaCount - FROM - teacher_congress_delegation dbt - WHERE dbt.sessionId = @sessionId - ORDER BY CODE ASC - """).setParam("sessionId", sessionId); - List listMap = committeeConfigService.listMap(sql); - config.setDelegationQuotaList(listMap); + Sql sql = Sqls.create(""" + SELECT + sun.id as unionId, + sun.name as unionName, + sun.unionCode , + (SELECT count( 1 ) FROM vw_user where sun.id = unionId) as memberCount, + 0 as quotaCount + FROM + sys_union sun + ORDER BY unionCode ASC + """); + List listMap = committeeConfigService.listMap(sql); + config.setUnionQuotaList(listMap); } return Result.success(config); } 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 9d67f24..d947cd7 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 @@ -41,13 +41,13 @@ import java.util.stream.Collectors; /** * @author zhf * @date 2025/8/25 15:18 - * @description 团长一次推选 + * @description 分工会一次推选 */ @IocBean @At("/platform/executiveCommittee/delegationOnePush") @Ok("json:full") @Slf4j -@Api(tags = "执委会推选-团长一次推选") +@Api(tags = "执委会推选-分工会主席一次推选") public class ExecutiveCommitteeDelegationOnePushController { @Inject @@ -61,8 +61,9 @@ public class ExecutiveCommitteeDelegationOnePushController { public void index() { } + @At - @ApiOperation("查询某个代表团的团长一次推选的委员") + @ApiOperation("查询某个分工会的一次推选的委员") @SaCheckPermission("executiveCommittee.delegationOnePush") public Result pageData(PageForm pageForm, String teacherMeetId, @@ -91,19 +92,13 @@ public class ExecutiveCommitteeDelegationOnePushController { Cnd cnd = Cnd.NEW(); cnd.andEX("t1.teacherMeetId", "=", teacherMeetId); if (StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || - StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { - cnd.andEX("t1.delegationId", "=", delegationId); + StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || + StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { + cnd.andEX("t3.id", "=", unionId); }else{ - Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class, - Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId) - .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId())); - if (ObjectUtil.isEmpty(db)) { - return Result.error("没有权限,只有代表团团长才能推选"); - } - cnd.andEX("t1.delegationId", "=", db.getDelegationId()); + cnd.andEX("t3.id", "=", SecurityUtil.getUnionId()); } - - cnd.andEX("t3.id", "=", unionId); + cnd.andEX("t1.delegationId", "=", delegationId); cnd.andEX("t1.addType", "=", 1); if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup group = new SqlExpressionGroup(); @@ -121,11 +116,10 @@ public class ExecutiveCommitteeDelegationOnePushController { @ApiOperation("查询可以推选委员和已经推选的人员") @SaCheckPermission("executiveCommittee.delegationOnePush") public Result getDelegationUser(String teacherMeetId) { - Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class, - Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId) - .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId())); - if (ObjectUtil.isEmpty(db)) { - return Result.error("没有权限,只有代表团团长才能推选"); + if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || + StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || + StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) { + return Result.error("没有权限,只有分工会主席才能推选"); } ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, Cnd.where(ExecutiveCommitteeConfig::getTeacherMeetId, "=", teacherMeetId)); @@ -144,11 +138,6 @@ public class ExecutiveCommitteeDelegationOnePushController { List onePushList = dao.query(ExecutiveCommitteeOnePush.class, Cnd.NEW()); List userIds = onePushList.stream().map(v -> v.getUserId()).collect(Collectors.toList()); - Cnd cnd = Cnd.NEW(); - cnd.andEX("db.sessionId", "=", teacherMeetId); - cnd.andEX("db.userId", "not in", userIds); - cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); - cnd.and("db.delegationId", "=", db.getDelegationId()); Sql sql = Sqls.create(""" SELECT db.*, @@ -160,29 +149,33 @@ public class ExecutiveCommitteeDelegationOnePushController { LEFT JOIN `vw_user` u ON db.userId = u.id $condition """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("db.sessionId", "=", teacherMeetId); + cnd.andEX("db.userId", "not in", userIds); + cnd.andEX("db.userId", "!=", SecurityUtil.getUserId()); + cnd.and("db.unionId", "=", SecurityUtil.getUnionId()); sql.setCondition(cnd); List userData = baseService.listMap(sql); - List delegationQuotaList = config.getDelegationQuotaList(); - NutMap delegationQuota = delegationQuotaList.stream().filter(v -> v.get("delegationId").equals(db.getDelegationId())).findFirst().orElse(null); - if (Lang.isNotEmpty(delegationQuota)) { - return Result.success(Map.of("userData", userData, "userValue", userValue, "quotaCount", delegationQuota.getInt("quotaCount"))); + List unionQuotaList = config.getUnionQuotaList(); + NutMap unionQuota = unionQuotaList.stream().filter(v -> v.get("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", userValue, "quotaCount", 0)); } @At @SaCheckPermission("executiveCommittee.delegationOnePush") - @SLog(tag = "执委会推选-团长推选委员", msg = "推选委员") + @SLog(tag = "执委会推选-分工会主席推选委员", msg = "推选委员") public Result addOnePush(@Param("userValue") String[] userValue, String teacherMeetId) { try { - Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class, - Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId) - .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId())); - if (ObjectUtil.isEmpty(db)) { - return Result.error("没有权限,只有代表团团长才能推选"); + if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || + StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || + StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) { + return Result.error("没有权限,只有分工会主席才能推选"); } ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, @@ -196,19 +189,20 @@ public class ExecutiveCommitteeDelegationOnePushController { if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) { return Result.error("一次预选已结束"); } - List delegationQuotaList = config.getDelegationQuotaList(); + List unionQuotaList = config.getUnionQuotaList(); - NutMap delegationQuota = delegationQuotaList.stream().filter(v -> v.getString("delegationId").equals(db.getDelegationId())).findFirst().orElse(null); - if (ObjectUtil.isEmpty(delegationQuota)) { - return Result.error("请先配置代表团人数"); + NutMap unionQuota = unionQuotaList.stream().filter(v -> v.getString("unionId").equals(SecurityUtil.getUnionId())).findFirst().orElse(null); + if (ObjectUtil.isEmpty(unionQuota)) { + return Result.error("请先配置分工会人数"); } int dbCount = dao.count(ExecutiveCommitteeOnePush.class, - Cnd.where("delegationId", "=", db.getDelegationId()) + Cnd.where("unionId", "=", SecurityUtil.getUnionId()) .and("teacherMeetId", "=", teacherMeetId) .and("addType", "=", 1)); - if (dbCount + userValue.length > delegationQuota.getInt("quotaCount")) { - return Result.error("推选人数限制" + delegationQuota.getInt("quotaCount") + "人"); + assert unionQuota != null; + if (dbCount + userValue.length > unionQuota.getInt("quotaCount")) { + return Result.error("推选人数限制" + unionQuota.getInt("quotaCount") + "人"); } Sql sql = Sqls.create(""" SELECT @@ -236,6 +230,7 @@ public class ExecutiveCommitteeDelegationOnePushController { onePush.setUserName(jdhDb.getString("userName")); onePush.setLoginName(jdhDb.getString("loginName")); onePush.setDelegationId(jdhDb.getString("delegationId")); + onePush.setUnionId(jdhDb.getString("unionId")); onePush.setUnitId(jdhDb.getString("unitId")); onePush.setTeacherMeetId(teacherMeetId); String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName"))); @@ -253,7 +248,7 @@ public class ExecutiveCommitteeDelegationOnePushController { @At @SaCheckPermission("executiveCommittee.delegationOnePush") - @SLog(tag = "执委会推选-团长推选委员", msg = "删除推选的人") + @SLog(tag = "执委会推选-分工会主席推选委员", msg = "删除推选的人") public Result doDelete(@Valid String id, @Valid String teacherMeetId) { ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, Cnd.where("teacherMeetId", "=", teacherMeetId)); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationTwoPushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationTwoPushController.java index 712a5ce..eb096ab 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationTwoPushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeDelegationTwoPushController.java @@ -1,10 +1,12 @@ package com.budwk.app.zhgh.democratic.executiveCommittee.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; @@ -34,7 +36,7 @@ import java.util.stream.Collectors; /** * @author zhf * @date 2025/6/23 15:25 - * @description 团长二次推选 + * @description 分工会二次推选 */ @At("/platform/executiveCommittee/delegationTwoPush") @Ok("json:full") @@ -87,7 +89,13 @@ public class ExecutiveCommitteeDelegationTwoPushController { cnd.andEX("t1.pushUserId", "=", SecurityUtil.getUserId()); cnd.andEX("t1.teacherMeetId", "=", teacherMeetId); cnd.andEX("t2.delegationId", "=", delegationId); - cnd.andEX("t4.id", "=", unionId); + if (StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || + StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || + StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { + cnd.andEX("t4.id", "=", unionId); + } else { + cnd.andEX("t4.id", "=", SecurityUtil.getUnionId()); + } if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup group = new SqlExpressionGroup(); group.orLike("t2.userName", pageForm.getSearchKeyword()); @@ -101,13 +109,12 @@ public class ExecutiveCommitteeDelegationTwoPushController { @At @SaCheckPermission("executiveCommittee.delegationTwoPush") - @SLog(type = "执委会推选-团长二次推选", tag = "查询可以二次推选的名单", param = true, result = true) + @SLog(type = "执委会推选-分工会二次推选", tag = "查询可以二次推选的名单", param = true, result = true) public Result getDelegationUser(String teacherMeetId) { - Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class, - Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId) - .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId())); - if (ObjectUtil.isEmpty(db)) { - return Result.error("没有权限,只有代表团团长才能推选"); + if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || + StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || + StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) { + return Result.error("没有权限,只有分工会主席才能推选"); } ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, Cnd.where("teacherMeetId", "=", teacherMeetId)); @@ -125,10 +132,7 @@ public class ExecutiveCommitteeDelegationTwoPushController { .and("pushUserId", "=", SecurityUtil.getUserId())); List userIds = userValue.stream().map(v -> v.getUserId()).collect(Collectors.toList()); - Cnd cnd = Cnd.NEW(); - cnd.andEX("t1.teacherMeetId", "=", teacherMeetId); - cnd.andEX("t1.userId", "not in", userIds); - cnd.andEX("t1.userId", "!=", SecurityUtil.getUserId()); + Sql sql = Sqls.create(""" SELECT t1.*, @@ -144,23 +148,26 @@ public class ExecutiveCommitteeDelegationTwoPushController { LEFT JOIN `vw_user` t2 ON t1.userId = t2.id $condition """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("t1.teacherMeetId", "=", teacherMeetId); + cnd.andEX("t1.userId", "not in", userIds); + cnd.andEX("t1.userId", "!=", SecurityUtil.getUserId()); sql.setCondition(cnd); List userData = baseService.listMap(sql); - return Result.success(Map.of("userData", userData, "userValue", userValue,"delegationQuotaCount",config.getDelegationQuotaCount())); + return Result.success(Map.of("userData", userData, "userValue", userValue, "committeeQuotaCount", config.getCommitteeQuotaCount())); } @At @SaCheckPermission("executiveCommittee.delegationTwoPush") @ApiOperation("推选委员") - @SLog(tag = "执委会推选-团长二次推选", msg = "推选委员") + @SLog(tag = "执委会推选-分工会二次推选", msg = "推选委员") public Result addOnePush(@Param("userValue") String[] userValue, String teacherMeetId) { try { - Teacher_congress_delegate db = dao.fetch(Teacher_congress_delegate.class, - Cnd.where(Teacher_congress_delegate::getSessionId, "=", teacherMeetId) - .and(Teacher_congress_delegate::getUserId, "=", SecurityUtil.getUserId())); - if (ObjectUtil.isEmpty(db)) { - return Result.error("没有权限,只有代表团团长才能推选"); + if (!(StpUtil.hasRole(RoleConstant.SYSADMIN.name()) || + StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()) || + StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))) { + return Result.error("没有权限,只有分工会主席才能推选"); } ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, @@ -193,7 +200,8 @@ public class ExecutiveCommitteeDelegationTwoPushController { ExecutiveCommitteeTwoPush twoPush = new ExecutiveCommitteeTwoPush(); twoPush.setPushDate(DateUtil.date()); twoPush.setUserId(id); - twoPush.setPushDelegationId(db.getDelegationId()); + twoPush.setPushDelegationId(jdhDb.getDelegationId()); + twoPush.setPushUnionId(SecurityUtil.getUnionId()); twoPush.setPushUserId(SecurityUtil.getUserId()); twoPush.setPushUserName(SecurityUtil.getUserUsername()); twoPush.setPushLoginName(SecurityUtil.getUserLoginname()); @@ -211,7 +219,7 @@ public class ExecutiveCommitteeDelegationTwoPushController { @At @ApiOperation("删除推选人员") @SaCheckPermission("executiveCommittee.delegationTwoPush") - @SLog(tag = "执委会推选-团长二次推选", msg = "删除推选人员") + @SLog(tag = "执委会推选-分工会二次推选", msg = "删除推选人员") public Result doDelete(@Valid String id, @Valid String teacherMeetId) { ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class, Cnd.where("teacherMeetId", "=", teacherMeetId)); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java index 610c901..73a754a 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java @@ -182,6 +182,7 @@ public class ExecutiveCommitteePushController { onePush.setUserName(jdhDb.getString("userName")); onePush.setLoginName(jdhDb.getString("loginName")); onePush.setDelegationId(jdhDb.getString("delegationId")); + onePush.setUnionId(jdhDb.getString("unionId")); onePush.setUnitId(jdhDb.getString("unitId")); onePush.setTeacherMeetId(teacherMeetId); String firstLetter = String.valueOf(getFirstLetter(jdhDb.getString("userName"))); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeConfig.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeConfig.java index 0f59943..9830664 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeConfig.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeConfig.java @@ -47,9 +47,9 @@ public class ExecutiveCommitteeConfig extends BaseModel implements Serializable private Integer committeeQuotaCount; @Column - @Comment("代表团推荐名额总数") + @Comment("分工会推荐名额总数") @ColDefine(type = ColType.INT) - private Integer delegationQuotaCount; + private Integer unionQuotaCount; @Column @Comment("一次预选开始时间") @@ -72,8 +72,8 @@ public class ExecutiveCommitteeConfig extends BaseModel implements Serializable private DateTime secondEndTime; @Column - @Comment("各代表团名额数") + @Comment("各分工会名额数") @ColDefine(type = ColType.MYSQL_JSON) - private List delegationQuotaList; + private List unionQuotaList; } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeOnePush.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeOnePush.java index 9c9961a..0c60b2d 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeOnePush.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeOnePush.java @@ -42,6 +42,11 @@ public class ExecutiveCommitteeOnePush extends BaseModel implements Serializable @ColDefine(type = ColType.VARCHAR, width = 32) private String delegationId; + @Column + @Comment("所属分工会") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + @Column @Comment("姓名") @ColDefine(type = ColType.VARCHAR, width = 20) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java index 5a92fcf..87794f7 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java @@ -37,6 +37,11 @@ public class ExecutiveCommitteeTwoPush extends BaseModel implements Serializable @ColDefine(type = ColType.VARCHAR, width = 32) private String teacherMeetId; + @Column + @Comment("推选的分工会") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String pushUnionId; + @Column @Comment("推选的代表团") @ColDefine(type = ColType.VARCHAR, width = 32) diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js index 3877ce0..7ea7e9e 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js @@ -4,7 +4,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = { @@ -24,7 +24,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = {
{{ option.userName }} - {{ option.loginName - }} - {{option.unitName}} + }} - {{option.unitName}} - {{option.unionName}}
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js index 98e578b..2845f00 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js @@ -4,7 +4,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = { @@ -36,7 +36,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
- 投票名额：{{delegationQuotaCount}}个 + 投票名额：{{committeeQuotaCount}}个 取 消 确 定 @@ -53,7 +53,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = { rightChecked: [], attendanceRightChecked: [], teacherMeetId: null, - delegationQuotaCount: 0 + committeeQuotaCount: 0 } }, methods: { @@ -70,7 +70,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = { data.userData.forEach(v => { this.userData.push({userId: v.userId, ...v}) }) - this.delegationQuotaCount = data.delegationQuotaCount + this.committeeQuotaCount = data.committeeQuotaCount this.dialogVisible = true } else { this.$message.error(msg) diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html index eb10f44..e5045d5 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html @@ -32,9 +32,9 @@ layout("/layouts/platform.html"){ style="width: 100%"> - - + + - - + + { - const total = this.formData.delegationQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0) - if (total > this.formData.delegationQuotaCount) { - this.$message.warning('各代表团名额分配数之和不能超过' + this.formData.delegationQuotaCount) + const total = this.formData.unionQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0) + if (total > this.formData.unionQuotaCount) { + this.$message.warning('各分工会名额分配数之和不能超过' + this.formData.unionQuotaCount) return } if (this.formData.firstTime && this.formData.firstTime.length > 1) { @@ -168,7 +168,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, 'secondEndTime', this.formData.secondTime[1]) } this.$set(this.formData, 'teacherMeetId', this.pageForm.sessionId) - this.$set(this.formData, 'delegationQuotaList', JSON.stringify(this.formData.delegationQuotaList)) + this.$set(this.formData, 'unionQuotaList', JSON.stringify(this.formData.unionQuotaList)) const resp = await this.$axios.post('/platform/executiveCommittee/executiveCommitteeConfig/onHandle', this.formData) if (resp.code === 0) { await this.fetchConfig()