From 575a40c2351080f4a30d87a1d495d8c2f51b1deb Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 16 Oct 2025 21:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExerciseCardServiceImpl.java | 2 +- .../views/platform/sys/msg/summary/index.html | 14 ++++---- .../activity/culture/common/userStatistics.js | 2 +- .../activity/family/userAdjust/userInfo.js | 8 ++--- .../trainSignUp/userAdjust/userInfo.js | 8 ++--- .../activity/workscollection/read/index.html | 4 +-- .../club/infoManage/manage/clubInfoManage.js | 8 ++--- .../cadreTraining/collect/index.html | 2 +- .../cadreTraining/schoolAudit/index.html | 2 +- .../dayofficework/clothing/apply/index.html | 14 ++++---- .../exerciseCard/query/index.html | 4 +-- .../fund/member/batchJoin/index.html | 8 ++--- .../member/branchUnionApproval/index.html | 5 +-- .../fund/member/changeRecord/index.html | 8 ++--- .../dayofficework/fund/member/his/index.html | 8 ++--- .../dayofficework/fund/member/mine/index.html | 2 +- .../fund/member/query/index.html | 8 ++--- .../member/schoolUnionApproval/index.html | 2 +- .../fund/subsidy/query/index.html | 8 ++--- .../dayofficework/integral/detail/index.html | 2 +- .../dayofficework/integral/manage/index.html | 2 +- .../literacy/userAdjust/userInfo.js | 8 ++--- .../literacy/userManage/index.html | 16 ++++----- .../meeting/statistics/periodsInfo.js | 8 ++--- .../zhgh/dayofficework/qsv/quiz/rank.html | 2 +- .../retiresouvenirs/ledger/index.html | 34 +++++++++---------- .../zhgh/dayofficework/site/mine/index.html | 2 +- .../zhgh/dayofficework/site/record/index.html | 2 +- .../site/schoolUnionAudit/index.html | 2 +- .../unionReimburse/collect/index.html | 2 +- .../unionReimburse/mine/index.html | 2 +- .../unionReimburse/review/index.html | 2 +- .../delegationOnePush/index.html | 6 ++-- .../delegationTwoPush/index.html | 6 ++-- .../executiveCommitteeMember/index.html | 8 ++--- .../preparatoryGroupPush/index.html | 6 ++-- .../proposal/query/collectProgress/index.html | 4 +-- .../proposal/query/comprehensive/index.html | 4 +-- .../proposal/transact/commissioner/index.html | 4 +-- .../transact/committeeFiling/index.html | 4 +-- .../proposal/transact/delegation/index.html | 4 +-- .../transact/schoolLeaderApproval/index.html | 4 +-- .../proposal/transact/suggestion/index.html | 4 +-- .../proposal/transact/unitReply/index.html | 4 +-- .../transact/viceDelegation/index.html | 4 +-- .../delegate/manage/index.html | 2 +- .../teachercongress/delegate/push/index.html | 2 +- .../delegate/push/zcAudit.html | 2 +- .../teachercongress/delegate/read/index.html | 2 +- .../workercongress/delegate/manage/index.html | 2 +- .../workercongress/delegate/read/index.html | 2 +- .../condolence/branchUnionApproval/index.html | 2 +- .../staffbenefit/condolence/mine/index.html | 2 +- .../staffbenefit/condolence/read/index.html | 2 +- .../condolence/schoolUnionApproval/index.html | 2 +- .../staffbenefit/dsznfmtx/collect/index.html | 2 +- .../dsznfmtx/schoolAudit/index.html | 2 +- .../dsznfmtx/unionAudit/index.html | 2 +- .../legal/doctorManage/index.html | 4 +-- .../maternityLeave/collect/index.html | 2 +- .../maternityLeave/schoolAudit/index.html | 2 +- .../maternityLeave/unionAudit/index.html | 2 +- .../mutualInsurance/collect/index.html | 2 +- .../psychology/doctorManage/index.html | 4 +-- .../member/apply/common/commonQuery.js | 2 +- .../branch/verification/check/index.html | 2 +- .../member/change/common/commonQuery.js | 2 +- .../member/change/manage/index.html | 2 +- .../member/change/record/index.html | 2 +- .../member/common/manage/memberManageQuery.js | 2 +- .../member/info/common/commonQuery.js | 2 +- .../member/info/history/index.html | 2 +- .../member/modelworker/manage/index.html | 2 +- .../verification/check/schoolViewAndHandle.js | 2 +- .../verification/manage/verificationQuery.js | 2 +- .../manage/verificationSetUserList.js | 2 +- .../manage/verificationShowSelectionUsers.js | 2 +- .../staffmanage/membercost/refund/index.html | 12 +++---- .../sourcechange/manage/index.html | 2 +- .../specialstaff/manage/index.html | 2 +- .../staffmanage/thirtyTeach/manage/index.html | 4 +-- 81 files changed, 176 insertions(+), 175 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java index 2fb27427..a29ccc09 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java @@ -117,6 +117,7 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl imple Record vwUser = vwUserMap.get(v.getLoginName()); if (vwUser != null) { exerciseCard.setUserId(vwUser.getString("id")); + exerciseCard.setUserId(vwUser.getString("userName")); exerciseCard.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd")); exerciseCard.setUnionId(vwUser.getString("unionId")); exerciseCard.setUnitId(vwUser.getString("unitId")); @@ -127,7 +128,6 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl imple // 设置其他基本信息 exerciseCard.setLoginName(v.getLoginName()); - exerciseCard.setUserName(v.getUsername()); exerciseCard.setApplyTime(new Date()); // 设置当前时间为申请时间 // 设置额度信息 diff --git a/src/main/resources/views/platform/sys/msg/summary/index.html b/src/main/resources/views/platform/sys/msg/summary/index.html index 921d6bb4..ce3be6c4 100644 --- a/src/main/resources/views/platform/sys/msg/summary/index.html +++ b/src/main/resources/views/platform/sys/msg/summary/index.html @@ -7,19 +7,19 @@ layout("/layouts/platform.html"){ - + - + - + @@ -28,20 +28,20 @@ layout("/layouts/platform.html"){ - - + + - + - + 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 d709d6f4..b0a1755d 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 @@ -44,7 +44,7 @@ const ACTIVITY_CULTURE_USER_STATISTICS = { {{ registerCourse.courseName + '报名人员' }}
- - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js index 4c19d8ce..6d75bcd0 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js +++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js @@ -4,15 +4,15 @@ const userInfo = {
{{ registerCourse.courseName + '报名人员' }}
- - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html b/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html index b557a08b..6a464656 100644 --- a/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html +++ b/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html @@ -30,8 +30,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js index ce74af45..733ed217 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js +++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js @@ -3,13 +3,13 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
- - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html index 06f69831..b9db3f04 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html @@ -26,7 +26,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html index c29d2733..2c1080fd 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html @@ -25,7 +25,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html index d05050fe..f9669f3f 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html @@ -11,7 +11,7 @@ layout("/layouts/platform.html"){