From 2810427b172565d78c848b31e520f32449492943 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 25 Sep 2025 21:29:22 +0800 Subject: [PATCH 1/2] commit --- ...ctivityCultureApplyActivityController.java | 6 + .../ActivityCultureApplyUserController.java | 9 + ...ctivityCultureAuditActivityController.java | 28 +- .../culture/models/ActivityTissue.java | 29 +- .../sports/models/ActivitySchoolApply.java | 11 +- .../ActivitySportsApplyUserServiceImpl.java | 1 + .../impl/ActivitySportsServiceImpl.java | 2 +- .../impl/AssetStocktakingServiceImpl.java | 2 +- ...TeacherCongressDelegatePushController.java | 38 +- ...CongressDelegatePushZgAuditController.java | 87 ++- .../models/TeacherCongressDelegatePush.java | 18 + ...eacherCongressDelegatePushServiceImpl.java | 3 +- ...cherCongressQuotaAllocationController.java | 7 +- .../Teacher_congress_quota_allocation.java | 18 + .../controller/WelfareListController.java | 7 +- .../controller/WelfareMineController.java | 10 - .../WelfareSelectionSituationController.java | 18 +- .../WelfareStatisticsController.java | 15 +- .../WelfareUserSelectController.java | 1 - .../app/zhgh/welfare/model/WelfareList.java | 6 +- .../zhgh/welfare/model/WelfareProject.java | 1 - .../welfare/model/WelfareProjectSubject.java | 3 - .../model/WelfareProjectSubjectOption.java | 1 + .../param/WelfareFilterUserPageForm.java | 4 +- .../welfare/param/WelfareListPageForm.java | 4 +- .../WelfareSelectionSituationPageForm.java | 1 - .../service/WelfareProjectService.java | 3 - .../service/impl/WelfareListServiceImpl.java | 15 +- .../impl/WelfareProjectServiceImpl.java | 22 +- .../WelfareSelectionSituationServiceImpl.java | 12 +- .../impl/WelfareStatisticsServiceImpl.java | 17 +- .../activity/culture/common/applyActivity.js | 9 +- .../activity/culture/common/auditActivity.js | 30 +- .../zhgh/activity/culture/common/infoMange.js | 6 + .../activity/sports/applyUser/applyUser.js | 42 +- .../activity/sports/applyUser/deleteUser.js | 3 +- .../teachercongress/delegate/push/index.html | 59 +- .../delegate/push/push-attendance-dialog.js | 17 +- .../delegate/push/push-formal-dialog.js | 16 +- .../delegate/push/push-progress.js | 320 +++++++--- .../teachercongress/delegate/push/write.js | 75 ++- .../delegate/push/zcAudit.html | 40 +- .../prepare/quotaAllocation/index.html | 7 +- .../quotaAllocation/manualAllocationDialog.js | 42 +- .../platform/zhgh/welfare/include/common.js | 2 +- .../platform/zhgh/welfare/mine/index.html | 314 +++++++++ .../zhgh/welfare/projectMange/filterUser.js | 6 +- .../zhgh/welfare/projectMange/index.html | 4 +- .../platform/zhgh/welfare/select/index.html | 595 +++++++++++++++++- .../zhgh/welfare/select/optionSelect.js | 155 +++-- .../welfare/selectionSituation/index.html | 595 ++++++++++++++++++ .../zhgh/welfare/welfareUser/addUser.js | 6 +- .../welfareUser/addWelfareListBySelect.js | 2 +- .../zhgh/welfare/welfareUser/index.html | 6 +- .../zhghh5/activity/culture/applyUser.html | 41 +- .../platform/zhghh5/welfare/address/list.html | 6 +- .../zhghh5/welfare/mine/selectView.js | 6 +- .../platform/zhghh5/welfare/select/index.html | 99 ++- 58 files changed, 2491 insertions(+), 411 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index 73bbd01a..1e75105d 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -14,6 +14,7 @@ import com.budwk.app.flow.entity.ProcessInstance; import com.budwk.app.flow.entity.ProcessTask; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.service.FlowCommonService; +import com.budwk.app.sys.models.Sys_home_activity; import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; @@ -136,6 +137,11 @@ public class ActivityCultureApplyActivityController { flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args); } return Result.success(); + }else{ + if (tissue.getIsUnseal()) { + Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); + activityCultureService.insertOrUpdate(sysHomeActivity); + } } return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java index edff076b..c67c4592 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java @@ -11,6 +11,8 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; +import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.models.ActivityTissuePerson; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureApplyUserService; import io.swagger.annotations.ApiOperation; @@ -83,6 +85,13 @@ public class ActivityCultureApplyUserController { @SaCheckLogin @ApiOperation(value = "报名") public Result signUp(@Valid String activityId, @Param("teamUserIds") String[] teamUserIds, @Param("ext") String formData, boolean isAgain) { + ActivityTissue tissue = dao.fetch(ActivityTissue.class, activityId); + int count = dao.count(ActivityUserScope.class, + Cnd.where(ActivityUserScope::getUserId, "=", SecurityUtil.getUserId()) + .and(ActivityUserScope::getGroupId, "=", tissue.getGroupId())); + if (count == 0){ + return Result.error("您没有权限报名！"); + } JSONObject dynamicFormParam = null; if (StrUtil.isNotBlank(formData)) { dynamicFormParam = Json.fromJson(JSONObject.class, formData); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index 55efcfd8..69cdbd4b 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -2,24 +2,29 @@ package com.budwk.app.zhgh.activity.culture.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.model.Audit; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.flow.service.FlowCommonService; +import com.budwk.app.sys.models.Sys_home_activity; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService; -import org.nutz.dao.Chain; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; import org.nutz.lang.Strings; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; import java.util.List; @@ -50,6 +55,9 @@ public class ActivityCultureAuditActivityController { @Inject private ActivityCultureService activityCultureService; + @Inject + private FlowCommonService flowCommonService; + @At @SaCheckPermission(value = {"activity.culture.auditActivity.union", "activity.culture.auditActivity.club"}, mode = SaMode.OR) @@ -124,14 +132,16 @@ public class ActivityCultureAuditActivityController { @At @SLog(tag = "文化活动", msg = "校工会审核了一条记录") + @Aop(TransAop.READ_COMMITTED) @SaCheckPermission(value = {"activity.culture.auditActivity.union", "activity.culture.auditActivity.club"}, mode = SaMode.OR) - public Result doReview(String id, boolean flag, Audit audit) { - audit.setLoginname(SecurityUtil.getUserLoginname()); - activityCultureService.insert(audit); - activityCultureService.dao().update(ActivityTissue.class, - Chain.make("state", flag ? 3 : 2) - .add("auditId", audit.getId()), - Cnd.where("id", "=", id)); + public Result doReview(@Param("data") String param, String id) { + Dict args = Json.fromJson(Dict.class, param); + ActivityTissue tissue = activityCultureService.dao().fetch(ActivityTissue.class, id); + if (tissue.getIsUnseal() && args.getInt("submitType") == 1) { + Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); + activityCultureService.insertOrUpdate(sysHomeActivity); + } + flowCommonService.executeTask(args); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index 0f0803a8..943a667e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -1,11 +1,15 @@ package com.budwk.app.zhgh.activity.culture.models; +import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; import com.budwk.app.base.model.CustomFormField; +import com.budwk.app.sys.models.Sys_home_activity; +import com.budwk.app.sys.services.SysHomeConvert; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import java.io.Serializable; @@ -21,7 +25,7 @@ import java.util.List; @Data @Comment("文化活动表") @Table("activity_tissue") -public class ActivityTissue extends BaseModel implements Serializable { +public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert { @Column @Name @@ -253,4 +257,27 @@ public class ActivityTissue extends BaseModel implements Serializable { private String username; private String loginname; + @Override + public Sys_home_activity covertToSysHomeActivity() { + Sys_home_activity sysHomeActivity = new Sys_home_activity(); + sysHomeActivity.setId(this.getId()); + sysHomeActivity.setName(this.getName()); + sysHomeActivity.setCover(this.getCover()); + if (this.getActivity_type()==40001){ + sysHomeActivity.setUrl("/platform/activity/culture/applyUser/school"); + }else if (this.getActivity_type()==40002){ + sysHomeActivity.setUrl("/platform/activity/culture/applyUser/union"); + }else{ + sysHomeActivity.setUrl("/platform/activity/culture/applyUser/club"); + } + sysHomeActivity.setH5Url("/platform/h5/activity/culture/signUp?id=" + this.getId()); + if (Lang.isNotEmpty(this.getApplyStartTime())) { + sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime())); + sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime())); + } + sysHomeActivity.setAllowUserGroupId(this.getGroupId()); + sysHomeActivity.setEnable(this.getIsUnseal()); + sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); + return sysHomeActivity; + } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolApply.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolApply.java index 0ea5891c..4bbada6e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolApply.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolApply.java @@ -162,14 +162,21 @@ public class ActivitySchoolApply extends BaseModel implements Serializable { @Excel(name = "姓名", width = 20) @ColDefine(type = ColType.VARCHAR, width = 50) private String username; + @Column @Comment("电话") @Excel(name = "手机号码", width = 20) @ColDefine(type = ColType.VARCHAR, width = 50) private String mobile; + @Column + @Comment("职级") + @Excel(name = "职级", width = 20) + @ColDefine(type = ColType.VARCHAR, width = 50) + private String professionalLevel; - @Excel(name = "身份证号", width = 20) + +// @Excel(name = "身份证号", width = 20) private String idCard; @Column @@ -178,7 +185,7 @@ public class ActivitySchoolApply extends BaseModel implements Serializable { @ColDefine(type = ColType.VARCHAR, width = 50) private String sex; - @Excel(name = "在职状态", width = 20) +// @Excel(name = "在职状态", width = 20) private String userState; @Excel(name = "身份", width = 40) diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index 633a7e26..3195ca81 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -282,6 +282,7 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl i app.activityUnionName unionname, app.sex, app.mobile, - u.idCard, + app.professionalLevel, u.userState, ev.allName, sc.`name` activityName, diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java index ae48a7cd..e1e44b5d 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java @@ -53,7 +53,7 @@ public class AssetStocktakingServiceImpl extends BaseServiceImpl v.getBoolean("seniorTeacher")).count(); + //已上报中级职称及以下代表数 + int intermediateBelow = (int) writeList.stream().filter(v -> v.getBoolean("intermediateBelow")).count(); + //已上报干部代表数 + int cadre = (int) writeList.stream().filter(v -> v.getBoolean("cadre")).count(); + //已上报工人代表数 + int worker = (int) writeList.stream().filter(v -> v.getBoolean("worker")).count(); // 已上报专任教师人数 int ordinaryTeacher = (int) writeList.stream().filter(v -> v.getBoolean("ordinaryTeacher")).count(); // 已上报45岁以下代表 @@ -400,6 +409,12 @@ public class TeacherCongressDelegatePushController { int female = (int) writeList.stream().filter(v -> List.of("女", "女性").contains(v.getString("sex"))).count(); // 高级职称专任教师人数 int seniorTeacher = (int) writeList.stream().filter(v->v.getBoolean("seniorTeacher")).count(); + // 中级职称及以下 + int intermediateBelow = (int) writeList.stream().filter(v->v.getBoolean("intermediateBelow")).count(); + // 干部 + int cadre = (int) writeList.stream().filter(v->v.getBoolean("cadre")).count(); + // 工人 + int worker = (int) writeList.stream().filter(v->v.getBoolean("worker")).count(); // 专任教师人数 int ordinaryTeacher = (int) writeList.stream().filter(v->v.getBoolean("ordinaryTeacher")).count(); // 45岁以下代表 @@ -434,6 +449,27 @@ public class TeacherCongressDelegatePushController { seniorTeaMap.put("remaining", allocation.getSeniorTeaNum() - seniorTeacher); hashMap.put("seniorTeacher", seniorTeaMap); + HashMap intermediateBelowMap = new HashMap<>(); + intermediateBelowMap.put("current", intermediateBelow); + intermediateBelowMap.put("target", allocation.getIntermediateBelowNum()); + intermediateBelowMap.put("progress", allocation.getIntermediateBelowNum() != 0 ? (double) intermediateBelow / allocation.getIntermediateBelowNum() : 0.0); + intermediateBelowMap.put("remaining", allocation.getIntermediateBelowNum() - intermediateBelow); + hashMap.put("intermediateBelow", intermediateBelowMap); + + HashMap cadreMap = new HashMap<>(); + cadreMap.put("current", cadre); + cadreMap.put("target", allocation.getCadreNum()); + cadreMap.put("progress", allocation.getCadreNum() != 0 ? (double) cadre / allocation.getCadreNum() : 0.0); + cadreMap.put("remaining", allocation.getCadreNum() - cadre); + hashMap.put("cadre", cadreMap); + + HashMap workerMap = new HashMap<>(); + workerMap.put("current", worker); + workerMap.put("target", allocation.getWorkerNum()); + workerMap.put("progress", allocation.getWorkerNum() != 0 ? (double) worker / allocation.getWorkerNum() : 0.0); + workerMap.put("remaining", allocation.getWorkerNum() - cadre); + hashMap.put("worker", workerMap); + HashMap ordinaryTeaMap = new HashMap<>(); ordinaryTeaMap.put("current", ordinaryTeacher); ordinaryTeaMap.put("target", allocation.getOrdinaryTeaNum()); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java index fb3d32a5..f79ace4d 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java @@ -1,18 +1,25 @@ package com.budwk.app.zhgh.democratic.teachercongress.delegate.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; @@ -20,6 +27,8 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -44,13 +53,75 @@ public class TeacherCongressDelegatePushZgAuditController { @At @ApiOperation("分页查询") - @SaCheckPermission("tc.delegate.push") + @SaCheckPermission("tc.delegate.push.zcAudit") public Result pageData(PageForm pageForm, @Param(value = "sessionId") String sessionId, @Param(value = "unionId") String unionId, @Param(value = "approval") Boolean approval, @Param(value = "isFormalOrAttendance") String isFormalOrAttendance) { + Sql sql = getSql(pageForm, sessionId, unionId, approval, isFormalOrAttendance); + Pagination pageVO = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pageVO); + } + + @Ok("void") + @At("/exportExcel") + @ApiOperation("代表资格审查导出") + @SaCheckPermission("tc.delegate.push.zcAudit") + public void exportExcel(PageForm pageForm, + @Param(value = "sessionId") String sessionId, + @Param(value = "unionId") String unionId, + @Param(value = "approval") Boolean approval, + @Param(value = "isFormalOrAttendance") String isFormalOrAttendance, HttpServletResponse response) { + Sql sql = getSql(pageForm, sessionId, unionId, approval, isFormalOrAttendance); + + List exportList = baseService.listMap(sql); + + exportList.forEach(item -> { + item.put("isJdh", item.getBoolean("isJdh") ? "是" : "否"); + item.put("isGdh", item.getBoolean("isGdh") ? "是" : "否"); + item.put("cadre", item.getBoolean("cadre") ? "是" : "否"); + item.put("worker", item.getBoolean("worker") ? "是" : "否"); + item.put("intermediateBelow", item.getBoolean("intermediateBelow") ? "是" : "否"); + item.put("seniorTeacher", item.getBoolean("seniorTeacher") ? "是" : "否"); + + }); + + List entityList = new ArrayList<>(); + entityList.add(new ExcelExportEntity("姓名", "userName", 20)); + entityList.add(new ExcelExportEntity("工号", "loginName", 20)); + entityList.add(new ExcelExportEntity("性别", "sex", 20)); + entityList.add(new ExcelExportEntity("联系电话", "mobile", 20)); + entityList.add(new ExcelExportEntity("分工会", "unionName", 20)); + entityList.add(new ExcelExportEntity("职称", "professionalTitle", 20)); + entityList.add(new ExcelExportEntity("职级", "professionalLevel", 20)); + entityList.add(new ExcelExportEntity("是否高级职称", "seniorTeacher", 20)); + entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20)); + entityList.add(new ExcelExportEntity("是否干部", "cadre", 20)); + entityList.add(new ExcelExportEntity("是否工人", "worker", 20)); + entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20)); + entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); + entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20)); + + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, exportList); + CommonDownloadUtil.download("推选代表汇总表.xlsx", workbook, response); + + } + + + /** + * 公共sql + * + * @return + */ + private Sql getSql(PageForm pageForm, + String sessionId, + String unionId, + Boolean approval, + String isFormalOrAttendance) { Sql sql = Sqls.create(""" SELECT info.*, @@ -92,6 +163,14 @@ public class TeacherCongressDelegatePushZgAuditController { } else { cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); } + + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("info.userName", pageForm.getSearchKeyword()); + group.orLike("info.loginName", pageForm.getSearchKeyword()); + cnd.and(group); + } + cnd.groupBy("t.id"); if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("t.createdAt"); @@ -99,11 +178,7 @@ public class TeacherCongressDelegatePushZgAuditController { cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); } sql.setCondition(cnd); - - - sql.setCondition(cnd); - Pagination pageVO = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pageVO); + return sql; } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/models/TeacherCongressDelegatePush.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/models/TeacherCongressDelegatePush.java index cda9747f..7343b003 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/models/TeacherCongressDelegatePush.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/models/TeacherCongressDelegatePush.java @@ -105,6 +105,24 @@ public class TeacherCongressDelegatePush extends BaseModel { @Default("0") private Boolean seniorTeacher; + @Column + @Comment("是否中级职称及以下") + @ColDefine(type = ColType.BOOLEAN) + @Default("0") + private Boolean intermediateBelow; + + @Column + @Comment("是否干部") + @ColDefine(type = ColType.BOOLEAN) + @Default("0") + private Boolean cadre; + + @Column + @Comment("是否工人") + @ColDefine(type = ColType.BOOLEAN) + @Default("0") + private Boolean worker; + @Column @Comment("是否校领导") @ColDefine(type = ColType.BOOLEAN) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java index 6dbf2f72..5298618b 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java @@ -58,7 +58,8 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl delegatePushList = listMap(sql); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/controller/TeacherCongressQuotaAllocationController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/controller/TeacherCongressQuotaAllocationController.java index f9cef59f..a022defa 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/controller/TeacherCongressQuotaAllocationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/controller/TeacherCongressQuotaAllocationController.java @@ -1,7 +1,6 @@ package com.budwk.app.zhgh.democratic.teachercongress.prepare.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_quota_allocation; @@ -59,6 +58,9 @@ public class TeacherCongressQuotaAllocationController { tcqa.ratio, tcqa.seniorTeaNum, tcqa.ordinaryTeaNum, + tcqa.intermediateBelowNum, + tcqa.cadreNum, + tcqa.workerNum, tcqa.femaleNum, tcqa.less45Num, COALESCE(u_count, 0) AS memberCount, @@ -96,6 +98,9 @@ public class TeacherCongressQuotaAllocationController { t2.ratio, t2.seniorTeaNum, t2.ordinaryTeaNum, + t2.intermediateBelowNum, + t2.cadreNum, + t2.workerNum, t2.femaleNum, t2.less45Num FROM diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/models/Teacher_congress_quota_allocation.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/models/Teacher_congress_quota_allocation.java index 195dc814..cce548e1 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/models/Teacher_congress_quota_allocation.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/models/Teacher_congress_quota_allocation.java @@ -53,6 +53,24 @@ public class Teacher_congress_quota_allocation extends BaseModel { @Default("0") private Integer seniorTeaNum; + @Column + @Comment("中级职称及以下代表数") + @ColDefine(type = ColType.INT, width = 4) + @Default("0") + private Integer intermediateBelowNum; + + @Column + @Comment("干部代表数") + @ColDefine(type = ColType.INT, width = 4) + @Default("0") + private Integer cadreNum; + + @Column + @Comment("工人代表数") + @ColDefine(type = ColType.INT, width = 4) + @Default("0") + private Integer workerNum; + @Column @Comment("专任教师代表数") @ColDefine(type = ColType.INT, width = 4) diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java index 963a9994..a6d1c146 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java @@ -158,9 +158,12 @@ public class WelfareListController { if (user != null) { WelfareList list = new WelfareList(); list.setUserId(user.getId()); - list.setWelfareUnitId(user.getUnionId()); + list.setWelfareUnitId(user.getUnitId()); + list.setWelfareUnitName(user.getUnitName()); + list.setWelfareUnionId(user.getUnionId()); + list.setWelfareUnionName(user.getUnionName()); list.setProjectId(businessId); - list.setWelfareSecondLevelUnitId(user.getUnitId()); +// list.setWelfareSecondLevelUnitId(user.getUnitId()); list.setPersonType(user.getPersonType()); list.setUserState(user.getUserState()); welfareLists.add(list); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java index d082fef0..fc8645bb 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareMineController.java @@ -1,34 +1,24 @@ package com.budwk.app.zhgh.welfare.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.welfare.model.WelfareCourierNumber; -import com.budwk.app.zhgh.welfare.model.WelfareEvaluate; import com.budwk.app.zhgh.welfare.model.WelfareList; -import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; import com.budwk.app.zhgh.welfare.service.WelfareListService; import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import com.budwk.app.zhgh.welfare.utils.ExpressSelectUtil; -import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.integration.jedis.RedisService; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Lang; -import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import java.util.*; -import java.util.stream.Collectors; - /** * @ClassName WelfareMineController * @Description 我的福利 diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java index 2cf76df9..4c23504f 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareSelectionSituationController.java @@ -1,19 +1,17 @@ package com.budwk.app.zhgh.welfare.controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.sys.models.Sys_user; import com.budwk.app.zhgh.welfare.model.WelfareList; import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; import com.budwk.app.zhgh.welfare.param.WelfareSelectionSituationPageForm; import com.budwk.app.zhgh.welfare.service.WelfareListService; import com.budwk.app.zhgh.welfare.service.WelfareSelectionSituationService; -import com.budwk.app.zhgh.welfare.service.WelfareSingleService; import com.budwk.app.zhgh.welfare.service.WelfareStatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,8 +19,6 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -86,7 +82,7 @@ public class WelfareSelectionSituationController { @SaCheckPermission("welfare.selection.situation") public Result confirmSelect(@Param("selections") WelfareUserSelection[] selections, String projectId, String userId) { int count = dao.count(WelfareList.class, Cnd.where(WelfareList::getProjectId, "=", projectId).and(WelfareList::getUserId, "=", userId)); - if(count==0){ + if (count == 0) { return Result.error("此用户没有选择的权限"); } @@ -109,4 +105,12 @@ public class WelfareSelectionSituationController { public void exportXlsx(@Valid @Param("pageForm") WelfareSelectionSituationPageForm pageForm, HttpServletResponse response) { situationService.exportXlsx(pageForm, response); } + + @At + @SaCheckLogin + public Result getMobileByUserId(String userId) { + Sys_user user = dao.fetch(Sys_user.class, userId); + return Result.success().addData(user.getMobile()); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java index 40e8835f..56218a0a 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareStatisticsController.java @@ -1,11 +1,6 @@ package com.budwk.app.zhgh.welfare.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -23,11 +18,6 @@ import org.apache.poi.ss.usermodel.Workbook; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; -import org.nutz.dao.FieldFilter; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.Daos; -import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -40,9 +30,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.BufferedOutputStream; import java.net.URLEncoder; -import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -213,7 +201,8 @@ public class WelfareStatisticsController { @Ok("void") @SaCheckPermission("welfare.statistics") public void exportSummary(String projectId, String unionId, HttpServletResponse response) { - welfareSingleService.exportSummary(projectId, unionId, response); +// welfareSingleService.exportSummary(projectId, unionId, response); + welfareStatisticsService.exportSummary(projectId,response); } @At diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java index ba28055b..452510ee 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java @@ -11,7 +11,6 @@ import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java index c493fa97..ff2caadb 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java @@ -7,8 +7,6 @@ import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; -import java.io.Serializable; - /** * 福利名单 * @@ -63,7 +61,7 @@ public class WelfareList extends BaseModel{ private String welfareUnionName; @Column - @Comment("教职工类别") + @Comment("人员类型") @ColDefine(type = ColType.VARCHAR) private String personType; @@ -73,7 +71,7 @@ public class WelfareList extends BaseModel{ private String userState; @Column - @Comment("编制类别") + @Comment("聘用方式") @ColDefine(type = ColType.VARCHAR) private String preparedBy; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java index ccb9427d..6e507c00 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java @@ -9,7 +9,6 @@ import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; -import java.io.Serializable; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubject.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubject.java index ca02ac4a..7241db4a 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubject.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubject.java @@ -1,9 +1,6 @@ package com.budwk.app.zhgh.welfare.model; import com.budwk.app.base.model.BaseModel; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubjectOption.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubjectOption.java index eb6de1d8..5729804c 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubjectOption.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProjectSubjectOption.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; + import java.io.Serializable; /** diff --git a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java index ace82c33..1bd27b0f 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java @@ -43,10 +43,10 @@ public class WelfareFilterUserPageForm extends PageForm { @ApiModelProperty("单位名称") private String unitName; - @ApiModelProperty("教职工类别") + @ApiModelProperty("人员类型") private String[] personTypes; - @ApiModelProperty("编制类别") + @ApiModelProperty("聘用方式") private String[] preparedBys; @ApiModelProperty("在职状态") diff --git a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java index f19e2c77..f16777e7 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java @@ -46,10 +46,10 @@ public class WelfareListPageForm extends PageForm { @ApiModelProperty("单位名称") private String unitName; - @ApiModelProperty("教职工类别") + @ApiModelProperty("人员类型") private String[] personTypes; - @ApiModelProperty("编制类别") + @ApiModelProperty("聘用方式") private String[] preparedBys; @ApiModelProperty("在职状态") diff --git a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareSelectionSituationPageForm.java b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareSelectionSituationPageForm.java index a35a7936..531a417a 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareSelectionSituationPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/param/WelfareSelectionSituationPageForm.java @@ -1,7 +1,6 @@ package com.budwk.app.zhgh.welfare.param; import com.budwk.app.base.param.PageForm; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java index 3f1a2ab8..ed9263d5 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java @@ -1,10 +1,7 @@ package com.budwk.app.zhgh.welfare.service; -import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.BaseService; import com.budwk.app.zhgh.welfare.model.WelfareProject; -import com.budwk.app.zhgh.welfare.param.WelfareFilterUserPageForm; -import org.nutz.lang.util.NutMap; import java.util.List; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java index 51df60ff..d0887514 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java @@ -32,7 +32,6 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; import org.nutz.lang.Lang; @@ -104,7 +103,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); - exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20)); + exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20)); exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("所在部门", "unitname", 20)); exportEntities.add(new ExcelExportEntity("份数", "selectNum", 20)); @@ -370,8 +369,10 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme WelfareList welfareList = new WelfareList(); welfareList.setProjectId(id); welfareList.setUserId(v.getId()); - welfareList.setWelfareUnitId(v.getUnionId()); - welfareList.setWelfareSecondLevelUnitId(v.getUnitId()); + welfareList.setWelfareUnitId(v.getUnitId()); + welfareList.setWelfareUnitName(v.getUnitName()); + welfareList.setWelfareUnionId(v.getUnionId()); + welfareList.setWelfareUnionName(v.getUnionName()); welfareList.setPersonType(v.getPersonType()); welfareList.setUserState(v.getUserState()); return welfareList; @@ -466,6 +467,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme cnd.andEX("u.personType", "in", pageForm.getPersonTypes()); cnd.andEX("u.preparedBy", "in", pageForm.getPreparedBys()); cnd.andEX("u.userState", "in", pageForm.getUserStates()); + cnd.andEX("u.member","=",pageForm.getIsMember()); if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.asc("u.unionCode"); @@ -517,6 +519,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme cnd.andEX("personType", "in", pageForm.getPersonTypes()); cnd.andEX("preparedBy", "in", pageForm.getPreparedBys()); cnd.andEX("userState", "in", pageForm.getUserStates()); + cnd.andEX("member","=",pageForm.getIsMember()); if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.asc("unionCode"); @@ -597,8 +600,8 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme entities.add(new ExcelExportEntity("姓名", "username", 20)); entities.add(new ExcelExportEntity("性别", "sex", 20)); entities.add(new ExcelExportEntity("出生日期", "birthday", 20)); - entities.add(new ExcelExportEntity("教职工类别", "personType", 20)); - entities.add(new ExcelExportEntity("编制类别", "preparedBy", 20)); + entities.add(new ExcelExportEntity("人员类型", "personType", 20)); + entities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20)); entities.add(new ExcelExportEntity("在职状态", "userState", 20)); entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20)); entities.add(new ExcelExportEntity("所属单位", "welfareUnitName", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java index 7f103fcf..bbddad06 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java @@ -1,29 +1,21 @@ package com.budwk.app.zhgh.welfare.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.base.utils.PageUtil; import com.budwk.app.sys.models.Sys_home_activity; import com.budwk.app.sys.models.Sys_user; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.welfare.model.*; -import com.budwk.app.zhgh.welfare.param.WelfareFilterUserPageForm; +import com.budwk.app.zhgh.welfare.model.WelfareList; +import com.budwk.app.zhgh.welfare.model.WelfareProject; +import com.budwk.app.zhgh.welfare.model.WelfareProjectSubjectOption; +import com.budwk.app.zhgh.welfare.model.WelfareUserSelection; import com.budwk.app.zhgh.welfare.service.WelfareProjectService; import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.Static; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.json.Json; -import org.nutz.lang.Lang; -import org.nutz.lang.random.R; import org.nutz.lang.util.NutMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -175,8 +167,10 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl i WelfareList list = new WelfareList(); list.setProjectId(projectId); list.setUserId(user.getString("id")); - list.setWelfareUnitId(user.getString("unionId")); - list.setWelfareSecondLevelUnitId(user.getString("unitId")); + list.setWelfareUnitId(user.getString("unitId")); + list.setWelfareUnitName(user.getString("unitName")); + list.setWelfareUnionId(user.getString("unionId")); + list.setWelfareUnionName(user.getString("unionName")); list.setPersonType(user.getString("personType")); list.setUserState(user.getString("userState")); lists.add(list); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java index 262fdd03..40bf1a2f 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java @@ -7,13 +7,13 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareList; +import com.budwk.app.zhgh.welfare.model.WelfareProject; import com.budwk.app.zhgh.welfare.param.WelfareSelectionSituationPageForm; import com.budwk.app.zhgh.welfare.service.WelfareSelectionSituationService; import lombok.extern.slf4j.Slf4j; @@ -45,8 +45,10 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl list = listMap(sql); + // 项目 + WelfareProject project = dao().fetch(WelfareProject.class, pageForm.getProjectId()); + // excel列 List entities = new ArrayList<>(); @@ -163,6 +169,10 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl welfareSelectionList = listMap(sql); @@ -96,11 +97,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl (union.getString("id")).equals(v.getString("welfareUnionId"))).count(); + long teacherSum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id"))).count(); union.put("teacherSum", teacherSum); // 已选人数 - long selectedNum = welfareSelectionList.stream().filter(v -> (union.getString("id")).equals(v.getString("welfareUnionId")) && v.getBoolean("has_selected")).count(); + long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count(); union.put("selectedNum", selectedNum); // 未选人数 @@ -108,7 +109,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl (union.getString("id")).equals(v.getString("welfareUnionId")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count(); + long count = userSelections.stream().filter(v -> v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count(); union.put(option.getId(), count); } } @@ -201,7 +202,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl { if (res.code === 0) { this.$message.success("保存成功") + this.$emit("goBack") if (this.activity_type === 40002) { commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") } else if (this.activity_type === 40003) { @@ -656,6 +657,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { data: JSON.stringify(formData) }).then(res => { if (res.code === 0) { + this.$emit("goBack") this.$message.success("提交成功") if (this.activity_type === 40002) { commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") @@ -698,6 +700,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { taskId: this.taskId }).then(res => { if (res.code === 0) { + this.$emit("goBack") this.$message.success("提交成功") if (this.activity_type === 40002) { commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") @@ -776,11 +779,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { this.$emit("goBack") } else { if (this.activity_type === 40002) { - pjaxReplace("/platform/activity/culture/infoManage/union") + commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") } else if (this.activity_type === 40003) { - pjaxReplace("/platform/activity/culture/infoManage/club") + commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") } else { - pjaxReplace("/platform/activity/culture/infoManage/school") + commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") } } diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js index fee1a6ba..abb3549b 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js @@ -130,7 +130,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { `, props: { activity_type: { - value: { type: Object, default: "" } + value: {type: Object, default: ""} } }, store, @@ -141,20 +141,20 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { unionList: [], showApprovalForm: false, auditList: [ - { code: true, name: "已审核" }, - { code: false, name: "未审核" } + {code: true, name: "已审核"}, + {code: false, name: "未审核"} ], pageForm: { approval: false, year: new Date().getFullYear() + "" }, tableColumns: [ - { prop: "name", label: "活动名称" }, - { prop: "address", label: "活动地点" }, - { prop: "projectTypeName", label: "活动项目类型" }, - { prop: "tussueName", label: "举办单位" }, - { prop: "time", label: "活动日期" }, - { prop: "applyTime", label: "创建时间", sortable: true }, + {prop: "name", label: "活动名称"}, + {prop: "address", label: "活动地点"}, + {prop: "projectTypeName", label: "活动项目类型"}, + {prop: "tussueName", label: "举办单位"}, + {prop: "time", label: "活动日期"}, + {prop: "applyTime", label: "创建时间", sortable: true}, ] } }, @@ -164,7 +164,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { methods: { openAudit(row) { - this.$refs.guava.edit(()=>{ + this.$refs.guava.edit(() => { this.showApprovalForm = true this.formData = { processTaskId: row.taskId, @@ -175,7 +175,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { }, onView(row) { - this.$refs.guava.edit(()=>{ + this.$refs.guava.edit(() => { this.showApprovalForm = false this.$refs.editInfo.onOpen(row) }) @@ -197,11 +197,11 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/activity/culture/auditActivity/doReview", { data: JSON.stringify({ ...this.formData, submitType: val - }) + }), id: this.formData.id }).then((res) => { if (res.code === 0) { this.$refs.guava.index() @@ -230,8 +230,8 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { // 根据 activity_type 动态添加流程相关列 if (this.activity_type === 40002 || this.activity_type === 40003) { this.tableColumns.push( - {prop: "curTaskName", label: "当前节点"}, - {prop: "instanceState", label: "流程状态"} + {prop: "curTaskName", label: "当前节点"}, + {prop: "instanceState", label: "流程状态"} ); } this.unionList = await this.$businessTool.listUnion() diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js index a9918217..8302b555 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js @@ -56,6 +56,12 @@ const ACTIVITY_CULTURE_INFO_MANAGE = { + + @@ -234,19 +263,21 @@ layout("/layouts/platform.html"){ }, onBatchSubmit() { const selection = this.$refs.tableRef.selection - if (selection.length === 0){ + /*if (selection.length === 0){ this.$message.warning('请选择要上报的记录') return - } + }*/ this.$confirm('您确定要上报吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(async () => { + const loading = createLoading('正在提交中') const {code, msg} = await this.$axios.post('/platform/teacherCongress/delegate/push/batchSubmit', { ids: JSON.stringify(selection.map(v => v.id)), sessionId: this.pageForm.sessionId }) + loading.close() if (code === 0) { this.$message.success(msg) this.doSearch() diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-attendance-dialog.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-attendance-dialog.js index 36755a2e..355a0fa9 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-attendance-dialog.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-attendance-dialog.js @@ -20,8 +20,10 @@ const pushAttendanceDialog = {
{{ option.sex}} {{ option.age }}岁 - {{ option.professionalTitle }} - {{ option.professionalLevel }} + {{ option.professionalTitle }} + {{ option.professionalLevel }} {{ option.nation }}
@@ -63,11 +65,13 @@ const pushAttendanceDialog = { return item.userName.indexOf(query) > -1 }, async onConfirm() { + const loading = createLoading('正在提交中') const {code, msg} = await $.post('/platform/teacherCongress/delegate/push/addPreselectionDb', { userValue: JSON.stringify(this.userValue), sessionId: this.sessionId, representativeType: '列席代表' }) + loading.close() if (code === 0) { this.dialogVisible = false this.$message.success(msg) @@ -76,10 +80,10 @@ const pushAttendanceDialog = { } }, style: /*language=CSS*/ ` - .push-attendance-dialog ::v-deep .el-transfer{ - text-align: center!important; + .push-attendance-dialog ::v-deep .el-transfer { + text-align: center !important; } - + .push-attendance-dialog ::v-deep .el-transfer-panel__item.el-checkbox { height: auto; display: block; @@ -115,7 +119,8 @@ const pushAttendanceDialog = { display: inline-flex; align-items: center; } - .push-attendance-dialog ::v-deep .el-transfer-panel{ + + .push-attendance-dialog ::v-deep .el-transfer-panel { height: 60vh; text-align: left !important; width: 35% !important; diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-formal-dialog.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-formal-dialog.js index 8446e2d2..98b8e9f2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-formal-dialog.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-formal-dialog.js @@ -20,8 +20,10 @@ const pushFormalDialog = {
{{ option.sex}} {{ option.age }}岁 - {{ option.professionalTitle }} - {{ option.professionalLevel }} + {{ option.professionalTitle }} + {{ option.professionalLevel }} {{ option.nation }}
@@ -63,11 +65,13 @@ const pushFormalDialog = { return item.userName.indexOf(query) > -1 }, async onConfirm() { + const loading = createLoading('正在提交中') const {code, msg} = await this.$axios.post('/platform/teacherCongress/delegate/push/addPreselectionDb', { userValue: JSON.stringify(this.userValue), sessionId: this.sessionId, representativeType: '正式代表' }) + loading.close() if (code === 0) { this.dialogVisible = false this.$message.success(msg) @@ -76,11 +80,11 @@ const pushFormalDialog = { } }, style: /*language=CSS*/ ` - .push-formal-dialog ::v-deep .el-transfer{ - text-align: center!important; + .push-formal-dialog ::v-deep .el-transfer { + text-align: center !important; } - .push-formal-dialog ::v-deep .el-transfer-panel__item.el-checkbox { + .push-formal-dialog ::v-deep .el-transfer-panel__item.el-checkbox { height: auto; display: block; margin-right: 0; @@ -116,7 +120,7 @@ const pushFormalDialog = { align-items: center; } - .push-formal-dialog ::v-deep .el-transfer-panel{ + .push-formal-dialog ::v-deep .el-transfer-panel { height: 60vh; text-align: left !important; width: 35% !important; diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js index 82038878..ee0bc03c 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js @@ -53,7 +53,7 @@ const pushProgress = {
-
高级职称专任教师
+
高级职称代表
{{ metrics.seniorTeacher.current }}/ {{ metrics.seniorTeacher.target }}
@@ -81,14 +81,14 @@ const pushProgress = {
- +
-
专任教师代表
-
{{ metrics.ordinaryTeacher.current }}中级职称及以下代表
+
{{ metrics.intermediateBelow.current }}/ {{ metrics.ordinaryTeacher.target }}
+ >/ {{ metrics.intermediateBelow.target }}
@@ -97,23 +97,121 @@ const pushProgress = {
- 已达标 - + 未达标 剩余 {{ metrics.ordinaryTeacher.remaining }} 人 + >剩余 {{ metrics.intermediateBelow.remaining }} 人
+ +
+
+
+
干部代表
+
{{ metrics.cadre.current }}/ {{ metrics.cadre.target }}
+
+
+ +
+
+
+
+
+
+ + 已达标 + + + 未达标 + + 剩余 {{ metrics.cadre.remaining }} 人 +
+
+ +
+
+
+
工人代表
+
{{ metrics.worker.current }}/ {{ metrics.worker.target }}
+
+
+ +
+
+
+
+
+
+ + 已达标 + + + 未达标 + + 剩余 {{ metrics.worker.remaining }} 人 +
+
+ + +
@@ -178,100 +276,100 @@ const pushProgress = { }} 人
- - - <!– 中层领导 –> -
-
-
-
中层领导
-
{{ metrics.middleLevelLeader.current }}/ {{ metrics.middleLevelLeader.target }}
-
-
- -
-
-
-
-
-
- - 已达标 - - - 未达标 - - 剩余 {{ - metrics.middleLevelLeader.remaining - }} 人 -
-
--> -
@@ -336,6 +434,24 @@ const pushProgress = { progress: 66.7, remaining: 2 }, + intermediateBelow: { + current: 4, + target: 6, + progress: 66.7, + remaining: 2 + }, + cadre: { + current: 4, + target: 6, + progress: 66.7, + remaining: 2 + }, + worker: { + current: 4, + target: 6, + progress: 66.7, + remaining: 2 + }, ordinaryTeacher: { current: 8, target: 10, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js index 72d9bb05..7a0bb16a 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js @@ -88,15 +88,15 @@ const write = { - - - - - - + - - + + + + 是 否 - - + + + 是 + 否 + + + + + + 是 + 否 + + + + + 是 否 @@ -169,13 +190,15 @@ const write = { -
+
保存草稿 提交信息
-
+

信息提交成功

@@ -308,7 +331,9 @@ const write = { cancelButtonText: '取消', type: 'warning' }).then(async () => { + const loading = createLoading('正在提交中') const {code} = await $.post('/platform/teacherCongress/delegate/push/write/save', this.formData) + loading.close() if (code === 0) { this.$message.success('保存成功') this.$emit('refresh') @@ -447,7 +472,7 @@ const write = { margin-bottom: 24px; } - .completion-panel ::v-deep .completion-actions { + .completion-panel ::v-deep .completion-actions { display: flex; justify-content: center; gap: 16px; @@ -467,32 +492,32 @@ const write = { margin-bottom: 32px; } - .info-box ::v-deep .info-content { + .info-box ::v-deep .info-content { display: flex; align-items: flex-start; } - .info-box .info-content ::v-deep .info-icon { + .info-box .info-content ::v-deep .info-icon { color: #2563eb; margin-right: 12px; margin-top: 2px; } - .info-box .info-content ::v-deep .info-text { + .info-box .info-content ::v-deep .info-text { flex: 1; } - .info-box .info-content .info-text ::v-deep .info-title { + .info-box .info-content .info-text ::v-deep .info-title { font-weight: 600; margin-bottom: 8px; } - .info-box .info-content .info-text ::v-deep .info-desc { + .info-box .info-content .info-text ::v-deep .info-desc { color: #666; margin-bottom: 8px; } - .info-box .info-content .info-text ::v-deep .info-details { + .info-box .info-content .info-text ::v-deep .info-details { font-size: 14px; color: #666; margin-top: 8px; @@ -506,19 +531,19 @@ const write = { margin-bottom: 32px; } - .form-section ::v-deep .section-title { + .form-section ::v-deep .section-title { font-size: 18px; font-weight: 500; margin-bottom: 16px; } - .form-section ::v-deep .form-grid { + .form-section ::v-deep .form-grid { display: grid; grid-template-columns: repeat(2, 1fr); column-gap: 12px; } - .form-section ::v-deep .form-grid.full-width { + .form-section ::v-deep .form-grid.full-width { grid-template-columns: 1fr; } diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html index b14243e4..b2b7d497 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html @@ -14,7 +14,7 @@ layout("/layouts/platform.html"){ - + @@ -33,6 +33,7 @@ layout("/layouts/platform.html"){ 已审核 未审核 + 导出 - + + + + + + + + + + + + + @@ -130,6 +157,9 @@ layout("/layouts/platform.html"){ } }, methods: { + exportExcel() { + this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm) + }, onView(row) { this.writeDialog = true this.userId = row.userId diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html index 7ff0b789..df3f256d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html @@ -45,8 +45,11 @@ layout("/layouts/platform.html"){ - - + + + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js index f4d24551..d02ddec5 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js @@ -51,7 +51,7 @@ const MANUAL_ALLOCATION_DIALOG = { > - + - + + + + + + + +