From f539184fcabf9e283583c17a60f8ee33e69ebce0 Mon Sep 17 00:00:00 2001 From: Paidax Date: Fri, 28 Feb 2025 17:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=94=B3=E6=8A=A5+=E5=9F=BA?= =?UTF-8?q?=E5=B1=82=E5=B7=A5=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/v/nutz/base/utils/Vi.java | 2 +- .../platform/caredata/UnionCareDataCon.java | 4 +- .../sys/unioncadre/UnionCadreController.java | 39 +- .../sys/services/SysLocalProcessService.java | 2 +- .../v/nutz/sys/services/SysUserService.java | 2 +- .../school/ActivityApplyController.java | 2 +- .../school/ActivityPrizeListController.java | 2 +- .../school/ActivityResultsController.java | 2 +- .../ActivityScoreStatisticsController.java | 12 +- ...ctivityStatisticsTypeExportController.java | 16 +- .../site/SiteReserveApplyController.java | 6 +- .../site/SiteUnionProcessController.java | 10 +- .../union/ActivityUnionManageController.java | 2 +- .../union/ActivityUnionPlanController.java | 2 +- .../models/ActivityAuditTypeEnum.java | 2 +- .../zhgh/activity/models/ActivityPlan.java | 4 +- .../zhgh/activity/models/ActivitySchool.java | 4 +- .../activity/models/ActivitySchoolApply.java | 2 +- .../activity/models/ActivitySchoolEvent.java | 2 +- .../activity/models/ActivitySiteReserve.java | 2 +- .../zhgh/activity/models/ActivityTissue.java | 10 +- .../activity/models/ActivityTissuePerson.java | 2 +- .../activity/models/ActivityYearSummary.java | 2 +- .../ContributionStatisticsController.java | 2 +- .../model/AidFundMemberAuditRecord.java | 4 +- .../evaluate/handler/EvaluateToDoHandler.java | 8 +- .../v/nutz/zhgh/evaluate/models/Evaluate.java | 2 +- .../zhgh/evaluate/models/EvaluateApply.java | 6 +- .../impl/EvaluateServiceApplyImpl.java | 2 +- .../manage/FellowshipUserBlackListManage.java | 4 +- .../mobile/MFellowshipActivityController.java | 4 +- ...ellowshipActivityStatisticsController.java | 2 +- .../fellowship/models/FellowshipCourse.java | 2 +- .../service/FellowshipActivityService.java | 2 +- .../impl/FellowshipActivityServiceImpl.java | 2 +- .../FitnessWalkPunchStatisticsController.java | 16 +- .../FitnessWalkStepRankingController.java | 2 +- .../FitnessWalkStepStatisticsController.java | 2 +- .../FitnessWalkStepWiningController.java | 2 +- .../models/FourOneActivity.java | 2 +- .../ghkh/controller/GhKhZpController.java | 2 +- .../io/v/nutz/zhgh/ghkh/model/Kh_record.java | 2 +- .../io/v/nutz/zhgh/ghkh/model/Kh_xghsh.java | 2 +- .../java/io/v/nutz/zhgh/ghkh/model/Kh_zp.java | 2 +- .../controller/ca/HdChildHjxxController.java | 6 +- .../controller/ca/HdChildZpxxController.java | 2 +- .../controller/wmhd/HdWmHjInfoController.java | 6 +- .../controller/wmhd/HdWmInfoController.java | 2 +- .../io/v/nutz/zhgh/hd/models/Hd_wm_sbxx.java | 2 +- .../HealthCheckupSingleController.java | 2 +- .../impl/HealthCheckupSingleServiceImpl.java | 2 +- .../controller/HonorBatchController.java | 4 +- .../controller/HonorManageController.java | 2 +- .../io/v/nutz/zhgh/honor/models/Honor.java | 6 +- .../v/nutz/zhgh/honor/models/HonorApply.java | 6 +- .../jdh/controller/db/JdhDbYlController.java | 2 +- .../controller/zzjg/DelegationController.java | 6 +- .../io/v/nutz/zhgh/jdh/model/two/Jdh_db2.java | 2 +- .../v/nutz/zhgh/jdh/model/two/Jdh_jdhxx2.java | 2 +- .../v/nutz/zhgh/jdh/model/two/Jdh_jdj2.java | 2 +- .../controller/activitybx/AccountingCon.java | 58 +- .../activitybx/ApplyController.java | 189 +- .../activitybx/ReimbursementCon.java | 6 +- .../jf/controller/activitybx/UnionCon.java | 18 +- .../jf/controller/club/clubTzController.java | 2 +- .../ActivityReimbursementApplyController.java | 2 +- .../ActivityReimbursementBoardController.java | 8 +- ...yReimbursementUnionChairmanController.java | 4 +- .../jf/controller/yjgh/jfsyController.java | 2 +- .../zhgh/jf/handle/funds/FundsToHandler.java | 24 +- .../reimbursement/ReimbursementToHandler.java | 6 +- .../io/v/nutz/zhgh/jf/model/ActivityBx.java | 6 + .../service/impl/ActivityBxServiceImpl.java | 2 +- .../LeadThoughtAuditStateConstant.java | 4 +- .../leadthought/model/LeadThoughtInfo.java | 8 +- .../LoveSubsidyAuditStateConstant.java | 4 +- ...LoveSubsidyBranchUnionAuditController.java | 2 +- .../zhgh/loveSubsidy/model/LoveSubsidy.java | 4 +- .../lxy/controller/LxyAgentController.java | 2 +- .../lxy/controller/LxyFghShController.java | 2 +- .../java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java | 4 +- .../controller/ManuscriptAgentController.java | 2 +- .../zhgh/manuscript/models/Manuscript.java | 4 +- ...edicalMutualAidFundAuditStateConstant.java | 4 +- .../MedicalMutualAidFundApplyController.java | 2 +- ...tualAidFundBranchUnionAuditController.java | 6 +- ...icalMutualAidFundFinalAuditController.java | 2 +- .../MedicalMutualAidFundToDoHandler.java | 8 +- .../model/MedicalMutualAidFund.java | 6 +- .../pc/MeetingOnlineController.java | 2 +- .../MeetingBasicStatisticsController.java | 2 +- .../meeting/models/CustomAuditTypeEnum.java | 2 +- .../member/constant/MemberApplyState.java | 4 +- .../constant/MemberChangeApplyState.java | 4 +- .../member/constant/MemberChangeOrigin.java | 2 +- .../controller/MemberCommonController.java | 2 +- .../apply/MemberApplyAuditController.java | 2 +- .../MemberChangeApplyAuditController.java | 2 +- .../inquire/MemberAnalysisController.java | 18 +- .../inquire/MemberStatisticsController.java | 4 +- .../inquire/MemberUserTypeController.java | 16 +- .../member/handle/MemberApplyAuditHandle.java | 2 +- .../member/handle/MemberApplyToDoHandler.java | 4 +- .../handle/MemberChangeAuditHandle.java | 4 +- .../handle/MemberChangeToDoHandler.java | 4 +- .../zhgh/member/model/MemberApplyRecord.java | 2 +- .../zhgh/member/model/MemberChangeRecord.java | 2 +- .../SiteInfoMobileUnionAuditController.java | 2 +- .../UnionActivityRegisterController.java | 12 +- .../unioncomment/MUnionCommentController.java | 2 +- .../ProposalExportLeaderHandleController.java | 4 +- .../statistics/ProposalSummaryController.java | 2 +- .../zhgh/proposal/models/ProposalInfo.java | 2 +- .../QuestionAnswerRankingController.java | 4 +- .../QuestionAnswerStatisticsController.java | 2 +- .../controller/QuestionCakeController.java | 2 +- .../QuestionPollAnalysisController.java | 2 +- ...stionUnionIntentionalChoiceController.java | 6 +- .../constants/ReimbursementState.java | 4 +- .../ReimbursementAgentController.java | 2 +- .../controller/applyNewController.java | 2 +- .../SingleUserStatisticsController.java | 4 +- .../service/impl/SingleUserServiceImpl.java | 2 +- .../SwufeDifficultSubsidyStateCode.java | 6 +- .../model/SwufeDifficultSubsidyApply.java | 4 +- .../controller/info/SyrXtsbController.java | 2 +- .../TheRapyRecuperationLineCreateMode.java | 4 +- .../TheRapyRecuperationSignUpMode.java | 4 +- .../constant/TheRapyRecuperationState.java | 8 +- .../TheRapyRecuperationAuditController.java | 8 +- ...RapyRecuperationBaseManagerController.java | 4 +- .../TheRapyRecuperationLineController.java | 4 +- .../TheRapyRecuperationEnrollController.java | 2 +- ...yRecuperationLineAdjustmentController.java | 4 +- ...RecuperationLineUnionSelectController.java | 16 +- ...eRapyRecuperationUnionQueryController.java | 12 +- .../mode/TheRapyTravelLineExcelMode.java | 4 +- .../TheRapyRecuperationBaseManagement.java | 6 +- .../model/TheRapyRecuperationEnroll.java | 10 +- .../model/TheRapyRecuperationLine.java | 6 +- .../TheRapyRecuperationLineUnionSelect.java | 4 +- .../TheRapyRecuperationAuditService.java | 2 +- .../TheRapyRecuperationLineService.java | 4 +- ...apyRecuperationLineUnionSelectService.java | 8 +- .../TheRapyRecuperationEnrollServiceImpl.java | 2 +- ...apyRecuperationLineClusterServiceImpl.java | 6 +- .../TheRapyRecuperationLineServiceImpl.java | 8 +- ...ecuperationLineUnionSelectServiceImpl.java | 8 +- .../TrainEduStatisticsUnionController.java | 2 +- .../trainEducation/models/TrainEduAlbum.java | 2 +- .../TrainSignUpUserAdjustController.java | 2 +- .../TrainSignUpUserBlackListManage.java | 4 +- .../MTrainSignUpActivityController.java | 4 +- ...ainSignUpActivityStatisticsController.java | 2 +- .../trainSignUp/models/TrainSignUpCourse.java | 2 +- .../service/TrainSignUpActivityService.java | 2 +- .../impl/TrainSignUpActivityServiceImpl.java | 6 +- .../controller/exportZpController.java | 6 +- .../zhgh/unioncomment/model/CommentZb.java | 2 +- .../controller/WelfareCommonController.java | 4 +- .../controller/WelfareListController.java | 4 +- .../WelfareMemberMangeController.java | 2 +- .../WelfareMemberCheckSchoolController.java | 2 +- .../WelfareMemberCheckUnionController.java | 2 +- .../statistics/WelfareSingleController.java | 6 +- .../zhgh/welfare/feature/WelfareFeature.java | 4 +- .../zhgh/welfare/mode/WelfareProvideMode.java | 2 +- .../zhgh/welfare/model/WelfareProject.java | 2 +- .../service/WelfareListSummaryService.java | 2 +- .../welfare/service/WelfareSingleService.java | 6 +- .../impl/WelfareListSummaryServiceImpl.java | 2 +- .../impl/WelfareSingleServiceImpl.java | 14 +- ...orkersCongressGdhDelegationController.java | 2 +- .../workersCongressDelegationMakeUpUnion.java | 2 +- .../xhkh/controller/XhKhZpController.java | 4 +- .../io/v/nutz/zhgh/xhkh/model/Xh_xghsh.java | 2 +- .../io/v/nutz/zhgh/zc/model/Zgfw_Zcxx.java | 2 +- .../zhgh/zgfw/controller/FwDbController.java | 18 +- .../condolence/CondolenceApplyCon.java | 2 +- .../condolence/CondolenceVcrCon.java | 2 +- .../DifficultBranchUnionAuditController.java | 2 +- .../difficult/DifficultReadingController.java | 8 +- ...cultSchoolUnionInitialAuditController.java | 4 +- .../controller/rxdj/RxdjShController.java | 4 +- .../controller/rxdj/RxdjSqxxController.java | 2 +- .../controller/rxdj/rxdjAgentController.java | 4 +- .../condolence/CondolenceToDoHandler.java | 8 +- .../difficult/DifficultToDoHandler.java | 8 +- .../zgfw/handler/rxdj/RxdjToDoHandler.java | 12 +- .../singleChild/SingleChildToDoHandler.java | 4 +- .../zhgh/zgfw/model/difficult/Zgfw_knbf.java | 4 +- .../v/nutz/zhgh/zgfw/model/rxdj/Fw_rxdj.java | 12 +- .../io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java | 2 +- .../zhgh/zgfw/service/CondolenceService.java | 2 +- .../zhgh/zgfw/service/DifficultState.java | 2 +- .../zhgh/zgfw/service/ZgfwKnbfService.java | 2 +- .../service/impl/CondolenceServiceImpl.java | 2 +- .../zhgh/zgfw/template/rxdj/RxdjTemp.java | 2 +- src/main/resources/docTemplate/funds2.docx | Bin 12833 -> 13428 bytes .../assets/platform/js/util/commonUtil.js | 68 + .../resources/static/assets/platform/js/v.js | 110 +- .../platform/module/activity/activity.js | 38 +- .../activity/school/AddActivity.vue | 2420 +++++++++-------- .../components/activity/school/Info.vue | 793 +++--- .../components/activity/school/planInfo.vue | 106 +- .../components/activity/school/tissueInfo.vue | 631 ++--- .../activity/score/isMaleFemale.vue | 288 +- .../activity/score/scoreTopEight.vue | 126 +- .../components/activity/site/ReserveInfo.vue | 417 ++- .../components/activity/site/SiteH5Info.vue | 247 +- .../components/activityBx/ActivityBxInfo.vue | 8 +- .../static/components/condolence/Info.vue | 482 ++-- .../components/condolence/mobile/common.vue | 2 +- .../static/components/difficulty/info.vue | 514 ++-- .../components/evaluate/evaluateInfo.vue | 368 ++- .../fourOneActivity/fourOneActivityInfo.vue | 1031 ++++--- .../static/components/hd/hdwmInfo.vue | 733 ++--- .../static/components/honor/honorInfo.vue | 519 ++-- .../leadthought/leadThoughtInfo.vue | 227 +- .../components/loveSubsidy/loveSubsidy.vue | 310 ++- .../manuscriptInfo/manuscriptInfo.vue | 222 +- .../medicalMutualAidFund.vue | 226 +- .../mobile/member/MobileMemberChangeInfo.vue | 338 ++- .../static/components/mobile/wmhd/info.vue | 417 ++- .../components/plugins/ConditionStructure.vue | 498 ++-- .../static/components/plugins/FghSelect.vue | 370 +-- .../reimbursement/reimbursementNew.vue | 551 ++-- .../swufeDifficultSubsidy/processInfo.vue | 304 ++- .../components/sys/union/cadre/Mange.vue | 552 ++-- .../theRapyRecuperation/BaseManageInfo.vue | 162 +- .../theRapyRecuperation/Enrollinfo.vue | 290 +- .../theRapyRecuperation/LineInfo.vue | 202 +- .../unionComment/UnionCommentZb.vue | 601 ++-- .../userChangeHistory/userChangeHistory.vue | 185 +- .../static/components/zgfw/knbf/knbf.vue | 137 +- .../components/zgfw/rxdj/mobileRxdj.vue | 246 +- .../static/components/zgfw/rxdj/rxdj.vue | 201 +- .../static/components/zgfw/wwj/wwj.vue | 133 +- .../resources/views/layouts/platform.html | 4 +- .../activity/site/unionAudit/audit.html | 4 +- .../mobile/activity/site/unionAudit/list.html | 2 +- .../unionActivity/common/activityInfo.html | 36 +- .../activity/unionActivity/unionReg.html | 4 +- .../resources/views/mobile/cahd/userList.html | 58 +- .../condolence/branchunionaudit/index.html | 127 +- .../views/mobile/condolence/school_Audit.html | 118 +- .../condolence/schoolunionaudit/index.html | 174 +- .../views/mobile/condolence/union_Audit.html | 85 +- .../views/mobile/difficulty/apply.html | 353 ++- .../views/mobile/difficulty/apply/index.html | 494 ++-- .../difficulty/branchunionaudit/index.html | 152 +- .../views/mobile/difficulty/common/info.js | 21 +- .../views/mobile/difficulty/union_Audit.html | 75 +- .../resources/views/mobile/member/edit.html | 2 +- .../views/mobile/member/union_Audit.html | 4 +- .../member/union_audit_change_list.html | 6 +- .../views/mobile/rxdj/applyDjList.html | 135 +- .../views/mobile/rxdj/auditList.html | 251 +- .../views/mobile/rxdj/unitAudit.html | 114 +- .../resources/views/mobile/scannerQrCode.html | 131 +- .../therapyRecuperation/baseManagement.html | 338 ++- .../mobile/therapyRecuperation/lineList.html | 174 +- .../therapyRecuperation/myRecuperation.html | 257 +- .../views/mobile/unioncomment/appraisal.html | 64 +- .../views/mobile/unioncomment/mine.html | 108 +- .../views/mobile/wmhd/unionAudit.html | 73 +- .../activity/basic/ActivityUnion.html | 18 +- .../activity/school/ActivityPrize.html | 269 +- .../activity/school/ActivityReading.html | 553 ++-- .../activity/school/ActivityRemind.html | 233 +- .../activity/school/ActivityResults.html | 609 ++--- .../activity/school/ScoreStatistics.html | 266 +- .../activity/site/SiteUnionProcess.html | 171 +- .../activity/union/ActivityUnionManage.html | 311 +-- .../activity/union/ActivityUnionPlan.html | 226 +- .../activity/union/addPlanCommon.html | 32 +- .../activity/union/applyActivity.html | 16 +- .../platform/activity/union/layoutPlan.html | 251 +- .../platform/caredata/StaffCareData.html | 380 +-- .../platform/caredata/UnionCareData.html | 1388 +++++----- .../views/platform/datav/activity.html | 378 ++- .../platform/diseaseaid/aidfund/Apply.html | 205 +- .../views/platform/evaluate/audit/party.html | 238 +- .../views/platform/evaluate/audit/school.html | 246 +- .../views/platform/evaluate/audit/union.html | 249 +- .../platform/evaluate/evaluateApply.html | 459 ++-- .../platform/evaluate/evaluateManage.html | 214 +- .../views/platform/evaluate/summary.html | 146 +- .../fellowship/manage/activity_add.html | 344 +-- .../manage/include_activity_edit.html | 389 ++- .../fellowship/manage/userAdjust.html | 4 +- .../fellowship/manage/user_black_list.html | 169 +- .../fellowship/statistics/activity.html | 178 +- .../platform/fitnessWalk/punchStatistics.html | 167 +- .../platform/fitnessWalk/stepRanking.html | 166 +- .../platform/fitnessWalk/stepStatistics.html | 181 +- .../platform/fitnessWalk/stepWining.html | 116 +- .../fourOneActivity/fourOneApply.html | 296 +- .../fourOneActivity/fourOneApplyList.html | 189 +- .../fourOneActivity/fourOneUnionAudit.html | 141 +- .../resources/views/platform/ghkh/khph.html | 114 +- .../resources/views/platform/ghkh/lssjcx.html | 251 +- .../resources/views/platform/ghkh/xghsh.html | 6 +- .../resources/views/platform/ghkh/zp.html | 14 +- .../views/platform/hd/ca/hjxxyl.html | 132 +- .../views/platform/hd/ca/zpMange.html | 1259 ++++----- .../resources/views/platform/hd/ca/zpxx.html | 472 ++-- .../views/platform/hd/wmhd/hjxxyl.html | 152 +- .../views/platform/hd/wmhd/sbxxyl.html | 430 ++- .../views/platform/hd/wmhd/schoolAudit.html | 349 +-- .../views/platform/hd/wmhd/unionAudit.html | 436 +-- .../views/platform/hd/wmhd/zpMange.html | 663 +++-- .../healthCheckup/statisticsSingle.html | 371 +-- .../resources/views/platform/honor/apply.html | 4 +- .../views/platform/honor/audit/union.html | 143 +- .../views/platform/honor/batchHonor.html | 162 +- .../views/platform/honor/manage.html | 257 +- .../views/platform/honor/registration.html | 232 +- .../views/platform/honor/unionSummary.html | 53 +- .../resources/views/platform/jdh/cb/mefp.html | 140 +- .../views/platform/jdh/db/audit.html | 109 +- .../views/platform/jdh/two/dbgl.html | 143 +- .../views/platform/jdh/two/jcgl.html | 441 ++- .../views/platform/jdh/two/unionManage.html | 1400 +++++----- .../views/platform/jdh/zzjg/dbt.html | 10 +- .../views/platform/jdh/zzjg/delegation.html | 484 ++-- .../views/platform/jf/Funds/apply.html | 359 ++- .../views/platform/jf/activitybx/cashier.html | 147 +- .../views/platform/jf/activitybx/confirm.html | 144 +- .../platform/jf/bxFundsLayout/accounting.html | 269 +- .../jf/bxFundsLayout/reimbursement.html | 451 ++- .../jf/bxFundsLayout/reimbursementview.html | 181 +- .../platform/jf/bxFundsLayout/union.html | 278 +- .../views/platform/jf/costsSet/costsSet.html | 131 +- .../platform/jf/reimbursement/apply.html | 2 +- .../platform/jf/reimbursement/board.html | 520 ++-- .../jf/reimbursement/clubChairman.html | 159 +- .../views/platform/jf/reimbursement/mine.html | 184 +- .../jf/reimbursement/schoolChairman.html | 190 +- .../jf/reimbursement/schoolDirector.html | 190 +- .../platform/jf/reimbursement/statistics.html | 186 +- .../jf/reimbursement/unionChairman.html | 172 +- .../views/platform/jsz/cxtj/hdunion.html | 94 +- .../platform/jsz/cxtj/unionRegisterInfo.html | 321 ++- .../views/platform/jsz/pc/prize.html | 75 +- .../platform/jsz/pc/stepCountingRank.html | 186 +- .../views/platform/leadthought/fghOption.html | 2 +- .../platform/legalAid/statistics/apply.html | 99 +- .../views/platform/loveSubsidy/apply.html | 251 +- .../loveSubsidy/branchUnionAudit.html | 132 +- .../resources/views/platform/lxy/HdFghsh.html | 307 ++- .../resources/views/platform/lxy/HdGhbm.html | 828 +++--- .../resources/views/platform/lxy/HdGrbm.html | 354 ++- .../resources/views/platform/lxy/HdMange.html | 742 +++-- .../resources/views/platform/lxy/HdMetj.html | 542 ++-- .../resources/views/platform/lxy/HdXghsh.html | 677 ++--- .../views/platform/lxy/dialogViewBm.html | 24 +- .../views/platform/lxy/dialogViewFp.html | 9 +- .../views/platform/manuscript/apply.html | 113 +- .../views/platform/manuscript/applyList.html | 149 +- .../views/platform/manuscript/school.html | 2 +- .../platform/manuscript/statisticsTable.html | 95 +- .../views/platform/manuscript/union.html | 6 +- .../platform/medicalMutualAidFund/apply.html | 244 +- .../branchUnionAudit.html | 119 +- .../resources/views/platform/meeting/add.html | 124 +- .../platform/meeting/statistics/basic.html | 198 +- .../platform/member/apply/audit/Layout.html | 2 +- .../views/platform/member/apply/index.html | 305 +-- .../views/platform/member/change/Manage.html | 2 +- .../platform/member/change/audit/Layout.html | 2 +- .../views/platform/member/check/school.html | 390 ++- .../views/platform/member/check/task.html | 131 +- .../views/platform/member/check/union.html | 2 +- .../platform/member/inquire/Analysis.html | 157 +- .../platform/member/inquire/DataBoard.html | 313 ++- .../platform/member/inquire/History.html | 274 +- .../platform/member/inquire/Statistics.html | 163 +- .../platform/member/inquire/usertype.html | 90 +- .../platform/memberCost/payment/summary.html | 491 ++-- .../views/platform/offerAdvice/query.html | 89 +- .../views/platform/payment/summary.html | 479 ++-- .../platform/projectfunding/declare.html | 240 +- .../platform/psychology/statistics/apply.html | 99 +- .../views/platform/question/pollAnalysis.html | 222 +- .../views/platform/question/ranking.html | 163 +- .../views/platform/question/statistics.html | 162 +- .../views/platform/reimbursement/Summary.html | 203 +- .../platform/reimbursement/applyNew.html | 572 ++-- .../views/platform/reimbursement/dma.html | 202 +- .../platform/shopping/shoppingTypeApply.html | 703 ++--- .../views/platform/single/statistics.html | 141 +- .../process/branchUnionAudit.html | 141 +- .../views/platform/syr/cxtj/dgncx.html | 119 +- .../views/platform/syr/cxtj/goodkt.html | 104 +- .../views/platform/syr/cxtj/lxhz.html | 124 +- .../views/platform/syr/cxtj/statetj.html | 61 +- .../views/platform/syr/info/jtsq.html | 329 ++- .../views/platform/syr/info/jtsqxjcs.html | 199 +- .../views/platform/syr/info/jtsqyjcs.html | 52 +- .../views/platform/syr/info/xjsh.html | 191 +- .../views/platform/syr/info/xtsb.html | 243 +- .../resources/views/platform/sys/home.html | 314 +-- .../views/platform/sys/union/unionMange.html | 2164 ++++++++------- .../baseManage/baseManagement.html | 645 ++--- .../theRapyRecuperation/basicManage/line.html | 647 ++--- .../process/TheRapyQuery.html | 2 +- .../process/TheRapyUserQuery.html | 522 ++-- .../process/lineAdjustment.html | 239 +- .../process/lineCluster.html | 265 +- .../process/lineUnionSelect.html | 540 ++-- .../views/platform/trainEdu/album.html | 147 +- .../platform/trainEdu/statistics/union.html | 75 +- .../platform/trainEdu/statistics/video.html | 82 +- .../trainSingUp/manage/activity_add.html | 402 +-- .../platform/trainSingUp/manage/apply.html | 333 ++- .../manage/include_activity_edit.html | 362 +-- .../trainSingUp/manage/userAdjust.html | 4 +- .../trainSingUp/manage/user_black_list.html | 241 +- .../trainSingUp/statistics/activity.html | 168 +- .../platform/unionComment/statistics.html | 384 ++- .../platform/welfare/member/Adjustment.html | 2 +- .../platform/welfare/member/check/school.html | 6 +- .../platform/welfare/member/check/task.html | 131 +- .../platform/welfare/member/check/union.html | 2 +- .../platform/welfare/selectbycpu/config.html | 196 +- .../welfare/selectbycpu/selectManage.html | 333 ++- .../platform/welfare/statistics/single.html | 600 ++-- .../platform/workersCongress/Delegation.html | 288 +- .../resources/views/platform/xhkh/lssjcx.html | 238 +- .../resources/views/platform/zcgl/gdzctz.html | 386 ++- .../resources/views/platform/zcgl/zcsjkb.html | 64 +- .../resources/views/platform/zcgl/zczhcx.html | 2 +- .../views/platform/zgfw/condolence/fr.html | 2 +- .../views/platform/zgfw/condolence/ucr.html | 212 +- .../views/platform/zgfw/condolence/vcr.html | 226 +- .../views/platform/zgfw/difficulty/apply.html | 4 +- .../platform/zgfw/difficulty/apply2.html | 87 +- .../zgfw/difficulty/branchUnionAudit.html | 154 +- .../platform/zgfw/difficulty/common/info.js | 4 +- .../views/platform/zgfw/lxy/HdFghsh.html | 307 ++- .../views/platform/zgfw/lxy/HdGhbm.html | 552 ++-- .../views/platform/zgfw/lxy/HdGrbm.html | 354 ++- .../views/platform/zgfw/lxy/HdMange.html | 825 +++--- .../views/platform/zgfw/lxy/HdMetj.html | 542 ++-- .../views/platform/zgfw/lxy/HdXghsh.html | 652 +++-- .../views/platform/zgfw/lxy/dialogViewBm.html | 24 +- .../views/platform/zgfw/lxy/dialogViewFp.html | 9 +- .../views/platform/zgfw/question/ranking.html | 149 +- .../views/platform/zgfw/rxdj/beian.html | 184 +- .../views/platform/zgfw/rxdj/fghsh.html | 287 +- .../views/platform/zgfw/rxdj/zhcx.html | 160 +- .../views/platform/zgfw/wwj/fghsh.html | 143 +- .../views/platform/zgfw/wwj/sqxx.html | 220 +- .../views/platform/zgfw/wwj/xghsh.html | 132 +- .../views/platform/zgfw/wwj/zhcx.html | 93 +- 456 files changed, 32939 insertions(+), 35577 deletions(-) create mode 100644 src/main/resources/static/assets/platform/js/util/commonUtil.js diff --git a/src/main/java/io/v/nutz/base/utils/Vi.java b/src/main/java/io/v/nutz/base/utils/Vi.java index 316c6ed..f53f27d 100644 --- a/src/main/java/io/v/nutz/base/utils/Vi.java +++ b/src/main/java/io/v/nutz/base/utils/Vi.java @@ -363,7 +363,7 @@ public class Vi { return list.stream().map(v-> v.getString("loginname")).collect(Collectors.toList()); } - //查询当前登录用户的分工会管理员 + //查询当前登录用户的基层工会管理员 public List getUnionManageByCurrentUser() { List userRoles = baseService.dao().query(Sys_user_role.class, Cnd.where("roleid", "=", Roles.UNION_MANGER).and("unionid", "=", getUnionId())); List list = userRoles.stream().map(Sys_user_role::getUserId).distinct().collect(Collectors.toList()); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/caredata/UnionCareDataCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/caredata/UnionCareDataCon.java index 00b58fd..8d18f15 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/caredata/UnionCareDataCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/caredata/UnionCareDataCon.java @@ -204,7 +204,7 @@ public class UnionCareDataCon { put("num", baseService.count(sql1)); }}); list.add(new HashMap() {{ - put("type", "分工会活动"); + put("type", "基层工会活动"); put("num", baseService.count(sql2)); }}); list.add(new HashMap() {{ @@ -253,7 +253,7 @@ public class UnionCareDataCon { list.add(new HashMap() {{ put("year", year); - put("type", "分工会活动"); + put("type", "基层工会活动"); put("num", sysUserService.list(sql2.setParam("year", year)).get(0).getDouble("jf")); }}); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/unioncadre/UnionCadreController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/unioncadre/UnionCadreController.java index db1ec11..8213fd1 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/unioncadre/UnionCadreController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/unioncadre/UnionCadreController.java @@ -2,17 +2,20 @@ package io.v.nutz.sys.controllers.platform.sys.unioncadre; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.utils.PageUtil; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.utils.PageUtil; import io.v.nutz.sys.models.Sys_role; +import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.models.UnionCadre; import io.v.nutz.sys.services.SysDictService; import io.v.nutz.sys.services.SysRoleService; import io.v.nutz.sys.services.UnionCadreService; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Strings; @@ -77,30 +80,50 @@ public class UnionCadreController { @At @ViReturn + @Aop(TransAop.READ_COMMITTED) public Object createCadre(UnionCadre cadre, String roleCode) { Sys_role role = roleService.fetch(Cnd.where("code", "=", roleCode)); + if ("gh08".equals(roleCode) || "gh01".equals(roleCode)) { + int count = roleService.dao().count(UnionCadre.class, Cnd.where("roleId", "=", role.getId()).and("unionid", "=", cadre.getUnionId())); + if (count > 0) { + return Result.error("该角色只能设置一位，如仍要设置，请取消前任角色"); + } + } + Cnd cnd = Cnd.where("userId", "=", cadre.getUserId()).and("roleId", "=", role.getId()).and("unionId", "=", cadre.getUnionId()).and("workersCongressSession", "=", cadre.getWorkersCongressSession()); if (unionCadreService.count(cnd) > 0) { return Result.error("此操作重复！"); } - cadre.setJoining(true).setRoleId(role.getId()).setAuditStateId(UnionCadreAuditState.SCHOOL_UNION); + cadre.setJoining(true).setRoleId(role.getId()).setAuditStateId(UnionCadreAuditState.SUCCESS); unionCadreService.insert(cadre); + + Sys_user_role sur = new Sys_user_role(); + sur.setRoleId(cadre.getRoleId()); + sur.setUserId(cadre.getUserId()); + sur.setUnionid(cadre.getUnionId()); + roleService.insert(sur); + return null; } + @At @ViReturn + @Aop(TransAop.READ_COMMITTED) public Object removeCadre(String id) { UnionCadre cadre = unionCadreService.fetch(id); - if (UnionCadreAuditState.SUCCESS != cadre.getAuditStateId() && cadre.isJoining()) { - unionCadreService.delete(id); - } else { - cadre.setJoining(false).setAuditStateId(UnionCadreAuditState.SCHOOL_UNION); - unionCadreService.update(cadre); - } + unionCadreService.delete(id); + unionCadreService.dao().clear(Sys_user_role.class, Cnd.where("userId", "=", cadre.getUserId()).and("roleId", "=", cadre.getRoleId())); + +// if (UnionCadreAuditState.SUCCESS != cadre.getAuditStateId() && cadre.isJoining()) { +// unionCadreService.delete(id); +// } else { +// cadre.setJoining(false).setAuditStateId(UnionCadreAuditState.SCHOOL_UNION); +// unionCadreService.update(cadre); +// } return null; } diff --git a/src/main/java/io/v/nutz/sys/services/SysLocalProcessService.java b/src/main/java/io/v/nutz/sys/services/SysLocalProcessService.java index 0c97f6f..bc46a74 100644 --- a/src/main/java/io/v/nutz/sys/services/SysLocalProcessService.java +++ b/src/main/java/io/v/nutz/sys/services/SysLocalProcessService.java @@ -10,7 +10,7 @@ public interface SysLocalProcessService { * * @param processName 流程实例名称 例如：xxx慰问申请 * @param processUniqueId 流程唯一id - * @param nodeName 流程当前节点名称 例如：分工会审核 + * @param nodeName 流程当前节点名称 例如：基层工会审核 * @param processInitiatorId 流程发起人id 传申请人的id * @param pcUrl pc端查看地址 * @param mobileUrl 手机端查看地址 diff --git a/src/main/java/io/v/nutz/sys/services/SysUserService.java b/src/main/java/io/v/nutz/sys/services/SysUserService.java index 4918047..4987690 100644 --- a/src/main/java/io/v/nutz/sys/services/SysUserService.java +++ b/src/main/java/io/v/nutz/sys/services/SysUserService.java @@ -52,7 +52,7 @@ public interface SysUserService extends BaseService { Sys_user fillModuleMenus(Sys_user user); /** - * 绑定用户单位 分工会信息 + * 绑定用户单位 基层工会信息 * * @param user * @return diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java index 037f3f7..348ca67 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java @@ -202,7 +202,7 @@ public class ActivityApplyController { Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); Sys_unit unit = user.getUnit(); - //根据当前登入人的单位查询他所属的活动分工会属于哪个 + //根据当前登入人的单位查询他所属的活动基层工会属于哪个 ActivityBasicUnit activityBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, unit.getId()); ActivitySchool activity = activitySchoolService.fetch(activityId); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java index cc588b0..a50de6b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java @@ -61,7 +61,7 @@ public class ActivityPrizeListController { ; /** - * 各个分工会奖品 + * 各个基层工会奖品 * * @param activityId * @param unionId diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java index 21ae911..3cdc1fc 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java @@ -210,7 +210,7 @@ public class ActivityResultsController { /** - * 查询团体参赛分工会 + * 查询团体参赛基层工会 * * @param activityId * @param eventId diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java index 01d02f3..728a431 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java @@ -338,7 +338,7 @@ public class ActivityScoreStatisticsController { List activitySchoolList = dao.query(ActivitySchool.class, Cnd.where("YEAR(applyStartTime)", "=", year)); List labelList = activitySchoolList.stream().map(v -> v.getName()).collect(Collectors.toList()); - labelList.add(0, "分工会"); + labelList.add(0, "基层工会"); unionList.forEach(u -> { NutMap unionMap = Lang.obj2nutmap(u); @@ -358,7 +358,7 @@ public class ActivityScoreStatisticsController { unionMap.put(x.getName(), score); }); unionMap.put("总分", scoreSum.get()); - unionMap.put("分工会", unionMap.getString("unionname")); + unionMap.put("基层工会", unionMap.getString("unionname")); resultMap.add(unionMap); }); labelList.add("总分"); @@ -383,7 +383,7 @@ public class ActivityScoreStatisticsController { List eventIdList = dao.query(ActivitySchoolEvent.class, Cnd.where("activityId", "in", activityIdList)).stream().map(v -> v.getEventId()).collect(Collectors.toList()); - activityNameList.add(0, "分工会"); + activityNameList.add(0, "基层工会"); Sql sql = Sqls.create(""" SELECT @@ -417,7 +417,7 @@ public class ActivityScoreStatisticsController { unionMap.put(a.getName(), sexScore + (qwScore * 0.5)); }); unionMap.put("总分", scoreSum.get()); - unionMap.put("分工会", unionMap.getString("unionname")); + unionMap.put("基层工会", unionMap.getString("unionname")); resultMap.add(unionMap); }); @@ -590,8 +590,8 @@ public class ActivityScoreStatisticsController { List list = schoolViService.listMap(sql); List entityList = new ArrayList<>(); - entityList.add(new ExcelExportEntity("分工会代码", "unioncode", 40)); - entityList.add(new ExcelExportEntity("分工会名称", "unionname", 20)); + entityList.add(new ExcelExportEntity("基层工会代码", "unioncode", 40)); + entityList.add(new ExcelExportEntity("基层工会名称", "unionname", 20)); entityList.add(new ExcelExportEntity("工号", "loginname", 20)); entityList.add(new ExcelExportEntity("姓名", "username", 20)); entityList.add(new ExcelExportEntity("性别", "sex", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java index 409555c..63416e0 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java @@ -59,7 +59,7 @@ public class ActivityStatisticsTypeExportController { List eventIdList = baseService.dao().query(ActivitySchoolEvent.class, Cnd.where("activityId", "in", activityIdList)).stream().map(v -> v.getEventId()).collect(Collectors.toList()); - activityNameList.add(0, "分工会"); + activityNameList.add(0, "基层工会"); Sql sql = Sqls.create(""" SELECT @@ -90,7 +90,7 @@ public class ActivityStatisticsTypeExportController { unionMap.put(a.getName(), sexScore + (qwScore * 0.5)); }); unionMap.put("总分", scoreSum.get()); - unionMap.put("分工会", unionMap.getString("unionname")); + unionMap.put("基层工会", unionMap.getString("unionname")); resultMap.add(unionMap); }); @@ -128,7 +128,7 @@ public class ActivityStatisticsTypeExportController { List activitySchoolList = dao.query(ActivitySchool.class, Cnd.where("YEAR(applyStartTime)", "=", year)); List labelList = activitySchoolList.stream().map(v -> v.getName()).collect(Collectors.toList()); - labelList.add(0, "分工会"); + labelList.add(0, "基层工会"); unionList.forEach(u -> { NutMap unionMap = Lang.obj2nutmap(u); @@ -148,7 +148,7 @@ public class ActivityStatisticsTypeExportController { unionMap.put(x.getName(), score); }); unionMap.put("总分", scoreSum.get()); - unionMap.put("分工会", unionMap.getString("unionname")); + unionMap.put("基层工会", unionMap.getString("unionname")); resultMap.add(unionMap); }); labelList.add("总分"); @@ -275,13 +275,13 @@ public class ActivityStatisticsTypeExportController { List entityList = new ArrayList<>(); entityList.add(new ExcelExportEntity("名次", "名次", 20)); - entityList.add(new ExcelExportEntity("分工会", "unionname", 40)); + entityList.add(new ExcelExportEntity("基层工会", "unionname", 40)); eventList.forEach(v -> { entityList.add(new ExcelExportEntity(v.getString("label"), v.getString("label"), 40)); }); entityList.add(new ExcelExportEntity("总分", "totalScore", 40)); try { - ViTool.excelResponse(response, "分工会" + sex + "项目积分.xls"); + ViTool.excelResponse(response, "基层工会" + sex + "项目积分.xls"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, result); workbook.write(response.getOutputStream()); } catch (Exception e) { @@ -461,7 +461,7 @@ public class ActivityStatisticsTypeExportController { List entityList = new ArrayList<>(); entityList.add(new ExcelExportEntity("名次", "名次", 20)); - entityList.add(new ExcelExportEntity("分工会", "unionname", 40)); + entityList.add(new ExcelExportEntity("基层工会", "unionname", 40)); entityList.add(new ExcelExportEntity("总分", "totalScore", 40)); result.sort(Comparator.comparing((Map m) -> (new BigDecimal(m.get("totalScore").toString()))).reversed()); @@ -470,7 +470,7 @@ public class ActivityStatisticsTypeExportController { } try { - ViTool.excelResponse(response, "分工会" + sex + "子总分.xls"); + ViTool.excelResponse(response, "基层工会" + sex + "子总分.xls"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, result); workbook.write(response.getOutputStream()); } catch (Exception e) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java index ccdd872..2e89bfd 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java @@ -105,7 +105,7 @@ public class SiteReserveApplyController { ActivitySiteInfo siteInfo = siteInfoService.fetch(activitySiteReserve.getSite_id()); if (activitySiteVo.getIsRetire()) { - //如如果是分工会，发送给分工会主席 + //如如果是基层工会，发送给基层工会主席 Sql sql = Sqls.create(""" SELECT u.loginname, @@ -120,7 +120,7 @@ public class SiteReserveApplyController { .setParam("unionid", Vi.getUnionId()); List processList = baseService.list(sql); - //移动端分工会审核 + //移动端基层工会审核 String auditUrl = "https://zhghydd.cpu.edu.cn/mobile/activity/site/unionAudit"; List auditLoginNameList = processList.stream().map(v -> v.getString("loginname")).collect(Collectors.toList()); @@ -188,7 +188,7 @@ public class SiteReserveApplyController { dao.clear(ActivitySiteReserve.class, Cnd.where("id", "=", id)); //发送短信提醒 -// //获取分工会主席 +// //获取基层工会主席 // Sql sql = Sqls.create(""" // SELECT // u.loginname, diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java index 0133f59..a187602 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * 场地预约分工会审核 + * 场地预约基层工会审核 */ @IocBean @Ok("json:full") @@ -57,7 +57,7 @@ public class SiteUnionProcessController { @At @ViReturn @RequiresPermissions("activity.site.unionProcess") - @SLog(type = "活动场地预约",tag = "分工会审核",msg = "页面数据",param = true,result = true) + @SLog(type = "活动场地预约",tag = "基层工会审核",msg = "页面数据",param = true,result = true) public Object pageData(PageForm pageForm, @Param(value = "siteType", required = false) String siteType, @Param(value = "time", required = false) String time, @@ -124,7 +124,7 @@ public class SiteUnionProcessController { @ViReturn @RequiresPermissions("activity.site.unionProcess") @Aop(TransAop.READ_COMMITTED) - @SLog(type = "活动场地预约",tag = "分工会审核",msg = "审核操作",param = true,result = true) + @SLog(type = "活动场地预约",tag = "基层工会审核",msg = "审核操作",param = true,result = true) public Object doProcess(@Param("id") String id, @Param("audit") Audit audit) { audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString()); audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString()); @@ -146,7 +146,7 @@ public class SiteUnionProcessController { //审核通过，发送给校工会审核(姜学军 1019911404) String auditUrl = "https://zhghydd.cpu.edu.cn/mobile/activity/site/schoolAudit"; - String content = "%s的%s老师申请的%s的场地预约，分工会审核已通过，转为校工会审核，请您通过门户网站或点击企业微信消息前往智慧工会平台进行审核。" + String content = "%s的%s老师申请的%s的场地预约，基层工会审核已通过，转为校工会审核，请您通过门户网站或点击企业微信消息前往智慧工会平台进行审核。" .formatted(Vi.getUnion().getUnionname(), reserve_person, siteInfo.getName()); @@ -154,7 +154,7 @@ public class SiteUnionProcessController { msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),""); } else { //审核拒绝，发送短信给本人 - String content = "%s老师您好！您预约的%s申请被分工会拒绝，您可重新提交其他场地或时间段的申请" + String content = "%s老师您好！您预约的%s申请被基层工会拒绝，您可重新提交其他场地或时间段的申请" .formatted(reserve_person, siteInfo.getName()); System.out.println(content); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java index 42f779d..cc048b8 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java @@ -54,7 +54,7 @@ import java.util.List; /** * @author: Aaron * @create: 2021-03-08 16:07 - * @description: 分工会活动信息管理 + * @description: 基层工会活动信息管理 **/ @IocBean diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java index 67e25f8..f5f815b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java @@ -17,7 +17,7 @@ import org.nutz.mvc.annotation.Param; /** * @author: Aaron * @create: 2021-03-08 16:08 - * @description: 分工会活动计划管理 + * @description: 基层工会活动计划管理 **/ @IocBean diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityAuditTypeEnum.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityAuditTypeEnum.java index 3f30ff1..d28d4fb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityAuditTypeEnum.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityAuditTypeEnum.java @@ -8,7 +8,7 @@ public enum ActivityAuditTypeEnum { ALL("ALL", "不限制"), CLUB("CLUB", "审核本协会"), DW("DW", "审核本单位"), - FGH("FGH", "审核本分工会"); + FGH("FGH", "审核本基层工会"); public String value; public String desc; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java index 283cb55..87209cf 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java @@ -53,12 +53,12 @@ public class ActivityPlan { private Double money; @Column - @Comment("计划类型(1-校活动、2-分工会活动、3协会社团活动)") + @Comment("计划类型(1-校活动、2-基层工会活动、3协会社团活动)") @ColDefine(type = ColType.VARCHAR, width = 7) private String type; @Column - @Comment("分工会ID或社团ID") + @Comment("基层工会ID或社团ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueId; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java index ec1cc02..6fb7afe 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java @@ -113,7 +113,7 @@ public class ActivitySchool extends BaseModel implements Serializable { private Double funding; @Column - @Comment("报名方式(1：个人 2：分工会 3：小程序)") + @Comment("报名方式(1：个人 2：基层工会 3：小程序)") @ColDefine(type = ColType.MYSQL_JSON) private List applyWay; @@ -158,7 +158,7 @@ public class ActivitySchool extends BaseModel implements Serializable { private Boolean close; @Column - @Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）") + @Comment("活动级别（40001-校级、40002-基层工会、40003-社团或协会）") @ColDefine(type = ColType.INT, width = 10) private Integer activityLevel; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java index 0d9142b..158b308 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java @@ -138,7 +138,7 @@ public class ActivitySchoolApply implements Serializable { private String unitname; - @Excel(name = "分工会", width = 30) + @Excel(name = "基层工会", width = 30) private String unionname; @Column diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolEvent.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolEvent.java index ad06c56..67cf9ce 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolEvent.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolEvent.java @@ -138,7 +138,7 @@ public class ActivitySchoolEvent { private ActivitySchool activitySchool; @Column - @Comment("分工会人数限制") + @Comment("基层工会人数限制") @ColDefine(type = ColType.MYSQL_JSON) private List unionLimit; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySiteReserve.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySiteReserve.java index f434f5d..dfbd5c7 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySiteReserve.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySiteReserve.java @@ -138,7 +138,7 @@ public class ActivitySiteReserve extends BaseModel { private String site_manager_id; @Column - @Comment("分工会审核id") + @Comment("基层工会审核id") @ColDefine(type = ColType.VARCHAR, width = 32) private String reserve_person_union_process; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java index e329ccb..8ff136c 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java @@ -17,12 +17,12 @@ import java.util.List; /** * @author: Aaron * @create: 2021-03-09 13:57 - * @description: 社团或分工会活动校工会活动 + * @description: 社团或基层工会活动校工会活动 **/ @Data @Table("activity_tissue") -@Comment("社团或分工会活动校工会活动") +@Comment("社团或基层工会活动校工会活动") public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert { @Column @@ -153,12 +153,12 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo private String activityExamineContent; @Column - @Comment("报名方式(1.个人 2.分工会 null.不需要报名)") + @Comment("报名方式(1.个人 2.基层工会 null.不需要报名)") @ColDefine(type = ColType.INT) private Integer signUpMethod; @Column - @Comment("限制方式(1.总人数限制 2.分工会人数限制 null.不限制)") + @Comment("限制方式(1.总人数限制 2.基层工会人数限制 null.不限制)") @ColDefine(type = ColType.INT) private Integer userNumberLimit; @@ -188,7 +188,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo private Integer teamNum; @Column - @Comment("分工会人数限制") + @Comment("基层工会人数限制") @ColDefine(type = ColType.MYSQL_JSON) private List unionUserNumberLimit; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java index a59c504..1bf6dc4 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java @@ -22,7 +22,7 @@ public class ActivityTissuePerson { private String id; @Column - @Comment("分工会或社团活动ID") + @Comment("基层工会或社团活动ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String tissueId; diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java index a026456..1adf546 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java @@ -44,7 +44,7 @@ public class ActivityYearSummary { private String summaryType; @Column - @Comment("总结来源（1-校活动、2-分工会活动、3协会社团活动）") + @Comment("总结来源（1-校活动、2-基层工会活动、3协会社团活动）") @ColDefine(type = ColType.VARCHAR, width = 32) private String summaryFrom; diff --git a/src/main/java/io/v/nutz/zhgh/contribution/controller/ContributionStatisticsController.java b/src/main/java/io/v/nutz/zhgh/contribution/controller/ContributionStatisticsController.java index 4fd7e5c..3ad8c72 100644 --- a/src/main/java/io/v/nutz/zhgh/contribution/controller/ContributionStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/contribution/controller/ContributionStatisticsController.java @@ -74,7 +74,7 @@ public class ContributionStatisticsController { sql.setCondition(cnd); List nutMaps = contributionApplyViService.listMap(sql); unionMap.forEach(v -> { - //这个项目每个分工会有多少个人捐款 + //这个项目每个基层工会有多少个人捐款 List userList = nutMaps.stream().collect( Collectors.collectingAndThen( Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(n -> n.getString("userId")))), ArrayList::new) diff --git a/src/main/java/io/v/nutz/zhgh/diseaseaid/model/AidFundMemberAuditRecord.java b/src/main/java/io/v/nutz/zhgh/diseaseaid/model/AidFundMemberAuditRecord.java index 1c0a958..b43b4e2 100644 --- a/src/main/java/io/v/nutz/zhgh/diseaseaid/model/AidFundMemberAuditRecord.java +++ b/src/main/java/io/v/nutz/zhgh/diseaseaid/model/AidFundMemberAuditRecord.java @@ -66,12 +66,12 @@ public class AidFundMemberAuditRecord extends ViBaseModel { private String unitName; @Column - @Comment("分工会id") + @Comment("基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionId; @Column - @Comment("分工会名称") + @Comment("基层工会名称") @ColDefine(type = ColType.VARCHAR, width = 100) private String unionName; diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java b/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java index 744c7f3..571a60d 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java @@ -84,7 +84,7 @@ public enum EvaluateToDoHandler { /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -109,7 +109,7 @@ public enum EvaluateToDoHandler { localProcessService.createTask( "evaluate_apply@" + e.getId(), "branchUnionAuditId", - "分工会审核", + "基层工会审核", ShiroUtil.getUserId(), loginNames, "/platform/evaluate/audit/union", @@ -118,12 +118,12 @@ public enum EvaluateToDoHandler { "/platform/evaluate/audit/union" ); - localProcessService.updateProcessNodeName("evaluate_apply@" + e.getId(), "分工会审核"); + localProcessService.updateProcessNodeName("evaluate_apply@" + e.getId(), "基层工会审核"); } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/models/Evaluate.java b/src/main/java/io/v/nutz/zhgh/evaluate/models/Evaluate.java index 776f9db..f3173b0 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/models/Evaluate.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/models/Evaluate.java @@ -74,7 +74,7 @@ public class Evaluate { private String directions; @Column - @Comment("分工会名额分配") + @Comment("基层工会名额分配") @ColDefine(type = ColType.MYSQL_JSON) private List unionLimit; diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/models/EvaluateApply.java b/src/main/java/io/v/nutz/zhgh/evaluate/models/EvaluateApply.java index e2c14bd..0ba2ea4 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/models/EvaluateApply.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/models/EvaluateApply.java @@ -115,7 +115,7 @@ public class EvaluateApply extends BaseModel { public String unitAuditId; @Column - @Comment("分工会审核记录id") + @Comment("基层工会审核记录id") @ColDefine(type = ColType.VARCHAR, width = 32) public String unionAuditId; @@ -195,9 +195,9 @@ public class EvaluateApply extends BaseModel { private String unionLeader; @Column - @Excel(name = "分工会") + @Excel(name = "基层工会") @ColDefine(type = ColType.VARCHAR, width = 20) - @Comment("分工会") + @Comment("基层工会") private String unionName; @Column diff --git a/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java b/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java index 748be84..cce54a6 100644 --- a/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java +++ b/src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java @@ -136,7 +136,7 @@ public class EvaluateServiceApplyImpl extends BaseServiceImpl imp if(count >= limitCount) { - return Result.error("抱歉，此评优评先活动您所在分工会人数已满！"); + return Result.error("抱歉，此评优评先活动您所在基层工会人数已满！"); } return Result.success(); } diff --git a/src/main/java/io/v/nutz/zhgh/fellowship/controller/manage/FellowshipUserBlackListManage.java b/src/main/java/io/v/nutz/zhgh/fellowship/controller/manage/FellowshipUserBlackListManage.java index 59161d3..c24d438 100644 --- a/src/main/java/io/v/nutz/zhgh/fellowship/controller/manage/FellowshipUserBlackListManage.java +++ b/src/main/java/io/v/nutz/zhgh/fellowship/controller/manage/FellowshipUserBlackListManage.java @@ -144,7 +144,7 @@ public class FellowshipUserBlackListManage { excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20)); excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20)); - excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20)); + excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20)); excelCommonExportEntity.add(new ExcelExportEntity("开始时间", "courseStartTimeExcel", 22)); excelCommonExportEntity.add(new ExcelExportEntity("结束时间", "courseEndTimeExcel", 22)); @@ -236,7 +236,7 @@ public class FellowshipUserBlackListManage { excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20)); excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20)); - excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20)); + excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20)); excelCommonExportEntity.add(new ExcelExportEntity("开始时间", "courseStartTimeExcel", 22)); excelCommonExportEntity.add(new ExcelExportEntity("结束时间", "courseEndTimeExcel", 22)); diff --git a/src/main/java/io/v/nutz/zhgh/fellowship/controller/mobile/MFellowshipActivityController.java b/src/main/java/io/v/nutz/zhgh/fellowship/controller/mobile/MFellowshipActivityController.java index c14a3f1..235f712 100644 --- a/src/main/java/io/v/nutz/zhgh/fellowship/controller/mobile/MFellowshipActivityController.java +++ b/src/main/java/io/v/nutz/zhgh/fellowship/controller/mobile/MFellowshipActivityController.java @@ -122,7 +122,7 @@ public class MFellowshipActivityController { return Result.error("您已经报过了!"); } if (fellowshipActivityService.isSignFullByUnionId(courseId)) { - return Result.error("该活动您所在的分工会名额已报满!"); + return Result.error("该活动您所在的基层工会名额已报满!"); } if (fellowshipActivityService.isSignFull(courseId)) { return Result.error("抱歉，此项已报满!"); @@ -267,7 +267,7 @@ public class MFellowshipActivityController { return Result.error("该活动已报过了!"); } if (fellowshipActivityService.isSignFullByUnionId(courseId)) { - return Result.error("该活动您所在的分工会名额已报满!"); + return Result.error("该活动您所在的基层工会名额已报满!"); } if (fellowshipActivityService.isSignFull(courseId)) { return Result.error("该活动已报满!"); diff --git a/src/main/java/io/v/nutz/zhgh/fellowship/controller/statistics/FellowshipActivityStatisticsController.java b/src/main/java/io/v/nutz/zhgh/fellowship/controller/statistics/FellowshipActivityStatisticsController.java index a4bfb7a..9fa1cab 100644 --- a/src/main/java/io/v/nutz/zhgh/fellowship/controller/statistics/FellowshipActivityStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/fellowship/controller/statistics/FellowshipActivityStatisticsController.java @@ -209,7 +209,7 @@ public class FellowshipActivityStatisticsController { excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20)); excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20)); - excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20)); + excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20)); excelCommonExportEntity.add(new ExcelExportEntity("手机号", "mobile", 20)); excelCommonExportEntity.add(new ExcelExportEntity("出生年月", "birthday", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/fellowship/models/FellowshipCourse.java b/src/main/java/io/v/nutz/zhgh/fellowship/models/FellowshipCourse.java index 16c7ebd..785c4fa 100644 --- a/src/main/java/io/v/nutz/zhgh/fellowship/models/FellowshipCourse.java +++ b/src/main/java/io/v/nutz/zhgh/fellowship/models/FellowshipCourse.java @@ -100,7 +100,7 @@ public class FellowshipCourse extends BaseModel implements Serializable { private MatchConditionStructure conditionStructure; @Column - @Comment("分工会人数限制") + @Comment("基层工会人数限制") @ColDefine(type = ColType.MYSQL_JSON) private List unionLimit; diff --git a/src/main/java/io/v/nutz/zhgh/fellowship/service/FellowshipActivityService.java b/src/main/java/io/v/nutz/zhgh/fellowship/service/FellowshipActivityService.java index 50998ec..be35414 100644 --- a/src/main/java/io/v/nutz/zhgh/fellowship/service/FellowshipActivityService.java +++ b/src/main/java/io/v/nutz/zhgh/fellowship/service/FellowshipActivityService.java @@ -86,7 +86,7 @@ public interface FellowshipActivityService extends ViService void asyncInsertUserCourse(String activityId, String courseId, String userId); /** - * 该培训班每个分工会名额是否报满 + * 该培训班每个基层工会名额是否报满 * * @param courseId * @return diff --git a/src/main/java/io/v/nutz/zhgh/fellowship/service/impl/FellowshipActivityServiceImpl.java b/src/main/java/io/v/nutz/zhgh/fellowship/service/impl/FellowshipActivityServiceImpl.java index 094ff86..7a0d0d4 100644 --- a/src/main/java/io/v/nutz/zhgh/fellowship/service/impl/FellowshipActivityServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/fellowship/service/impl/FellowshipActivityServiceImpl.java @@ -326,7 +326,7 @@ public class FellowshipActivityServiceImpl extends ViServiceImpl list = fitnessWalkPunchStatisticsService.unionRegCheckInNum(activityId, null); List entities = new ArrayList<>(); - entities.add(new ExcelExportEntity("分工会", "unionname", 20)); + entities.add(new ExcelExportEntity("基层工会", "unionname", 20)); entities.add(new ExcelExportEntity("报名人数", "regCount", 20)); entities.add(new ExcelExportEntity("打卡人数", "checkInCount", 20)); try { - ViTool.excelResponse(response, "各分工会统计人数.xlsx"); + ViTool.excelResponse(response, "各基层工会统计人数.xlsx"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); workbook.write(response.getOutputStream()); } catch (IOException e) { @@ -136,7 +136,7 @@ public class FitnessWalkPunchStatisticsController { } /** - * 导出某个分工会的报名人员 + * 导出某个基层工会的报名人员 * * @param response * @param activityId @@ -158,7 +158,7 @@ public class FitnessWalkPunchStatisticsController { entities.add(new ExcelExportEntity("报名时间", "register_time_str", 20)); try { - ViTool.excelResponse(response, unionName + "分工会报名人员.xlsx"); + ViTool.excelResponse(response, unionName + "基层工会报名人员.xlsx"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); workbook.write(response.getOutputStream()); } catch (IOException e) { @@ -167,7 +167,7 @@ public class FitnessWalkPunchStatisticsController { } /** - * 导出某个分工会的打卡人员 + * 导出某个基层工会的打卡人员 * * @param response * @param activityId @@ -203,7 +203,7 @@ public class FitnessWalkPunchStatisticsController { entities.add(new ExcelExportEntity("礼品券", "used", 20)); try { - ViTool.excelResponse(response, unionName + "分工会打卡人员.xlsx"); + ViTool.excelResponse(response, unionName + "基层工会打卡人员.xlsx"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); workbook.write(response.getOutputStream()); } catch (IOException e) { diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepRankingController.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepRankingController.java index 2c84768..f7f4d49 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepRankingController.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepRankingController.java @@ -202,7 +202,7 @@ public class FitnessWalkStepRankingController { entityList.add(no); entityList.add(new ExcelExportEntity("姓名", "username", 20)); entityList.add(new ExcelExportEntity("工号", "loginname", 20)); - entityList.add(new ExcelExportEntity("分工会", "unionname", 20)); + entityList.add(new ExcelExportEntity("基层工会", "unionname", 20)); entityList.add(new ExcelExportEntity("单位", "unitname", 20)); entityList.add(new ExcelExportEntity("today".equals(mode) ? "今日步数" :"活动期间总步数", "step", 20)); try { diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepStatisticsController.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepStatisticsController.java index 24fcb6a..b4672b5 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepStatisticsController.java @@ -148,7 +148,7 @@ public class FitnessWalkStepStatisticsController { add(new ExcelExportEntity("姓名", "username", 20)); add(new ExcelExportEntity("工号", "loginname", 20)); add(new ExcelExportEntity("单位", "unitname", 20)); - add(new ExcelExportEntity("分工会", "unionname", 20)); + add(new ExcelExportEntity("基层工会", "unionname", 20)); add(new ExcelExportEntity("当前步数", "step", 20)); add(new ExcelExportEntity("日期", "prizeData", 20)); }}; diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepWiningController.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepWiningController.java index cc4b4eb..68ef8f3 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepWiningController.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepWiningController.java @@ -94,7 +94,7 @@ public class FitnessWalkStepWiningController { entityList.add(no); entityList.add(new ExcelExportEntity("工号", "loginName", 20)); entityList.add(new ExcelExportEntity("姓名", "username", 20)); - entityList.add(new ExcelExportEntity("分工会", "unionName", 20)); + entityList.add(new ExcelExportEntity("基层工会", "unionName", 20)); entityList.add(new ExcelExportEntity("单位", "unitName", 20)); entityList.add(new ExcelExportEntity("奖项名称", "awardName", 20)); entityList.add(new ExcelExportEntity("中奖时间", "applyDate", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/fourOneActivity/models/FourOneActivity.java b/src/main/java/io/v/nutz/zhgh/fourOneActivity/models/FourOneActivity.java index 29db235..2450904 100644 --- a/src/main/java/io/v/nutz/zhgh/fourOneActivity/models/FourOneActivity.java +++ b/src/main/java/io/v/nutz/zhgh/fourOneActivity/models/FourOneActivity.java @@ -83,7 +83,7 @@ public class FourOneActivity { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("分工会审核id") + @Comment("基层工会审核id") private String unionAuditId; @Column diff --git a/src/main/java/io/v/nutz/zhgh/ghkh/controller/GhKhZpController.java b/src/main/java/io/v/nutz/zhgh/ghkh/controller/GhKhZpController.java index c8eb7c6..f08d578 100644 --- a/src/main/java/io/v/nutz/zhgh/ghkh/controller/GhKhZpController.java +++ b/src/main/java/io/v/nutz/zhgh/ghkh/controller/GhKhZpController.java @@ -69,7 +69,7 @@ public class GhKhZpController { if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) { cnd.and("zb.annual", "=", annual); } - cnd.and("zb.assessment", "!=", "模板V1.0（分工会工作量化考核评分请勿修改）"); + cnd.and("zb.assessment", "!=", "模板V1.0（基层工会工作量化考核评分请勿修改）"); if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) { cnd.where().andLike("zb.assessment", assessment); } else { diff --git a/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_record.java b/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_record.java index 5a43f74..ec49e5c 100644 --- a/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_record.java +++ b/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_record.java @@ -25,7 +25,7 @@ public class Kh_record { private String zb_id; @Column - @Comment("分工会id") + @Comment("基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String union_id; diff --git a/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_xghsh.java b/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_xghsh.java index 99d70c3..e32a725 100644 --- a/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_xghsh.java +++ b/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_xghsh.java @@ -33,7 +33,7 @@ public class Kh_xghsh extends BaseModel { private String addition; @Column - @Comment("分工会id") + @Comment("基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String flatid; diff --git a/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_zp.java b/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_zp.java index c771dc8..4880c5d 100644 --- a/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_zp.java +++ b/src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_zp.java @@ -48,7 +48,7 @@ public class Kh_zp { private Integer zpf; @Column - @Comment("分工会id") + @Comment("基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String flatid; diff --git a/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildHjxxController.java b/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildHjxxController.java index 7a74d51..8153d81 100644 --- a/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildHjxxController.java +++ b/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildHjxxController.java @@ -114,7 +114,7 @@ public class HdChildHjxxController { sql.setParam("cuserid", ShiroUtil.getPrincipalProperty("id")); List list = baseService.list(sql); fileName = "获奖人员名单"; - String[] title = {"姓名", "工资号", "手机号", "单位", "分工会", "获奖次数"}; + String[] title = {"姓名", "工资号", "手机号", "单位", "基层工会", "获奖次数"}; String[][] content = new String[list.size()][title.length]; for (int i = 0; i < list.size(); i++) { Record r = list.get(i); @@ -164,8 +164,8 @@ public class HdChildHjxxController { Sql ghtjsql = Sqls.create(ghtjstr.toString()); ghtjsql.setParam("hdid", hdid); List ghtjList = baseService.list(ghtjsql); - fileName = "分工会奖品统计"; - String[] title = {"分工会", "参加人数", "应发奖品数"}; + fileName = "基层工会奖品统计"; + String[] title = {"基层工会", "参加人数", "应发奖品数"}; String[][] content = new String[ghtjList.size()][title.length]; for (int i = 0; i < ghtjList.size(); i++) { Record r = ghtjList.get(i); diff --git a/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildZpxxController.java b/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildZpxxController.java index a4493ca..dec6288 100644 --- a/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildZpxxController.java +++ b/src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildZpxxController.java @@ -238,7 +238,7 @@ public class HdChildZpxxController { HSSFWorkbook wb = null; String fileName = hdname; //excel标题 - String[] title = {"作品主题", "子女姓名", "教职工姓名", "工资号", "手机号", "活动主题", "活动类别", "作品类别", "年龄", "关系", "单位", "分工会"}; + String[] title = {"作品主题", "子女姓名", "教职工姓名", "工资号", "手机号", "活动主题", "活动类别", "作品类别", "年龄", "关系", "单位", "基层工会"}; //content String[][] content = new String[zpList.size()][title.length]; for (int i = 0; i < zpList.size(); i++) { diff --git a/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmHjInfoController.java b/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmHjInfoController.java index 60895e2..b8097f2 100644 --- a/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmHjInfoController.java +++ b/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmHjInfoController.java @@ -122,7 +122,7 @@ public class HdWmHjInfoController { exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("单位", "dwname", 20)); - exportEntities.add(new ExcelExportEntity("分工会", "ghname", 20)); + exportEntities.add(new ExcelExportEntity("基层工会", "ghname", 20)); exportEntities.add(new ExcelExportEntity("获奖次数", "hjcount", 20)); try { @@ -154,12 +154,12 @@ public class HdWmHjInfoController { sql.setCondition(cnd); List unionList = hdWmsbxxService.listMap(sql); List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("分工会", "unionname", 20)); + exportEntities.add(new ExcelExportEntity("基层工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("参加人数", "joinNum", 20)); exportEntities.add(new ExcelExportEntity("应发奖品数", "prizeNum", 20)); try { - ViTool.excelResponse(response, "分工会获奖信息.xls"); + ViTool.excelResponse(response, "基层工会获奖信息.xls"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), exportEntities, unionList); workbook.write(response.getOutputStream()); } catch (Exception e) { diff --git a/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmInfoController.java b/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmInfoController.java index 8e2736e..835100d 100644 --- a/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmInfoController.java +++ b/src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmInfoController.java @@ -451,7 +451,7 @@ public class HdWmInfoController { exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); exportEntities.add(new ExcelExportEntity("单位", "dwname", 20)); - exportEntities.add(new ExcelExportEntity("分工会", "ghname", 20)); + exportEntities.add(new ExcelExportEntity("基层工会", "ghname", 20)); exportEntities.add(new ExcelExportEntity("作品主题", "hdname", 20)); exportEntities.add(new ExcelExportEntity("活动类别", "hdlbname", 20)); exportEntities.add(new ExcelExportEntity("作品类别", "zplbname", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/hd/models/Hd_wm_sbxx.java b/src/main/java/io/v/nutz/zhgh/hd/models/Hd_wm_sbxx.java index a07f9b9..9023617 100644 --- a/src/main/java/io/v/nutz/zhgh/hd/models/Hd_wm_sbxx.java +++ b/src/main/java/io/v/nutz/zhgh/hd/models/Hd_wm_sbxx.java @@ -70,7 +70,7 @@ public class Hd_wm_sbxx implements Serializable { private String auditState; @Column - @Comment("分工会审核id") + @Comment("基层工会审核id") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionAuditId; diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupSingleController.java index b986e17..2190781 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupSingleController.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupSingleController.java @@ -68,7 +68,7 @@ public class HealthCheckupSingleController { /** - * 每个分工会领取人员/未领取人员 + * 每个基层工会领取人员/未领取人员 * * @param projectId * @param unionId diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index a47f26b..0c069d3 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -48,7 +48,7 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl healthCheckupList = listMap(sql); //该体检项目下的套餐 List subjectList = project.getHealthCheckupProjectSubjects(); diff --git a/src/main/java/io/v/nutz/zhgh/honor/controller/HonorBatchController.java b/src/main/java/io/v/nutz/zhgh/honor/controller/HonorBatchController.java index 7e5c25a..94792f8 100644 --- a/src/main/java/io/v/nutz/zhgh/honor/controller/HonorBatchController.java +++ b/src/main/java/io/v/nutz/zhgh/honor/controller/HonorBatchController.java @@ -120,7 +120,7 @@ public class HonorBatchController { honorList.forEach(v -> { if (lx.equals("1")) { v.setHonorType(getBasicIdByName("个人荣誉")); - //设置分工会 单位 + //设置基层工会 单位 Optional user = userList.stream().filter(u -> u.getString("username").equals(v.getUserName())).findFirst(); user.ifPresent(sys_user -> v.setUnionId(sys_user.getString("unionid"))); user.ifPresent(sys_user -> v.setUnionName(sys_user.getString("unionname"))); @@ -129,7 +129,7 @@ public class HonorBatchController { user.ifPresent(sys_user -> v.setUserId(sys_user.getString("id"))); } else { v.setHonorType(getBasicIdByName("集体荣誉")); - //设置分工会 + //设置基层工会 Optional union = unionList.stream().filter(u -> u.getUnionname().equals(v.getApplyUnionName())).findFirst(); union.ifPresent(sys_union -> v.setUnionId(sys_union.getId())); union.ifPresent(sys_union -> v.setUnionName(sys_union.getUnionname())); diff --git a/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java b/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java index cf78843..0f0e692 100644 --- a/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java +++ b/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java @@ -242,7 +242,7 @@ public class HonorManageController { excelExportEntity.add(new ExcelExportEntity("加入工会时间", "joinTime", 16)); excelExportEntity.add(new ExcelExportEntity("在职状态", "jobStatus", 10)); excelExportEntity.add(new ExcelExportEntity("政治面貌", "political", 10)); - excelExportEntity.add(new ExcelExportEntity("分工会", "unionName", 20)); + excelExportEntity.add(new ExcelExportEntity("基层工会", "unionName", 20)); excelExportEntity.add(new ExcelExportEntity("单位", "unitName", 20)); excelExportEntity.add(new ExcelExportEntity("奖项", "prize", 20)); excelExportEntity.add(new ExcelExportEntity("荣誉级别", "honorLevel", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/honor/models/Honor.java b/src/main/java/io/v/nutz/zhgh/honor/models/Honor.java index 95694ae..0985e24 100644 --- a/src/main/java/io/v/nutz/zhgh/honor/models/Honor.java +++ b/src/main/java/io/v/nutz/zhgh/honor/models/Honor.java @@ -98,9 +98,9 @@ public class Honor implements Serializable { private String unionLeader; @Column - @Excel(name = "分工会") + @Excel(name = "基层工会") @ColDefine(type = ColType.VARCHAR, width = 20) - @Comment("分工会") + @Comment("基层工会") private String unionName; @Column @@ -203,7 +203,7 @@ public class Honor implements Serializable { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("所属分工会") + @Comment("所属基层工会") private String unionId; @Column diff --git a/src/main/java/io/v/nutz/zhgh/honor/models/HonorApply.java b/src/main/java/io/v/nutz/zhgh/honor/models/HonorApply.java index cd8c57c..bf13b31 100644 --- a/src/main/java/io/v/nutz/zhgh/honor/models/HonorApply.java +++ b/src/main/java/io/v/nutz/zhgh/honor/models/HonorApply.java @@ -142,9 +142,9 @@ public class HonorApply { private Integer stateId; @Column - @Excel(name = "分工会") + @Excel(name = "基层工会") @ColDefine(type = ColType.VARCHAR, width = 20) - @Comment("分工会") + @Comment("基层工会") private String unionName; @Column @@ -164,7 +164,7 @@ public class HonorApply { public String unitAuditId; @Column - @Comment("分工会审核记录id") + @Comment("基层工会审核记录id") @ColDefine(type = ColType.VARCHAR, width = 32) public String unionAuditId; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/controller/db/JdhDbYlController.java b/src/main/java/io/v/nutz/zhgh/jdh/controller/db/JdhDbYlController.java index 6592706..7b6cd6e 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/controller/db/JdhDbYlController.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/controller/db/JdhDbYlController.java @@ -445,7 +445,7 @@ public class JdhDbYlController { maps.get(i).setv("isGdh", maps.get(i).getBoolean("isGdh") ? "√" : ""); } - map.put("unionname", Vi.getUnion().getUnionname().replaceAll("分工会*", "")); + map.put("unionname", Vi.getUnion().getUnionname().replaceAll("基层工会*", "")); map.put("jdhJs", jdhxx.getJdhjs()); String fileName = null; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/DelegationController.java b/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/DelegationController.java index 5f3ff6c..c0d93dd 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/DelegationController.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/DelegationController.java @@ -301,7 +301,7 @@ public class DelegationController { } /** - * 查询该教代会还未组成的分工会 + * 查询该教代会还未组成的基层工会 * * @param jdhid * @param dbtid @@ -333,7 +333,7 @@ public class DelegationController { } /** - * 查询该教代会还未组成的分工会 + * 查询该教代会还未组成的基层工会 * * @param jdhid * @param dbtid @@ -445,7 +445,7 @@ public class DelegationController { } /** - * 删除该代表团下的分工会 + * 删除该代表团下的基层工会 * * @param id * @return diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_db2.java b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_db2.java index ba8d1bd..bd232d1 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_db2.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_db2.java @@ -29,7 +29,7 @@ public class Jdh_db2 implements Serializable { private String jdhid; @Column - @Comment("代表分工会id") + @Comment("代表基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionid; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdhxx2.java b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdhxx2.java index 2d1a996..4e1eae2 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdhxx2.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdhxx2.java @@ -57,7 +57,7 @@ public class Jdh_jdhxx2 { private String jdhcjsj; @Column - @Comment("所属分工会") + @Comment("所属基层工会") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionid; diff --git a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdj2.java b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdj2.java index bac81ed..ebd6ee5 100644 --- a/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdj2.java +++ b/src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdj2.java @@ -28,7 +28,7 @@ public class Jdh_jdj2 implements Serializable { private String hyname; @Column - @Comment("所属分工会") + @Comment("所属基层工会") @ColDefine(type = ColType.VARCHAR, width = 32) private String fghid; diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java index 9065404..a766868 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java @@ -1,15 +1,13 @@ package io.v.nutz.zhgh.jf.controller.activitybx; +import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Goods; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_signature; -import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.services.SysSignatureService; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.jf.handle.funds.FundsToHandler; @@ -18,13 +16,14 @@ import io.v.nutz.zhgh.jf.service.ActivityBxService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; 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; import org.nutz.json.Json; -import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; @@ -46,16 +45,14 @@ public class AccountingCon { @Inject private Vi vi; - + @Inject + private Dao dao; @Inject private ActivityBxService activityBxService; - @Inject private BaseService baseService; - @Inject private MsgApi msgApi; - @Inject private SysSignatureService sysSignatureService; @@ -105,12 +102,16 @@ public class AccountingCon { cnd.and("act.projectTypeCode", "=", 50002); } - Vi.cndPlus(cnd, "act.year", "=", year); - if (Vi.isNotBlank(searchName, searchKeyword)) { - cnd.where().andLike(searchName, searchKeyword); + + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("u.username", "LIKE", "%" + searchKeyword + "%"); + seg.or("u.loginname", "LIKE", "%" + searchKeyword + "%"); + cnd.and(seg); } + if (Vi.isNotBlank(pageOrderName, pageOrderBy)) { cnd.orderBy(pageOrderName, pageOrderBy); } else { @@ -145,17 +146,32 @@ public class AccountingCon { activityBxService.update(aid); String nodeName = ""; if (nutMap.getBoolean("flag")) { - nodeName = "校工会主席审核"; - Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH_WYH_ZX)); - if (Lang.isNotEmpty(sys_user_role)) { - Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); - FundsToHandler.CREATE_SCHOOL_TASK.exec(aid.getId(), null, List.of(user.getLoginname())); - } + nodeName = "校工会分管副主席审核"; + // 获取校工会分管副主席 + Sql roleSql = Sqls.create(""" + SELECT + u.loginname + FROM + `sys_role` role + LEFT JOIN sys_user_role ur ON ur.roleId = role.id + LEFT JOIN `sys_user` u ON u.id = ur.userId + WHERE + role.`code` = 'SCHOOL_UNION_CHARGE_LEADER' + GROUP BY + u.loginname + """); + Sql sql = Sqls.queryString(roleSql.toString()); + dao.execute(sql); + List loginNameList = sql.getList(String.class); + FundsToHandler.CREATE_SCHOOL_TASK.exec(aid.getId(), null, loginNameList); +// if (Lang.isNotEmpty(sys_user_role)) { +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); +// msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); +// } } else { - nodeName = "校工会负责人拒绝"; - Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会负责人拒绝，审核意见：" + aid.getAccounting_idea(), List.of(user.getLoginname()), null); + nodeName = "校工会文体部负责人拒绝"; +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); +// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会负责人拒绝，审核意见：" + aid.getAccounting_idea(), List.of(user.getLoginname()), null); FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null); } FundsToHandler.COMPLETE_SCHOOL_FZR_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java index 7587ed0..c24cd60 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java @@ -6,11 +6,8 @@ import cn.wizzer.framework.base.service.BaseService; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.MsgApi; -import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_signature; -import io.v.nutz.sys.models.Sys_user; -import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.services.SysSignatureService; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.jf.handle.funds.FundsToHandler; @@ -20,6 +17,9 @@ import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -53,13 +53,12 @@ public class ApplyController { @Inject private Vi vi; - + @Inject + private Dao dao; @Inject private ActivityBxService activityBxService; - @Inject private SysSignatureService sysSignatureService; - @Inject private BaseService baseService; @Inject @@ -99,52 +98,73 @@ public class ApplyController { @Aop(TransAop.READ_COMMITTED) @RequiresPermissions(value = {"sys.jf.Funds.apply","sys.jf.Funds.apply2","sys.jf.reimbursement.apply","sys.jf.activity_bx.apply"},logical = Logical.OR) public Object doAdd(@Param("activityBx") ActivityBx activityBx, @Param("sign") String sign) { - List loginNames = new ArrayList<>(); activityBx.setYear(activityBx.getYear() != null ? activityBx.getYear() : DateUtil.getYear()); - if (activityBx.getActivity_type() == 40001) { - // 校工会活动 - activityBx.setState_id("1020"); - loginNames.add("1019911404"); - } else if (activityBx.getActivity_type() == 40002) { - // 分工会活动 - activityBx.setState_id("1010"); - Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId())); - if (Lang.isNotEmpty(sys_user_role)) { - Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - loginNames.add(user.getLoginname()); - } - } else if (activityBx.getActivity_type() == 40003) { - // 协会活动 - Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId())); - if (Lang.isNotEmpty(sys_user_role)) { - Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - loginNames.add(user.getLoginname()); - } - activityBx.setState_id("1000"); - } else { - activityBx.setState_id("1010"); - } + // 哈尔滨师范大学，流程都是一样的，直接提交到校工会文体部负责人审核 + activityBx.setState_id("1020"); + + // 获取校工会文体部负责人 + Sql roleSql = Sqls.create(""" + SELECT + u.loginname + FROM + `sys_role` role + LEFT JOIN sys_user_role ur ON ur.roleId = role.id + LEFT JOIN `sys_user` u ON u.id = ur.userId + WHERE + role.`code` = 'SCHOOL_UNION_SPORTS_ADMIN' + GROUP BY + u.loginname + """); + Sql sql = Sqls.queryString(roleSql.toString()); + dao.execute(sql); + List loginNameList = sql.getList(String.class); + +// if (activityBx.getActivity_type() == 40001) { +// // 校工会活动 +// activityBx.setState_id("1020"); +// loginNames.add("1019911404"); +// } else if (activityBx.getActivity_type() == 40002) { +// // 基层工会活动 +// activityBx.setState_id("1010"); +// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId())); +// if (Lang.isNotEmpty(sys_user_role)) { +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); +// loginNames.add(user.getLoginname()); +// } +// } else if (activityBx.getActivity_type() == 40003) { +// // 协会活动 +// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId())); +// if (Lang.isNotEmpty(sys_user_role)) { +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); +// loginNames.add(user.getLoginname()); +// } +// activityBx.setState_id("1000"); +// } else { +// activityBx.setState_id("1010"); +// } activityBx.setApply_time(StrUtil.isNotBlank(activityBx.getApply_time()) ? activityBx.getApply_time() : DateUtil.getDateTime()); activityBx.setUser_id(StrUtil.isNotBlank(activityBx.getUser_id()) ? activityBx.getUser_id() : ShiroUtil.getUserId()); if (Strings.isNotBlank(sign)) { activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId()); } activityBxService.doAdd(activityBx); - if (Lang.isNotEmpty(loginNames)) { + if (Lang.isNotEmpty(loginNameList)) { // msgApi.sendWxMsg("活动申报", "", "text", activityBx.getUser_name() + "申请了一条活动申报【" + activityBx.getActivity_name() + "】,请前往智慧工会进行审核。", loginNames, null); NutMap map = new NutMap(); map.setv("userId",activityBx.getUser_id()); map.setv("activityName",activityBx.getActivity_name()); - FundsToHandler.START_PROCESS.exec(activityBx.getId(),map,loginNames); + FundsToHandler.START_PROCESS.exec(activityBx.getId(),map,loginNameList); - if (activityBx.getActivity_type() == 40001) { - FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNames); - } else if (activityBx.getActivity_type() == 40002) { - FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),map,loginNames); - } else if (activityBx.getActivity_type() == 40003) { - FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),map,loginNames); - } + FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNameList); + +// if (activityBx.getActivity_type() == 40001) { +// FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNames); +// } else if (activityBx.getActivity_type() == 40002) { +// FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),map,loginNames); +// } else if (activityBx.getActivity_type() == 40003) { +// FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),map,loginNames); +// } } return null; @@ -155,55 +175,68 @@ public class ApplyController { @Aop(TransAop.READ_COMMITTED) @RequiresPermissions(value = {"sys.jf.Funds.apply","sys.jf.Funds.apply2","sys.jf.reimbursement.apply","sys.jf.activity_bx.apply"},logical = Logical.OR) public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param("sign") String sign) { - List loginNames = new ArrayList<>(); +// List loginNames = new ArrayList<>(); ActivityBx oldActivity = activityBxService.dao().fetch(ActivityBx.class, activityBx.getId()); activityBx.setYear(Calendar.getInstance().get(Calendar.YEAR)); - if (activityBx.getActivity_type() == 40001) { - activityBx.setState_id("1020"); - loginNames.add("1019911404"); - } else if (activityBx.getActivity_type() == 40002) { - activityBx.setState_id("1010"); - Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId())); - if (Lang.isNotEmpty(sys_user_role)) { - Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - loginNames.add(user.getLoginname()); - } - } else if (activityBx.getActivity_type() == 40003) { - activityBx.setState_id("1000"); - // 协会活动 - Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId())); - if (Lang.isNotEmpty(sys_user_role)) { - Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - loginNames.add(user.getLoginname()); - } - } else { - activityBx.setState_id("1010"); - } +// if (activityBx.getActivity_type() == 40001) { +// activityBx.setState_id("1020"); +// loginNames.add("1019911404"); +// } else if (activityBx.getActivity_type() == 40002) { +// activityBx.setState_id("1010"); +// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId())); +// if (Lang.isNotEmpty(sys_user_role)) { +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); +// loginNames.add(user.getLoginname()); +// } +// } else if (activityBx.getActivity_type() == 40003) { +// activityBx.setState_id("1000"); +// // 协会活动 +// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId())); +// if (Lang.isNotEmpty(sys_user_role)) { +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); +// loginNames.add(user.getLoginname()); +// } +// } else { +// } + + activityBx.setState_id("1020"); activityBx.setApply_time(DateUtil.getDateTime()); activityBx.setUser_id(ShiroUtil.getPrincipalProperty("id").toString()); if (Strings.isNotBlank(sign)) { activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId()); } - - if ("1025".equals(oldActivity.getState_id()) || "1045".equals(oldActivity.getState_id()) ) { - activityBx.setState_id("1025".equals(oldActivity.getState_id()) ? "1020" : "1040"); - } activityBxService.doEdit(activityBx); - NutMap map = new NutMap(); - map.setv("userId",activityBx.getUser_id()); - map.setv("activityName",activityBx.getActivity_name()); - FundsToHandler.START_PROCESS.exec(activityBx.getId(),map,loginNames); + // 获取校工会文体部负责人 + Sql roleSql = Sqls.create(""" + SELECT + u.loginname + FROM + `sys_role` role + LEFT JOIN sys_user_role ur ON ur.roleId = role.id + LEFT JOIN `sys_user` u ON u.id = ur.userId + WHERE + role.`code` = 'SCHOOL_UNION_SPORTS_ADMIN' + GROUP BY + u.loginname + """); + Sql sql = Sqls.queryString(roleSql.toString()); + dao.execute(sql); + List loginNameList = sql.getList(String.class); - if ("999".equals(activityBx.getState_id())) { - - if (activityBx.getActivity_type() == 40001) { - FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames); - } else if (activityBx.getActivity_type() == 40002) { - FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),List.of("1019971597")); - } else if (activityBx.getActivity_type() == 40003) { - FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames); - } + if (Lang.isNotEmpty(loginNameList) && "999".equals(activityBx.getState_id())) { + NutMap map = new NutMap(); + map.setv("userId",activityBx.getUser_id()); + map.setv("activityName",activityBx.getActivity_name()); + FundsToHandler.START_PROCESS.exec(activityBx.getId(), map, loginNameList); + FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNameList); +// if (activityBx.getActivity_type() == 40001) { +// FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames); +// } else if (activityBx.getActivity_type() == 40002) { +// FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),List.of("1019971597")); +// } else if (activityBx.getActivity_type() == 40003) { +// FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames); +// } } return null; diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java index efe1663..0d2ed25 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java @@ -131,8 +131,6 @@ public class ReimbursementCon { @Param("pageNumber") int pageNumber, @Param("pageSize") int pageSize, @Param(value = "pageOrderName", required = false) String pageOrderName, @Param(value = "pageOrderBy", required = false) String pageOrderBy) { - - Sql sql = Sqls.create(""" SELECT abs.`name` absName, @@ -144,7 +142,7 @@ public class ReimbursementCon { FROM activity_bx bx LEFT JOIN `user` bxr ON bx.user_id = bxr.id - LEFT JOIN state state ON state.state_id = bx.state_id + LEFT JOIN state state ON state.state_id = bx.state_id LEFT JOIN activity_basic_settings abs ON abs.`code` = bx.projectJfCode $condition """); @@ -237,7 +235,7 @@ public class ReimbursementCon { if (one.getString("activity_type").equals("40001")) { one.setv("jfName", "校工会"); } else if (one.getString("activity_type").equals("40002")) { - one.setv("jfName", "分工会"); + one.setv("jfName", "基层工会"); } else if (one.getString("activity_type").equals("40003")) { one.setv("jfName", "协会"); } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java index 81b8255..b0d2227 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java @@ -1,12 +1,12 @@ package io.v.nutz.zhgh.jf.controller.activitybx; +import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.model.Goods; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Vi; import io.v.nutz.sys.models.Sys_signature; -import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysSignatureService; import io.v.nutz.web.commons.utils.ShiroUtil; @@ -20,6 +20,7 @@ import org.nutz.aop.interceptor.ioc.TransAop; 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.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -98,10 +99,12 @@ public class UnionCon { cnd.and("act.state_id", isAudit == 2 ? ">" : "=", 1040); } - Vi.cndPlus(cnd, "act.year", "=", year); - if (Vi.isNotBlank(searchName, searchKeyword)) { - cnd.where().andLike(searchName, searchKeyword); + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("u.username", "LIKE", "%" + searchKeyword + "%"); + seg.or("u.loginname", "LIKE", "%" + searchKeyword + "%"); + cnd.and(seg); } if (Vi.isNotBlank(pageOrderName, pageOrderBy)) { @@ -151,7 +154,7 @@ public class UnionCon { String nodeName = ""; if (nutMap.getBoolean("flag")) { User user = activityBxService.dao().fetch(User.class, Cnd.where("id", "=", aid.getUser_id())); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null); +// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null); if (aid.getActivity_id() == null) { @@ -177,9 +180,10 @@ public class UnionCon { aid.setActivity_id(activityTissue.getId()); } nodeName = "审核通过"; + FundsToHandler.COMPLETE_PROCESS.exec(aid.getId(), null, null); } else { - Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null); +// Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); +// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null); FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null); } activityBxService.update(aid); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java index 6367937..24fa90c 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; /** * @author zhf * @date 2020/11/5 14:18 - * @description 分工会经费使用情况 + * @description 基层工会经费使用情况 */ @IocBean @At("/platform/jf/club/tz") diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java index 4537d0a..761dc1b 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java @@ -103,7 +103,7 @@ public class ActivityReimbursementApplyController { //校工会申请，校工会负责人审核 ReimbursementToHandler.CREATE_SCHOOL_DIRECTOR_TASK.exec(activityBx.getId(), map); } else if (activityBx.getActivity_type() == 40002) { - //分工会 + //基层工会 ReimbursementToHandler.CREATE_UNION_TASK.exec(activityBx.getId(), map); } else if (activityBx.getActivity_type() == 40003) { //协会 diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java index 44f0abb..ef215be 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java @@ -127,7 +127,7 @@ public class ActivityReimbursementBoardController { list.add(new NutMap() {{ put("year", year); - put("type", "分工会活动"); + put("type", "基层工会活动"); put("num", activityBxService.count(sql2.setParam("year", year))); }}); @@ -160,7 +160,7 @@ public class ActivityReimbursementBoardController { put("num", activityBxService.count(sql1)); }}); list.add(new NutMap() {{ - put("type", "分工会活动"); + put("type", "基层工会活动"); put("num", activityBxService.count(sql2)); }}); list.add(new NutMap() {{ @@ -201,7 +201,7 @@ public class ActivityReimbursementBoardController { list.add(new NutMap() {{ put("year", year); - put("type", "分工会经费"); + put("type", "基层工会经费"); put("num", activityBxService.list(sql2.setParam("year", year)).get(0).getDouble("jf")); }}); @@ -233,7 +233,7 @@ public class ActivityReimbursementBoardController { put("num", activityBxService.count(schoolSql)); }}); list.add(new NutMap() {{ - put("type", "分工会经费"); + put("type", "基层工会经费"); put("num", activityBxService.count(unionSql)); }}); list.add(new NutMap() {{ diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java index 510d0de..378888b 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java @@ -28,7 +28,7 @@ import java.util.Date; * @Author zzr * @name：ActivityReimbursementUnionChairmanController * @Date 2024/4/26 14:58 - * @注释 活动报销，分工会主席审核 + * @注释 活动报销，基层工会主席审核 */ @IocBean @Ok("json:full") @@ -85,7 +85,7 @@ public class ActivityReimbursementUnionChairmanController { @At @ViReturn @RequiresPermissions("sys.jf.reimbursement.unionChairman") - @SLog(type = "文体活动", tag = "活动报销", msg = "分工会主席审核", param = true, result = true) + @SLog(type = "文体活动", tag = "活动报销", msg = "基层工会主席审核", param = true, result = true) public Object doAuditing(@Param("id") String id,@Param("audit") Audit audit){ audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString()); audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java index feed304..c69c583 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java @@ -30,7 +30,7 @@ import java.util.List; /** * @author zhf * @date 2020/11/5 14:25 - * @description 分工会经费使用情况 + * @description 基层工会经费使用情况 */ @IocBean @At("/platform/jf/yjgh/jfsy") diff --git a/src/main/java/io/v/nutz/zhgh/jf/handle/funds/FundsToHandler.java b/src/main/java/io/v/nutz/zhgh/jf/handle/funds/FundsToHandler.java index 78e5134..9fe8900 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/handle/funds/FundsToHandler.java +++ b/src/main/java/io/v/nutz/zhgh/jf/handle/funds/FundsToHandler.java @@ -69,10 +69,10 @@ public enum FundsToHandler { "退回重新修改", ShiroUtil.getUserId(), List.of(loginname), - "/platform/fw/singleChild/report", - "/platform/fw/singleChild/report", - "/platform/fw/singleChild/report", - "/platform/fw/singleChild/report" + "/platform/jf/activity_bx/reimbursement", + "/platform/jf/activity_bx/reimbursement", + "/platform/jf/activity_bx/reimbursement", + "/platform/jf/activity_bx/reimbursement" ); } }, @@ -131,7 +131,7 @@ public enum FundsToHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -152,7 +152,7 @@ public enum FundsToHandler { } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override @@ -168,7 +168,7 @@ public enum FundsToHandler { }, /** - * 创建校工会负责人任务 + * 创建校工会负责人任务, 哈尔滨师范大学是校工会文体部负责人审核 */ CREATE_SCHOOL_FZR_TASK() { @Override @@ -176,7 +176,7 @@ public enum FundsToHandler { localProcessService.createTask( "funds_apply@" + reimbursementId, "funds_accounting", - "校工会负责人审核", + "校工会文体部负责人审核", ShiroUtil.getUserId(), loginNames, "/platform/jf/activity_bx/accounting", @@ -185,7 +185,7 @@ public enum FundsToHandler { "/platform/jf/activity_bx/accounting" ); - localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会负责人审核"); + localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会文体部负责人审核"); } }, /** @@ -212,7 +212,7 @@ public enum FundsToHandler { localProcessService.createTask( "funds_apply@" + reimbursementId, "funds_union", - "校工会主席审核", + "校工会分管副主席审核", ShiroUtil.getUserId(), loginNames, "/platform/jf/activity_bx/union", @@ -221,7 +221,7 @@ public enum FundsToHandler { "/platform/jf/activity_bx/union" ); - localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会主席审核"); + localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会分管副主席审核"); } }, /** @@ -247,6 +247,8 @@ public enum FundsToHandler { @Override public void exec(String reimbursementId, NutMap extra, List loginNames) { localProcessService.completeProcess("funds_apply@" + reimbursementId); + + localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "审核通过"); } }, diff --git a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java index 92ffdf7..0c60e16 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java +++ b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java @@ -100,12 +100,12 @@ public enum ReimbursementToHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override public void exec(String reimbursementId, NutMap extra) { - //获取分工会管理员的工号 + //获取基层工会管理员的工号 List unionLeader = condolenceService.getUnionLeader(ShiroUtil.getUserId()); localProcessService.createTask( "activity_reimbursement@" + reimbursementId, @@ -125,7 +125,7 @@ public enum ReimbursementToHandler { /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java b/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java index 4461a09..58b972d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java +++ b/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java @@ -133,6 +133,12 @@ public class ActivityBx { @ColDefine(type = ColType.VARCHAR, width = 50) private String activity_number; + + @Column + @Comment("参加活动人数") + @ColDefine(type = ColType.VARCHAR, width = 50) + private Integer joinActivityNum; + @Column @Comment("报销金额") @ColDefine(type = ColType.FLOAT, width = 10, precision = 2) diff --git a/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java b/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java index b24b15a..57f7a26 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java @@ -243,7 +243,7 @@ public class ActivityBxServiceImpl extends ViServiceImpl implements switch (one.getString("activity_type")) { case "40001" -> one.setv("jfName", "校工会"); - case "40002" -> one.setv("jfName", "分工会"); + case "40002" -> one.setv("jfName", "基层工会"); case "40003" -> one.setv("jfName", "协会"); } diff --git a/src/main/java/io/v/nutz/zhgh/leadthought/constant/LeadThoughtAuditStateConstant.java b/src/main/java/io/v/nutz/zhgh/leadthought/constant/LeadThoughtAuditStateConstant.java index ee33023..4402347 100644 --- a/src/main/java/io/v/nutz/zhgh/leadthought/constant/LeadThoughtAuditStateConstant.java +++ b/src/main/java/io/v/nutz/zhgh/leadthought/constant/LeadThoughtAuditStateConstant.java @@ -16,8 +16,8 @@ import lombok.Getter; public enum LeadThoughtAuditStateConstant { NOT_SUBMIT(10, "待提交"), - BRANCH_UNION_AUDIT(20, "待分工会审核"), - BRANCH_UNION_REJECT(30, "分工会审核拒绝"), + BRANCH_UNION_AUDIT(20, "待基层工会审核"), + BRANCH_UNION_REJECT(30, "基层工会审核拒绝"), SCHOOL_UNION_AUDIT(40, "待校工会审核"), SCHOOL_UNION_REJECT(50, "校工会拒绝"), PASS(60, "申请通过"); diff --git a/src/main/java/io/v/nutz/zhgh/leadthought/model/LeadThoughtInfo.java b/src/main/java/io/v/nutz/zhgh/leadthought/model/LeadThoughtInfo.java index eadda19..7f00849 100644 --- a/src/main/java/io/v/nutz/zhgh/leadthought/model/LeadThoughtInfo.java +++ b/src/main/java/io/v/nutz/zhgh/leadthought/model/LeadThoughtInfo.java @@ -158,22 +158,22 @@ public class LeadThoughtInfo extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 10) - @Comment("分工会负责人") + @Comment("基层工会负责人") private String fghFzr; @Column @ColDefine(type = ColType.TEXT) - @Comment("分工会负责人签字") + @Comment("基层工会负责人签字") private String fghFzrQz; @Column @ColDefine(type = ColType.VARCHAR, width = 300) - @Comment("分工会意见") + @Comment("基层工会意见") private String fghOption; @Column @ColDefine(type = ColType.VARCHAR, width = 20) - @Comment("分工会审核时间") + @Comment("基层工会审核时间") private String fghTime; @Column diff --git a/src/main/java/io/v/nutz/zhgh/loveSubsidy/constant/LoveSubsidyAuditStateConstant.java b/src/main/java/io/v/nutz/zhgh/loveSubsidy/constant/LoveSubsidyAuditStateConstant.java index 1b15813..96ad4f1 100644 --- a/src/main/java/io/v/nutz/zhgh/loveSubsidy/constant/LoveSubsidyAuditStateConstant.java +++ b/src/main/java/io/v/nutz/zhgh/loveSubsidy/constant/LoveSubsidyAuditStateConstant.java @@ -16,8 +16,8 @@ import lombok.Getter; public enum LoveSubsidyAuditStateConstant { NOT_SUBMIT(1, "待提交"), - BRANCH_UNION_AUDIT(2, "待分工会审核"), - BRANCH_UNION_REJECT(3, "分工会审核拒绝"), + BRANCH_UNION_AUDIT(2, "待基层工会审核"), + BRANCH_UNION_REJECT(3, "基层工会审核拒绝"), SCHOOL_UNION_AUDIT(4, "待校工会财务审核"), SCHOOL_UNION_REJECT(5, "校工会财务审核拒绝"), SCHOOL_UNION_ZX_AUDIT(6, "待校工会主席审核"), diff --git a/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java index add4f5d..f431df3 100644 --- a/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java @@ -74,7 +74,7 @@ public class LoveSubsidyBranchUnionAuditController { @At @RequiresPermissions("loveSubsidy.branchUnionAudit") - @SLog(type = "loveSubsidy", tag = "分工会审核", msg = "分工会审核") + @SLog(type = "loveSubsidy", tag = "基层工会审核", msg = "基层工会审核") @Aop(TransAop.READ_COMMITTED) public Result doSubmit(Audit audit, String id, Boolean flag) { dao.insert(audit); diff --git a/src/main/java/io/v/nutz/zhgh/loveSubsidy/model/LoveSubsidy.java b/src/main/java/io/v/nutz/zhgh/loveSubsidy/model/LoveSubsidy.java index 1bb8590..b92778e 100644 --- a/src/main/java/io/v/nutz/zhgh/loveSubsidy/model/LoveSubsidy.java +++ b/src/main/java/io/v/nutz/zhgh/loveSubsidy/model/LoveSubsidy.java @@ -76,12 +76,12 @@ public class LoveSubsidy extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR) - @Comment("分工会Id") + @Comment("基层工会Id") private String unionId; @Column @ColDefine(type = ColType.VARCHAR) - @Comment("分工会") + @Comment("基层工会") private String unionName; @Column diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java index b96a0df..7868c9e 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java @@ -40,7 +40,7 @@ public class LxyAgentController { final String title = "【疗休养】"; List result = new ArrayList<>(); if (ShiroUtil.hasAnyRoles("sysadmin")) { - result.add(new NutMap().setv("title", title).setv("url", FGHSH).setv("iconClass", vi.getIconByPath(FGHSH)).setv("label", "待分工会审核").setv("number", getFghshCount())); + result.add(new NutMap().setv("title", title).setv("url", FGHSH).setv("iconClass", vi.getIconByPath(FGHSH)).setv("label", "待基层工会审核").setv("number", getFghshCount())); result.add(new NutMap().setv("title", title).setv("url", XGHSH).setv("iconClass", vi.getIconByPath(XGHSH)).setv("label", "待校工会审核").setv("number", getXghshCount().size())); } return result; diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyFghShController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyFghShController.java index cf90a1b..0e9b04a 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyFghShController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyFghShController.java @@ -33,7 +33,7 @@ import java.util.List; /** * @author: Aaron * @create: 2020-09-01 16:08 - * @description: 疗修养分工会审核 + * @description: 疗修养基层工会审核 **/ @At("/platform/zgfw/lxy/fghsh") @Ok("json") diff --git a/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java b/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java index 1a6068d..10ac815 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java @@ -43,12 +43,12 @@ public class Lxy_bm { private String bmsj; @Column - @Comment("报名状态(1.待分工会审核 2.分工会审核不通过 3.待校工会审核 4 校工会审核不通过 5 报名成功 6 待填写个人资料)") + @Comment("报名状态(1.待基层工会审核 2.基层工会审核不通过 3.待校工会审核 4 校工会审核不通过 5 报名成功 6 待填写个人资料)") @ColDefine(type = ColType.INT) private Integer bmzt; @Column - @Comment("报名类型(1.分工会统一报名 2.个人报名)") + @Comment("报名类型(1.基层工会统一报名 2.个人报名)") @ColDefine(type = ColType.INT) private Integer bmlx; diff --git a/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java b/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java index e3f264a..ba75c1d 100644 --- a/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java @@ -45,7 +45,7 @@ public class ManuscriptAgentController { List result = new ArrayList<>(); - result.add(new NutMap().setv("title", title).setv("url", union).setv("iconClass", vi.getIconByPath(union)).setv("label", "待分工会审核").setv("number", getUnionCount())); + result.add(new NutMap().setv("title", title).setv("url", union).setv("iconClass", vi.getIconByPath(union)).setv("label", "待基层工会审核").setv("number", getUnionCount())); result.add(new NutMap().setv("title", title).setv("url", school).setv("iconClass", vi.getIconByPath(school)).setv("label", "待校工会审核").setv("number", getSchoolCount())); Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); diff --git a/src/main/java/io/v/nutz/zhgh/manuscript/models/Manuscript.java b/src/main/java/io/v/nutz/zhgh/manuscript/models/Manuscript.java index 114484f..a2108b5 100644 --- a/src/main/java/io/v/nutz/zhgh/manuscript/models/Manuscript.java +++ b/src/main/java/io/v/nutz/zhgh/manuscript/models/Manuscript.java @@ -42,7 +42,7 @@ public class Manuscript extends BaseModel implements Serializable { private String manuscriptCode; @Column - @Comment("活动类型(1-协会协会、2-分工会,3校工会)") + @Comment("活动类型(1-协会协会、2-基层工会,3校工会)") @ColDefine(type = ColType.INT, width = 10) private Integer type; @@ -77,7 +77,7 @@ public class Manuscript extends BaseModel implements Serializable { private List files; @Column - @Comment("分工会审核记录id") + @Comment("基层工会审核记录id") @ColDefine(type = ColType.MYSQL_JSON) private List union_audit; diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/constant/MedicalMutualAidFundAuditStateConstant.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/constant/MedicalMutualAidFundAuditStateConstant.java index f07e321..ee1a2ba 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/constant/MedicalMutualAidFundAuditStateConstant.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/constant/MedicalMutualAidFundAuditStateConstant.java @@ -16,8 +16,8 @@ import lombok.Getter; public enum MedicalMutualAidFundAuditStateConstant { NOT_SUBMIT(1, "待提交"), - BRANCH_UNION_AUDIT(2, "待分工会审核"), - BRANCH_UNION_REJECT(3, "分工会审核拒绝"), + BRANCH_UNION_AUDIT(2, "待基层工会审核"), + BRANCH_UNION_REJECT(3, "基层工会审核拒绝"), SCHOOL_UNION_AUDIT(4, "待导入医院审核金额"), FUND_AID_GROUP_AUDIT(5, "待导入互助金小组审核金额"), PASS(6,"申请通过"); diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundApplyController.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundApplyController.java index 3cd946b..e27185b 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundApplyController.java @@ -97,7 +97,7 @@ public class MedicalMutualAidFundApplyController { MedicalMutualAidFundToDoHandler.START_PROCESS.exec(medicalMutualAidFund); //完成修改任务 如果有的话 MedicalMutualAidFundToDoHandler.COMPLETE_APPLY_RE_MODIFY_TASK.exec(medicalMutualAidFund); - //创建分工会待办 + //创建基层工会待办 MedicalMutualAidFundToDoHandler.CREATE_UNION_TASK.exec(medicalMutualAidFund); return Result.success(); } diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java index b9efcc0..8ea790a 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java @@ -27,7 +27,7 @@ import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletRequest; /** - * 分工会审核 + * 基层工会审核 * * @author jug * @date 2024/01/17 @@ -70,7 +70,7 @@ public class MedicalMutualAidFundBranchUnionAuditController { @At @RequiresPermissions("medicalMutualAidFund.branchUnionAudit") - @SLog(type = "medicalMutualAidFund", tag = "分工会（离退休）审核通过", msg = "分工会（离退休）审核通过") + @SLog(type = "medicalMutualAidFund", tag = "基层工会（离退休）审核通过", msg = "基层工会（离退休）审核通过") @Aop(TransAop.READ_COMMITTED) public Result pass(Audit audit, String id) { dao.insert(audit); @@ -89,7 +89,7 @@ public class MedicalMutualAidFundBranchUnionAuditController { @At @RequiresPermissions("medicalMutualAidFund.branchUnionAudit") - @SLog(type = "medicalMutualAidFund", tag = "分工会（离退休）审核拒绝", msg = "分工会（离退休）审核拒绝") + @SLog(type = "medicalMutualAidFund", tag = "基层工会（离退休）审核拒绝", msg = "基层工会（离退休）审核拒绝") @Aop(TransAop.READ_COMMITTED) public Result reject(Audit audit, String id) { dao.insert(audit); diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundFinalAuditController.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundFinalAuditController.java index cf19760..2b1e77f 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundFinalAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundFinalAuditController.java @@ -152,7 +152,7 @@ public class MedicalMutualAidFundFinalAuditController { exportEntities.add(new ExcelExportEntity("姓名","userName",20)); exportEntities.add(new ExcelExportEntity("工号","loginName",20)); exportEntities.add(new ExcelExportEntity("单位","unitName",20)); - exportEntities.add(new ExcelExportEntity("分工会","unionName",20)); + exportEntities.add(new ExcelExportEntity("基层工会","unionName",20)); exportEntities.add(new ExcelExportEntity("疾病","diseaseCategory",20)); exportEntities.add(new ExcelExportEntity("个人现金支付金额","selfPaymentAmount",20)); exportEntities.add(new ExcelExportEntity("病种","diseaseType",20)); diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/handler/MedicalMutualAidFundToDoHandler.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/handler/MedicalMutualAidFundToDoHandler.java index e2e23a3..1aa381f 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/handler/MedicalMutualAidFundToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/handler/MedicalMutualAidFundToDoHandler.java @@ -81,7 +81,7 @@ public enum MedicalMutualAidFundToDoHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -106,7 +106,7 @@ public enum MedicalMutualAidFundToDoHandler { localProcessService.createTask( "medical_mutual_aid_fund@" + mutualAidFund.getId(), "branchUnionAuditId", - "分工会审核", + "基层工会审核", ShiroUtil.getUserId(), loginNames, "/platform/medicalMutualAidFund/branchUnionAudit", @@ -115,12 +115,12 @@ public enum MedicalMutualAidFundToDoHandler { "/platform/medicalMutualAidFund/branchUnionAudit" ); - localProcessService.updateProcessNodeName("medical_mutual_aid_fund@" + mutualAidFund.getId(), "分工会审核"); + localProcessService.updateProcessNodeName("medical_mutual_aid_fund@" + mutualAidFund.getId(), "基层工会审核"); } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/model/MedicalMutualAidFund.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/model/MedicalMutualAidFund.java index 7a44464..e6443f5 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/model/MedicalMutualAidFund.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/model/MedicalMutualAidFund.java @@ -76,12 +76,12 @@ public class MedicalMutualAidFund extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR) - @Comment("分工会Id") + @Comment("基层工会Id") private String unionId; @Column @ColDefine(type = ColType.VARCHAR) - @Comment("分工会") + @Comment("基层工会") private String unionName; @Column @@ -138,7 +138,7 @@ public class MedicalMutualAidFund extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("分工会、离退休审核Id") + @Comment("基层工会、离退休审核Id") private String branchUnionAuditId; @Column diff --git a/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/MeetingOnlineController.java b/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/MeetingOnlineController.java index 7d035eb..1b3d42e 100644 --- a/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/MeetingOnlineController.java +++ b/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/MeetingOnlineController.java @@ -87,7 +87,7 @@ public class MeetingOnlineController { entityArrayList.add(new ExcelExportEntity("姓名", "username", 20)); entityArrayList.add(new ExcelExportEntity("工号", "loginname", 20)); entityArrayList.add(new ExcelExportEntity("单位", "unitname", 20)); - entityArrayList.add(new ExcelExportEntity("分工会", "unionname", 20)); + entityArrayList.add(new ExcelExportEntity("基层工会", "unionname", 20)); entityArrayList.add(new ExcelExportEntity("签字", "", 20)); try { ViTool.excelResponse(response, fileName + ".xlsx"); diff --git a/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/statistics/MeetingBasicStatisticsController.java b/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/statistics/MeetingBasicStatisticsController.java index dc53e69..e8f092c 100644 --- a/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/statistics/MeetingBasicStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/meeting/controller/pc/statistics/MeetingBasicStatisticsController.java @@ -91,7 +91,7 @@ public class MeetingBasicStatisticsController { entityList.add(new ExcelExportEntity("姓名", "userName", 20)); entityList.add(new ExcelExportEntity("工号", "loginName", 20)); entityList.add(new ExcelExportEntity("单位", "unitName", 30)); - entityList.add(new ExcelExportEntity("分工会", "unionName", 35)); + entityList.add(new ExcelExportEntity("基层工会", "unionName", 35)); Workbook workbook = new XSSFWorkbook(); diff --git a/src/main/java/io/v/nutz/zhgh/meeting/models/CustomAuditTypeEnum.java b/src/main/java/io/v/nutz/zhgh/meeting/models/CustomAuditTypeEnum.java index 49fdde9..a3b4193 100644 --- a/src/main/java/io/v/nutz/zhgh/meeting/models/CustomAuditTypeEnum.java +++ b/src/main/java/io/v/nutz/zhgh/meeting/models/CustomAuditTypeEnum.java @@ -7,7 +7,7 @@ public enum CustomAuditTypeEnum { CLUB("CLUB", "审核本协会"), DW("DW", "审核本单位"), - FGH("FGH", "审核本分工会"), + FGH("FGH", "审核本基层工会"), TZ("TZ", "审核本代表团"); public String value; diff --git a/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java b/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java index e7778f5..5c20e3e 100644 --- a/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java +++ b/src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java @@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant; */ public interface MemberApplyState { /** - * 待分工会审核 + * 待基层工会审核 */ int UNION = 10; /** - * 分工会审核不通过 + * 基层工会审核不通过 */ int UNION_FAIL = 15; diff --git a/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java b/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java index 181b0d6..6bf5fb8 100644 --- a/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java +++ b/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java @@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant; */ public interface MemberChangeApplyState { /** - * 待分工会审核 + * 待基层工会审核 */ int UNION = 50; /** - * 分工会审核不通过 + * 基层工会审核不通过 */ int UNION_FAIL = 55; diff --git a/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeOrigin.java b/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeOrigin.java index 22eb82a..b4a0fab 100644 --- a/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeOrigin.java +++ b/src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeOrigin.java @@ -16,7 +16,7 @@ import lombok.Getter; @AllArgsConstructor public enum MemberChangeOrigin { PERSONAL(1, "个人"), - UNION(2, "分工会"), + UNION(2, "基层工会"), UNION_GROUP(3, "工会小组"), SCHOOL(4, "校工会"), OTHER(5, "其他"), diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java b/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java index 8b2fb16..b90f0d4 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java @@ -257,7 +257,7 @@ public class MemberCommonController { ); } - //需要包含分工会、校工会审核信息 + //需要包含基层工会、校工会审核信息 String memberChangeRecordId = userHistory.getMemberChangeRecordId(); MemberChangeRecord memberChangeRecord = dao.fetch(MemberChangeRecord.class, memberChangeRecordId); dao.fetchLinks(memberChangeRecord,"auditState|unionAudit|schoolAudit"); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/apply/MemberApplyAuditController.java b/src/main/java/io/v/nutz/zhgh/member/controller/apply/MemberApplyAuditController.java index 40158c5..edf7dcd 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/apply/MemberApplyAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/apply/MemberApplyAuditController.java @@ -46,7 +46,7 @@ public class MemberApplyAuditController { /** * @param pageForm 分页查询对象 - * @param source 来源 1 分工会 2 校工会 + * @param source 来源 1 基层工会 2 校工会 * @return */ @At diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeApplyAuditController.java b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeApplyAuditController.java index 95d375b..b36bc31 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeApplyAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeApplyAuditController.java @@ -48,7 +48,7 @@ public class MemberChangeApplyAuditController { /** * @param pageForm 分页查询对象 - * @param source 来源 1 分工会 2 校工会 + * @param source 来源 1 基层工会 2 校工会 * @return */ @At diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java index beae080..e3751df 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java @@ -281,7 +281,7 @@ public class MemberAnalysisController { // cnd.and("dw.parentId", "=", 0).and("dw.id", "not in ", Lang.array("0", "000")); cnd.asc("dw.unitcode"); } - if (searchType.equals("按分工会分析")) { + if (searchType.equals("按基层工会分析")) { if (Strings.isNotBlank(unionId)) { cnd.and("gh.id", "=", unionId); } @@ -298,9 +298,9 @@ public class MemberAnalysisController { List list = NutMaplist.stream().filter(v -> v.getInt("currentYearMemberNum") != 0).collect(Collectors.toList()); list.forEach(v -> { - if (searchType.equals("按分工会分析")) { - v.put("分工会代码", v.getString("unionCode")); - v.put("分工会名称", v.getString("unionName")); + if (searchType.equals("按基层工会分析")) { + v.put("基层工会代码", v.getString("unionCode")); + v.put("基层工会名称", v.getString("unionName")); } else { v.put("单位代码", v.getString("unitCode")); @@ -322,8 +322,8 @@ public class MemberAnalysisController { }); NutMap sumMap = new NutMap() {{ - put(searchType.equals("按分工会分析") ? "分工会名称" : "单位名称", "合计"); - put(searchType.equals("按分工会分析") ? "分工会代码" : "单位代码", ""); + put(searchType.equals("按基层工会分析") ? "基层工会名称" : "单位名称", "合计"); + put(searchType.equals("按基层工会分析") ? "基层工会代码" : "单位代码", ""); put("年初数量", list.stream().mapToInt(v -> v.getInt("年初数量")).sum()); put("新增人数", list.stream().mapToInt(v -> v.getInt("新增人数")).sum()); put("新入职（恢复）", list.stream().mapToInt(v -> v.getInt("新入职（恢复）")).sum()); @@ -337,9 +337,9 @@ public class MemberAnalysisController { list.add(sumMap); List entityList = new ArrayList<>(); - if (searchType.equals("按分工会分析")) { - entityList.add(new ExcelExportEntity("分工会代码", "分工会代码", 20)); - entityList.add(new ExcelExportEntity("分工会名称", "分工会名称", 20)); + if (searchType.equals("按基层工会分析")) { + entityList.add(new ExcelExportEntity("基层工会代码", "基层工会代码", 20)); + entityList.add(new ExcelExportEntity("基层工会名称", "基层工会名称", 20)); } else { entityList.add(new ExcelExportEntity("单位代码", "单位代码", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java index 26a17a0..e79d738 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java @@ -227,8 +227,8 @@ public class MemberStatisticsController { List entityList = new ArrayList<>(); if (union) { - entityList.add(new ExcelExportEntity("分工会代码", "unionCode", 20)); - entityList.add(new ExcelExportEntity("分工会名称", "unionName", 20)); + entityList.add(new ExcelExportEntity("基层工会代码", "unionCode", 20)); + entityList.add(new ExcelExportEntity("基层工会名称", "unionName", 20)); }else{ entityList.add(new ExcelExportEntity("单位代码", "unitCode", 20)); entityList.add(new ExcelExportEntity("单位名称", "unitName", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java index 92fb71c..31ec515 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java @@ -54,7 +54,7 @@ public class MemberUserTypeController { Sql sql = null; if (ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { - if (searchType.equals("按分工会统计")) { + if (searchType.equals("按基层工会统计")) { sql = Sqls.create(""" SELECT gh.id as ghid, @@ -137,7 +137,7 @@ public class MemberUserTypeController { boolean hasAdminRoles = ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03")); if (hasAdminRoles) { - if (searchType.equals("按分工会统计")) { + if (searchType.equals("按基层工会统计")) { sql = Sqls.create(""" SELECT gh.id, @@ -224,14 +224,14 @@ public class MemberUserTypeController { List entityList = new ArrayList<>(); if (hasAdminRoles) { - if (searchType.equals("按分工会统计")) { - entityList.add(new ExcelExportEntity("分工会代码", "unionCode", 20)); - entityList.add(new ExcelExportEntity("分工会名称", "unionName", 20)); + if (searchType.equals("按基层工会统计")) { + entityList.add(new ExcelExportEntity("基层工会代码", "unionCode", 20)); + entityList.add(new ExcelExportEntity("基层工会名称", "unionName", 20)); } else { entityList.add(new ExcelExportEntity("单位代码", "unitCode", 20)); entityList.add(new ExcelExportEntity("单位名称", "unitName", 20)); - entityList.add(new ExcelExportEntity("分工会代码", "unionCode", 20)); - entityList.add(new ExcelExportEntity("分工会名称", "unionName", 20)); + entityList.add(new ExcelExportEntity("基层工会代码", "unionCode", 20)); + entityList.add(new ExcelExportEntity("基层工会名称", "unionName", 20)); } } else { entityList.add(new ExcelExportEntity("单位名称", "unitName", 20)); @@ -244,7 +244,7 @@ public class MemberUserTypeController { /*NutMap sumMap = new NutMap() {{ if (hasAdminRoles) { - if (searchType.equals("按分工会统计")) { + if (searchType.equals("按基层工会统计")) { put("unionName", "合计"); } else { put("unitName", "合计"); diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java index aa7f350..d5dc3d5 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyAuditHandle.java @@ -92,7 +92,7 @@ public enum MemberApplyAuditHandle { } }, /** - * 分工会审核 + * 基层工会审核 */ AUDIT_UNION(MemberApplyState.UNION) { @Override diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyToDoHandler.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyToDoHandler.java index a27ee68..8cb34ce 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberApplyToDoHandler.java @@ -98,7 +98,7 @@ public enum MemberApplyToDoHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -121,7 +121,7 @@ public enum MemberApplyToDoHandler { }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java index ac69570..36fbb1f 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeAuditHandle.java @@ -71,7 +71,7 @@ public enum MemberChangeAuditHandle { } }, /** - * 分工会审核 + * 基层工会审核 */ UNION(MemberChangeApplyState.UNION) { @Override @@ -100,7 +100,7 @@ public enum MemberChangeAuditHandle { MemberChangeToDoHandler.CREATE_SCHOOL_TASK.exec(record,null); } else { - MemberChangeToDoHandler.REFUSE_UNION_TASK.exec(record,NutMap.NEW().addv("nodeName","分工会拒绝")); + MemberChangeToDoHandler.REFUSE_UNION_TASK.exec(record,NutMap.NEW().addv("nodeName","基层工会拒绝")); } return record; } diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeToDoHandler.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeToDoHandler.java index c6c9e17..1b7a285 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeToDoHandler.java @@ -101,7 +101,7 @@ public enum MemberChangeToDoHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -126,7 +126,7 @@ public enum MemberChangeToDoHandler { }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/member/model/MemberApplyRecord.java b/src/main/java/io/v/nutz/zhgh/member/model/MemberApplyRecord.java index 06f22b3..007ab55 100644 --- a/src/main/java/io/v/nutz/zhgh/member/model/MemberApplyRecord.java +++ b/src/main/java/io/v/nutz/zhgh/member/model/MemberApplyRecord.java @@ -55,7 +55,7 @@ public class MemberApplyRecord { private Integer memberStates; @Column - @Comment("分工会审核记录id") + @Comment("基层工会审核记录id") @ColDefine(type = ColType.VARCHAR, width = 32) public String unionAuditId; diff --git a/src/main/java/io/v/nutz/zhgh/member/model/MemberChangeRecord.java b/src/main/java/io/v/nutz/zhgh/member/model/MemberChangeRecord.java index 1b64495..867b6a4 100644 --- a/src/main/java/io/v/nutz/zhgh/member/model/MemberChangeRecord.java +++ b/src/main/java/io/v/nutz/zhgh/member/model/MemberChangeRecord.java @@ -105,7 +105,7 @@ public class MemberChangeRecord { private Integer stateId; @Column - @Comment("分工会审核记录id") + @Comment("基层工会审核记录id") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionAuditId; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileUnionAuditController.java index e3c3a8b..ccdaf84 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileUnionAuditController.java @@ -9,7 +9,7 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; /** - * 场地分工会审核 + * 场地基层工会审核 * * @author jug * @date 2023/12/15 diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java index 48226a4..252035f 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java @@ -100,7 +100,7 @@ public class UnionActivityRegisterController { """; /** - * 获取某个分工会限制的数量 + * 获取某个基层工会限制的数量 * * @param unionUserNumberLimit * @param unionId @@ -336,7 +336,7 @@ public class UnionActivityRegisterController { } /** - * 分工会报名 + * 基层工会报名 * * @param activityId * @param personIds @@ -352,7 +352,7 @@ public class UnionActivityRegisterController { ActivityTissue activityTissue = simpleService.dao().fetch(ActivityTissue.class, activityId); if (activityTissue.getSignUpMethod() == 2) { if (!ShiroUtil.hasRole("H04")) { - return Result.error().addMsg("请使用分工会管理员报名!"); + return Result.error().addMsg("请使用基层工会管理员报名!"); } } if (Lang.isNotEmpty(activityTissue.getUserNumberLimit())) { @@ -366,7 +366,7 @@ public class UnionActivityRegisterController { if (activityTissue.getUserNumberLimit() == 2) { int limitNumByUnion = getLimitNumByUnion(activityTissue.getUnionUserNumberLimit(), unionId); if (personIds.length > limitNumByUnion) { - return Result.error().addMsg("分工会报名限额%s人!".formatted(limitNumByUnion)); + return Result.error().addMsg("基层工会报名限额%s人!".formatted(limitNumByUnion)); } } } @@ -458,7 +458,7 @@ public class UnionActivityRegisterController { } if (activityTissue.getUserNumberLimit() == 2) { int limitNumByUnion = getLimitNumByUnion(activityTissue.getUnionUserNumberLimit(), unionId); - //获取当前该分工会已报多少人 + //获取当前该基层工会已报多少人 Sql sql = Sqls.create(""" SELECT count(1) @@ -473,7 +473,7 @@ public class UnionActivityRegisterController { int hasRegisterCount = simpleService.count(sql); if (!(limitNumByUnion - hasRegisterCount > 0)) { lock.unlock(); - return Result.error().addMsg("该分工会报名名额已满！"); + return Result.error().addMsg("该基层工会报名名额已满！"); } } } diff --git a/src/main/java/io/v/nutz/zhgh/mobile/unioncomment/MUnionCommentController.java b/src/main/java/io/v/nutz/zhgh/mobile/unioncomment/MUnionCommentController.java index 00670f1..3130776 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/unioncomment/MUnionCommentController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/unioncomment/MUnionCommentController.java @@ -227,7 +227,7 @@ public class MUnionCommentController { private static final String GH02 = "672b47cfc79c4a77878c0f2cfd5734be"; /** - * 获取分工会主席和副主席 + * 获取基层工会主席和副主席 * @return */ @At diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java index 96bfc67..1d0f831 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportLeaderHandleController.java @@ -286,8 +286,8 @@ public class ProposalExportLeaderHandleController { // exportEntities.add(new ExcelExportEntity("提案类型编码", "typeCode", 20)); // exportEntities.add(new ExcelExportEntity("提案类型", "typeName", 20)); // exportEntities.add(new ExcelExportEntity("立案结果", "resultName", 20)); -// exportEntities.add(new ExcelExportEntity("分工会代码", "unionCode", 20)); -// exportEntities.add(new ExcelExportEntity("分工会名称", "unionName", 20)); +// exportEntities.add(new ExcelExportEntity("基层工会代码", "unionCode", 20)); +// exportEntities.add(new ExcelExportEntity("基层工会名称", "unionName", 20)); // exportEntities.add(new ExcelExportEntity("提案人工号", "createLoginName", 20)); // exportEntities.add(new ExcelExportEntity("提案人姓名", "createUserName", 20)); // if (principalIsNode) { diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java index 34dd232..27e31da 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java @@ -314,7 +314,7 @@ public class ProposalSummaryController { @Excel(name = "提案类型", width = 20d) private String typeName; - @Excel(name = "分工会名称", width = 20d) + @Excel(name = "基层工会名称", width = 20d) private String unionname; @Excel(name = "提案人工号", width = 20d) diff --git a/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalInfo.java b/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalInfo.java index 2377992..8d6a7dd 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalInfo.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalInfo.java @@ -138,7 +138,7 @@ public class ProposalInfo extends BaseModel implements Serializable { private Boolean excellent; @Column - @Comment("审核团长的分工会id") + @Comment("审核团长的基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String delegationUnionId; diff --git a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerRankingController.java b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerRankingController.java index 597b082..a9ad68c 100644 --- a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerRankingController.java +++ b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerRankingController.java @@ -185,14 +185,14 @@ public class QuestionAnswerRankingController { }); List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("分工会名称", "unionname", 30)); + exportEntities.add(new ExcelExportEntity("基层工会名称", "unionname", 30)); exportEntities.add(new ExcelExportEntity("分数<60", "lt60", 20)); exportEntities.add(new ExcelExportEntity("60≤分数<80", "gte60<80", 20)); exportEntities.add(new ExcelExportEntity("80≤分数<90", "gte80<90", 20)); exportEntities.add(new ExcelExportEntity("90≤分数≤100", "gte90<100", 20)); response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment;filename=" + new String(("分工会阶段得分统计.xlsx").getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)); + response.setHeader("Content-Disposition", "attachment;filename=" + new String(("基层工会阶段得分统计.xlsx").getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, excelDataList); diff --git a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerStatisticsController.java b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerStatisticsController.java index e9dc765..7f4aa6a 100644 --- a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionAnswerStatisticsController.java @@ -137,7 +137,7 @@ public class QuestionAnswerStatisticsController { exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("单位", "unitname", 20)); - exportEntities.add(new ExcelExportEntity("分工会", "unionname", 20)); + exportEntities.add(new ExcelExportEntity("基层工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("得分", "max_score", 20)); try (ServletOutputStream outputStream = response.getOutputStream()) { diff --git a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionCakeController.java b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionCakeController.java index 2506f15..22ae80a 100644 --- a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionCakeController.java +++ b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionCakeController.java @@ -123,7 +123,7 @@ public class QuestionCakeController { } /** - * 蛋糕卡这类查询每个分工会下的人选的什么物品 + * 蛋糕卡这类查询每个基层工会下的人选的什么物品 * * @param questionId * @param unionId diff --git a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionPollAnalysisController.java b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionPollAnalysisController.java index 333c5c6..8e1c97c 100644 --- a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionPollAnalysisController.java +++ b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionPollAnalysisController.java @@ -250,7 +250,7 @@ public class QuestionPollAnalysisController { }); Question question = questionService.fetch(questionId); - String fileName = question.getQtitle() + "按分工会导出"; + String fileName = question.getQtitle() + "按基层工会导出"; response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition", "attachment;filename=" + new String((fileName + ".xls").getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), exportEntities, result); diff --git a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionUnionIntentionalChoiceController.java b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionUnionIntentionalChoiceController.java index 0f24c0b..7ed2ef9 100644 --- a/src/main/java/io/v/nutz/zhgh/question/controller/QuestionUnionIntentionalChoiceController.java +++ b/src/main/java/io/v/nutz/zhgh/question/controller/QuestionUnionIntentionalChoiceController.java @@ -280,7 +280,7 @@ public class QuestionUnionIntentionalChoiceController { } /** - * 蛋糕卡这类查询每个分工会下的人选的什么物品 + * 蛋糕卡这类查询每个基层工会下的人选的什么物品 * * @param questionId * @param unionId @@ -525,7 +525,7 @@ public class QuestionUnionIntentionalChoiceController { exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); exportEntities.add(new ExcelExportEntity("单位", "unitname", 40)); - exportEntities.add(new ExcelExportEntity("分工会", "unionname", 40)); + exportEntities.add(new ExcelExportEntity("基层工会", "unionname", 40)); exportEntities.add(new ExcelExportEntity("手机号", "mobile", 20)); exportEntities.add(new ExcelExportEntity("所选物品", "shop", 20)); @@ -601,7 +601,7 @@ public class QuestionUnionIntentionalChoiceController { entityList.add(new ExcelExportEntity("工号", "loginName", 20)); entityList.add(new ExcelExportEntity("性别", "sex", 20)); entityList.add(new ExcelExportEntity("单位", "unitName", 30)); - entityList.add(new ExcelExportEntity("分工会", "unionName", 35)); + entityList.add(new ExcelExportEntity("基层工会", "unionName", 35)); entityList.add(new ExcelExportEntity("手机号", "mobile", 30)); List mapList = null; if (!flag) { diff --git a/src/main/java/io/v/nutz/zhgh/reimbursement/constants/ReimbursementState.java b/src/main/java/io/v/nutz/zhgh/reimbursement/constants/ReimbursementState.java index 1415872..9a2d22f 100644 --- a/src/main/java/io/v/nutz/zhgh/reimbursement/constants/ReimbursementState.java +++ b/src/main/java/io/v/nutz/zhgh/reimbursement/constants/ReimbursementState.java @@ -24,12 +24,12 @@ public interface ReimbursementState { Integer SIGNATURE = 3045; /** - * 待分工会审核 + * 待基层工会审核 */ Integer UNION = 3050; /** - * 分工会审核不通过 + * 基层工会审核不通过 */ Integer UNION_FAIL = 3055; /** diff --git a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementAgentController.java b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementAgentController.java index 60d280e..e1e1a57 100644 --- a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementAgentController.java @@ -52,7 +52,7 @@ public class ReimbursementAgentController { if (ShiroUtil.hasAnyRoles("sysadmin")) { result.add(new NutMap().setv("title", title).setv("url", MODIFY).setv("iconClass", vi.getIconByPath(MODIFY)).setv("label", "待经办人修改").setv("number", getModifyCount())); result.add(new NutMap().setv("title", title).setv("url", SIGNATURE).setv("iconClass", vi.getIconByPath(SIGNATURE)).setv("label", "待慰问人签字").setv("number", getSignatureCount())); - result.add(new NutMap().setv("title", title).setv("url", UNION).setv("iconClass", vi.getIconByPath(UNION)).setv("label", "待分工会审核").setv("number", getUcrCount())); + result.add(new NutMap().setv("title", title).setv("url", UNION).setv("iconClass", vi.getIconByPath(UNION)).setv("label", "待基层工会审核").setv("number", getUcrCount())); result.add(new NutMap().setv("title", title).setv("url", UNIT_SECRETARY).setv("iconClass", vi.getIconByPath(UNIT_SECRETARY)).setv("label", "待单位书记审核").setv("number", getUnit_secretaryCount())); result.add(new NutMap().setv("title", title).setv("url", FINANCE).setv("iconClass", vi.getIconByPath(FINANCE)).setv("label", "待财务审核").setv("number", getFinanceCount())); result.add(new NutMap().setv("title", title).setv("url", VICE_CHAIRMAN).setv("iconClass", vi.getIconByPath(VICE_CHAIRMAN)).setv("label", "待分管副主席审核").setv("number", getVice_chairmanCount())); diff --git a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java index eb908ee..84de7d8 100644 --- a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java +++ b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java @@ -222,7 +222,7 @@ public class applyNewController { } if ("2".equals(val)) { if (!ShiroUtil.hasAnyRoles("gh01, H04")) { - return Result.error("分工会报销只能由分工会主席操作"); + return Result.error("基层工会报销只能由基层工会主席操作"); } } else if ("3".equals(val)) { int count = baseService.dao().count(Sys_club_user.class, Cnd.where("userid", "=", ShiroUtil.getPrincipalProperty("id")) diff --git a/src/main/java/io/v/nutz/zhgh/single/controller/SingleUserStatisticsController.java b/src/main/java/io/v/nutz/zhgh/single/controller/SingleUserStatisticsController.java index 919bc95..9fe478e 100644 --- a/src/main/java/io/v/nutz/zhgh/single/controller/SingleUserStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/single/controller/SingleUserStatisticsController.java @@ -74,8 +74,8 @@ public class SingleUserStatisticsController { List entityList = new ArrayList<>(); if ("0".equals(analyze)) { - entityList.add(new ExcelExportEntity("分工会代码", "unionCode", 20)); - entityList.add(new ExcelExportEntity("分工会名称", "unionName", 20)); + entityList.add(new ExcelExportEntity("基层工会代码", "unionCode", 20)); + entityList.add(new ExcelExportEntity("基层工会名称", "unionName", 20)); }else if("1".equals(analyze)){ entityList.add(new ExcelExportEntity("单位代码", "unitCode", 20)); entityList.add(new ExcelExportEntity("单位名称", "unitName", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java index 7d65f21..e4ab82a 100644 --- a/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java @@ -112,7 +112,7 @@ public class SingleUserServiceImpl extends ViServiceImpl implements Si public List singleStatisticsList(String[] personTypes,String unionId, String unitId,String analyze) { Sql sql = null; CndPlus cnd = CndPlus.create(); - if ("0".equals(analyze)){//按分工会统计 + if ("0".equals(analyze)){//按基层工会统计 sql = Sqls.create(""" SELECT un.id, diff --git a/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/constants/SwufeDifficultSubsidyStateCode.java b/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/constants/SwufeDifficultSubsidyStateCode.java index 845d089..85da67d 100644 --- a/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/constants/SwufeDifficultSubsidyStateCode.java +++ b/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/constants/SwufeDifficultSubsidyStateCode.java @@ -8,17 +8,17 @@ public class SwufeDifficultSubsidyStateCode { public static final Integer TO_BE_SUBMITTED = 7000; /** - * 待分工会审核 + * 待基层工会审核 */ public static final Integer BRANCH_UNION_AUDIT = 7010; /** - * 分工会拒绝 + * 基层工会拒绝 */ public static final Integer BRANCH_UNION_REFUSE = 7020; /** - * 分工会退回 + * 基层工会退回 */ public static final Integer BRANCH_UNION_BACK = 7030; diff --git a/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/model/SwufeDifficultSubsidyApply.java b/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/model/SwufeDifficultSubsidyApply.java index d6cbf42..acb65d1 100644 --- a/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/model/SwufeDifficultSubsidyApply.java +++ b/src/main/java/io/v/nutz/zhgh/swufeDifficultSubsidy/model/SwufeDifficultSubsidyApply.java @@ -59,12 +59,12 @@ public class SwufeDifficultSubsidyApply extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR) - @Comment("分工会ID") + @Comment("基层工会ID") private String unionId; @Column @ColDefine(type = ColType.VARCHAR) - @Comment("分工会") + @Comment("基层工会") private String unionName; @Column diff --git a/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java b/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java index 0696cd8..767e6f1 100644 --- a/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java +++ b/src/main/java/io/v/nutz/zhgh/syr/controller/info/SyrXtsbController.java @@ -97,7 +97,7 @@ public class SyrXtsbController { List roleList = baseService.list(sql); String content = "您有一个“%s”提交的“三育人”项目申报材料需审核，请于7月31日前登录https://zhgh.nuaa.edu.cn进行审核。谢谢！【智慧工会】".formatted(ShiroUtil.getPrincipalProperty("username")); roleList.forEach(v -> { -// msgApi.pushWeChatMsg("三育人分工会审核", content, v.getString("loginname")); +// msgApi.pushWeChatMsg("三育人基层工会审核", content, v.getString("loginname")); }); return Result.success(); } catch (Exception e) { diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationLineCreateMode.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationLineCreateMode.java index 879a2d7..53277b3 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationLineCreateMode.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationLineCreateMode.java @@ -17,9 +17,9 @@ import lombok.Getter; public enum TheRapyRecuperationLineCreateMode { /** - * 分工会 + * 基层工会 */ - UNION(1, "分工会"), + UNION(1, "基层工会"), /** * 校工会 diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java index abfacc6..bbbf943 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java @@ -17,9 +17,9 @@ import lombok.Getter; public enum TheRapyRecuperationSignUpMode { /** - * 分工会模式 + * 基层工会模式 */ - UNION(1, "分工会组织", new String[]{"H04", "A06", "sysadmin"}), + UNION(1, "基层工会组织", new String[]{"H04", "A06", "sysadmin"}), /** * 自由模式 diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationState.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationState.java index 46150c9..9594bf6 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationState.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationState.java @@ -6,19 +6,19 @@ package io.v.nutz.zhgh.therapyRecuperation.constant; public interface TheRapyRecuperationState { /** - * 待分工会审核 + * 待基层工会审核 */ Integer UNIT = 2710; /** - * 分工会审核不通过 + * 基层工会审核不通过 */ Integer UNITFAIL = 2715; /** - * 待选择线路分工会审核 + * 待选择线路基层工会审核 */ Integer LINEUNIT = 2720; /** - * 选择线路分工会不通过 + * 选择线路基层工会不通过 */ Integer LINEUNITFAIL = 2725; diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/audit/TheRapyRecuperationAuditController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/audit/TheRapyRecuperationAuditController.java index 30c8550..8ffe4eb 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/audit/TheRapyRecuperationAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/audit/TheRapyRecuperationAuditController.java @@ -201,11 +201,11 @@ public class TheRapyRecuperationAuditController { } //如果通过 if (flag) { - //如果参加的线路分工会是自己分工会的，并且状态等于分工会审核 + //如果参加的线路基层工会是自己基层工会的，并且状态等于基层工会审核 if (enroll.getTakePartInUnionId().equals(Vi.getUnionId()) && enroll.getStateId().equals(TheRapyRecuperationState.UNIT)) { enroll.setStateId(TheRapyRecuperationState.PASS); } else { - //否则就是不是参加的自己分工会线路，就需要线路分工会审核 + //否则就是不是参加的自己基层工会线路，就需要线路基层工会审核 if (enroll.getStateId().equals(TheRapyRecuperationState.UNIT)) { enroll.setStateId(TheRapyRecuperationState.LINEUNIT); } else { @@ -280,11 +280,11 @@ public class TheRapyRecuperationAuditController { Audit insert = auditService.insert(audit); for (String id : ids) { TheRapyRecuperationEnroll enroll = auditService.dao().fetch(TheRapyRecuperationEnroll.class, id); - //如果状态等于分工会审核，并且参加的线路分工会也是自己的工会，就代表自己参加自己的工会线路 + //如果状态等于基层工会审核，并且参加的线路基层工会也是自己的工会，就代表自己参加自己的工会线路 if (enroll.getStateId().equals(TheRapyRecuperationState.UNIT) && enroll.getTakePartInUnionId().equals(vi.getUnionId())) { enroll.setStateId(flag ? TheRapyRecuperationState.PASS : TheRapyRecuperationState.UNITFAIL); enroll.setSelfUnionAuditId(insert.getId()); - //如果状态等于分工会审核，并且参加的线路分工会不是自己的工会，就代表参加的不是自己工会的线路，就需要线路分工会审核 + //如果状态等于基层工会审核，并且参加的线路基层工会不是自己的工会，就代表参加的不是自己工会的线路，就需要线路基层工会审核 } else if (enroll.getStateId().equals(TheRapyRecuperationState.UNIT) && !enroll.getTakePartInUnionId().equals(vi.getUnionId())) { enroll.setStateId(flag ? TheRapyRecuperationState.LINEUNIT : TheRapyRecuperationState.UNITFAIL); enroll.setSelfUnionAuditId(insert.getId()); diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java index b9bd76d..c43e017 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java @@ -84,7 +84,7 @@ public class TheRapyRecuperationBaseManagerController { * @param year 查询参数 * @param lotId 标段时间 * @param baseName 基地名 - * @param unionId 分工会 + * @param unionId 基层工会 * @param travelAgencyId 旅行社 * @param regionalNature 活动范围 * @return {@link Object} @@ -303,7 +303,7 @@ public class TheRapyRecuperationBaseManagerController { } else if (field.getName().equals("regionalNature")) { e.put("replace", new String[]{"省内_省内", "省外_省外"}); } else if (field.getName().equals("createMode")) { - e.put("replace", new String[]{"校工会_1", "分工会_2"}); + e.put("replace", new String[]{"校工会_1", "基层工会_2"}); } else if (field.getName().equals("isDisabled")) { e.put("replace", new String[]{"是_1", "否_0"}); } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java index ff3b497..49989aa 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java @@ -193,7 +193,7 @@ public class TheRapyRecuperationLineController { /** - * 根据分工会选择的线路id查询所该线路报名的人 + * 根据基层工会选择的线路id查询所该线路报名的人 * * @param pageForm 页面形式 * @param id id @@ -221,7 +221,7 @@ public class TheRapyRecuperationLineController { } /** - * 查看各个分工会设置的时间信息 + * 查看各个基层工会设置的时间信息 * * @param id 线路id * @return {@link Object} diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java index 4ae5a43..7553152 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java @@ -96,7 +96,7 @@ public class TheRapyRecuperationEnrollController { return enrollService.enrollPageData(pageForm, year, unionId, theRapyRecuperationType, lineUnionType); } - //获取设置了公开线路的分工会 + //获取设置了公开线路的基层工会 @At @ViReturn @RequiresAuthentication diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java index 641556e..2adaeac 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java @@ -71,7 +71,7 @@ public class TheRapyRecuperationLineAdjustmentController { /** - * 查询分工会报名模式线路 + * 查询基层工会报名模式线路 * * @param year 年度 * @return {@link Object} @@ -95,7 +95,7 @@ public class TheRapyRecuperationLineAdjustmentController { /** - * 查询分工会模式报名的用户 + * 查询基层工会模式报名的用户 * * @param lineId lineId * @return {@link Object} diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java index 216127d..52cd943 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java @@ -143,9 +143,9 @@ public class TheRapyRecuperationLineUnionSelectController { } /** - * 分工会选择线路 + * 基层工会选择线路 * - * @param us 分工会选择线路信息 + * @param us 基层工会选择线路信息 * @return {@link Object} */ @At("/selectLine") @@ -158,9 +158,9 @@ public class TheRapyRecuperationLineUnionSelectController { } /** - * 分工会选择线路时间 + * 基层工会选择线路时间 * - * @param lineUnionSelects 分工会选择线路 + * @param lineUnionSelects 基层工会选择线路 * @return {@link Object} */ @At("/selectLineTimes") @@ -208,7 +208,7 @@ public class TheRapyRecuperationLineUnionSelectController { unionId = StrUtil.emptyToNull(Vi.getUnionId()); if (mode == 1 && !ShiroUtil.hasRole("H04")) { - return Result.error("您没有分工会角色权限！"); + return Result.error("您没有基层工会角色权限！"); } else if (mode == 2 && !ShiroUtil.hasRole("A06")) { return Result.error("您没有校工会角色权限！"); } @@ -220,7 +220,7 @@ public class TheRapyRecuperationLineUnionSelectController { } /** - * 查询某个分工会设置的线路时间信息 + * 查询某个基层工会设置的线路时间信息 * * @param lineId 行id * @param usUnionId 我们工会id @@ -272,9 +272,9 @@ public class TheRapyRecuperationLineUnionSelectController { /** - * 是否公开分工会选择线路 + * 是否公开基层工会选择线路 * - * @param id 分工会选择线路id + * @param id 基层工会选择线路id * @return {@link Object} */ @At("/isOpenUnionLine/?") diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java index 4201926..e5e7d20 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java @@ -753,7 +753,7 @@ public class TheRapyRecuperationUnionQueryController { /** - * 分工会疗休养组团时间路线申报表导出 + * 基层工会疗休养组团时间路线申报表导出 * * @param response */ @@ -762,9 +762,9 @@ public class TheRapyRecuperationUnionQueryController { @RequiresAuthentication public void exportDeclareForm(HttpServletResponse response) { Map map = new HashMap<>(); - //本分工会的所有线路 + //本基层工会的所有线路 List takePartInList = baseService.dao().query(TheRapyRecuperationEnroll.class, Cnd.where("isNormal", "=", true).and("stateId", "=", TheRapyRecuperationState.PASS).and("takePartInUnionId", "=", Vi.getUnionId())); - //本分工会的参加线路人数 + //本基层工会的参加线路人数 long count = takePartInList.stream().filter(v -> v.getTakePartInUnionId().equals(v.getSelfUnionId())).count(); map.put("unionTakePartInCount", count); //其他工会参加本公会线路的人数 @@ -794,9 +794,9 @@ public class TheRapyRecuperationUnionQueryController { sql.setParam("year", DateUtil.thisYear()); List lineAllList = baseService.listMap(sql); List nutMaps = new ArrayList<>(); - //分工会线路列表 + //基层工会线路列表 lineAllList.forEach(v -> { - //该线路所有的参加人数（包含了其他分工会参加的） + //该线路所有的参加人数（包含了其他基层工会参加的） Long lineSum = lineTakePartInCountMap.get(v.getString("id")); if (lineSum == null || lineSum.longValue() == 0) { // nutMaps.add(v); @@ -831,7 +831,7 @@ public class TheRapyRecuperationUnionQueryController { /** - * 分工会疗休养出行人员导出 + * 基层工会疗休养出行人员导出 * * @param response */ diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/mode/TheRapyTravelLineExcelMode.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/mode/TheRapyTravelLineExcelMode.java index a924598..844c5ae 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/mode/TheRapyTravelLineExcelMode.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/mode/TheRapyTravelLineExcelMode.java @@ -24,10 +24,10 @@ public class TheRapyTravelLineExcelMode { @Excel(name = "最少成团人数") private Integer minimumGroupSize; -// @Excel(name = "创建模式（分工会/校工会）") +// @Excel(name = "创建模式（基层工会/校工会）") // private String createMode; // -// @Excel(name = "报名模式（分工会/自由）") +// @Excel(name = "报名模式（基层工会/自由）") // private String signUpMode; // // @Excel(name = "联系人") diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java index 7a8cc35..85b187a 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java @@ -78,7 +78,7 @@ public class TheRapyRecuperationBaseManagement { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("哪个分工会创建的") + @Comment("哪个基层工会创建的") private String createUnionId; @Column @@ -124,8 +124,8 @@ public class TheRapyRecuperationBaseManagement { @Column @ColDefine(type = ColType.INT) - @Comment("创建模式(1.校工会 2.分工会)") - @Excel(name = "组织形式(分工会/校工会)") + @Comment("创建模式(1.校工会 2.基层工会)") + @Excel(name = "组织形式(基层工会/校工会)") private int createMode; @Column diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java index 1f1801c..c8b9721 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java @@ -53,7 +53,7 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 50) - @Comment("本人分工会") + @Comment("本人基层工会") private String unionName; @Column @@ -63,12 +63,12 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("本人分工会Id") + @Comment("本人基层工会Id") private String selfUnionId; @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("参加的分工会") + @Comment("参加的基层工会") private String takePartInUnionId; @Column @@ -109,7 +109,7 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("本人分工会审核Id") + @Comment("本人基层工会审核Id") private String selfUnionAuditId; @Column @@ -119,7 +119,7 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("参加的线路分工会审核Id") + @Comment("参加的线路基层工会审核Id") private String joinLineUnionAuditId; @Column diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java index 6df8035..cfd69f9 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java @@ -76,7 +76,7 @@ public class TheRapyRecuperationLine extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("哪个分工会创建的") + @Comment("哪个基层工会创建的") private String createUnionId; @Column @@ -126,12 +126,12 @@ public class TheRapyRecuperationLine extends BaseModel { @Column @ColDefine(type = ColType.INT) - @Comment("报名模式(1.分工会 2.自由)") + @Comment("报名模式(1.基层工会 2.自由)") private Integer signUpMode; @Column @ColDefine(type = ColType.INT) - @Comment("创建模式(1.分工会 2.校工会)") + @Comment("创建模式(1.基层工会 2.校工会)") private int createMode; @Column diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLineUnionSelect.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLineUnionSelect.java index d7a4b4c..680c54b 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLineUnionSelect.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLineUnionSelect.java @@ -29,7 +29,7 @@ public class TheRapyRecuperationLineUnionSelect extends BaseModel { @Column @ColDefine(type = ColType.VARCHAR, width = 32) - @Comment("分工会id") + @Comment("基层工会id") private String unionId; @Column @@ -117,7 +117,7 @@ public class TheRapyRecuperationLineUnionSelect extends BaseModel { @Column @ColDefine(type = ColType.INT) - @Comment("报名模式、组织形式(1.分工会 2.校工会)") + @Comment("报名模式、组织形式(1.基层工会 2.校工会)") private Integer signUpMode; @Column diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationAuditService.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationAuditService.java index 5eaec8a..e1c9930 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationAuditService.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationAuditService.java @@ -10,7 +10,7 @@ public interface TheRapyRecuperationAuditService extends ViService { /** - * 根据分工会查询线路 + * 根据基层工会查询线路 * * @param * @param unionId diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineService.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineService.java index 254b5c9..e5fa420 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineService.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineService.java @@ -70,7 +70,7 @@ public interface TheRapyRecuperationLineService extends ViService diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineUnionSelectService.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineUnionSelectService.java index ec5be49..e9b4d2d 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineUnionSelectService.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/TheRapyRecuperationLineUnionSelectService.java @@ -10,7 +10,7 @@ import org.nutz.lang.util.NutMap; import java.util.List; /** - * 分工会选择线路 + * 基层工会选择线路 * * @author jug * @date 2022/06/01 @@ -30,7 +30,7 @@ public interface TheRapyRecuperationLineUnionSelectService extends ViService childNumber = this.getChildNumber(activity, null); diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java index c1a30fb..a791b5c 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java @@ -179,7 +179,7 @@ public class TrainSignUpActivityStatisticsController { excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20)); excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20)); - excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20)); + excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20)); excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20)); excelCommonExportEntity.add(new ExcelExportEntity("手机号", "mobile", 20)); excelCommonExportEntity.add(new ExcelExportEntity("生日", "birthday", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpCourse.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpCourse.java index 7e3f710..7a03038 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpCourse.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpCourse.java @@ -104,7 +104,7 @@ public class TrainSignUpCourse extends BaseModel implements Serializable { private MatchConditionStructure conditionStructure; @Column - @Comment("分工会人数限制") + @Comment("基层工会人数限制") @ColDefine(type = ColType.MYSQL_JSON) private List unionLimit; diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityService.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityService.java index 12fb0c2..9d458c9 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityService.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/service/TrainSignUpActivityService.java @@ -86,7 +86,7 @@ public interface TrainSignUpActivityService extends ViService 分工会限制人数 + //如果已报人数+当前报名（自己）+家属 > 基层工会限制人数 return (hasRegisterNum + hasFamilyNum) > limitCount; } diff --git a/src/main/java/io/v/nutz/zhgh/unioncomment/controller/exportZpController.java b/src/main/java/io/v/nutz/zhgh/unioncomment/controller/exportZpController.java index fa6c584..6c3b3e7 100644 --- a/src/main/java/io/v/nutz/zhgh/unioncomment/controller/exportZpController.java +++ b/src/main/java/io/v/nutz/zhgh/unioncomment/controller/exportZpController.java @@ -162,7 +162,7 @@ public class exportZpController { //创建临时文件夹 Path templateDir = Files.createTempDirectory("评测结果文件夹"); -//循环分工会 +//循环基层工会 for (NutMap un : unionMap) { List users = zbService.dao().query(User.class, Cnd.where("unionId", "=", un.getString("id"))); @@ -198,7 +198,7 @@ public class exportZpController { NutMap zpxxZx = new NutMap(); Cnd clone = cndPs.clone(); sqlps.setCondition(clone); - clone.and("cp.evaluatedPersonType", "=", "分工会主席"); + clone.and("cp.evaluatedPersonType", "=", "基层工会主席"); NutMap psMap = zbService.fetch(sqlps); zpxxZx.setv("pcdx", "工会主席履职情况测评"); zpxxZx.setv("my", psMap.getInt("my")); @@ -209,7 +209,7 @@ public class exportZpController { NutMap zpxxFzx = new NutMap(); Cnd clone2 = cndPs.clone(); - clone2.and("cp.evaluatedPersonType", "=", "分工会副主席"); + clone2.and("cp.evaluatedPersonType", "=", "基层工会副主席"); sqlps.setCondition(clone2); NutMap psMap2 = zbService.fetch(sqlps); zpxxFzx.setv("pcdx", "工会副主席履职情况测评"); diff --git a/src/main/java/io/v/nutz/zhgh/unioncomment/model/CommentZb.java b/src/main/java/io/v/nutz/zhgh/unioncomment/model/CommentZb.java index c6baa2f..1712be3 100644 --- a/src/main/java/io/v/nutz/zhgh/unioncomment/model/CommentZb.java +++ b/src/main/java/io/v/nutz/zhgh/unioncomment/model/CommentZb.java @@ -54,7 +54,7 @@ public class CommentZb extends BaseModel { @Column - @Comment("测评对象(1.校工会2.分工会)") + @Comment("测评对象(1.校工会2.基层工会)") @ColDefine(type = ColType.INT) private Integer commentTarget; diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java index 07b5509..037b4c8 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java @@ -340,7 +340,7 @@ public class WelfareCommonController { List list = projectService.listMap(sql); List exportEntityList = new ArrayList(); - exportEntityList.add(new ExcelExportEntity("分工会", "welfareUnitName", 30)); + exportEntityList.add(new ExcelExportEntity("基层工会", "welfareUnitName", 30)); List dicts = userTypeDictList.stream().filter(v -> typeList.contains(v.getName())).collect(Collectors.toList()); dicts.forEach(v -> { exportEntityList.add(new ExcelExportEntity(v.getName(), v.getName())); @@ -366,7 +366,7 @@ public class WelfareCommonController { @Excel(name = "编码", width = 20d) private String welfareUnitCode; - @Excel(name = "分工会", width = 40d) + @Excel(name = "基层工会", width = 40d) private String welfareUnitName; @Excel(name = "教职工", width = 20d) diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java index c11a230..4b35db9 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java @@ -357,7 +357,7 @@ public class WelfareListController { exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); exportEntities.add(new ExcelExportEntity("电话号码", "mobile", 20)); - exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 30)); + exportEntities.add(new ExcelExportEntity("所在基层工会", "unionname", 30)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 50)); exportEntities.add(new ExcelExportEntity("选择份数", "selectNum", 20)); if (Globals.MyConfig.getBoolean("isThreeUnit")) { @@ -541,7 +541,7 @@ public class WelfareListController { exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20)); - exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20)); + exportEntities.add(new ExcelExportEntity("所在基层工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("所在部门", "unitname", 20)); exportEntities.add(new ExcelExportEntity("份数", "selectNum", 20)); for (int i = 0; i < nameList.size(); i++) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java index c6cd85a..61206ba 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java @@ -352,7 +352,7 @@ public class WelfareMemberMangeController { exportEntities.add(new ExcelExportEntity("性别","sex",20)); exportEntities.add(new ExcelExportEntity("人员性质","personType",20)); exportEntities.add(new ExcelExportEntity("在职状态","userState",20)); - exportEntities.add(new ExcelExportEntity("分工会","unionname",20)); + exportEntities.add(new ExcelExportEntity("基层工会","unionname",20)); exportEntities.add(new ExcelExportEntity("单位","unitname",50)); exportEntities.add(new ExcelExportEntity("是否会员","member",50)); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckSchoolController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckSchoolController.java index c2a6b14..aafb88b 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckSchoolController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckSchoolController.java @@ -218,7 +218,7 @@ public class WelfareMemberCheckSchoolController { exportEntities.add(new ExcelExportEntity("联系方式", "mobile", 20)); exportEntities.add(new ExcelExportEntity("身份证号", "idcard", 20)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20)); - exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20)); + exportEntities.add(new ExcelExportEntity("所在基层工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("变更类型", "typeName", 20)); try (ServletOutputStream outputStream = response.getOutputStream()) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java index 2c1a5ce..abea356 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java @@ -212,7 +212,7 @@ public class WelfareMemberCheckUnionController { public Object submitCheck(@Param(value = "taskId", required = false) String taskId, @Param(value = "welfareUnit", required = false) String welfareUnit) { // if (ShiroUtil.lacksRole("H04")) { -// return Result.error("请使用分工会管理员来提交核对"); +// return Result.error("请使用基层工会管理员来提交核对"); // } Cnd cnd = Cnd.NEW(); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java index 4f5bec7..6e91b84 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java @@ -356,7 +356,7 @@ public class WelfareSingleController { /** - * 每个分工会领取人员 + * 每个基层工会领取人员 * * @param projectId * @param welfareUnitCode @@ -522,7 +522,7 @@ public class WelfareSingleController { /** - * 某个项目某一分工会未领取人员 + * 某个项目某一基层工会未领取人员 * * @param projectId * @param welfareUnitCode @@ -825,7 +825,7 @@ public class WelfareSingleController { exportEntities.add(new ExcelExportEntity("电话号码", "mobile", 20)); exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); exportEntities.add(new ExcelExportEntity("人员性质", "personType", 20)); - exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 30)); + exportEntities.add(new ExcelExportEntity("所在基层工会", "unionname", 30)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 50)); exportEntities.add(new ExcelExportEntity("选择份数", "selectNum", 20)); // if (Globals.MyConfig.getBoolean("isThreeUnit")) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/feature/WelfareFeature.java b/src/main/java/io/v/nutz/zhgh/welfare/feature/WelfareFeature.java index 96a02a0..f475a8d 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/feature/WelfareFeature.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/feature/WelfareFeature.java @@ -39,7 +39,7 @@ public interface WelfareFeature { /** * 判断是否可以查看全部 - * 分工会只看自己工会的 + * 基层工会只看自己工会的 * * @param cnd * @return @@ -50,7 +50,7 @@ public interface WelfareFeature { /** * 判断是否可以查看全部 - * 分工会只看自己工会的 + * 基层工会只看自己工会的 * * @param cnd * @param prefix diff --git a/src/main/java/io/v/nutz/zhgh/welfare/mode/WelfareProvideMode.java b/src/main/java/io/v/nutz/zhgh/welfare/mode/WelfareProvideMode.java index 12803ea..7831e04 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/mode/WelfareProvideMode.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/mode/WelfareProvideMode.java @@ -15,7 +15,7 @@ import lombok.Getter; @AllArgsConstructor @SelectEnum public enum WelfareProvideMode { - WELFARE_UNIT(1, "分工会/福利单位"), + WELFARE_UNIT(1, "基层工会/福利单位"), PERSON_CHOICE(2, "意向选择"), PERSONAL(3, "邮寄到家"); // TOGETHER(4, "集中发放"); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java index fd7fa31..ab3e5c8 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java @@ -164,7 +164,7 @@ public class WelfareProject extends ViBaseModel implements Serializable, SysHome private List flexibleGifts; @Column - @Comment("福利所属分工会") + @Comment("福利所属基层工会") @ColDefine(type = ColType.VARCHAR, width = 32) private String welfareUnionId; diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareListSummaryService.java b/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareListSummaryService.java index d5ec3ed..b8678a4 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareListSummaryService.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareListSummaryService.java @@ -10,7 +10,7 @@ import org.nutz.lang.util.NutMap; public interface WelfareListSummaryService extends ViService { /** - * 分工会/福利单位，集中发放 + * 基层工会/福利单位，集中发放 * * @param pageForm * @param projectId diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareSingleService.java b/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareSingleService.java index 3c61e5a..206838c 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareSingleService.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/WelfareSingleService.java @@ -24,11 +24,11 @@ public interface WelfareSingleService extends ViService { List welfareProjectList(Integer year); /** - * 分工会信息 + * 基层工会信息 * - * @param unionId 分工会id + * @param unionId 基层工会id * @param projectId 福利id - * @return 每个分工会信息 及 该福利项目下分工会的福利会员人数 + * @return 每个基层工会信息 及 该福利项目下基层工会的福利会员人数 */ List getUnionData(String unionId, String projectId); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareListSummaryServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareListSummaryServiceImpl.java index 721fe6b..61b6902 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareListSummaryServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareListSummaryServiceImpl.java @@ -107,7 +107,7 @@ public class WelfareListSummaryServiceImpl extends ViServiceImpl implements Welf //选择数据 List userSelectionList = welfareSingleService.getUserSelectionByProjectId(projectId, null); for (NutMap wUnit : welfareUnitList) { - //该分工会选择数据 + //该基层工会选择数据 List thisUnionSelectionList = userSelectionList.stream().filter(x -> x.getString("unionCode").equals(wUnit.getString("welfareUnitCode")) && x.getString("welfareId").equals(projectId)).collect(Collectors.toList()); optionList.forEach(o -> { //每一项选择的人数 diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java index dcb525f..d6e3490 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java @@ -101,11 +101,11 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl /** - * 分工会信息 + * 基层工会信息 * - * @param unionId 分工会id + * @param unionId 基层工会id * @param projectId 福利id - * @return 每个分工会信息 及 该福利项目下分工会的福利会员人数 + * @return 每个基层工会信息 及 该福利项目下基层工会的福利会员人数 */ @Override public List getUnionData(String unionId, String projectId) { @@ -240,9 +240,9 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl List viewMap = listMap(sqlViewList); - //循环每个分工会 + //循环每个基层工会 welfareUnitList.forEach(v -> { - //找出这个分工会的人数 + //找出这个基层工会的人数 List collect = viewMap.stream().filter(view -> view.getString("unionid").equals(v.getString("welfareUnitId"))).collect(Collectors.toList()); v.addv("teacherSum", collect.size()); }); @@ -253,7 +253,7 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl //选择数据 List userSelectionList = this.getUserSelectionByProjectId(projectId, month); for (NutMap wUnit : welfareUnitList) { - //该分工会选择数据 + //该基层工会选择数据 List thisUnionSelectionList; thisUnionSelectionList = userSelectionList.stream().filter(x -> x.getString("unionId").equals(wUnit.getString("welfareUnitId")) && @@ -715,7 +715,7 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl exportEntities.add(new ExcelExportEntity("序号", "no", 20)); exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); - exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20)); + exportEntities.add(new ExcelExportEntity("所在基层工会", "unionname", 20)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20)); for (NutMap option : options) { diff --git a/src/main/java/io/v/nutz/zhgh/workersCongress/controller/workersCongressGdhDelegationController.java b/src/main/java/io/v/nutz/zhgh/workersCongress/controller/workersCongressGdhDelegationController.java index 9328a27..7578ed4 100644 --- a/src/main/java/io/v/nutz/zhgh/workersCongress/controller/workersCongressGdhDelegationController.java +++ b/src/main/java/io/v/nutz/zhgh/workersCongress/controller/workersCongressGdhDelegationController.java @@ -190,7 +190,7 @@ public class workersCongressGdhDelegationController { } /** - * 查询未组成的分工会 + * 查询未组成的基层工会 * * @param gdh_id * @param dbt_id diff --git a/src/main/java/io/v/nutz/zhgh/workersCongress/model/workersCongressDelegationMakeUpUnion.java b/src/main/java/io/v/nutz/zhgh/workersCongress/model/workersCongressDelegationMakeUpUnion.java index e27a3bb..f32b06a 100644 --- a/src/main/java/io/v/nutz/zhgh/workersCongress/model/workersCongressDelegationMakeUpUnion.java +++ b/src/main/java/io/v/nutz/zhgh/workersCongress/model/workersCongressDelegationMakeUpUnion.java @@ -6,7 +6,7 @@ import org.nutz.dao.entity.annotation.*; /** * @author zhf * @date 2021/8/3 9:15 - * @description 组成分工会 + * @description 组成基层工会 */ @Data @Table("workers_congress_delegation_make_up_union") diff --git a/src/main/java/io/v/nutz/zhgh/xhkh/controller/XhKhZpController.java b/src/main/java/io/v/nutz/zhgh/xhkh/controller/XhKhZpController.java index 921413b..546ce25 100644 --- a/src/main/java/io/v/nutz/zhgh/xhkh/controller/XhKhZpController.java +++ b/src/main/java/io/v/nutz/zhgh/xhkh/controller/XhKhZpController.java @@ -96,7 +96,7 @@ public class XhKhZpController { } /** - * 分工会自评记录 + * 基层工会自评记录 * * @param annual 年度 * @param assessment 考核名称 @@ -139,7 +139,7 @@ public class XhKhZpController { } /** - * 分工会自评 + * 基层工会自评 * * @param zp 自评记录 * @param handleType 保存、提交 diff --git a/src/main/java/io/v/nutz/zhgh/xhkh/model/Xh_xghsh.java b/src/main/java/io/v/nutz/zhgh/xhkh/model/Xh_xghsh.java index 268d28d..2df14e3 100644 --- a/src/main/java/io/v/nutz/zhgh/xhkh/model/Xh_xghsh.java +++ b/src/main/java/io/v/nutz/zhgh/xhkh/model/Xh_xghsh.java @@ -29,7 +29,7 @@ public class Xh_xghsh extends BaseModel { private String addition; @Column - @Comment("分工会id") + @Comment("基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String flatid; diff --git a/src/main/java/io/v/nutz/zhgh/zc/model/Zgfw_Zcxx.java b/src/main/java/io/v/nutz/zhgh/zc/model/Zgfw_Zcxx.java index a3688f7..f3e5b53 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/model/Zgfw_Zcxx.java +++ b/src/main/java/io/v/nutz/zhgh/zc/model/Zgfw_Zcxx.java @@ -159,7 +159,7 @@ public class Zgfw_Zcxx implements Serializable { private String zclydwhid; @Column - @Comment("分工会资产、校工会资产") + @Comment("基层工会资产、校工会资产") @ColDefine(type = ColType.VARCHAR, width = 10) private String zcghlx; diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/FwDbController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/FwDbController.java index fa1edb9..bb6b8f1 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/FwDbController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/FwDbController.java @@ -57,13 +57,13 @@ public class FwDbController { "left join sys_union fgh on fgh.id = dw.unionid $wwj"); if (ShiroUtil.hasRole("sysadmin")) { - //待分工会审核 + //待基层工会审核 rxdjSql.setVar("rxdj", Cnd.where("dj_sqzt", "=", 1)); - nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/rxdj/sh/fghindex")).addv("label", "入学登记分工会审核").addv("number", baseService.count(rxdjSql)).addv("url", "/platform/zgfw/rxdj/sh/fghindex")); + nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/rxdj/sh/fghindex")).addv("label", "入学登记基层工会审核").addv("number", baseService.count(rxdjSql)).addv("url", "/platform/zgfw/rxdj/sh/fghindex")); knbzSql.setVar("knbz", Cnd.where("sq_sqzt", "=", 1)); - nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/knbf/sh/fghindex")).addv("label", "困难帮扶分工会审核").addv("number", baseService.count(knbzSql)).addv("url", "/platform/zgfw/knbf/sh/fghindex")); + nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/knbf/sh/fghindex")).addv("label", "困难帮扶基层工会审核").addv("number", baseService.count(knbzSql)).addv("url", "/platform/zgfw/knbf/sh/fghindex")); wwjSql.setVar("wwj", Cnd.where("`status`", "=", 1)); - nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/wwj/sh/fghindex")).addv("label", "慰问金分工会审核").addv("number", baseService.count(wwjSql)).addv("url", "/platform/zgfw/wwj/sh/fghindex")); + nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/wwj/sh/fghindex")).addv("label", "慰问金基层工会审核").addv("number", baseService.count(wwjSql)).addv("url", "/platform/zgfw/wwj/sh/fghindex")); //待校工会审核 rxdjSql.setVar("rxdj", Cnd.where("dj_sqzt", "=", 2)); nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/rxdj/sh/xghindex")).addv("label", "入学登记校工会审核").addv("number", baseService.count(rxdjSql)).addv("url", "/platform/zgfw/rxdj/sh/xghindex")); @@ -81,21 +81,21 @@ public class FwDbController { } else { if (ShiroUtil.hasRole("H04") || ShiroUtil.hasRole("sp02")) { - //困难补助分工会 审批员 + //困难补助基层工会 审批员 String unionid = ((Sys_union) ShiroUtil.getPrincipalProperty("union")).getId(); knbzSql.setVar("knbz", Cnd.where("sq_sqzt", "=", 1).and("fgh.id", "=", unionid)); - nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/knbf/sh/fghindex")).addv("label", "困难帮扶分工会审核").addv("number", baseService.count(knbzSql)).addv("url", "/platform/zgfw/knbf/sh/fghindex")); + nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/knbf/sh/fghindex")).addv("label", "困难帮扶基层工会审核").addv("number", baseService.count(knbzSql)).addv("url", "/platform/zgfw/knbf/sh/fghindex")); } if (ShiroUtil.hasRole("H04") || ShiroUtil.hasRole("sp03")) { - //入学登记分工会 审批员 + //入学登记基层工会 审批员 String unionid = ((Sys_union) ShiroUtil.getPrincipalProperty("union")).getId(); rxdjSql.setVar("rxdj", Cnd.where("dj_sqzt", "=", 1).and("fgh.id", "=", unionid)); - nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/rxdj/sh/fghindex")).addv("label", "入学登记分工会审核").addv("number", baseService.count(rxdjSql)).addv("url", "/platform/zgfw/rxdj/sh/fghindex")); + nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/rxdj/sh/fghindex")).addv("label", "入学登记基层工会审核").addv("number", baseService.count(rxdjSql)).addv("url", "/platform/zgfw/rxdj/sh/fghindex")); } if (ShiroUtil.hasRole("H04") || ShiroUtil.hasRole("sp01")) { String unionid = ((Sys_union) ShiroUtil.getPrincipalProperty("union")).getId(); wwjSql.setVar("wwj", Cnd.where("`status`", "=", 1).and("fgh.id", "=", unionid)); - nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/wwj/sh/fghindex")).addv("label", "慰问金分工会审核").addv("number", baseService.count(wwjSql)).addv("url", "/platform/zgfw/wwj/sh/fghindex")); + nutMaps.add(NutMap.NEW().addv("iconClass", vi.getIconByPath("/platform/zgfw/wwj/sh/fghindex")).addv("label", "慰问金基层工会审核").addv("number", baseService.count(wwjSql)).addv("url", "/platform/zgfw/wwj/sh/fghindex")); } } diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceApplyCon.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceApplyCon.java index 74ce793..69052d4 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceApplyCon.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceApplyCon.java @@ -130,7 +130,7 @@ public class CondolenceApplyCon { unionAdminSql.setParam("unionId", Vi.getUnionId()); List unionAdmins = condolenceService.listMap(unionAdminSql); for (NutMap unionAdmin : unionAdmins) { - String msg = "%s主席您好!您分工会下的%s老师申请了一条慰问,请您登录智慧工会系统职工服务>职工慰问下审核.".formatted( + String msg = "%s主席您好!您基层工会下的%s老师申请了一条慰问,请您登录智慧工会系统职工服务>职工慰问下审核.".formatted( unionAdmin.getString("username"), ShiroUtil.getPrincipalProperty("username")); // msgApi.sendMsg(unionAdmin.getString("loginname"), msg); System.out.println(msg); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceVcrCon.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceVcrCon.java index 014a813..a5a6d9e 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceVcrCon.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceVcrCon.java @@ -159,7 +159,7 @@ public class CondolenceVcrCon { CondolenceType condolenceType = condolenceService.dao().fetch(CondolenceType.class, condolence.getType()); String note = """ -

您的申报已审批通过，请参照以下提示跟进:

1.慰问事项为生病住院、去世、直系亲属去世，慰问金线上申报审批完成后，不需要再提交纸质材料。

2.慰问事项为结婚和生育的，审核通过后请将报销材料尽快提交至校工会（行政楼A426办公室）周学军老师处。注意：报销发票上须有分工会主席和经办人的签字；购买慰问品须有公务卡支付记录，如未使用公务卡，请提交支付记录和公务卡结算审批表（所在单位审核签字）。

3.各类慰问金每月结算一次。当月审核通过且报销材料提交齐全的，校工会将于次月第一周统一办理慰问金（慰问品报销）上卡，材料不齐全的推迟上卡。

+

您的申报已审批通过，请参照以下提示跟进:

1.慰问事项为生病住院、去世、直系亲属去世，慰问金线上申报审批完成后，不需要再提交纸质材料。

2.慰问事项为结婚和生育的，审核通过后请将报销材料尽快提交至校工会（行政楼A426办公室）周学军老师处。注意：报销发票上须有基层工会主席和经办人的签字；购买慰问品须有公务卡支付记录，如未使用公务卡，请提交支付记录和公务卡结算审批表（所在单位审核签字）。

3.各类慰问金每月结算一次。当月审核通过且报销材料提交齐全的，校工会将于次月第一周统一办理慰问金（慰问品报销）上卡，材料不齐全的推迟上卡。

"""; for (String unionLeader : unionLeaders) { sysMsgService.sendMsg(unionLeader,"【职工慰问】-" + beUser.getUsername(),note,ShiroUtil.getUserId()); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultBranchUnionAuditController.java index c5e4c27..361748f 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultBranchUnionAuditController.java @@ -109,7 +109,7 @@ public class DifficultBranchUnionAuditController { .add("branchUnionAuditId", null), Cnd.where("id", "=", id)); //待办撤回 - sysLocalProcessService.revokeTask("zgfw_knbf@" + id, "分工会审核"); + sysLocalProcessService.revokeTask("zgfw_knbf@" + id, "基层工会审核"); return Result.success(); } diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultReadingController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultReadingController.java index 8f0bb11..72d2ade 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultReadingController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultReadingController.java @@ -271,7 +271,7 @@ public class DifficultReadingController { record.set("bzlx_name", "“元旦、春节”困难补助慰问"); }*/ - //分工会 + //基层工会 Object app = record.get("app"); if (app != null) { Sys_signature signature = (Sys_signature) app; @@ -280,7 +280,7 @@ public class DifficultReadingController { } } - //分工会 + //基层工会 Object upa = record.get("upa"); if (upa != null) { Audit audit = (Audit) upa; @@ -447,8 +447,8 @@ public class DifficultReadingController { entities.add(new ExcelExportEntity("申请时间", "applyTime", 20)); entities.add(new ExcelExportEntity("联系电话", "mobile", 20)); entities.add(new ExcelExportEntity("类别", "subsidyStandards", 20)); - entities.add(new ExcelExportEntity("分工会审核意见", "branchUnionAuditOpinion", 20)); - entities.add(new ExcelExportEntity("分工会审核金额", "branchUnionAuditMoney", 20)); + entities.add(new ExcelExportEntity("基层工会审核意见", "branchUnionAuditOpinion", 20)); + entities.add(new ExcelExportEntity("基层工会审核金额", "branchUnionAuditMoney", 20)); entities.add(new ExcelExportEntity("校工会初审意见", "schoolUnionInitialAuditOpinion", 20)); entities.add(new ExcelExportEntity("校工会初审金额", "schoolUnionInitialAuditMoney", 20)); entities.add(new ExcelExportEntity("工会常委会审核意见", "schoolUnionFinalAuditOpinion", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultSchoolUnionInitialAuditController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultSchoolUnionInitialAuditController.java index e318ba4..b7c80b1 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultSchoolUnionInitialAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultSchoolUnionInitialAuditController.java @@ -208,8 +208,8 @@ public class DifficultSchoolUnionInitialAuditController { entities.add(new ExcelExportEntity("申请时间", "applyTime", 20)); entities.add(new ExcelExportEntity("联系电话", "mobile", 20)); entities.add(new ExcelExportEntity("类别", "subsidyStandards", 20)); - entities.add(new ExcelExportEntity("分工会审核意见", "branchUnionAuditOpinion", 20)); - entities.add(new ExcelExportEntity("分工会审核金额", "branchUnionAuditMoney", 20)); + entities.add(new ExcelExportEntity("基层工会审核意见", "branchUnionAuditOpinion", 20)); + entities.add(new ExcelExportEntity("基层工会审核金额", "branchUnionAuditMoney", 20)); entities.add(new ExcelExportEntity("校工会初审意见", "schoolUnionInitialAuditOpinion", 20)); entities.add(new ExcelExportEntity("校工会初审金额", "schoolUnionInitialAuditMoney", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java index 1b39c42..580fba2 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java @@ -399,7 +399,7 @@ public class RxdjShController { entityList.add(new ExcelExportEntity("青年教职工姓名", "dj_xm", 20)); entityList.add(new ExcelExportEntity("工号", "dj_gzh", 20)); entityList.add(new ExcelExportEntity("单位", "dj_szdw", 20)); - entityList.add(new ExcelExportEntity("分工会", "dj_szfgh", 20)); + entityList.add(new ExcelExportEntity("基层工会", "dj_szfgh", 20)); entityList.add(new ExcelExportEntity("职称/学历", "zc_xl", 20)); entityList.add(new ExcelExportEntity("子女姓名", "dj_znname", 20)); entityList.add(new ExcelExportEntity("子女姓别", "dj_znsex", 20)); @@ -436,7 +436,7 @@ public class RxdjShController { /** - * 通知未审核的分工会 + * 通知未审核的基层工会 * * @param sendTypes 发送方式 * @param content 发送内容 diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjSqxxController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjSqxxController.java index 17f3705..85ee676 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjSqxxController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjSqxxController.java @@ -235,7 +235,7 @@ public class RxdjSqxxController { entityList.add(new ExcelExportEntity("登记类型", "djName", 20)); entityList.add(new ExcelExportEntity("工号", "dj_gzh", 20)); entityList.add(new ExcelExportEntity("单位", "dj_szdw", 20)); - entityList.add(new ExcelExportEntity("分工会", "dj_szfgh", 20)); + entityList.add(new ExcelExportEntity("基层工会", "dj_szfgh", 20)); entityList.add(new ExcelExportEntity("职称/学历", "zc_xl", 20)); entityList.add(new ExcelExportEntity("子女姓名", "dj_znname", 20)); entityList.add(new ExcelExportEntity("子女姓别", "dj_znsex", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java index 4e34c69..160bf35 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java @@ -52,12 +52,12 @@ public class rxdjAgentController { schoolUrl = SCHOOL; } if (ShiroUtil.hasAnyRoles("sysadmin")) { - result.add(new NutMap().setv("title", title).setv("url", unitUrl).setv("iconClass", vi.getIconByPath(UNIT)).setv("label", "待分工会审核").setv("number", getUnitCount())); + result.add(new NutMap().setv("title", title).setv("url", unitUrl).setv("iconClass", vi.getIconByPath(UNIT)).setv("label", "待基层工会审核").setv("number", getUnitCount())); result.add(new NutMap().setv("title", title).setv("url", schoolUrl).setv("iconClass", vi.getIconByPath(SCHOOL)).setv("label", "待校工会审核").setv("number", getSchoolCount())); } else { if (ShiroUtil.hasAnyRoles("H04,gh01")) { - result.add(new NutMap().setv("title", title).setv("url", unitUrl).setv("iconClass", vi.getIconByPath(UNIT)).setv("label", "待分工会审核").setv("number", getUnitCount())); + result.add(new NutMap().setv("title", title).setv("url", unitUrl).setv("iconClass", vi.getIconByPath(UNIT)).setv("label", "待基层工会审核").setv("number", getUnitCount())); } if (ShiroUtil.hasAnyRoles("A06,wyh02")) { result.add(new NutMap().setv("title", title).setv("url", schoolUrl).setv("iconClass", vi.getIconByPath(SCHOOL)).setv("label", "待校工会审核").setv("number", getSchoolCount())); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/handler/condolence/CondolenceToDoHandler.java b/src/main/java/io/v/nutz/zhgh/zgfw/handler/condolence/CondolenceToDoHandler.java index 441fb00..5105fb3 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/handler/condolence/CondolenceToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/handler/condolence/CondolenceToDoHandler.java @@ -123,7 +123,7 @@ public enum CondolenceToDoHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -133,7 +133,7 @@ public enum CondolenceToDoHandler { localProcessService.createTask( "condolence_apply@" + condolence.getId(), "union_chairman_review", - "分工会审核", + "基层工会审核", ShiroUtil.getUserId(), unionLeader, "/platform/fw/condolence/ucr/union", @@ -142,13 +142,13 @@ public enum CondolenceToDoHandler { "/platform/fw/condolence/ucr/union" ); - localProcessService.updateProcessNodeName("condolence_apply@" + condolence.getId(), "分工会审核"); + localProcessService.updateProcessNodeName("condolence_apply@" + condolence.getId(), "基层工会审核"); } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/handler/difficult/DifficultToDoHandler.java b/src/main/java/io/v/nutz/zhgh/zgfw/handler/difficult/DifficultToDoHandler.java index eed835e..dab46f2 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/handler/difficult/DifficultToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/handler/difficult/DifficultToDoHandler.java @@ -79,7 +79,7 @@ public enum DifficultToDoHandler { /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK(){ @Override @@ -88,7 +88,7 @@ public enum DifficultToDoHandler { localProcessService.createTask( "zgfw_knbf@" + knbf.getId(), "branchUnionAudit", - "分工会审核", + "基层工会审核", ShiroUtil.getUserId(), unionLeader, "/platform/difficulty/branchUnionAudit", @@ -96,12 +96,12 @@ public enum DifficultToDoHandler { "/platform/difficulty/branchUnionAudit", "/platform/difficulty/branchUnionAudit" ); - localProcessService.updateProcessNodeName("zgfw_knbf@" + knbf.getId(), "分工会审核"); + localProcessService.updateProcessNodeName("zgfw_knbf@" + knbf.getId(), "基层工会审核"); } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK(){ @Override diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/handler/rxdj/RxdjToDoHandler.java b/src/main/java/io/v/nutz/zhgh/zgfw/handler/rxdj/RxdjToDoHandler.java index 7418efa..0543733 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/handler/rxdj/RxdjToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/handler/rxdj/RxdjToDoHandler.java @@ -88,7 +88,7 @@ public enum RxdjToDoHandler { /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK(){ @Override @@ -109,7 +109,7 @@ public enum RxdjToDoHandler { localProcessService.createTask( "rxdj@" + rxdj.getDj_id(), "dj_fghshr", - "分工会审核", + "基层工会审核", ShiroUtil.getUserId(), unionLeader, "/platform/zgfw/rxdj/sh/fghindex", @@ -117,12 +117,12 @@ public enum RxdjToDoHandler { "/platform/zgfw/rxdj/sh/fghindex", "/platform/zgfw/rxdj/sh/fghindex" ); - localProcessService.updateProcessNodeName("rxdj@" + rxdj.getDj_id(), "分工会审核"); + localProcessService.updateProcessNodeName("rxdj@" + rxdj.getDj_id(), "基层工会审核"); } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK(){ @Override @@ -139,7 +139,7 @@ public enum RxdjToDoHandler { }, /** - * 分工会拒绝 + * 基层工会拒绝 */ COMPLETE_UNION_TASK_REJECTED(){ @Override @@ -150,7 +150,7 @@ public enum RxdjToDoHandler { ShiroUtil.getUserId(), "" ); - localProcessService.updateProcessNodeName("rxdj@" + rxdj.getDj_id(), "分工会拒绝"); + localProcessService.updateProcessNodeName("rxdj@" + rxdj.getDj_id(), "基层工会拒绝"); localProcessService.completeProcess("rxdj@" + rxdj.getDj_id()); } }, diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/handler/singleChild/SingleChildToDoHandler.java b/src/main/java/io/v/nutz/zhgh/zgfw/handler/singleChild/SingleChildToDoHandler.java index fc66ae9..b57722b 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/handler/singleChild/SingleChildToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/handler/singleChild/SingleChildToDoHandler.java @@ -92,7 +92,7 @@ public enum SingleChildToDoHandler { }, /** - * 创建分工会任务 + * 创建基层工会任务 */ CREATE_UNION_TASK() { @Override @@ -115,7 +115,7 @@ public enum SingleChildToDoHandler { } }, /** - * 分工会完成 + * 基层工会完成 */ COMPLETE_UNION_TASK() { @Override diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java b/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java index 90d0d11..a783807 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/model/difficult/Zgfw_knbf.java @@ -87,7 +87,7 @@ public class Zgfw_knbf implements Serializable { private String unitName; @Column - @Comment("分工会id") + @Comment("基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionId; @@ -147,7 +147,7 @@ public class Zgfw_knbf implements Serializable { private String signature; @Column - @Comment("分工会审核记录id") + @Comment("基层工会审核记录id") @ColDefine(type = ColType.VARCHAR, width = 32) private String branchUnionAuditId; diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/model/rxdj/Fw_rxdj.java b/src/main/java/io/v/nutz/zhgh/zgfw/model/rxdj/Fw_rxdj.java index a51ce7f..f6dc9db 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/model/rxdj/Fw_rxdj.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/model/rxdj/Fw_rxdj.java @@ -99,12 +99,12 @@ public class Fw_rxdj implements Serializable { private String dj_szdwid; @Column - @Comment("所在分工会") + @Comment("所在基层工会") @ColDefine(type = ColType.VARCHAR, width = 100) private String dj_szfgh; @Column - @Comment("所在分工会id") + @Comment("所在基层工会id") @ColDefine(type = ColType.VARCHAR, width = 32) private String dj_szfghid; @@ -248,7 +248,7 @@ public class Fw_rxdj implements Serializable { private Date dj_tbrq; @Column - @Comment("申请状态(0.待修改 1.待分工审核 2.待校工会审核 3.分工会拒绝 4.校工会拒绝 5.审核通过)") + @Comment("申请状态(0.待修改 1.待分工审核 2.待校工会审核 3.基层工会拒绝 4.校工会拒绝 5.审核通过)") @ColDefine(type = ColType.INT, width = 10) private Integer dj_sqzt; @@ -258,17 +258,17 @@ public class Fw_rxdj implements Serializable { private Integer dj_year; @Column - @Comment("分工会审核人") + @Comment("基层工会审核人") @ColDefine(type = ColType.VARCHAR, width = 32) private String dj_fghshr; @Column - @Comment("分工会审核时间") + @Comment("基层工会审核时间") @ColDefine(type = ColType.VARCHAR, width = 20) private String dj_fghshsj; @Column - @Comment("分工会审核意见") + @Comment("基层工会审核意见") @ColDefine(type = ColType.VARCHAR, width = 155) private String dj_fghshyj; diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java b/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java index 8dd510f..249bf87 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/model/wwj/Fw_Wwj.java @@ -104,7 +104,7 @@ public class Fw_Wwj implements Serializable { private String xghqz; @Column - @Comment("审核状态(0待申请人修改 1待分工会审核 2待校工会审核 3分工会审核不通过 4校工会审核不通过 5审核通过)") + @Comment("审核状态(0待申请人修改 1待基层工会审核 2待校工会审核 3基层工会审核不通过 4校工会审核不通过 5审核通过)") @ColDefine(type = ColType.INT) private Integer status; diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/service/CondolenceService.java b/src/main/java/io/v/nutz/zhgh/zgfw/service/CondolenceService.java index 51fee6d..3e89435 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/service/CondolenceService.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/service/CondolenceService.java @@ -44,7 +44,7 @@ public interface CondolenceService extends ViService { /** - * 获取分工会待办审核人 + * 获取基层工会待办审核人 * @return */ List getUnionLeader(String userId); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/service/DifficultState.java b/src/main/java/io/v/nutz/zhgh/zgfw/service/DifficultState.java index ab746f5..c482009 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/service/DifficultState.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/service/DifficultState.java @@ -3,7 +3,7 @@ package io.v.nutz.zhgh.zgfw.service; public interface DifficultState { /** - * 待分工会审核 + * 待基层工会审核 */ int T100 = 100; diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/service/ZgfwKnbfService.java b/src/main/java/io/v/nutz/zhgh/zgfw/service/ZgfwKnbfService.java index 3007a02..c946129 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/service/ZgfwKnbfService.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/service/ZgfwKnbfService.java @@ -22,7 +22,7 @@ public interface ZgfwKnbfService extends BaseService { /** - * 获取分工会待办审核人 + * 获取基层工会待办审核人 * @return */ List getUnionLeader(String userId); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/service/impl/CondolenceServiceImpl.java b/src/main/java/io/v/nutz/zhgh/zgfw/service/impl/CondolenceServiceImpl.java index aa1fdc2..45c407e 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/service/impl/CondolenceServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/service/impl/CondolenceServiceImpl.java @@ -109,7 +109,7 @@ public class CondolenceServiceImpl extends ViServiceImpl implements if (Strings.isNotBlank(record.getString("be_sign"))) { record.set("bs", reviewService.fetch(record.getString("be_sign"))); } -// 分工会 +// 基层工会 if (Strings.isNotBlank(record.getString("union_chairman_review"))) { record.set("ucr", reviewService.fetch(record.getString("union_chairman_review"))); } diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/template/rxdj/RxdjTemp.java b/src/main/java/io/v/nutz/zhgh/zgfw/template/rxdj/RxdjTemp.java index 98e9589..1b7d8b1 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/template/rxdj/RxdjTemp.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/template/rxdj/RxdjTemp.java @@ -22,7 +22,7 @@ public class RxdjTemp { @Excel(name = "单位") private String dj_szdw; - @Excel(name = "分工会") + @Excel(name = "基层工会") private String dj_szfgh; @Excel(name = "职称") diff --git a/src/main/resources/docTemplate/funds2.docx b/src/main/resources/docTemplate/funds2.docx index bba1fdda629e435285de17147f2a1bae177b694e..6bd0875378a19fd0baf6b30f4877f5ccb167b3df 100644 GIT binary patch delta 7274 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 delta 6648 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 diff --git a/src/main/resources/static/assets/platform/js/util/commonUtil.js b/src/main/resources/static/assets/platform/js/util/commonUtil.js new file mode 100644 index 0000000..468c0d1 --- /dev/null +++ b/src/main/resources/static/assets/platform/js/util/commonUtil.js @@ -0,0 +1,68 @@ +const commonUtil = { + //权限认证 + authService() { + function authPermission(permission) { + // if (typeof permission !== "string" || !permission.trim()) { + // return false + // } + // const permissions = store.state.user.permissions + // if (!Array.isArray(permissions) || permissions.length === 0) { + // return false + // } + // const permissionsSet = new Set(permissions) + // return permissionsSet.has(permission.trim()) + } + + function authRole(role) { + if (typeof role !== "string" || !role.trim()) { + return false + } + const user = JSON.parse(window.sessionStorage.getItem('user')) + const roles = user.roles.map((item) => item.code) + if (!Array.isArray(roles) || roles.length === 0) { + return false + } + const rolesSet = new Set(roles) + return rolesSet.has(role.trim()) + } + + return { + // 验证用户是否具备某权限 + hasPermission(permission) { + return authPermission(permission) + }, + // 验证用户是否含有指定权限，只需包含其中一个 + hasPermissionOr(permissionsOrPermissionsStr) { + const permissions = Array.isArray(permissionsOrPermissionsStr) ? permissionsOrPermissionsStr : permissionsOrPermissionsStr.split(",") + return permissions.some((item) => { + return authPermission(item) + }) + }, + // 验证用户是否含有指定权限，必须全部拥有 + hasPermissionAnd(permissionsOrPermissionsStr) { + const permissions = Array.isArray(permissionsOrPermissionsStr) ? permissionsOrPermissionsStr : permissionsOrPermissionsStr.split(",") + return permissions.every((item) => { + return authPermission(item) + }) + }, + // 判断用户是否拥有某个角色 + hasRole(role) { + return authRole(role) + }, + // 判断用户是否拥有某些角色中的任意一个 + hasRoleOr(rolesOrRoleStr) { + const roles = Array.isArray(rolesOrRoleStr) ? rolesOrRoleStr : rolesOrRoleStr.split(",") + return roles.some((item) => { + return authRole(item.trim()) + }) + }, + // 判断用户是否拥有某些角色中的所有 + hasRoleAnd(rolesOrRoleStr) { + const roles = Array.isArray(rolesOrRoleStr) ? rolesOrRoleStr : rolesOrRoleStr.split(",") + return roles.every((item) => { + return authRole(item) + }) + } + } + }, +} diff --git a/src/main/resources/static/assets/platform/js/v.js b/src/main/resources/static/assets/platform/js/v.js index f71864d..200a4f9 100644 --- a/src/main/resources/static/assets/platform/js/v.js +++ b/src/main/resources/static/assets/platform/js/v.js @@ -3,7 +3,7 @@ * @returns {Promise<*>} */ const getEnumOptions = async (enumName) => { - const {data} = await $.get("/platform/vi/common/enumOptions", {enumName}) + const { data } = await $.get("/platform/vi/common/enumOptions", { enumName }) return data } @@ -12,7 +12,7 @@ const getEnumOptions = async (enumName) => { * @returns {Promise<*>} */ const getDictOptions = async (code) => { - const {data} = await $.get("/platform/vi/common/dictOptions", {code}) + const { data } = await $.get("/platform/vi/common/dictOptions", { code }) return data } @@ -21,7 +21,7 @@ const getDictOptions = async (code) => { * @returns {Promise<*>} */ const getDictState = async (code) => { - const {data} = await $.get("/platform/vi/common/dictState", {code}) + const { data } = await $.get("/platform/vi/common/dictState", { code }) return data } @@ -30,29 +30,28 @@ const getDictState = async (code) => { * @returns {Promise<*>} */ const getCampus = async () => { - const {data} = await $.get("/platform/vi/common/getCampus") + const { data } = await $.get("/platform/vi/common/getCampus") return data } - /** * 获取代表团 * @returns {Promise<*>} */ const getDbt = async (jdhId) => { - const {data} = await $.get("/platform/vi/common/getDbt", {jdhId}) + const { data } = await $.get("/platform/vi/common/getDbt", { jdhId }) return data } //查询当前用户管理的院级工会 const getUnion = async () => { - const {data} = await $.get("/platform/vi/common/getUnion") + const { data } = await $.get("/platform/vi/common/getUnion") return data } //查询当前用户管理的院级工会下的单位 const getUnit = async (unionid) => { - const {data} = await $.get("/platform/vi/common/getUnit", {unionid: unionid}) + const { data } = await $.get("/platform/vi/common/getUnit", { unionid: unionid }) return data } @@ -61,13 +60,13 @@ const getUnit = async (unionid) => { * @returns {Promise<*>} */ const getGroup = async (jdhId) => { - const {data} = await $.get("/platform/vi/common/getGroup", {jdhId}) + const { data } = await $.get("/platform/vi/common/getGroup", { jdhId }) return data } //获取所有开启的教代会 const getOpenJdh = async () => { - const {data} = await $.get("/platform/jdh/Common/getOpenJdhxx") + const { data } = await $.get("/platform/jdh/Common/getOpenJdhxx") return data } @@ -76,7 +75,7 @@ const getOpenJdh = async () => { * @returns {Promise<*>} */ const getUnions = async (delegationId = null, isPermission = false) => { - const {data} = await $.get("/platform/vi/common/unions", {delegationId, isPermission}) + const { data } = await $.get("/platform/vi/common/unions", { delegationId, isPermission }) return data } @@ -85,7 +84,7 @@ const getUnions = async (delegationId = null, isPermission = false) => { * @returns {Promise<*>} */ const getActivityUnions = async () => { - const {data} = await $.get("/platform/activity/basic/union/getActivityUnions",) + const { data } = await $.get("/platform/activity/basic/union/getActivityUnions") return data } @@ -94,12 +93,12 @@ const getActivityUnions = async () => { * @returns {Promise<*>} */ const getUnits = async (unionId = null) => { - const {data} = await $.get("/platform/vi/common/units", {unionId}) + const { data } = await $.get("/platform/vi/common/units", { unionId }) return data } const getClubUnits = async () => { - const {data} = await $.get("/platform/vi/common/getClubUnits", {}) + const { data } = await $.get("/platform/vi/common/getClubUnits", {}) return data } @@ -108,17 +107,16 @@ const getClubUnits = async () => { * @returns {Promise<*>} */ const getActivityUnits = async (unionId) => { - const {data} = await $.get("/platform/activity/basic/union/getActivityUnits", {unionId}) + const { data } = await $.get("/platform/activity/basic/union/getActivityUnits", { unionId }) return data } - /** - * 获取本分工会的单位 + * 获取本基层工会的单位 * @returns {Promise<*>} */ const getUnionUnits = async () => { - const {data} = await $.get("/platform/vi/common/unionUnits") + const { data } = await $.get("/platform/vi/common/unionUnits") return data } @@ -127,7 +125,7 @@ const getUnionUnits = async () => { * @returns {Promise<*>} */ const getWelfareUnits = async () => { - const {data} = await $.get("/platform/vi/common/welfareUnits") + const { data } = await $.get("/platform/vi/common/welfareUnits") return data } @@ -136,7 +134,7 @@ const getWelfareUnits = async () => { * @returns {Promise<*>} */ const getUnitsByWelfareUnit = async (welfareUnitId) => { - const {data} = await $.get("/platform/vi/common/unitsByWelfareUnit", {welfareUnitId}) + const { data } = await $.get("/platform/vi/common/unitsByWelfareUnit", { welfareUnitId }) return data } @@ -145,7 +143,7 @@ const getUnitsByWelfareUnit = async (welfareUnitId) => { * @returns {Promise<*>} */ const getClubs = async () => { - const {data} = await $.get("/platform/vi/common/clubs", {}) + const { data } = await $.get("/platform/vi/common/clubs", {}) return data } @@ -154,7 +152,7 @@ const getClubs = async () => { * @returns {Promise<*>} */ const getJc = async () => { - const {data} = await $.get("/platform/vi/common/getJcByDict") + const { data } = await $.get("/platform/vi/common/getJcByDict") return data } @@ -163,7 +161,7 @@ const getJc = async () => { * @returns {Promise<*>} */ const getClubsByRole = async () => { - const {data} = await $.get("/platform/vi/common/getClubsByRole", {}) + const { data } = await $.get("/platform/vi/common/getClubsByRole", {}) return data } /** @@ -171,7 +169,7 @@ const getClubsByRole = async () => { * @returns {Promise<*>} */ const getClubsByUser = async () => { - const {data} = await $.get("/platform/vi/common/getClubsByUser", {}) + const { data } = await $.get("/platform/vi/common/getClubsByUser", {}) return data } @@ -180,7 +178,7 @@ const getClubsByUser = async () => { * @returns {Promise<*>} */ const getFileType = async () => { - const {data} = await $.get("/platform/vi/common/getFileTypeByDict") + const { data } = await $.get("/platform/vi/common/getFileTypeByDict") return data } @@ -189,7 +187,7 @@ const getFileType = async () => { * @returns {Promise<*>} */ const getJcgbJs = async () => { - const {data} = await $.get("/platform/vi/common/getJcgbJsByDict") + const { data } = await $.get("/platform/vi/common/getJcgbJsByDict") return data } @@ -198,7 +196,7 @@ const getJcgbJs = async () => { * @returns {Promise<*>} */ const getSpyJs = async () => { - const {data} = await $.get("/platform/vi/common/getSpyJsByDict") + const { data } = await $.get("/platform/vi/common/getSpyJsByDict") return data } @@ -207,7 +205,7 @@ const getSpyJs = async () => { * @returns {Promise<*>} */ const getClubType = async () => { - const {data} = await $.get("/platform/vi/common/getClubTypeByDict") + const { data } = await $.get("/platform/vi/common/getClubTypeByDict") return data } @@ -216,7 +214,7 @@ const getClubType = async () => { * @returns {Promise<*>} */ const getSystemName = async () => { - const {data} = await $.get("/platform/vi/common/getSystemNameByDict") + const { data } = await $.get("/platform/vi/common/getSystemNameByDict") return data } @@ -225,7 +223,7 @@ const getSystemName = async () => { * @returns {Promise<*>} */ const getGdh = async (open = true) => { - const {data} = await $.get("/platform/vi/common/getGdh", {open}) + const { data } = await $.get("/platform/vi/common/getGdh", { open }) return data } @@ -234,7 +232,7 @@ const getGdh = async (open = true) => { * @returns {Promise<*>} */ const getGdhDbt = async (jdhId) => { - const {data} = await $.get("/platform/gdh/common/getDbt", {jdhId}) + const { data } = await $.get("/platform/gdh/common/getDbt", { jdhId }) return data } @@ -243,7 +241,7 @@ const getGdhDbt = async (jdhId) => { * @returns {Promise<*>} */ const queryUserByIds = async (ids) => { - const {data} = await $.get("/platform/vi/common/queryUserByIds", {ids: JSON.stringify(ids)}) + const { data } = await $.get("/platform/vi/common/queryUserByIds", { ids: JSON.stringify(ids) }) return data } @@ -252,7 +250,7 @@ const queryUserByIds = async (ids) => { * @returns {Promise<*>} */ const queryUserById = async (id) => { - const {data} = await $.get("/platform/vi/common/queryUserById", {id: id}) + const { data } = await $.get("/platform/vi/common/queryUserById", { id: id }) return data } @@ -266,7 +264,7 @@ const queryUserById = async (id) => { * @returns {Promise<*>} */ const searchUser = async (query, unionId = null, unitId = null, sex = null, member = null) => { - const {data} = await $.get("/platform/vi/common/searchUser", { + const { data } = await $.get("/platform/vi/common/searchUser", { query, unionId, unitId, @@ -281,7 +279,7 @@ const searchUser = async (query, unionId = null, unitId = null, sex = null, memb * @returns {Promise<*>} */ const getJdhByDb = async () => { - const {data} = await $.get("/platform/proposal/common/getJdhByDb") + const { data } = await $.get("/platform/proposal/common/getJdhByDb") return data } @@ -290,7 +288,7 @@ const getJdhByDb = async () => { * @returns {Promise<*>} */ const getOpenJdhByDb = async () => { - const {data} = await $.get("/platform/proposal/common/getOpenMeeting") + const { data } = await $.get("/platform/proposal/common/getOpenMeeting") return data } @@ -299,7 +297,7 @@ const getOpenJdhByDb = async () => { * @returns {Promise<*>} */ const getGzzllx = async () => { - const {data} = await $.get("/platform/jdh/Common/getGzzllx") + const { data } = await $.get("/platform/jdh/Common/getGzzllx") return data } @@ -308,16 +306,16 @@ const getGzzllx = async () => { * @returns {Promise<*>} */ const getLxyHd = async () => { - const {data} = await $.get("/platform/zgfw/lxy/common/getHdList") + const { data } = await $.get("/platform/zgfw/lxy/common/getHdList") return data } const getlxyHdCd = async () => { - const {data} = await $.get("/platform/zgfw/lxy/common/getlxyHdCd") + const { data } = await $.get("/platform/zgfw/lxy/common/getlxyHdCd") return data } const getNowLxyHd = async () => { - const {data} = await $.get("/platform/zgfw/lxy/common/getNowHdList") + const { data } = await $.get("/platform/zgfw/lxy/common/getNowHdList") return data } @@ -326,11 +324,11 @@ const getNowLxyHd = async () => { * @returns {Promise<*>} */ const getUnionList = async (unionId) => { - const {data} = await $.get("/platform/vi/common/unionList", {unionId}) + const { data } = await $.get("/platform/vi/common/unionList", { unionId }) return data } const threeUnitsByUnionGroupOrUnitId = async (unitId, groupId) => { - const {data} = await $.get("/platform/vi/common/threeUnitsByUnionGroupOrUnitId", { + const { data } = await $.get("/platform/vi/common/threeUnitsByUnionGroupOrUnitId", { unitId, groupId }) @@ -338,7 +336,7 @@ const threeUnitsByUnionGroupOrUnitId = async (unitId, groupId) => { } const unionGroupsByUnionId = async (unionId) => { - const {data} = await $.get("/platform/vi/common/unionGroupsByUnionId", {unionId}) + const { data } = await $.get("/platform/vi/common/unionGroupsByUnionId", { unionId }) return data } @@ -347,7 +345,7 @@ const unionGroupsByUnionId = async (unionId) => { * @returns {Promise<*>} */ const getActivityGroup = async () => { - const {data} = await $.get('/platform/activity/basic/scope/getActivityUserScopeGroup') + const { data } = await $.get("/platform/activity/basic/scope/getActivityUserScopeGroup") return data } /** @@ -355,7 +353,7 @@ const getActivityGroup = async () => { * @returns {Promise<*>} */ const getScopeUser = async (activityGroupId) => { - const {data} = await $.get('/platform/activity/basic/scope/getScopeUser', {activityGroupId}) + const { data } = await $.get("/platform/activity/basic/scope/getScopeUser", { activityGroupId }) return data } @@ -365,30 +363,30 @@ const getScopeUser = async (activityGroupId) => { * @returns {Promise<*>} */ const getActivityTwoLevelType = async (code) => { - const {data} = await $.get("/platform/activity/basic/basic/settings/getActivityTwoLevelType", {code}) + const { data } = await $.get("/platform/activity/basic/basic/settings/getActivityTwoLevelType", { code }) return data } //获取二级教代会（双代会）工作资料类型 const getJdh2Gzzllx = async () => { - const {data} = await $.get("/platform/jdh/Common/getJdh2Gzzllx") + const { data } = await $.get("/platform/jdh/Common/getJdh2Gzzllx") return data } const getLocationVariable = (variable) => { - var query = window.location.search.substring(1); - var vars = query.split("&"); + var query = window.location.search.substring(1) + var vars = query.split("&") for (let i = 0; i < vars.length; i++) { - var pair = vars[i].split("="); + var pair = vars[i].split("=") if (pair[0] == variable) { - return pair[1]; + return pair[1] } } - return ''; + return "" } const getConfigKey = async (key) => { - const {data} = await $.get('/platform/sys/conf/getValue', {key}) + const { data } = await $.get("/platform/sys/conf/getValue", { key }) return data } @@ -397,7 +395,7 @@ const getConfigKey = async (key) => { * @returns {Promise<*>} */ const getUnitByUnions = async (unionId = null) => { - const {data} = await $.get("/platform/vi/common/getUnitsByUnions", {unionId}) + const { data } = await $.get("/platform/vi/common/getUnitsByUnions", { unionId }) return data } @@ -408,7 +406,7 @@ const getUnitByUnions = async (unionId = null) => { * @returns {Promise<*>} */ const getThreeUnitsByUnionGroupsOrUnitIds = async (unitId, groupId) => { - const {data} = await $.get("/platform/vi/common/getThreeUnitsByUnionGroupsOrUnitIds", { + const { data } = await $.get("/platform/vi/common/getThreeUnitsByUnionGroupsOrUnitIds", { unitId, groupId }) @@ -421,6 +419,6 @@ const getThreeUnitsByUnionGroupsOrUnitIds = async (unitId, groupId) => { * @returns {Promise<*>} */ const getUnionGroupsByUnions = async (unionId) => { - const {data} = await $.get("/platform/vi/common/getUnionGroupsByUnions", {unionId}) + const { data } = await $.get("/platform/vi/common/getUnionGroupsByUnions", { unionId }) return data } diff --git a/src/main/resources/static/assets/platform/module/activity/activity.js b/src/main/resources/static/assets/platform/module/activity/activity.js index b0043b6..3bde146 100644 --- a/src/main/resources/static/assets/platform/module/activity/activity.js +++ b/src/main/resources/static/assets/platform/module/activity/activity.js @@ -1,49 +1,49 @@ window.activity = { getType: async () => { - const {code, data, msg} = await $.get("/platform/activity/common/getType") + const { code, data, msg } = await $.get("/platform/activity/common/getType") return data }, getTeam: async () => { - const {code, data, msg} = await $.get("/platform/activity/common/getTeam") + const { code, data, msg } = await $.get("/platform/activity/common/getTeam") return data }, getEvents: async (type) => { - const {code, data, msg} = await $.get("/platform/activity/common/getEvents",{type}) + const { code, data, msg } = await $.get("/platform/activity/common/getEvents", { type }) return data }, getSchoolActivityPlan: async (type) => { - const {code, data, msg} = await $.get("/platform/activity/common/getSchoolActivityPlan", {type}) + const { code, data, msg } = await $.get("/platform/activity/common/getSchoolActivityPlan", { type }) return data }, school: { gameStyle: { - 1: '竞赛类', - 2: '非竞赛类' + 1: "竞赛类", + 2: "非竞赛类" }, awardsMode: { - 1: '单项', - 2: '团体' + 1: "单项", + 2: "团体" }, activityLevel: { - 1: '校级', - 2: '分工会', - 3: '社团或协会' + 1: "校级", + 2: "基层工会", + 3: "社团或协会" }, combinationMethod: { - 1: '单项报名人数', - 2: '团体报名人数' + 1: "单项报名人数", + 2: "团体报名人数" }, applyWay: { - 1: '个人报名', - 2: '院级工会报名', - 3: '小程序报名' + 1: "个人报名", + 2: "院级工会报名", + 3: "小程序报名" }, getStatus(close, applyStartTime, applyEndTime, startTime, endTime) { if (close) { return `活动已关闭` } const now = moment().valueOf() - const dateNow = moment(moment(moment().format('YYYY-MM-DD')).valueOf()).valueOf() + const dateNow = moment(moment(moment().format("YYYY-MM-DD")).valueOf()).valueOf() if (now < moment(applyStartTime).valueOf()) { return `未开始报名` @@ -65,6 +65,6 @@ window.activity = { return true } return false - }, - }, + } + } } diff --git a/src/main/resources/static/components/activity/school/AddActivity.vue b/src/main/resources/static/components/activity/school/AddActivity.vue index 0d1fcd0..010adec 100644 --- a/src/main/resources/static/components/activity/school/AddActivity.vue +++ b/src/main/resources/static/components/activity/school/AddActivity.vue @@ -1,35 +1,32 @@