From e6a1721f778037bbe5e1782fe2db00951ef590a2 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 19 Nov 2025 08:57:49 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysHomeController.java | 2 +- ...ctivityCultureApplyActivityController.java | 3 +- .../ExecutiveCommitteeConfigController.java | 4 +- ...TeacherCongressDelegatePushController.java | 59 +++++++++++------- .../static/assets/platform/img/v4/xw.png | Bin 0 -> 15761 bytes .../views/layouts/v4/home/index.html | 2 +- .../resources/views/layouts/v4/home/jcdt.js | 12 ++-- .../executiveCommitteeConfig/index.html | 2 +- .../teachercongress/delegate/push/index.html | 50 ++++++++------- .../views/platform/zhghh5/sys/home/apps.js | 10 +-- 10 files changed, 83 insertions(+), 61 deletions(-) create mode 100644 src/main/resources/static/assets/platform/img/v4/xw.png diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index bc2957d..6211427 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -264,7 +264,7 @@ public class SysHomeController { // @CacheResult(cacheKey = "news", ignoreNull = true, cacheLiveTime = 60 * 60 * 24) public Result getNews() { // 定义要爬取的URL - String domain = "https://gh.hgu.edu.cn/index.htm"; + String domain = "https://gh.hgu.edu.cn"; try { // 使用Jsoup连接到URL并获取页面内容 Document doc = Jsoup.connect(domain).get(); 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 e13bd2b..c14ed97 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 @@ -133,6 +133,7 @@ public class ActivityCultureApplyActivityController { } tissue.setUserId(SecurityUtil.getUserId()); tissue.setApplyTime(DateUtil.now()); + tissue.setIsUnseal(false); activityCultureService.insertOrUpdate(tissue); if (List.of(40002, 40003).contains(tissue.getActivity_type()) && tissue.getIsEnrollSystem()) { @@ -149,7 +150,7 @@ public class ActivityCultureApplyActivityController { } return Result.success(); } - if (tissue.getIsUnseal() && tissue.getIsEnrollSystem()) { + if (tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityCultureService.insertOrUpdate(sysHomeActivity); } 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 600c32e..c7e9005 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 @@ -59,12 +59,12 @@ public class ExecutiveCommitteeConfigController { sun.id as unionId, sun.name as unionName, sun.unionCode , - (SELECT count( 1 ) FROM vw_user where sun.id = unionId) as memberCount, + (SELECT count( 1 ) FROM teacher_congress_delegate where unionId =sun.id and sessionId=@sessionId) as dbCount, 0 as quotaCount FROM sys_union sun ORDER BY unionCode ASC - """); + """).setParam("sessionId",sessionId); List listMap = committeeConfigService.listMap(sql); config.setUnionQuotaList(listMap); } 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 057839f..53aea30 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 @@ -15,6 +15,7 @@ import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.flow.entity.ProcessInstance; import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.sys.views.View_user; @@ -123,8 +124,13 @@ public class TeacherCongressDelegatePushController { cnd.and(group); } cnd.desc("info.createdAt"); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) { + if (AuthUtil.hasRole(RoleConstant.UNIT_PARTY_SECRETARY.name())) { + cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); + } + } sql.setCondition(cnd); Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @@ -289,18 +295,36 @@ public class TeacherCongressDelegatePushController { Sql sql = Sqls.create(""" SELECT info.*, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + ins.processDefineId instanceProcessDefineId, + t.id taskId, t.taskName AS taskKey, - t.displayName taskName + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable FROM teacher_congress_delegate_push info LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id + AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id $condition """); Cnd cnd = Cnd.NEW(); cnd.andEX("info.sessionId", "=", sessionId); cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId()); - cnd.andEX("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62"); + SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("t.taskName", "!=", "53ff0c2a-ba93-45e9-a9fd-db51cdab3080"); + group.or("t.taskName", "is", null); + cnd.and(group); + cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode()); cnd.groupBy("info.id"); sql.setCondition(cnd); List writeList = baseService.listMap(sql); @@ -328,6 +352,9 @@ public class TeacherCongressDelegatePushController { if (total > allocation.getAllocationNum()) { tips.append("上报总人数超出分配名额！"); } + if (total < allocation.getAllocationNum()) { + tips.append("上报总人数不满足分配名额！"); + } if (seniorTeacher < allocation.getSeniorTeaNum()) { tips.append("高级职称专任教师数不满足分配名额数！"); @@ -376,23 +403,7 @@ public class TeacherCongressDelegatePushController { Sql sql = Sqls.create(""" SELECT - info.*, - ins.id AS instanceId, - ins.businessNo, - ins.state instanceState, - ins.variable instanceVariale, - ins.processDefineId instanceProcessDefineId, - t.id taskId, - t.taskName AS taskKey, - t.displayName taskName, - t.taskType, - t.performType taskPerformType, - t.taskState, - t.finishTime, - t.taskParentId, - t.variable taskVariale, - IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, - (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask' AND taskState IN (10, 20)) AS startTaskId + info.* FROM teacher_congress_delegate_push info LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id @@ -401,10 +412,14 @@ public class TeacherCongressDelegatePushController { $condition """); Cnd cnd = Cnd.NEW(); + SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801"); + group.or("t.taskName", "is", null); + cnd.and(group); + cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode()); cnd.andEX("info.sessionId", "=", sessionId); cnd.andEX("info.unionId", "=", unionId); cnd.andEX("info.representativeType", "=", "正式代表"); - cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); sql.setCondition(cnd); List writeList = baseService.listMap(sql); diff --git a/src/main/resources/static/assets/platform/img/v4/xw.png b/src/main/resources/static/assets/platform/img/v4/xw.png new file mode 100644 index 0000000000000000000000000000000000000000..c0ffbbbcdfe5f48994b8badc6c027bc830d364f4 GIT binary patch literal 15761 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 zig
5rgLV{dPpUrQtB$~9y+Z%`*baaChG@m5 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 OfQ*Eqc!Q{M$o~OqKxe)H literal 0 HcmV?d00001 diff --git a/src/main/resources/views/layouts/v4/home/index.html b/src/main/resources/views/layouts/v4/home/index.html index 0b1f4b4..0199a22 100644 --- a/src/main/resources/views/layouts/v4/home/index.html +++ b/src/main/resources/views/layouts/v4/home/index.html @@ -86,7 +86,7 @@ layout("/layouts/v4/baseLayout.html"){ - + diff --git a/src/main/resources/views/layouts/v4/home/jcdt.js b/src/main/resources/views/layouts/v4/home/jcdt.js index aa0be87..736f7b1 100644 --- a/src/main/resources/views/layouts/v4/home/jcdt.js +++ b/src/main/resources/views/layouts/v4/home/jcdt.js @@ -4,21 +4,23 @@ const jcdt = {
基层动态 -
+
{{item.date}}
-
🆕
+
+ +
{{item.title}}
- + - +
@@ -120,7 +122,7 @@ const jcdt = { .jcdt-item .date { font-size: 20px; - font-weight: bold; + /*font-weight: bold;*/ white-space: nowrap; text-align: left; margin-bottom: 8px; 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 e5045d5..6f7e1c3 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 @@ -114,7 +114,7 @@ layout("/layouts/platform.html"){ }, tableColumns: [ {prop: 'unionName', label: '分工会名称', sortable: true}, - {prop: 'memberCount', label: '代表人数', sortable: true}, + {prop: 'dbCount', label: '代表人数', sortable: true}, {prop: 'quotaCount', label: '分配人数', sortable: true} ], formData: {}, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index e0f0af6..00eacbf 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -27,25 +27,28 @@ layout("/layouts/platform.html"){ - 正式代表预选 - - 列席代表预选 - - - - 正式代表提交上报 - + + + 导出 @@ -163,11 +166,12 @@ layout("/layouts/platform.html"){