From 344229fc311851120695902cb8fa7fd00bfd3bd6 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 18 Dec 2025 11:51:10 +0800 Subject: [PATCH 01/13] commit --- .../controller/ActivityWorksCollectionReadController.java | 4 ++-- src/main/resources/views/layouts/v4/baseLayout.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java index ad3b69a..44b6952 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionReadController.java @@ -145,8 +145,8 @@ public class ActivityWorksCollectionReadController { cnd.andEX("up.activityId", "=", pageForm.getActivityId()); cnd.andEX("up.subjectId", "=", pageForm.getSubjectId()); cnd.andEX("up.worksId", "=", pageForm.getWorksId()); - cnd.andEX("unionId", "=", pageForm.getUnionId()); - cnd.andEX("unitId", "=", pageForm.getUnitId()); + cnd.andEX("up.unionId", "=", pageForm.getUnionId()); + cnd.andEX("up.unitId", "=", pageForm.getUnitId()); if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.orLike("userName", pageForm.getSearchKeyword()); diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index c3435d5..c2f4a00 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -168,7 +168,7 @@ this.isSubscribed = true this.sendJoinMessage() } - }, 2000) + }, 500) } // 事件处理 @@ -243,9 +243,9 @@ if (this.ws.readyState === WebSocket.OPEN) { this.sendJoinMessage() } - }, 1000) + }, 500) } - }, 3000) // 延迟3秒重连 + }, 2000) // 延迟2秒重连 } // 窗口事件处理 From 5e13af047fdb41ad81623fa74d7eedfb4b36f311 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 18 Dec 2025 12:37:46 +0800 Subject: [PATCH 02/13] commit --- .../components/plugins/sysSignature/pc.vue | 154 ++++++++++-------- .../views/layouts/v4/baseLayout.html | 5 +- 2 files changed, 86 insertions(+), 73 deletions(-) diff --git a/src/main/resources/static/components/plugins/sysSignature/pc.vue b/src/main/resources/static/components/plugins/sysSignature/pc.vue index 6afc4fd..b3801c7 100644 --- a/src/main/resources/static/components/plugins/sysSignature/pc.vue +++ b/src/main/resources/static/components/plugins/sysSignature/pc.vue @@ -1,96 +1,108 @@ diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index c2f4a00..8bde804 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -168,7 +168,7 @@ this.isSubscribed = true this.sendJoinMessage() } - }, 500) + }, 1000) } // 事件处理 @@ -202,6 +202,7 @@ // ) // 连接建立时不立即发送 join，等待订阅完成 this.ping() + console.log('websocket open success') } } @@ -245,7 +246,7 @@ } }, 500) } - }, 2000) // 延迟2秒重连 + }, 1000) // 延迟2秒重连 } // 窗口事件处理 From 180544e22a6bb996eb83e3cfe047da3952fe7221 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 18 Dec 2025 12:38:42 +0800 Subject: [PATCH 03/13] commit --- .../ActivityDeclareSchoolUnionController.java | 10 ++- .../controller/BlessingUserController.java | 2 +- .../declare/apply/index.html | 2 +- .../staffbenefit/blessing/blessingUser.html | 82 ++++++++----------- 4 files changed, 43 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java index 8d04806..a33b7f6 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; 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; @@ -94,8 +95,6 @@ public class ActivityDeclareSchoolUnionController { $condition """); Cnd cnd = Cnd.NEW(); - pageParam.buildSearch(cnd, "info."); - cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); @@ -105,6 +104,13 @@ public class ActivityDeclareSchoolUnionController { cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); } + if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", pageParam.getSearchKeyword()); + seg.orLike("info.loginName", pageParam.getSearchKeyword()); + cnd.and(seg); + } + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { cnd.desc("info.applyTime"); } else { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java index e625d85..2d08146 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java @@ -48,7 +48,7 @@ public class BlessingUserController { FROM blessing_user blu LEFT JOIN blessing bl ON bl.id = blu.blessingId - LEFT JOIN `user` u ON u.id = blu.userId + LEFT JOIN `vw_user` u ON u.id = blu.userId $condition """); if (Strings.isNotBlank(pageForm.getSearchKeyword()) && Strings.isNotBlank(pageForm.getSearchName())) { diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html index fd92510..d75ff41 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html @@ -356,7 +356,7 @@ layout("/layouts/platform.html"){ } }) } - if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "UNION_REIMBURSEMENT_MANAGER"])) { + if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "BRANCH_UNION_CHAIRMAN"])) { this.activityDeclareReimbursementList.map(v => { if (["BRANCH_UNION"].includes(v.name)) { activityDeclareReimbursementList.push(v) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html index 67f2419..8b48037 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html @@ -46,14 +46,13 @@ layout("/layouts/platform.html"){ -
+
所属工会：
+ filterable>
@@ -63,8 +62,8 @@ layout("/layouts/platform.html"){
所属单位：
+ clearable + filterable>
@@ -83,49 +82,41 @@ layout("/layouts/platform.html"){
- +
搜索 - -
- - - - - - - - + - + From 583559208e1908a19146f879dcefa9df3c110b87 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 18 Dec 2025 15:39:17 +0800 Subject: [PATCH 11/13] commit --- .../views/layouts/v4/baseLayout.html | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index 6638dbe..3c69200 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -100,10 +100,27 @@ -