From 8490f7d9652cde9440e92fb4d5b381a4210b8c82 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 25 Sep 2025 19:12:08 +0800 Subject: [PATCH] commit --- .../meeting/controller/MeetingLeaveController.java | 1 - .../dayofficework/site/controller/SiteRecordController.java | 4 +++- .../site/service/impl/SiteApplyServiceImpl.java | 4 ++++ .../views/platform/zhgh/dayofficework/site/apply/apply.js | 4 +++- .../platform/zhgh/dayofficework/site/record/index.html | 2 +- .../zhgh/dayofficework/site/schoolUnionAudit/index.html | 2 +- .../views/platform/zhghh5/dayofficework/site/apply/apply.js | 6 ++++-- .../zhghh5/dayofficework/site/schoolUnionAudit/index.html | 2 +- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java index ceea749c..3da4f241 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java @@ -117,7 +117,6 @@ public class MeetingLeaveController { cnd.and("info.userId", "=", SecurityUtil.getUserId()); cnd.and("ins.id", "is not", null); cnd.andEX("mi.type", "=", type); - cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); if(year != null) { long startTime = DateUtil.parse(year + "-01-01").getTime(); long endTime = DateUtil.parse(year + "-12-31").getTime(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java index 79e67d0d..11df3df4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java @@ -65,10 +65,12 @@ public class SiteRecordController { ins.id AS instanceId, ins.state instanceState, ins.processDefineId instanceProcessDefineId, - t.displayName taskName + t.displayName taskName, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName FROM site_apply info LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 LEFT JOIN ( SELECT processInstanceId, diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java index 516694c9..04731d8e 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java @@ -36,6 +36,9 @@ public class SiteApplyServiceImpl extends BaseServiceImpl implements @Override public Map validateApply(SiteApply apply, String day) { SiteInfo siteInfo = dao().fetch(SiteInfo.class, apply.getSiteId()); + if(apply.getJoinCount() > siteInfo.getMaxNum()) { + return Map.of(false, "预约人数最多为%s人".formatted(siteInfo.getMaxNum())); + } Sql sql = Sqls.create(""" select sa.* @@ -49,6 +52,7 @@ public class SiteApplyServiceImpl extends BaseServiceImpl implements cnd.and(SiteApply::getApplyDay, "=", day); cnd.and(SiteApply::getStartTime, "=", apply.getStartTime()); cnd.and(SiteApply::getEndTime, "=", apply.getEndTime()); + cnd.andEX("sa.id", "!=", apply.getId()); List stateList = List.of(ProcessInstanceStateEnum.DOING.getCode(), ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.PENDING.getCode()); cnd.and(ProcessInstance::getState, "in", stateList); diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js index ed7dc38d..dfc9b1c2 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js @@ -88,7 +88,9 @@ const apply = { allowTimeList: [], selectDayList: [], dialogVisible: false, - formData: {}, + formData: { + applyCause: ',', + }, formRules: { applyUserId: [{required: true, message: '必填', trigger: ['blur', 'change']}], applyUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}], diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html index 6f65f995..19a68430 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html @@ -102,7 +102,7 @@ layout("/layouts/platform.html"){ {prop: 'startTime', label: '开始时间'}, {prop: 'endTime', label: '结束时间'}, {prop: 'applyMobile', label: '联系方式'}, - {prop: 'taskName', label: '当前节点'}, + {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html index 3ed03a5a..04f20714 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html @@ -128,7 +128,7 @@ layout("/layouts/platform.html"){ {prop: 'startTime', label: '开始时间'}, {prop: 'endTime', label: '结束时间'}, {prop: 'applyMobile', label: '联系方式'}, - {prop: 'taskName', label: '当前节点'}, + {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], typeOptions: [], diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js b/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js index 806b89c5..74e92736 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js +++ b/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js @@ -91,7 +91,7 @@ const apply = {
关闭 提交 - 提交 + 提交
@@ -112,7 +112,9 @@ const apply = { weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'}, formVisible: false, - formData: {}, + formData: { + applyCause: '', + }, calendarVisible: false, } diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/site/schoolUnionAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/site/schoolUnionAudit/index.html index bcdf091a..927faf93 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/site/schoolUnionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/site/schoolUnionAudit/index.html @@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){ {{row.applyDay}} {{row.startTime}} {{row.endTime}} - {{row.taskName}} + {{row.curTaskName}}