From be764149e4f671dc2fa9cf29d9e99b7e09af76c7 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sun, 19 Oct 2025 17:18:13 +0800 Subject: [PATCH] commit --- .../HealthCheckupListController.java | 9 +- .../HealthCheckupSingleController.java | 14 ++- ...TeacherCongressDelegatePushController.java | 18 +-- ...CongressDelegatePushZgAuditController.java | 13 +- .../controller/ThirtyTeachController.java | 6 +- .../activity/culture/common/infoActivity.js | 2 +- .../activity/culture/common/singleSignUp.js | 5 +- .../activity/culture/common/userStatistics.js | 4 +- .../zhgh/dayofficework/article/common/info.js | 4 +- .../dayofficework/article/write/index.html | 2 +- .../healthCheckup/listMange/index.html | 12 +- .../healthCheckup/projectMange/index.html | 10 +- .../healthCheckup/statisticsSingle/index.html | 57 ++++++--- .../excellentRecuperation/line/info.js | 5 +- .../schoolAudit/index.html | 18 +-- .../excellentRecuperation/summary/index.html | 14 +-- .../travelAgency/index.html | 4 +- .../staffmanage/thirtyTeach/manage/index.html | 4 +- .../zhghh5/activity/culture/signUp.html | 3 +- .../healthCheckup/list/index.html | 112 +++--------------- 20 files changed, 131 insertions(+), 185 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java index d9f02634..52e9e356 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java @@ -33,6 +33,7 @@ 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.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -100,6 +101,7 @@ public class HealthCheckupListController { hcus.selectTime, hcus.campus, hcus.subjectId, + hcus.bz, ca.campusName FROM health_checkup_user hcu @@ -117,8 +119,11 @@ public class HealthCheckupListController { cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId()); } - if (StrUtil.isNotBlank(pageForm.getSearchName()) && StrUtil.isNotBlank(pageForm.getSearchKeyword())) { - cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword())); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("hcu.userName", pageForm.getSearchKeyword()); + group.orLike("hcu.loginName", pageForm.getSearchKeyword()); + cnd.and(group); } cnd.groupBy("hcu.userId"); if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && Strings.isNotBlank(pageForm.getPageOrderBy())) { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java index 9a72960b..4ae55484 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java @@ -34,6 +34,7 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; @@ -348,7 +349,7 @@ public class HealthCheckupSingleController { } } //如果有符合的就添加 - if (subjectMoneyId != null){ + if (subjectMoneyId != null) { HealthCheckupUserSelection selection = new HealthCheckupUserSelection(); selection.setProjectId(projectId); selection.setSelectUserId(v); @@ -363,4 +364,15 @@ public class HealthCheckupSingleController { }); return Result.success(); } + + + @At + @ApiOperation("给未选的人发送提醒") + @Ok("json:full") + @SaCheckPermission("healthCheckup.statisticsSingle") + @SLog(type = "healthCheckup", tag = "体检管理", msg = "管理员给未选的人发送提醒") + public Result msgNotSelect(@Valid String projectId) { + List userList = healthCheckupSingleService.receivePageData(projectId, null, "1"); + return Result.success("暂未开启消息！"); + } } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java index bd12cd7b..3455bc47 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java @@ -170,6 +170,7 @@ public class TeacherCongressDelegatePushController { sql.setParam("sessionId", sessionId); Cnd cnd = Cnd.NEW(); cnd.and("u.member", "=", 1); + cnd.and("u.username", "is not", null); cnd.andEX("u.id", "not in", userIds); cnd.and("tcd.userId", "is", null); cnd.and("tcdp.id", "is", null); @@ -249,6 +250,7 @@ public class TeacherCongressDelegatePushController { // 自动完成第一个申请任务 List doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); for (ProcessTask task : doingTaskList) { + args.put(FlowConst.NEXT_NODE_OPERATOR, teacherCongressDelegatePush.getUserId()); flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args); } }); @@ -370,7 +372,7 @@ public class TeacherCongressDelegatePushController { Teacher_congress_quota_allocation allocation = dao.fetch(Teacher_congress_quota_allocation.class, Cnd.where(Teacher_congress_quota_allocation::getSessionId, "=", sessionId) .and(Teacher_congress_quota_allocation::getUnionId, "=", SecurityUtil.getUnionId())); - if(allocation == null){ + if (allocation == null) { return Result.success(); } @@ -414,23 +416,23 @@ 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 seniorTeacher = (int) writeList.stream().filter(v -> v.getBoolean("seniorTeacher")).count(); // 中级职称及以下 - int intermediateBelow = (int) writeList.stream().filter(v->v.getBoolean("intermediateBelow")).count(); + int intermediateBelow = (int) writeList.stream().filter(v -> v.getBoolean("intermediateBelow")).count(); // 干部 - int cadre = (int) writeList.stream().filter(v->v.getBoolean("cadre")).count(); + int cadre = (int) writeList.stream().filter(v -> v.getBoolean("cadre")).count(); // 工人 - int worker = (int) writeList.stream().filter(v->v.getBoolean("worker")).count(); + int worker = (int) writeList.stream().filter(v -> v.getBoolean("worker")).count(); // 专任教师人数 - int ordinaryTeacher = (int) writeList.stream().filter(v->v.getBoolean("ordinaryTeacher")).count(); + int ordinaryTeacher = (int) writeList.stream().filter(v -> v.getBoolean("ordinaryTeacher")).count(); // 45岁以下代表 int under45 = (int) writeList.stream().filter(v -> Convert.toInt(v.getInt("age"), 0) <= 45).count(); // 少数民族代表 long ethnicMinority = writeList.stream().filter(v -> StrUtil.isNotBlank(v.getString("nation")) && !"汉族".equals(v.getString("nation"))).count(); // 校领导数 - long schoolLeader = writeList.stream().filter(v->v.getBoolean("schoolLeader")).count(); + long schoolLeader = writeList.stream().filter(v -> v.getBoolean("schoolLeader")).count(); // 中层领导数 - long middleLevelLeader = writeList.stream().filter(v->v.getBoolean("middleLevelLeader")).count(); + long middleLevelLeader = writeList.stream().filter(v -> v.getBoolean("middleLevelLeader")).count(); HashMap hashMap = new HashMap<>(); 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 ef0c603b..5e09f44b 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 @@ -24,6 +24,7 @@ import com.budwk.app.sys.views.View_user; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; @@ -227,15 +228,15 @@ public class TeacherCongressDelegatePushZgAuditController { delegate.setSessionId(delegatePush.getSessionId()); - Teacher_congress_delegation_union delegation_union = baseService.dao().fetch(Teacher_congress_delegation_union.class, - Cnd.where(Teacher_congress_delegation_union::getUnionId, "=", user.getUnionId()) + Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class, + Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", user.getUnitId()) .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId())); - if (ObjectUtil.isNotEmpty(delegation_union)) { - delegate.setDelegationId(delegation_union.getId()); - userRole.setTcDelegationId(delegation_union.getId()); + if (ObjectUtil.isNotEmpty(delegation_unit)) { + delegate.setDelegationId(delegation_unit.getId()); + userRole.setTcDelegationId(delegation_unit.getId()); } else { - return Result.error(user.getUnionName() + "没有设置到代表团,请先在代表团管理里设置。"); + return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。"); } if ("正式代表".equals(delegatePush.getRepresentativeType())) { Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name())); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java index a36146fd..e77fef3f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java @@ -181,11 +181,11 @@ public class ThirtyTeachController { for (ThirtyTeachTemp temp : teachTempList) { if (StrUtil.isBlank(temp.getUserName())) { - temp.setResult("获取不到该用户的姓名！"); + /* temp.setResult("获取不到该用户的姓名！"); errorInfos.add(temp); - break; + break;*/ } else if (StrUtil.isBlank(temp.getLoginName())) { - temp.setResult("获取不到该用户的出生日期！"); + temp.setResult("获取不到该用户的工号！"); errorInfos.add(temp); break; }else if (StrUtil.isBlank(temp.getThirtyCertificateProcessingTime())) { diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js index 47f9f1c0..515b762f 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js @@ -3,7 +3,7 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
申请信息 - 点击查看流程图 + 点击查看流程图
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js index 40828cf9..223dafcf 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js @@ -153,7 +153,7 @@ const singleSignUp = {
-
选择报名人员，报名人数 {{viewData.teamNum}}人 +
选择报名人员
{ if (res.code === 0) { @@ -512,7 +513,7 @@ const singleSignUp = { const union = this.viewData.unionUserNumberLimit.find(v => v.id === this.$store.state.user.union.id) this.viewData.teamNum = union.limitNum this.listTeamUserUnion() - }else{ + } else { this.listTeamUser() } if (this.viewData.formConfig) { diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js b/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js index 9c683cb9..dabc2e55 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js @@ -29,8 +29,8 @@ const ACTIVITY_CULTURE_USER_STATISTICS = { - - + {{ viewData.mobile }} {{ viewData.mobile2 }} {{ viewData.title }} - {{ viewData.excerpt }} + + {{ viewData.excerpt }} + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html index 605c8669..7ec01755 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html @@ -145,7 +145,7 @@ layout("/layouts/platform.html"){ type: "warning" }).then(() => { this.$axios.post('/platform/article/write/submitAgain', { - info: JSON.stringify(this.formData), + article: JSON.stringify(this.formData), taskId: GetQueryString("taskId") }).then(res => { if (res.code === 0) { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html index cd0609ed..7e00dc97 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html @@ -28,15 +28,8 @@ layout("/layouts/platform.html"){ v-for="item in projectOptions"> - - - - - - - + + - + 二维码 @@ -463,6 +463,12 @@ layout("/layouts/platform.html"){ this.conditionStructureDialogVisible = true if(row.matchCnd){ this.conditionGroup = row.matchCnd + }else{ + this.conditionGroup = { + logic: "AND", + conditions: [], + groups: [] + } } // this.$refs.conditionStructureDialog.onOpen(row.matchCnd ? row.matchCnd : null) }, diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html index 235c09b1..2e7d3ebf 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html @@ -37,15 +37,15 @@ layout("/layouts/platform.html"){ :value="item.id" :key="item.id"> - - - - - + @@ -80,6 +80,12 @@ layout("/layouts/platform.html"){ type="primary" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">一键选择去年数据 + 给未选发送消息 + { + this.doSearch() + this.tableLoading = false + this.notifySuccess(resp.msg) + }, 2000) + } else { + this.notifyWarning(resp.msg) + } + } + }, async doSelectByAdmin() { if (!this.noSelectOptionId || !this.campus) { this.notifyWarning('请选择套餐/院区') @@ -298,16 +326,15 @@ layout("/layouts/platform.html"){ type: 'warning' }) if (confirm === "confirm") { - this.loading = true + this.tableLoading = true const resp = await $.get(loc() + '/selectOptionByLastYear', { projectId: this.pageForm.projectId }) + this.tableLoading = false if (resp.code === 0) { - setTimeout(() => { - this.doSearch() - this.loading = false - this.notifySuccess(resp.msg) - }, 2000) + this.doSearch() + + this.notifySuccess(resp.msg) } else { this.notifyWarning(resp.msg) } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/line/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/line/info.js index 9e16927a..432e99f6 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/line/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/line/info.js @@ -6,7 +6,7 @@ const info = { {{ viewData.year }} {{ viewData.serialNumber }} {{ viewData.lineName }} - {{ viewData.regionalNature }} +
@@ -17,7 +17,8 @@ const info = { {{ viewData.travelAgency.travelAgencyName }} {{ viewData.travelAgency.contact }} - {{ viewData.travelAgency.contactMobileNumber }} + {{ viewData.travelAgency.contactMobileNumber }} + {{ viewData.travelAgency.email }} diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html index 9af8ff69..f0a21ac8 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html @@ -35,17 +35,8 @@ layout("/layouts/platform.html"){ > - - - - - - - + + - 取消 + 取消 退回到发起人 拒绝申请 同意申请 @@ -141,7 +132,6 @@ layout("/layouts/platform.html"){ pageDataUrl: "/platform/excellentRecuperation/schoolAudit/pageData", pageForm: { year: moment().format('YYYY'), - searchName: "info.userName", approval: false }, activityList: [], @@ -166,7 +156,7 @@ layout("/layouts/platform.html"){ }) }).then((res) => { if (res.code === 0) { - this.auditDialogVisible = false + this.$refs.guava.index() this.$message.success(res.msg) this.doSearch() } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/summary/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/summary/index.html index 288ac2d2..c25720d6 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/summary/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/summary/index.html @@ -35,17 +35,8 @@ layout("/layouts/platform.html"){ > - - - - - - - + + - - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html index 268b86fa..38a82e97 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html @@ -7,7 +7,7 @@ layout("/layouts/platform.html"){