From 2a1d1e11edded39ab595960d45ff16ff39d70ae0 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 9 Sep 2025 20:25:19 +0800 Subject: [PATCH] commit --- .../ActivityBasicScopeController.java | 2 +- .../ActivityCultureApplyUserServiceImpl.java | 6 +- .../FitnessWalkStepManageController.java | 2 +- .../FitnessWalkStepRaffleController.java | 2 +- .../controller/AssetCategoryController.java | 9 +- .../AssetDepreciationRecordController.java | 10 +- .../controller/AssetManageController.java | 18 +- .../AssetStocktakingController.java | 11 +- .../AssetStocktakingPlanController.java | 8 +- .../asset/model/Asset.java | 2 +- .../asset/model/AssetCategory.java | 2 +- .../asset/model/AssetDepreciationRecord.java | 2 +- .../asset/model/AssetStocktaking.java | 2 +- .../asset/model/AssetStocktakingPlan.java | 2 +- .../asset/param/AssetPageForm.java | 2 +- .../AssetDepreciationRecordService.java | 6 +- .../asset/service/AssetService.java | 6 +- .../service/AssetStocktakingService.java | 6 +- .../AssetDepreciationRecordServiceImpl.java | 9 +- .../asset/service/impl/AssetServiceImpl.java | 10 +- .../impl/AssetStocktakingServiceImpl.java | 12 +- ...EnrollmentRegistrationApplyController.java | 27 +- ...llmentRegistrationApplyListController.java | 24 +- .../EnrollmentRegistrationPlanController.java | 6 +- ...mentRegistrationSchoolAuditController.java | 21 +- ...rollmentRegistrationSummaryController.java | 20 +- ...lmentRegistrationUnionAuditController.java | 15 +- .../model/EnrollmentRegistration.java | 2 +- .../model/EnrollmentRegistrationPlan.java | 2 +- .../EnrollmentRegistrationSummaryService.java | 5 +- ...ollmentRegistrationSummaryServiceImpl.java | 6 +- .../vo/EnrollmentRegistrationPageForm.java | 2 +- .../HealthCheckupCampusController.java | 7 +- .../HealthCheckupListController.java | 28 +- .../HealthCheckupProjectMangeController.java | 9 +- .../HealthCheckupSingleController.java | 15 +- .../model/HealthCheckupCampus.java | 2 +- .../model/HealthCheckupProject.java | 2 +- .../model/HealthCheckupProjectSubject.java | 2 +- .../model/HealthCheckupUnionConfirm.java | 2 +- .../model/HealthCheckupUser.java | 2 +- .../model/HealthCheckupUserCompanion.java | 2 +- .../model/HealthCheckupUserSelection.java | 2 +- .../service/HealthCheckupProjectService.java | 5 +- .../service/HealthCheckupSingleService.java | 4 +- .../impl/HealthCheckupProjectServiceImpl.java | 20 +- .../impl/HealthCheckupSingleServiceImpl.java | 10 +- .../template/HealthCheckupImportTemp.java | 2 +- .../constant/IntegralOtherModelConstant.java | 2 +- .../controller/IntegralConfigController.java | 9 +- .../controller/IntegralDetailController.java | 14 +- .../controller/IntegralManageController.java | 14 +- .../integral/model/IntegralConfig.java | 2 +- .../integral/model/IntegralDetail.java | 2 +- .../service/IntegralDetailService.java | 4 +- ...tegralInsertTaskOrSelectConfigService.java | 4 +- .../service/IntegralManageService.java | 4 +- .../impl/IntegralDetailServiceImpl.java | 6 +- ...alInsertTaskOrSelectConfigServiceImpl.java | 6 +- .../impl/IntegralManageServiceImpl.java | 10 +- .../ActivityBudgetApplyController.java | 10 +- .../ActivityBudgetApplyListController.java | 11 +- ...tivityBudgetApplyStatisticsController.java | 6 +- ...tivityBudgetQueryStatisticsController.java | 8 +- .../ActivityBudgetSchoolAuditController.java | 6 +- .../OutlayActBudgetSchoolPostInterceptor.java | 5 +- .../activityBudget/models/ActivityBudget.java | 3 +- .../models/ActivityBudgetDetails.java | 2 +- .../models/ActivityBudgetType.java | 2 +- .../ActivityBudgetApplyStatisticsService.java | 2 +- .../ActivityBudgetQueryStatisticsService.java | 2 +- .../service/ActivityBudgetService.java | 4 +- ...ivityBudgetApplyStatisticsServiceImpl.java | 14 +- ...ivityBudgetQueryStatisticsServiceImpl.java | 4 +- .../impl/ActivityBudgetServiceImpl.java | 37 +- .../template/ActivityBudgetTemp.java | 2 +- .../OutlayManageClubController.java | 6 +- .../OutlayManageClubUseDetailController.java | 8 +- .../club/model/OutlayManageClub.java | 2 +- .../outlayManage/model/OutlayUseDetail.java | 2 +- .../OutlayManageSchoolController.java | 10 +- ...OutlayManageSchoolUseDetailController.java | 15 +- .../school/model/OutlayManageSchool.java | 2 +- .../service/OutlayUseDetailService.java | 4 +- .../impl/OutlayUseDetailServiceImpl.java | 12 +- .../OutlayManageUnionController.java | 9 +- .../OutlayManageUnionUseDetailController.java | 8 +- .../union/model/OutlayManageUnion.java | 2 +- .../OutlayReimburseApplyController.java | 27 +- .../OutlayReimburseApplyListController.java | 27 +- .../OutlayReimburseClubAuditController.java | 12 +- .../OutlayReimburseClubZxAuditController.java | 14 +- ...utlayReimburseSchoolCnAuditController.java | 18 +- ...utlayReimburseSchoolKjAuditController.java | 18 +- ...utlayReimburseSchoolZxAuditController.java | 22 +- .../OutlayReimburseSummaryController.java | 16 +- .../OutlayReimburseUnionAuditController.java | 15 +- ...ReimburseSchoolKjAuditPostInterceptor.java | 7 +- ...ReimburseSchoolZxAuditPostInterceptor.java | 18 +- .../model/OutlayReimburse.java | 2 +- .../service/OutlayReimburseApplyService.java | 4 +- .../OutlayReimburseSummaryService.java | 4 +- .../impl/OutlayReimburseApplyServiceImpl.java | 14 +- .../OutlayReimburseSummaryServiceImpl.java | 6 +- .../vo/OutlayReimbursePageForm.java | 2 +- .../ExecutiveCommitteeMemberController.java | 3 - ...xcellentRecuperationSummaryController.java | 11 +- .../ChildManageManageController.java | 12 +- .../controller/ChildManageMineController.java | 9 +- .../ChildManageWriteController.java | 9 +- .../H5ChildManageManageController.java | 2 +- .../H5ChildManageMineController.java | 27 + .../H5ChildManageWriteController.java | 2 +- .../childManage/models/ChildManage.java | 2 +- .../service/ChildManageService.java | 10 + .../service/impl/ChildManageServiceImpl.java | 8 +- .../childManage/vo/ChildManagePageForm.java | 2 +- .../SingleTeacherChartController.java | 7 +- .../SingleTeacherLedgerController.java | 14 +- .../singleTeacher/models/SingleTeacher.java | 2 +- .../param/SingleTeacherPageForm.java | 2 +- .../service/SingleTeacherService.java | 6 +- .../impl/SingleTeacherServiceImpl.java | 8 +- .../controller/ThirtyTeachController.java | 19 +- .../ThirtyTeachSummaryController.java | 9 +- .../param/ThirtyTeachPageForm.java | 2 +- .../service/ThirtyTeachService.java | 4 +- .../service/impl/ThirtyTeachServiceImpl.java | 6 +- .../thirtyTeach/template/ThirtyTeachTemp.java | 2 +- .../UnionReimburseApplyController.java | 8 +- .../UnionReimburseFundSourceInterceptor.java | 11 +- .../H5ChildManageMineController.java | 40 -- .../service/ChildManageService.java | 10 - .../components/plugins/sysUpload/h5Index.vue | 346 ++++++------- .../activity/sports/applyUser/indexList.html | 4 +- .../asset/category/index.html | 0 .../asset/common/assetForm.js | 0 .../asset/common/assetInfo.js | 0 .../asset/common/assetStocktakingForm.js | 0 .../asset/depreciation/index.html | 0 .../asset/manage/index.html | 0 .../asset/stocktaking/index.html | 0 .../asset/stocktakingPlan/index.html | 0 .../enrollmentRegistration/apply/index.html | 83 +-- .../applyList/index.html | 0 .../enrollmentRegistration/info.js | 0 .../enrollmentRegistration/plan/index.html | 0 .../schoolAudit/index.html | 2 +- .../enrollmentRegistration/summary/index.html | 0 .../unionAudit/index.html | 8 +- .../dayofficework/evaluation/apply/index.html | 6 +- .../evaluation/branchUnionApproval/index.html | 2 +- .../evaluation/schoolUnionApproval/index.html | 2 +- .../healthCheckup/campus/index.html | 0 .../healthCheckup/listMange/index.html | 0 .../healthCheckup/projectMange/index.html | 0 .../healthCheckup/statisticsSingle/index.html | 0 .../integral/config/index.html | 0 .../integral/detail/index.html | 0 .../integral/manage/index.html | 0 .../outlay/activityBudget/apply/index.html | 0 .../activityBudget/applyList/index.html | 0 .../activityBudget/applyStatistics/index.html | 0 .../outlay/activityBudget/info.js | 0 .../activityBudget/queryStatistics/index.html | 0 .../activityBudget/schoolAudit/form.html | 0 .../activityBudget/schoolAudit/index.html | 2 +- .../outlayManage/club/manage/index.html | 0 .../outlayManage/club/useDetail/detailInfo.js | 0 .../outlayManage/club/useDetail/index.html | 0 .../outlayManage/common/editDetailDialog.js | 0 .../outlayManage/school/manage/index.html | 0 .../outlayManage/school/useDetail/index.html | 0 .../outlayManage/union/manage/index.html | 0 .../union/useDetail/detailInfo.js | 0 .../outlayManage/union/useDetail/index.html | 0 .../outlay/outlayReimburse/apply/index.html | 7 +- .../outlayReimburse/applyList/index.html | 14 +- .../outlayReimburse/clubAudit/index.html | 2 +- .../outlayReimburse/clubZxAudit/index.html | 2 +- .../outlay/outlayReimburse/info.js | 0 .../outlayReimburse/schoolCnAudit/index.html | 2 +- .../outlayReimburse/schoolKjAudit/index.html | 2 +- .../outlayReimburse/schoolZxAudit/index.html | 2 +- .../outlay/outlayReimburse/summary/index.html | 0 .../outlayReimburse/unionAudit/index.html | 2 +- .../activityList/basicForm.js | 5 +- .../activitySignUp/signUpForm.js | 2 +- .../schoolAudit/index.html | 2 +- .../{user => staffmanage}/childManage/info.js | 0 .../childManage/manage/index.html | 0 .../childManage/mine/index.html | 0 .../childManage/write/index.html | 0 .../singleTeacher/chart/index.html | 0 .../singleTeacher/ledger/formEdit.js | 0 .../singleTeacher/ledger/index.html | 0 .../thirtyTeach/manage/index.html | 0 .../thirtyTeach/summary/index.html | 0 .../enrollmentRegistration/apply/index.html | 479 ++++++++++++++++++ .../enrollmentRegistration/info.js | 170 +++++++ .../enrollmentRegistration/mine/index.html | 60 ++- .../schoolAudit/index.html | 186 +++++++ .../unionAudit/index.html | 188 +++++++ .../outlayReimburse/apply/index.html | 464 +++++++++++++++++ .../outlayReimburse/applyList/index.html | 136 +++++ .../outlayReimburse/clubAudit/index.html | 185 +++++++ .../outlayReimburse/clubZxAudit/index.html | 185 +++++++ .../dayofficework/outlayReimburse/info.js | 146 ++++++ .../outlayReimburse/schoolCnAudit/index.html | 185 +++++++ .../outlayReimburse/schoolKjAudit/index.html | 207 ++++++++ .../outlayReimburse/schoolZxAudit/index.html | 185 +++++++ .../outlayReimburse/unionAudit/index.html | 185 +++++++ 212 files changed, 3716 insertions(+), 863 deletions(-) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/controller/AssetCategoryController.java (90%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/controller/AssetDepreciationRecordController.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/controller/AssetManageController.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/controller/AssetStocktakingController.java (85%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/controller/AssetStocktakingPlanController.java (91%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/model/Asset.java (98%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/model/AssetCategory.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/model/AssetDepreciationRecord.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/model/AssetStocktaking.java (97%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/model/AssetStocktakingPlan.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/param/AssetPageForm.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/service/AssetDepreciationRecordService.java (77%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/service/AssetService.java (57%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/service/AssetStocktakingService.java (62%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/service/impl/AssetDepreciationRecordServiceImpl.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/service/impl/AssetServiceImpl.java (90%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/asset/service/impl/AssetStocktakingServiceImpl.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java (79%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java (78%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java (89%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java (84%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java (90%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java (87%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/model/EnrollmentRegistration.java (98%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/model/EnrollmentRegistrationPlan.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java (53%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java (89%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java (82%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/controller/HealthCheckupCampusController.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/controller/HealthCheckupListController.java (91%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/controller/HealthCheckupProjectMangeController.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/controller/HealthCheckupSingleController.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupCampus.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupProject.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupProjectSubject.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupUnionConfirm.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupUser.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupUserCompanion.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/model/HealthCheckupUserSelection.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/service/HealthCheckupProjectService.java (76%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/service/HealthCheckupSingleService.java (87%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/healthCheckup/template/HealthCheckupImportTemp.java (91%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/constant/IntegralOtherModelConstant.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/controller/IntegralConfigController.java (82%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/controller/IntegralDetailController.java (90%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/controller/IntegralManageController.java (97%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/model/IntegralConfig.java (97%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/model/IntegralDetail.java (97%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/service/IntegralDetailService.java (75%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/service/IntegralInsertTaskOrSelectConfigService.java (84%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/service/IntegralManageService.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/service/impl/IntegralDetailServiceImpl.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/integral/service/impl/IntegralManageServiceImpl.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java (91%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java (87%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/models/ActivityBudget.java (97%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/models/ActivityBudgetDetails.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/models/ActivityBudgetType.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java (80%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java (80%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/service/ActivityBudgetService.java (81%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java (87%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/activityBudget/template/ActivityBudgetTemp.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/club/controller/OutlayManageClubController.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/club/model/OutlayManageClub.java (94%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/model/OutlayUseDetail.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/school/controller/OutlayManageSchoolController.java (91%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/school/model/OutlayManageSchool.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/service/OutlayUseDetailService.java (72%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java (84%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/union/controller/OutlayManageUnionController.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayManage/union/model/OutlayManageUnion.java (95%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java (79%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java (70%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java (89%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java (85%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java (89%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java (86%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java (78%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java (89%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/model/OutlayReimburse.java (97%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/service/OutlayReimburseApplyService.java (86%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java (56%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java (96%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java (91%) rename src/main/java/com/budwk/app/zhgh/{ => dayofficework}/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java (84%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/controller/ChildManageManageController.java (94%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/controller/ChildManageMineController.java (86%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/controller/ChildManageWriteController.java (91%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/h5controller/H5ChildManageManageController.java (88%) create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageMineController.java rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/h5controller/H5ChildManageWriteController.java (91%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/models/ChildManage.java (98%) create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/ChildManageService.java rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/service/impl/ChildManageServiceImpl.java (89%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/childManage/vo/ChildManagePageForm.java (84%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/singleTeacher/controller/SingleTeacherChartController.java (86%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/singleTeacher/controller/SingleTeacherLedgerController.java (88%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/singleTeacher/models/SingleTeacher.java (97%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/singleTeacher/param/SingleTeacherPageForm.java (93%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/singleTeacher/service/SingleTeacherService.java (62%) rename src/main/java/com/budwk/app/zhgh/{user => staffmanage}/singleTeacher/service/impl/SingleTeacherServiceImpl.java (93%) rename src/main/java/com/budwk/app/zhgh/{ => staffmanage}/thirtyTeach/controller/ThirtyTeachController.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => staffmanage}/thirtyTeach/controller/ThirtyTeachSummaryController.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => staffmanage}/thirtyTeach/param/ThirtyTeachPageForm.java (88%) rename src/main/java/com/budwk/app/zhgh/{ => staffmanage}/thirtyTeach/service/ThirtyTeachService.java (64%) rename src/main/java/com/budwk/app/zhgh/{ => staffmanage}/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java (92%) rename src/main/java/com/budwk/app/zhgh/{ => staffmanage}/thirtyTeach/template/ThirtyTeachTemp.java (92%) delete mode 100644 src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java delete mode 100644 src/main/java/com/budwk/app/zhgh/user/childManage/service/ChildManageService.java rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/category/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/common/assetForm.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/common/assetInfo.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/common/assetStocktakingForm.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/depreciation/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/stocktaking/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/asset/stocktakingPlan/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/apply/index.html (85%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/applyList/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/info.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/plan/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/schoolAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/summary/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/enrollmentRegistration/unionAudit/index.html (97%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/healthCheckup/campus/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/healthCheckup/listMange/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/healthCheckup/projectMange/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/healthCheckup/statisticsSingle/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/integral/config/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/integral/detail/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/integral/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/apply/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/applyList/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/applyStatistics/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/info.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/queryStatistics/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/schoolAudit/form.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/activityBudget/schoolAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/club/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/club/useDetail/detailInfo.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/club/useDetail/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/common/editDetailDialog.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/school/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/school/useDetail/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/union/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/union/useDetail/detailInfo.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayManage/union/useDetail/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/apply/index.html (98%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/applyList/index.html (90%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/clubAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/clubZxAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/info.js (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/schoolCnAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/schoolKjAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/schoolZxAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/summary/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => dayofficework}/outlay/outlayReimburse/unionAudit/index.html (99%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/childManage/info.js (100%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/childManage/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/childManage/mine/index.html (100%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/childManage/write/index.html (100%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/singleTeacher/chart/index.html (100%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/singleTeacher/ledger/formEdit.js (100%) rename src/main/resources/views/platform/zhgh/{user => staffmanage}/singleTeacher/ledger/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => staffmanage}/thirtyTeach/manage/index.html (100%) rename src/main/resources/views/platform/zhgh/{ => staffmanage}/thirtyTeach/summary/index.html (100%) create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/info.js rename src/main/resources/views/platform/zhghh5/{ => dayofficework}/enrollmentRegistration/mine/index.html (72%) create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/schoolAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/unionAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/applyList/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubZxAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/info.js create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolCnAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolKjAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolZxAudit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/unionAudit/index.html diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index 6c6f2d2a..65d06236 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -107,7 +107,7 @@ public class ActivityBasicScopeController { FROM `vw_user` u LEFT JOIN sys_user_role sur on sur.userid = u.id - LEFT JOIN sys_club_user clubuser ON clubuser.userid=u.id + LEFT JOIN club_user clubuser ON clubuser.userid=u.id $condition """); try { diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java index 3c5d15a8..207fdb15 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java @@ -64,8 +64,10 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl { diff --git a/src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetDepreciationRecordServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetDepreciationRecordServiceImpl.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetDepreciationRecordServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetDepreciationRecordServiceImpl.java index f1bab5b3..bc9fce14 100644 --- a/src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetDepreciationRecordServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetDepreciationRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.asset.service.impl; +package com.budwk.app.zhgh.dayofficework.asset.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -6,10 +6,9 @@ import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.asset.model.Asset; -import com.budwk.app.zhgh.asset.model.AssetDepreciationRecord; -import com.budwk.app.zhgh.asset.param.AssetPageForm; -import com.budwk.app.zhgh.asset.service.AssetDepreciationRecordService; +import com.budwk.app.zhgh.dayofficework.asset.model.AssetDepreciationRecord; +import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm; +import com.budwk.app.zhgh.dayofficework.asset.service.AssetDepreciationRecordService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetServiceImpl.java similarity index 90% rename from src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetServiceImpl.java index 7711852b..566d3dae 100644 --- a/src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetServiceImpl.java @@ -1,14 +1,14 @@ -package com.budwk.app.zhgh.asset.service.impl; +package com.budwk.app.zhgh.dayofficework.asset.service.impl; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.asset.model.Asset; -import com.budwk.app.zhgh.asset.model.AssetStocktaking; -import com.budwk.app.zhgh.asset.param.AssetPageForm; -import com.budwk.app.zhgh.asset.service.AssetService; +import com.budwk.app.zhgh.dayofficework.asset.model.Asset; +import com.budwk.app.zhgh.dayofficework.asset.model.AssetStocktaking; +import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm; +import com.budwk.app.zhgh.dayofficework.asset.service.AssetService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetStocktakingServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetStocktakingServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java index 1d9090ad..ae48a7cd 100644 --- a/src/main/java/com/budwk/app/zhgh/asset/service/impl/AssetStocktakingServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java @@ -1,22 +1,20 @@ -package com.budwk.app.zhgh.asset.service.impl; +package com.budwk.app.zhgh.dayofficework.asset.service.impl; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.sys.models.Sys_union; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.asset.model.Asset; -import com.budwk.app.zhgh.asset.model.AssetStocktaking; -import com.budwk.app.zhgh.asset.param.AssetPageForm; -import com.budwk.app.zhgh.asset.service.AssetStocktakingService; +import com.budwk.app.zhgh.dayofficework.asset.model.Asset; +import com.budwk.app.zhgh.dayofficework.asset.model.AssetStocktaking; +import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm; +import com.budwk.app.zhgh.dayofficework.asset.service.AssetStocktakingService; 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.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.IocBean; /** diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java similarity index 79% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java index d592ddd1..afb35c03 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationApplyController.java @@ -1,7 +1,8 @@ -package com.budwk.app.zhgh.enrollmentRegistration.controller; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; @@ -15,7 +16,7 @@ import com.budwk.app.flow.entity.ProcessTask; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model.EnrollmentRegistration; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -56,15 +57,21 @@ public class EnrollmentRegistrationApplyController { @At("/index") - @Ok("beetl:/platform/zhgh/enrollmentRegistration/apply/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/enrollmentRegistration/apply/index.html") @SaCheckPermission("enrollmentRegistration.apply") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html") + @SaCheckPermission("h5.enrollmentRegistration.apply") + public void h5Index() { + } + @At @ApiOperation("查询可以登记的计划") - @SaCheckPermission("enrollmentRegistration.apply") + @SaCheckPermission(value = {"enrollmentRegistration.apply", "h5.enrollmentRegistration.apply"}, mode = SaMode.OR) public Result getEnrollmentRegistrationPlan() { Sql sql = Sqls.create(""" SELECT @@ -82,9 +89,9 @@ public class EnrollmentRegistrationApplyController { } @At - @SaCheckPermission("enrollmentRegistration.apply") + @SaCheckPermission(value = {"enrollmentRegistration.apply", "h5.enrollmentRegistration.apply"}, mode = SaMode.OR) @ApiOperation("保存申请") - @SLog( tag = "子女入学管理-子女入学登记", msg = "保存子女入学登记") + @SLog(tag = "子女入学管理-子女入学登记", msg = "保存子女入学登记") public Result save(@Param("data") EnrollmentRegistration enrollmentRegistration) { enrollmentRegistration.setApplyTime(DateUtil.now()); baseService.insertOrUpdate(enrollmentRegistration); @@ -92,10 +99,10 @@ public class EnrollmentRegistrationApplyController { } @At - @SaCheckPermission("enrollmentRegistration.apply") + @SaCheckPermission(value = {"enrollmentRegistration.apply", "h5.enrollmentRegistration.apply"}, mode = SaMode.OR) @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) - @SLog( tag = "子女入学管理-子女入学登记", msg = "重新提交申请") + @SLog(tag = "子女入学管理-子女入学登记", msg = "重新提交申请") public Result submitAgain(@Param("data") EnrollmentRegistration enrollmentRegistration, @Param("taskId") Long taskId) { baseService.insertOrUpdate(enrollmentRegistration); @@ -107,9 +114,9 @@ public class EnrollmentRegistrationApplyController { } @At - @SaCheckPermission("enrollmentRegistration.apply") + @SaCheckPermission(value = {"enrollmentRegistration.apply", "h5.enrollmentRegistration.apply"}, mode = SaMode.OR) @ApiOperation("提交申请") - @SLog( tag = "子女入学管理-子女入学登记", msg = "提交子女入学登记") + @SLog(tag = "子女入学管理-子女入学登记", msg = "提交子女入学登记") public Result submit(@Param("data") EnrollmentRegistration enrollmentRegistration) { if (StrUtil.isBlank(enrollmentRegistration.getId())) { enrollmentRegistration.setApplyTime(DateUtil.now()); diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java similarity index 78% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java index a4a3d5c7..58612fcc 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationApplyListController.java @@ -1,21 +1,20 @@ -package com.budwk.app.zhgh.enrollmentRegistration.controller; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model.EnrollmentRegistration; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -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.mvc.annotation.At; @@ -38,14 +37,20 @@ public class EnrollmentRegistrationApplyListController { @At("/index") - @Ok("beetl:/platform/zhgh/enrollmentRegistration/applyList/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/enrollmentRegistration/applyList/index.html") @SaCheckPermission("enrollmentRegistration.applyList") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/enrollmentRegistration/mine/index.html") + @SaCheckPermission("h5.enrollmentRegistration.applyList") + public void h5Index() { + } + @At @ApiOperation("分页查询") - @SaCheckPermission("enrollmentRegistration.applyList") + @SaCheckPermission(value = {"enrollmentRegistration.applyList", "h5.enrollmentRegistration.applyList"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year) { @@ -55,7 +60,7 @@ public class EnrollmentRegistrationApplyListController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, @@ -65,7 +70,7 @@ public class EnrollmentRegistrationApplyListController { t.taskState, t.finishTime, t.taskParentId, - t.variable taskVariale, + t.variable taskVariable, IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask' AND taskState IN (10, 20)) AS startTaskId FROM @@ -86,8 +91,7 @@ public class EnrollmentRegistrationApplyListController { @At @ApiOperation("删除子女入学信息") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("enrollmentRegistration.applyList") + @SaCheckPermission(value = {"enrollmentRegistration.applyList", "h5.enrollmentRegistration.applyList"}, mode = SaMode.OR) @SLog(tag = "子女入学-我的填报", msg = "删除id: ${args[0]}") public Result doDelete(String id) { baseService.dao().delete(EnrollmentRegistration.class, id); diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java index 91e38ea8..7090563b 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationPlanController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.enrollmentRegistration.controller; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.annotation.SLog; @@ -6,7 +6,7 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistrationPlan; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model.EnrollmentRegistrationPlan; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -38,7 +38,7 @@ public class EnrollmentRegistrationPlanController { private BaseService baseService; @At("/index") - @Ok("beetl:/platform/zhgh/enrollmentRegistration/plan/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/enrollmentRegistration/plan/index.html") @SaCheckPermission("enrollmentRegistration.plan") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java similarity index 84% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java index ab44ec8c..757bdfb7 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationSchoolAuditController.java @@ -1,6 +1,7 @@ -package com.budwk.app.zhgh.enrollmentRegistration.controller; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -39,16 +40,22 @@ public class EnrollmentRegistrationSchoolAuditController { private BaseService baseService; @At("/index") - @Ok("beetl:/platform/zhgh/enrollmentRegistration/schoolAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html") @SaCheckPermission("enrollmentRegistration.schoolAudit") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/enrollmentRegistration/schoolAudit/index.html") + @SaCheckPermission("h5.enrollmentRegistration.schoolAudit") + public void h5Index() { + } + @At @ApiOperation("分页查询") - @SaCheckPermission("enrollmentRegistration.schoolAudit") + @SaCheckPermission(value = {"enrollmentRegistration.schoolAudit", "h5.enrollmentRegistration.schoolAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year, String unionId, @@ -62,7 +69,7 @@ public class EnrollmentRegistrationSchoolAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, @@ -87,9 +94,9 @@ public class EnrollmentRegistrationSchoolAuditController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "=", "fcdea609-e3e9-41bc-94c0-61d09ab03dcc"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - cnd.andEX("info.unionId","=",unionId); - cnd.andEX("info.unitId","=",unitId); - cnd.andEX("info.registrationType","=",registrationType); + cnd.andEX("info.unionId", "=", unionId); + cnd.andEX("info.unitId", "=", unitId); + cnd.andEX("info.registrationType", "=", registrationType); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java similarity index 90% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java index 49c33a13..d723e878 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationSummaryController.java @@ -1,38 +1,29 @@ -package com.budwk.app.zhgh.enrollmentRegistration.controller; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.json.JSONObject; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.base.service.BaseService; -import com.budwk.app.bpm.service.BpmService; import com.budwk.app.flow.engine.FlowEngine; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.sys.services.SysFileService; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; -import com.budwk.app.zhgh.enrollmentRegistration.service.EnrollmentRegistrationSummaryService; -import com.budwk.app.zhgh.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model.EnrollmentRegistration; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.service.EnrollmentRegistrationSummaryService; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.Workbook; 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; @@ -48,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.BufferedOutputStream; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -78,7 +68,7 @@ public class EnrollmentRegistrationSummaryController { @At("/index") - @Ok("beetl:/platform/zhgh/enrollmentRegistration/summary/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/enrollmentRegistration/summary/index.html") @SaCheckPermission("enrollmentRegistration.summary") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java similarity index 87% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java index 11e9d64d..ba7578f5 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/controller/EnrollmentRegistrationUnionAuditController.java @@ -1,6 +1,7 @@ -package com.budwk.app.zhgh.enrollmentRegistration.controller; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -39,16 +40,22 @@ public class EnrollmentRegistrationUnionAuditController { private BaseService baseService; @At("/index") - @Ok("beetl:/platform/zhgh/enrollmentRegistration/unionAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/enrollmentRegistration/unionAudit/index.html") @SaCheckPermission("enrollmentRegistration.unionAudit") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/enrollmentRegistration/unionAudit/index.html") + @SaCheckPermission("h5.enrollmentRegistration.unionAudit") + public void h5Index() { + } + @At @ApiOperation("分页查询") - @SaCheckPermission("enrollmentRegistration.unionAudit") + @SaCheckPermission(value = {"enrollmentRegistration.unionAudit", "h5.enrollmentRegistration.unionAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year, String registrationType, @@ -60,7 +67,7 @@ public class EnrollmentRegistrationUnionAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/model/EnrollmentRegistration.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/model/EnrollmentRegistration.java similarity index 98% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/model/EnrollmentRegistration.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/model/EnrollmentRegistration.java index ffa6927b..d5a16e85 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/model/EnrollmentRegistration.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/model/EnrollmentRegistration.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.enrollmentRegistration.model; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/model/EnrollmentRegistrationPlan.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/model/EnrollmentRegistrationPlan.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/model/EnrollmentRegistrationPlan.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/model/EnrollmentRegistrationPlan.java index cba552c3..90185178 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/model/EnrollmentRegistrationPlan.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/model/EnrollmentRegistrationPlan.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.enrollmentRegistration.model; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java similarity index 53% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java index 89749a3e..9656d2fa 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/service/EnrollmentRegistrationSummaryService.java @@ -1,8 +1,7 @@ -package com.budwk.app.zhgh.enrollmentRegistration.service; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.service; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; import org.nutz.dao.sql.Sql; public interface EnrollmentRegistrationSummaryService extends BaseService { diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java index c3ceb875..53102239 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/service/impl/EnrollmentRegistrationSummaryServiceImpl.java @@ -1,9 +1,9 @@ -package com.budwk.app.zhgh.enrollmentRegistration.service.impl; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.service.impl; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.zhgh.enrollmentRegistration.service.EnrollmentRegistrationSummaryService; -import com.budwk.app.zhgh.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.service.EnrollmentRegistrationSummaryService; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java similarity index 82% rename from src/main/java/com/budwk/app/zhgh/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java index 3b38114a..18a7605e 100644 --- a/src/main/java/com/budwk/app/zhgh/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/enrollmentRegistration/vo/EnrollmentRegistrationPageForm.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.enrollmentRegistration.vo; +package com.budwk.app.zhgh.dayofficework.enrollmentRegistration.vo; import com.budwk.app.base.param.PageForm; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupCampusController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupCampusController.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupCampusController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupCampusController.java index e48131dd..ef5695a6 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupCampusController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupCampusController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.controller; +package com.budwk.app.zhgh.dayofficework.healthCheckup.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -6,7 +6,7 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupCampus; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupCampus; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -15,7 +15,6 @@ import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.random.R; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; @@ -40,7 +39,7 @@ public class HealthCheckupCampusController { private BaseService baseService; @At("") - @Ok("beetl:/platform/zhgh/healthCheckup/campus/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/healthCheckup/campus/index.html") @SaCheckPermission("healthCheckup.campus") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupListController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java index d081d452..64312368 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java @@ -1,21 +1,12 @@ -package com.budwk.app.zhgh.healthCheckup.controller; +package com.budwk.app.zhgh.dayofficework.healthCheckup.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.ImportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.model.ExcelImportRes; @@ -24,21 +15,15 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.EasyExcelUtil; -import com.budwk.app.sys.models.Sys_user; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; -import com.budwk.app.zhgh.healthCheckup.model.*; -import com.budwk.app.zhgh.healthCheckup.service.HealthCheckupProjectService; -import com.budwk.app.zhgh.healthCheckup.template.HealthCheckupImportTemp; -import com.budwk.app.zhgh.integral.controller.IntegralManageController; -import com.budwk.app.zhgh.welfare.mode.WelfareUserImportExcel; -import com.budwk.app.zhgh.welfare.model.WelfareList; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.*; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupProjectService; +import com.budwk.app.zhgh.dayofficework.healthCheckup.template.HealthCheckupImportTemp; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; @@ -48,7 +33,6 @@ 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.Daos; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -58,12 +42,10 @@ import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.AdaptBy; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; import org.nutz.mvc.upload.TempFile; import org.nutz.mvc.upload.UploadAdaptor; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -90,7 +72,7 @@ public class HealthCheckupListController { private HealthCheckupProjectService healthCheckupProjectService; @At("") - @Ok("beetl:/platform/zhgh/healthCheckup/listMange/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/healthCheckup/listMange/index.html") @SaCheckPermission("healthCheckup.list.mange") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupProjectMangeController.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupProjectMangeController.java index 5cd695fd..fc70ea7a 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupProjectMangeController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.controller; +package com.budwk.app.zhgh.dayofficework.healthCheckup.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; @@ -7,8 +7,8 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_union; -import com.budwk.app.zhgh.healthCheckup.model.*; -import com.budwk.app.zhgh.healthCheckup.service.HealthCheckupProjectService; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.*; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupProjectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; @@ -19,7 +19,6 @@ import org.nutz.dao.util.Daos; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -46,7 +45,7 @@ public class HealthCheckupProjectMangeController { @At("") - @Ok("beetl:/platform/zhgh/healthCheckup/projectMange/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html") @SaCheckPermission("healthCheckup.projectMange") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupSingleController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java index cc59391b..9b042822 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/controller/HealthCheckupSingleController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.controller; +package com.budwk.app.zhgh.dayofficework.healthCheckup.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -11,10 +11,10 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.ManyAddOrRenewUtil; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProject; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProjectSubject; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupUserSelection; -import com.budwk.app.zhgh.healthCheckup.service.HealthCheckupSingleService; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProject; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubject; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUserSelection; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupSingleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; @@ -28,11 +28,8 @@ import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -58,7 +55,7 @@ public class HealthCheckupSingleController { private ManyAddOrRenewUtil manyAddOrRenewUtil; @At("") - @Ok("beetl:/platform/zhgh/healthCheckup/statisticsSingle/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html") @SaCheckPermission("healthCheckup.statisticsSingle") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupCampus.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupCampus.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupCampus.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupCampus.java index 76a0811f..ff38ced8 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupCampus.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupCampus.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupProject.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupProject.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java index d9d67564..738ac9bd 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupProject.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProject.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupProjectSubject.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupProjectSubject.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java index 45b9fe19..b21eb9a8 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupProjectSubject.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupProjectSubject.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUnionConfirm.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUnionConfirm.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUnionConfirm.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUnionConfirm.java index 154f4f4e..8fac91b1 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUnionConfirm.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUnionConfirm.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUser.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUser.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUser.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUser.java index bba44ff1..3d72bf8a 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUser.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUser.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUserCompanion.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserCompanion.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUserCompanion.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserCompanion.java index 976d26e4..dc17fe0b 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUserCompanion.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserCompanion.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUserSelection.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUserSelection.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java index 6d6b381d..a0a01032 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/model/HealthCheckupUserSelection.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/model/HealthCheckupUserSelection.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.model; +package com.budwk.app.zhgh.dayofficework.healthCheckup.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/HealthCheckupProjectService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupProjectService.java similarity index 76% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/service/HealthCheckupProjectService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupProjectService.java index cbd20d88..ddb2bb59 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/HealthCheckupProjectService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupProjectService.java @@ -1,8 +1,7 @@ -package com.budwk.app.zhgh.healthCheckup.service; +package com.budwk.app.zhgh.dayofficework.healthCheckup.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProject; -import org.nutz.lang.util.NutMap; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProject; public interface HealthCheckupProjectService extends BaseService { diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/HealthCheckupSingleService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java similarity index 87% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/service/HealthCheckupSingleService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java index 011ec646..001316b8 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/HealthCheckupSingleService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/HealthCheckupSingleService.java @@ -1,8 +1,8 @@ -package com.budwk.app.zhgh.healthCheckup.service; +package com.budwk.app.zhgh.dayofficework.healthCheckup.service; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProject; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProject; import org.nutz.lang.util.NutMap; import java.util.List; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java index f874509f..68a82fdd 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java @@ -1,35 +1,27 @@ -package com.budwk.app.zhgh.healthCheckup.service.impl; +package com.budwk.app.zhgh.dayofficework.healthCheckup.service.impl; -import cn.hutool.core.date.DateUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.utils.ManyAddOrRenewUtil; -import com.budwk.app.sys.models.Sys_user; import com.budwk.app.sys.views.View_user; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProject; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupUser; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupUserCompanion; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupUserSelection; -import com.budwk.app.zhgh.healthCheckup.service.HealthCheckupProjectService; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProject; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUser; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUserCompanion; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUserSelection; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupProjectService; 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.entity.annotation.Comment; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.Daos; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Lang; -import org.nutz.lang.Mirror; import org.nutz.lang.Strings; import org.nutz.lang.random.R; import org.nutz.lang.util.NutMap; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index dd62a762..e67576db 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -1,11 +1,11 @@ -package com.budwk.app.zhgh.healthCheckup.service.impl; +package com.budwk.app.zhgh.dayofficework.healthCheckup.service.impl; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProject; -import com.budwk.app.zhgh.healthCheckup.model.HealthCheckupProjectSubject; -import com.budwk.app.zhgh.healthCheckup.service.HealthCheckupProjectService; -import com.budwk.app.zhgh.healthCheckup.service.HealthCheckupSingleService; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProject; +import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubject; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupProjectService; +import com.budwk.app.zhgh.dayofficework.healthCheckup.service.HealthCheckupSingleService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/healthCheckup/template/HealthCheckupImportTemp.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/template/HealthCheckupImportTemp.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/healthCheckup/template/HealthCheckupImportTemp.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/template/HealthCheckupImportTemp.java index 456b899a..1b31e291 100644 --- a/src/main/java/com/budwk/app/zhgh/healthCheckup/template/HealthCheckupImportTemp.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/template/HealthCheckupImportTemp.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.healthCheckup.template; +package com.budwk.app.zhgh.dayofficework.healthCheckup.template; import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/budwk/app/zhgh/integral/constant/IntegralOtherModelConstant.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/constant/IntegralOtherModelConstant.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/integral/constant/IntegralOtherModelConstant.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/constant/IntegralOtherModelConstant.java index 7600fcb9..ac3dc18b 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/constant/IntegralOtherModelConstant.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/constant/IntegralOtherModelConstant.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.integral.constant; +package com.budwk.app.zhgh.dayofficework.integral.constant; import com.budwk.app.base.annotation.DictEnum; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/budwk/app/zhgh/integral/controller/IntegralConfigController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralConfigController.java similarity index 82% rename from src/main/java/com/budwk/app/zhgh/integral/controller/IntegralConfigController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralConfigController.java index f5816176..e66f49a4 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/controller/IntegralConfigController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralConfigController.java @@ -1,10 +1,9 @@ -package com.budwk.app.zhgh.integral.controller; +package com.budwk.app.zhgh.dayofficework.integral.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.integral.model.IntegralConfig; -import com.budwk.app.zhgh.integral.service.IntegralInsertTaskOrSelectConfigService; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralConfig; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralInsertTaskOrSelectConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -33,7 +32,7 @@ public class IntegralConfigController { @At("") - @Ok("beetl:/platform/zhgh/integral/config/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/integral/config/index.html") @SaCheckPermission("integral.config") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/integral/controller/IntegralDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralDetailController.java similarity index 90% rename from src/main/java/com/budwk/app/zhgh/integral/controller/IntegralDetailController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralDetailController.java index 72d04c31..5806b207 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/controller/IntegralDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralDetailController.java @@ -1,25 +1,19 @@ -package com.budwk.app.zhgh.integral.controller; +package com.budwk.app.zhgh.dayofficework.integral.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.sys.models.Sys_union; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.integral.service.IntegralDetailService; -import com.budwk.app.zhgh.integral.service.IntegralManageService; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralDetailService; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralManageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Strings; @@ -56,7 +50,7 @@ public class IntegralDetailController { @At("") - @Ok("beetl:/platform/zhgh/integral/detail/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/integral/detail/index.html") @SaCheckPermission("integral.detail") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/integral/controller/IntegralManageController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralManageController.java similarity index 97% rename from src/main/java/com/budwk/app/zhgh/integral/controller/IntegralManageController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralManageController.java index d0eab178..57f209ba 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/controller/IntegralManageController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralManageController.java @@ -1,11 +1,10 @@ -package com.budwk.app.zhgh.integral.controller; +package com.budwk.app.zhgh.dayofficework.integral.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.annotation.ExcelIgnore; @@ -13,18 +12,14 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.EasyExcelUtil; import com.budwk.app.sys.models.Sys_union; import com.budwk.app.sys.views.View_user; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.benefit.mode.BenefitUserTemp; -import com.budwk.app.zhgh.integral.model.IntegralDetail; -import com.budwk.app.zhgh.integral.service.IntegralManageService; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralManageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.Data; @@ -36,7 +31,6 @@ 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; @@ -70,7 +64,7 @@ public class IntegralManageController { private IntegralManageService integralManageService; @At("") - @Ok("beetl:/platform/zhgh/integral/manage/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/integral/manage/index.html") @SaCheckPermission("integral.manage") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/integral/model/IntegralConfig.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/model/IntegralConfig.java similarity index 97% rename from src/main/java/com/budwk/app/zhgh/integral/model/IntegralConfig.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/model/IntegralConfig.java index 51bf972b..cfc02963 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/model/IntegralConfig.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/model/IntegralConfig.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.integral.model; +package com.budwk.app.zhgh.dayofficework.integral.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/model/IntegralDetail.java similarity index 97% rename from src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/model/IntegralDetail.java index 95dfc55c..17ca0e2a 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/model/IntegralDetail.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.integral.model; +package com.budwk.app.zhgh.dayofficework.integral.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/integral/service/IntegralDetailService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralDetailService.java similarity index 75% rename from src/main/java/com/budwk/app/zhgh/integral/service/IntegralDetailService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralDetailService.java index ee5b4298..962e6d3e 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/service/IntegralDetailService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralDetailService.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.integral.service; +package com.budwk.app.zhgh.dayofficework.integral.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.integral.model.IntegralDetail; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail; import org.nutz.dao.sql.Sql; public interface IntegralDetailService extends BaseService { diff --git a/src/main/java/com/budwk/app/zhgh/integral/service/IntegralInsertTaskOrSelectConfigService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralInsertTaskOrSelectConfigService.java similarity index 84% rename from src/main/java/com/budwk/app/zhgh/integral/service/IntegralInsertTaskOrSelectConfigService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralInsertTaskOrSelectConfigService.java index 50bc3359..7f7e31c7 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/service/IntegralInsertTaskOrSelectConfigService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralInsertTaskOrSelectConfigService.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.integral.service; +package com.budwk.app.zhgh.dayofficework.integral.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.integral.model.IntegralConfig; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralConfig; public interface IntegralInsertTaskOrSelectConfigService extends BaseService { diff --git a/src/main/java/com/budwk/app/zhgh/integral/service/IntegralManageService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralManageService.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/integral/service/IntegralManageService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralManageService.java index 58032189..37466c37 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/service/IntegralManageService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/IntegralManageService.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.integral.service; +package com.budwk.app.zhgh.dayofficework.integral.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.integral.model.IntegralDetail; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.sql.Sql; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralDetailServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralDetailServiceImpl.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralDetailServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralDetailServiceImpl.java index 3cc6069c..e026d806 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralDetailServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralDetailServiceImpl.java @@ -1,12 +1,12 @@ -package com.budwk.app.zhgh.integral.service.impl; +package com.budwk.app.zhgh.dayofficework.integral.service.impl; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.integral.model.IntegralDetail; -import com.budwk.app.zhgh.integral.service.IntegralDetailService; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralDetailService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java index 237af1fe..93447070 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralInsertTaskOrSelectConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.budwk.app.zhgh.integral.service.impl; +package com.budwk.app.zhgh.dayofficework.integral.service.impl; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.zhgh.integral.model.IntegralConfig; -import com.budwk.app.zhgh.integral.service.IntegralInsertTaskOrSelectConfigService; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralConfig; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralInsertTaskOrSelectConfigService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; diff --git a/src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralManageServiceImpl.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralManageServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralManageServiceImpl.java index 2f62ff51..425ae32a 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralManageServiceImpl.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.integral.service.impl; +package com.budwk.app.zhgh.dayofficework.integral.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -12,10 +12,10 @@ import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.integral.model.IntegralConfig; -import com.budwk.app.zhgh.integral.model.IntegralDetail; -import com.budwk.app.zhgh.integral.service.IntegralManageService; -import com.budwk.app.zhgh.integral.service.IntegralInsertTaskOrSelectConfigService; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralConfig; +import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralManageService; +import com.budwk.app.zhgh.dayofficework.integral.service.IntegralInsertTaskOrSelectConfigService; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java index cfed1930..d7fe10dc 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.conteoller; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.conteoller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -19,9 +19,9 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.club.model.SysClub; import com.budwk.app.zhgh.club.service.SysClubService; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetService; -import com.budwk.app.zhgh.outlay.activityBudget.template.ActivityBudgetTemp; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.template.ActivityBudgetTemp; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -68,7 +68,7 @@ public class ActivityBudgetApplyController { @At("") - @Ok("beetl:/platform/zhgh/outlay/activityBudget/apply/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html") @SaCheckPermission("activity.budget.apply") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java index 4403aec1..a36ae953 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.conteoller; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.conteoller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -8,9 +8,9 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudgetDetails; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudgetDetails; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -48,7 +48,7 @@ public class ActivityBudgetApplyListController { @At("") - @Ok("beetl:/platform/zhgh/outlay/activityBudget/applyList/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html") @SaCheckPermission("activity.budget.applyList") public void index() { } @@ -58,7 +58,6 @@ public class ActivityBudgetApplyListController { @ApiOperation("分页查询") @SaCheckPermission("activity.budget.applyList") public Result pageData(PageForm pageForm, Integer year, String activityMatter) { - Sql sqlByApplyList = activityBudgetService.getSqlByApplyList(pageForm, year, activityMatter, Cnd.NEW()); Pagination pagination = activityBudgetService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sqlByApplyList); return Result.success(pagination); diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java index b221d231..2663a212 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyStatisticsController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.conteoller; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.conteoller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -12,7 +12,7 @@ import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetApplyStatisticsService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetApplyStatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -53,7 +53,7 @@ public class ActivityBudgetApplyStatisticsController { private SysDictService sysDictService; @At("") - @Ok("beetl:/platform/zhgh/outlay/activityBudget/applyStatistics/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html") @SaCheckPermission("activity.budget.applyStatistics") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java index 945431e1..d90a962b 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetQueryStatisticsController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.conteoller; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.conteoller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -8,15 +8,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetQueryStatisticsService; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetQueryStatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.random.R; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -45,7 +43,7 @@ public class ActivityBudgetQueryStatisticsController { @At("") - @Ok("beetl:/platform/zhgh/outlay/activityBudget/queryStatistics/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/queryStatistics/index.html") @SaCheckPermission("activity.budget.queryStatistics") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java index 572ecf5b..756140f2 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetSchoolAuditController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.conteoller; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.conteoller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; @@ -8,7 +8,7 @@ import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -41,7 +41,7 @@ public class ActivityBudgetSchoolAuditController { @At("") - @Ok("beetl:/platform/zhgh/outlay/activityBudget/schoolAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html") @SaCheckPermission("activity.budget.schoolAudit") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java similarity index 87% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java index c0f7f2df..c5f4f922 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/interceptor/OutlayActBudgetSchoolPostInterceptor.java @@ -1,11 +1,10 @@ -package com.budwk.app.zhgh.outlay.activityBudget.interceptor; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.interceptor; import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowInterceptor; import com.budwk.app.flow.engine.core.Execution; import com.budwk.app.flow.engine.core.ServiceContext; -import com.budwk.app.flow.entity.ProcessInstance; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudget.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java similarity index 97% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudget.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java index 48d9e93f..435a2e94 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudget.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudget.java @@ -1,10 +1,9 @@ -package com.budwk.app.zhgh.outlay.activityBudget.models; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models; import com.budwk.app.base.model.Audit; import com.budwk.app.base.model.BaseModel; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import java.io.Serializable; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudgetDetails.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudgetDetails.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudgetDetails.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudgetDetails.java index aa03efcb..7a41b081 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudgetDetails.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudgetDetails.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.models; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudgetType.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudgetType.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudgetType.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudgetType.java index 7ecb5fe7..29578d23 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/models/ActivityBudgetType.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/models/ActivityBudgetType.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.models; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java similarity index 80% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java index 3ae39055..8106d2b3 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetApplyStatisticsService.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.service; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service; import com.budwk.app.base.service.BaseService; import org.nutz.dao.sql.Sql; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java similarity index 80% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java index 2ca8e072..85df1e20 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetQueryStatisticsService.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.service; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service; import com.budwk.app.base.service.BaseService; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetService.java similarity index 81% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetService.java index 14769cce..d1bf2de9 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/ActivityBudgetService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/ActivityBudgetService.java @@ -1,9 +1,9 @@ -package com.budwk.app.zhgh.outlay.activityBudget.service; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; import org.nutz.dao.Cnd; import org.nutz.dao.sql.Sql; import org.nutz.lang.util.NutMap; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java similarity index 87% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java index 0f0eb742..16b24edc 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetApplyStatisticsServiceImpl.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.service.impl; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,12 +6,10 @@ import cn.hutool.core.util.StrUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.flow.entity.ProcessInstance; -import com.budwk.app.flow.entity.ProcessTask; -import com.budwk.app.flow.entity.ProcessTaskActor; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetApplyStatisticsService; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetApplyStatisticsService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -19,8 +17,6 @@ import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import java.util.List; - /** * @ClassName ActivityBudgetApplyStatisticsServiceImpl * @Description TODO diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java index 0c087bd3..8b3279fb 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetQueryStatisticsServiceImpl.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.outlay.activityBudget.service.impl; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.impl; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetQueryStatisticsService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetQueryStatisticsService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java index 6bb7cd31..0ce79e69 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java @@ -1,15 +1,12 @@ -package com.budwk.app.zhgh.outlay.activityBudget.service.impl; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.model.Audit; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.impl.BaseServiceImpl; @@ -23,11 +20,11 @@ import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudgetDetails; -import com.budwk.app.zhgh.outlay.activityBudget.service.ActivityBudgetService; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.club.model.SysClub; +import com.budwk.app.zhgh.club.service.SysClubService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudgetDetails; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; @@ -36,7 +33,6 @@ import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import javax.servlet.http.HttpServletResponse; @@ -56,6 +52,8 @@ public class ActivityBudgetServiceImpl extends BaseServiceImpl i @Inject private SysDictService sysDictService; + @Inject + private SysClubService sysClubService; @Inject private FlowEngine flowEngine; @@ -100,23 +98,24 @@ public class ActivityBudgetServiceImpl extends BaseServiceImpl i group1.and("info.unionId", "=", SecurityUtil.getUnionId()); group.or(group1); } - /*if (ShiroUtil.hasAnyRoles("club01,club05")) { + if (AuthUtil.hasRoleOr(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name())) { + List myManageClub = sysClubService.getMyManageClub(); + List clubIds = myManageClub.stream().map(SysClub::getId).toList(); SqlExpressionGroup group1 = new SqlExpressionGroup(); - SqlExpressionGroup group2 = new SqlExpressionGroup(); - group2.or("ab.outlayManageSource", "=", "ACTIVITY_BUDGET_TYPE_THREE"); - group2.or("ab.outlayManageSource", "=", "ACTIVITY_BUDGET_TYPE_FOUR"); - List clubIds = this.getClubsByRole().stream().map(v -> v.getString("id")).toList(); - group1.and("ab.clubId", "in", clubIds); - group1.and(group2); + group1.or("info.outlayManageSource", "=", "ACTIVITY_BUDGET_TYPE_THREE"); + group1.and("info.clubId", "in", clubIds); group.or(group1); - }*/ + } if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { SqlExpressionGroup group1 = new SqlExpressionGroup(); group1.and("info.outlayManageSource", "=", "ACTIVITY_BUDGET_TYPE_ONE"); group1.or("info.loginName", "=", SecurityUtil.getUserLoginname()); group.or(group1); } - cnd.and(group); + + if (group.getExps().size()>0){ + cnd.and(group); + } cnd.andEX("YEAR(info.applyDate)", "=", year); cnd.desc("info.applyDate"); sql.setCondition(cnd); diff --git a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/template/ActivityBudgetTemp.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/outlay/activityBudget/template/ActivityBudgetTemp.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java index 97ea8728..5a84e3d4 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/activityBudget/template/ActivityBudgetTemp.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/template/ActivityBudgetTemp.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.activityBudget.template; +package com.budwk.app.zhgh.dayofficework.outlay.activityBudget.template; import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/controller/OutlayManageClubController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/controller/OutlayManageClubController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java index 1f24cf64..35fc6a4e 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/controller/OutlayManageClubController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.club.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; @@ -15,7 +15,7 @@ import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.club.model.SysClub; -import com.budwk.app.zhgh.outlay.outlayManage.club.model.OutlayManageClub; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayManageClub; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -51,7 +51,7 @@ public class OutlayManageClubController { private SysRoleService sysRoleService; @At("") - @Ok("beetl:/platform/zhgh/outlay/outlayManage/club/manage/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayManage/club/manage/index.html") @SaCheckPermission("outlay.outlayManage.club.manage") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java index cef2943a..9a8197d2 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.club.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.annotation.SLog; @@ -13,8 +13,8 @@ import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; -import com.budwk.app.zhgh.outlay.outlayManage.service.OutlayUseDetailService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayUseDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -52,7 +52,7 @@ public class OutlayManageClubUseDetailController { private OutlayUseDetailService outlayUseDetailService; @At("") - @Ok("beetl:/platform/zhgh/outlay/outlayManage/club/useDetail/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html") @SaCheckPermission("outlay.outlayManage.club.useDetail") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/model/OutlayManageClub.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/model/OutlayManageClub.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java index 9933e633..e70d25e8 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/club/model/OutlayManageClub.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/model/OutlayManageClub.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.club.model; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/model/OutlayUseDetail.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/model/OutlayUseDetail.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/model/OutlayUseDetail.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/model/OutlayUseDetail.java index f98a088f..4b9d7042 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/model/OutlayUseDetail.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/model/OutlayUseDetail.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.model; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model; import com.budwk.app.base.model.BaseModel; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/controller/OutlayManageSchoolController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/controller/OutlayManageSchoolController.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/controller/OutlayManageSchoolController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/controller/OutlayManageSchoolController.java index 1f40f041..17fa61f4 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/controller/OutlayManageSchoolController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/controller/OutlayManageSchoolController.java @@ -1,16 +1,13 @@ -package com.budwk.app.zhgh.outlay.outlayManage.school.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.aspose.slides.internal.og.bas; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,7 +22,6 @@ import org.nutz.mvc.annotation.Ok; import java.math.BigDecimal; import java.util.List; -import java.util.Objects; /** * @author zhf @@ -44,7 +40,7 @@ public class OutlayManageSchoolController { private BaseService baseService; @At("") - @Ok("beetl:/platform/zhgh/outlay/outlayManage/school/manage/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayManage/school/manage/index.html") @SaCheckPermission("outlay.outlayManage.school.manage") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java index 5e5a7c26..03d9ab57 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/controller/OutlayManageSchoolUseDetailController.java @@ -1,19 +1,15 @@ -package com.budwk.app.zhgh.outlay.outlayManage.school.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.service.OutlayUseDetailService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayUseDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,7 +21,6 @@ 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; -import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -53,7 +48,7 @@ public class OutlayManageSchoolUseDetailController { private OutlayUseDetailService outlayUseDetailService; @At("") - @Ok("beetl:/platform/zhgh/outlay/outlayManage/school/useDetail/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayManage/school/useDetail/index.html") @SaCheckPermission("outlay.outlayManage.school.useDetail") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/model/OutlayManageSchool.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/model/OutlayManageSchool.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/model/OutlayManageSchool.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/model/OutlayManageSchool.java index 73313f17..dcfc41ff 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/school/model/OutlayManageSchool.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/school/model/OutlayManageSchool.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.school.model; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/service/OutlayUseDetailService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java similarity index 72% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/service/OutlayUseDetailService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java index 3051054e..5a996f19 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/service/OutlayUseDetailService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayUseDetailService.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.outlay.outlayManage.service; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; public interface OutlayUseDetailService extends BaseService { diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java similarity index 84% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java index 0d5173e6..9ff8382d 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayUseDetailServiceImpl.java @@ -1,15 +1,13 @@ -package com.budwk.app.zhgh.outlay.outlayManage.service.impl; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.impl; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.service.OutlayUseDetailService; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayUseDetailService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; -import java.math.BigDecimal; - /** * @author zhf * @date 2025/7/25 11:30 diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/controller/OutlayManageUnionController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/controller/OutlayManageUnionController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java index bdee95bd..a8f92ff1 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/controller/OutlayManageUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.union.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; @@ -11,9 +11,7 @@ import com.budwk.app.base.service.BaseService; import com.budwk.app.sys.models.Sys_union; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -29,7 +27,6 @@ import org.nutz.mvc.annotation.Ok; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import java.util.Objects; /** * @author zhf @@ -47,7 +44,7 @@ public class OutlayManageUnionController { private BaseService baseService; @At("") - @Ok("beetl:/platform/zhgh/outlay/outlayManage/union/manage/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html") @SaCheckPermission("outlay.outlayManage.union.manage") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java index 32159c6d..f7baf7ef 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.union.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.annotation.SLog; @@ -10,8 +10,8 @@ import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; -import com.budwk.app.zhgh.outlay.outlayManage.service.OutlayUseDetailService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayUseDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -44,7 +44,7 @@ public class OutlayManageUnionUseDetailController { private OutlayUseDetailService outlayUseDetailService; @At("") - @Ok("beetl:/platform/zhgh/outlay/outlayManage/union/useDetail/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayManage/union/useDetail/index.html") @SaCheckPermission("outlay.outlayManage.union.useDetail") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/model/OutlayManageUnion.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/model/OutlayManageUnion.java similarity index 95% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/model/OutlayManageUnion.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/model/OutlayManageUnion.java index 658b3771..1f89602c 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayManage/union/model/OutlayManageUnion.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/model/OutlayManageUnion.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayManage.union.model; +package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model; import com.budwk.app.base.model.BaseModel; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java similarity index 79% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java index ed4960a2..104b1748 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyController.java @@ -1,7 +1,8 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; @@ -14,8 +15,8 @@ import com.budwk.app.flow.entity.ProcessTask; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayReimburse.model.OutlayReimburse; -import com.budwk.app.zhgh.outlay.outlayReimburse.service.OutlayReimburseApplyService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.OutlayReimburseApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; @@ -54,23 +55,29 @@ public class OutlayReimburseApplyController { private FlowCommonService flowCommonService; @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/apply/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/apply/index.html") @SaCheckPermission("outlay.reimburse.apply") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html") + @SaCheckPermission("h5.outlay.reimburse.apply") + public void h5Index() { + } + @At @ApiOperation("获取预算金额或活动") - @SaCheckPermission("outlay.reimburse.apply") + @SaCheckPermission(value = {"outlay.reimburse.apply", "h5.outlay.reimburse.apply"}, mode = SaMode.OR) public Result getBudgetMoneyOrActivity(String outlayManageSource, String clubId, String unionId, String id) { return Result.success(outlayReimburseApplyService.getBudgetMoneyOrActivity(outlayManageSource, clubId, unionId, id)); } @At @ApiOperation("查询这个预算已经报销了的金额") - @SaCheckPermission("outlay.reimburse.apply") + @SaCheckPermission(value = {"outlay.reimburse.apply", "h5.outlay.reimburse.apply"}, mode = SaMode.OR) public Result getBxMoneyByBudgetId(String budgetId) { return Result.success(outlayReimburseApplyService.getBxMoneyByActivityId(budgetId,null)); } @@ -78,14 +85,14 @@ public class OutlayReimburseApplyController { @At @ApiOperation("判断这个报销的记录预算是否充足") - @SaCheckPermission("outlay.reimburse.apply") + @SaCheckPermission(value = {"outlay.reimburse.apply", "h5.outlay.reimburse.apply"}, mode = SaMode.OR) public Result bxAddValidate(String budgetId, String money, String outlayManageSource, String clubId) { return outlayReimburseApplyService.bxAddValidate(budgetId, money, outlayManageSource, clubId); } @At @ApiOperation("提交报销申请") - @SaCheckPermission("activity.reimburse.apply") + @SaCheckPermission(value = {"outlay.reimburse.apply", "h5.outlay.reimburse.apply"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) @SLog( tag = "费用报销管理-报销申请", msg = "提交年度预算申报") public Result submit(@Param("data") OutlayReimburse outlayReimburse) { @@ -109,7 +116,7 @@ public class OutlayReimburseApplyController { } @At - @SaCheckPermission("activity.reimburse.apply") + @SaCheckPermission(value = {"outlay.reimburse.apply", "h5.outlay.reimburse.apply"}, mode = SaMode.OR) @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) @SLog( tag = "费用报销管理-报销申请", msg = "重新提交申请") @@ -125,7 +132,7 @@ public class OutlayReimburseApplyController { @At - @SaCheckPermission("outlay.reimburse.apply") + @SaCheckPermission(value = {"outlay.reimburse.apply", "h5.outlay.reimburse.apply"}, mode = SaMode.OR) @ApiOperation("保存申请") @SLog( tag = "费用报销管理-报销申请", msg = "保存年度预算申报") public Result save(@Param("data") OutlayReimburse outlayReimburse) { diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java similarity index 70% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java index 0e7e0132..2021d780 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseApplyListController.java @@ -1,12 +1,14 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayReimburse.service.OutlayReimburseApplyService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.dao.Cnd; @@ -33,15 +35,20 @@ public class OutlayReimburseApplyListController { @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/applyList/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/applyList/index.html") @SaCheckPermission("outlay.reimburse.applyList") public void index() { + } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/applyList/index.html") + @SaCheckPermission("h5.outlay.reimburse.applyList") + public void h5Index() { } @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.applyList") + @SaCheckPermission(value = {"outlay.reimburse.applyList", "h5.outlay.reimburse.applyList"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year) { @@ -51,7 +58,7 @@ public class OutlayReimburseApplyListController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, @@ -61,7 +68,7 @@ public class OutlayReimburseApplyListController { t.taskState, t.finishTime, t.taskParentId, - t.variable taskVariale, + t.variable taskVariable, IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask' AND taskState IN (10, 20)) AS startTaskId FROM @@ -80,5 +87,13 @@ public class OutlayReimburseApplyListController { return Result.success(pagination); } + @At + @SaCheckPermission(value = {"outlay.reimburse.applyList", "h5.outlay.reimburse.applyList"}, mode = SaMode.OR) + @ApiOperation("删除我的申报") + @SLog( tag = "费用报销管理-我的申请", msg = "删除我的申报") + public Result doDelete(String id){ + baseService.dao().delete(OutlayReimburse.class, id); + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java index 37365c1b..d49dd7b8 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java @@ -1,6 +1,7 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -42,16 +43,21 @@ public class OutlayReimburseClubAuditController { private SysDictService sysDictService; @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/clubAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html") @SaCheckPermission("outlay.reimburse.clubAudit") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html") + @SaCheckPermission("h5.outlay.reimburse.clubAudit") + public void h5Index() { + } @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.clubAudit") + @SaCheckPermission(value = {"outlay.reimburse.clubAudit", "h5.outlay.reimburse.clubAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year, Boolean approval, diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java index 01d5d7f3..e8e2c0e0 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java @@ -1,6 +1,7 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -42,16 +43,21 @@ public class OutlayReimburseClubZxAuditController { private SysDictService sysDictService; @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/clubZxAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/clubZxAudit/index.html") @SaCheckPermission("outlay.reimburse.clubZxAudit") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/clubZxAudit/index.html") + @SaCheckPermission("h5.outlay.reimburse.clubZxAudit") + public void h5Index() { + } @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.clubZxAudit") + @SaCheckPermission(value = {"outlay.reimburse.clubZxAudit", "h5.outlay.reimburse.clubZxAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year, Boolean approval, @@ -63,7 +69,7 @@ public class OutlayReimburseClubZxAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java similarity index 85% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java index 67c1dae7..ff8738f7 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java @@ -1,15 +1,15 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo.OutlayReimbursePageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -41,15 +41,21 @@ public class OutlayReimburseSchoolCnAuditController { @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/schoolCnAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html") @SaCheckPermission("outlay.reimburse.schoolCnAudit") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/schoolCnAudit/index.html") + @SaCheckPermission("h5.outlay.reimburse.schoolCnAudit") + public void h5Index() { + } + @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.schoolCnAudit") + @SaCheckPermission(value = {"outlay.reimburse.schoolCnAudit", "h5.outlay.reimburse.schoolCnAudit"}, mode = SaMode.OR) public Result pageData(OutlayReimbursePageForm pageForm) { Sql sql = Sqls.create(""" SELECT @@ -58,7 +64,7 @@ public class OutlayReimburseSchoolCnAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java index f49bb626..aae40f1b 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java @@ -1,11 +1,11 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.PageUtil; @@ -13,7 +13,7 @@ import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo.OutlayReimbursePageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -47,16 +47,22 @@ public class OutlayReimburseSchoolKjAuditController { private SysDictService sysDictService; @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/schoolKjAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html") @SaCheckPermission("outlay.reimburse.schoolKjAudit") public void index() { + } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/schoolKjAudit/index.html") + @SaCheckPermission("h5.outlay.reimburse.schoolKjAudit") + public void h5Index() { + } @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.schoolKjAudit") + @SaCheckPermission(value = {"outlay.reimburse.schoolKjAudit", "h5.outlay.reimburse.schoolKjAudit"}, mode = SaMode.OR) public Result pageData(OutlayReimbursePageForm pageForm) { Sql sql = Sqls.create(""" SELECT @@ -65,7 +71,7 @@ public class OutlayReimburseSchoolKjAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java similarity index 86% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java index a3bb69bc..6b47110b 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java @@ -1,19 +1,16 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.ObjectUtil; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo.OutlayReimbursePageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,7 +22,6 @@ import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; import java.util.List; @@ -47,16 +43,22 @@ public class OutlayReimburseSchoolZxAuditController { private SysDictService sysDictService; @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/schoolZxAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html") @SaCheckPermission("outlay.reimburse.schoolZxAudit") public void index() { + } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/schoolZxAudit/index.html") + @SaCheckPermission("h5.outlay.reimburse.schoolZxAudit") + public void h5Index() { + } @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.schoolZxAudit") + @SaCheckPermission(value = {"outlay.reimburse.schoolZxAudit", "h5.outlay.reimburse.schoolZxAudit"}, mode = SaMode.OR) public Result pageData(OutlayReimbursePageForm pageForm) { Sql sql = Sqls.create(""" SELECT @@ -65,7 +67,7 @@ public class OutlayReimburseSchoolZxAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java index e1153fa9..40124ac4 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSummaryController.java @@ -1,27 +1,19 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.base.service.BaseService; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayReimburse.service.OutlayReimburseSummaryService; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.OutlayReimburseSummaryService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo.OutlayReimbursePageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -54,7 +46,7 @@ public class OutlayReimburseSummaryController { @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/summary/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/summary/index.html") @SaCheckPermission("outlay.reimburse.summary") public void index() { diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java index 5c3bb842..c51497a9 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java @@ -1,6 +1,7 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.controller; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -42,16 +43,22 @@ public class OutlayReimburseUnionAuditController { private SysDictService sysDictService; @At("/index") - @Ok("beetl:/platform/zhgh/outlay/outlayReimburse/unionAudit/index.html") + @Ok("beetl:/platform/zhgh/dayofficework/outlay/outlayReimburse/unionAudit/index.html") @SaCheckPermission("outlay.reimburse.unionAudit") public void index() { + } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/outlayReimburse/unionAudit/index.html") + @SaCheckPermission("h5outlay.reimburse.unionAudit") + public void h5Index() { + } @At @ApiOperation("分页查询") - @SaCheckPermission("outlay.reimburse.unionAudit") + @SaCheckPermission(value = {"outlay.reimburse.unionAudit", "h5.outlay.reimburse.unionAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, Integer year, Boolean approval, @@ -63,7 +70,7 @@ public class OutlayReimburseUnionAuditController { ins.id AS instanceId, ins.businessNo, ins.state instanceState, - ins.variable instanceVariale, + ins.variable instanceVariable, ins.processDefineId instanceProcessDefineId, t.id taskId, t.taskName AS taskKey, diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java similarity index 78% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java index e5cfff62..1937dbfa 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolKjAuditPostInterceptor.java @@ -1,13 +1,10 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.interceptor; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.interceptor; import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowInterceptor; import com.budwk.app.flow.engine.core.Execution; import com.budwk.app.flow.engine.core.ServiceContext; -import com.budwk.app.flow.entity.ProcessInstance; -import com.budwk.app.zhgh.outlay.outlayReimburse.model.OutlayReimburse; -import org.nutz.dao.Chain; -import org.nutz.dao.Cnd; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse; import org.nutz.dao.Dao; import org.nutz.json.Json; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java index ee331e31..bc99ce97 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/interceptor/OutlayReimburseSchoolZxAuditPostInterceptor.java @@ -1,27 +1,23 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.interceptor; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.interceptor; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.budwk.app.base.exception.BaseException; -import com.budwk.app.base.result.Result; import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowInterceptor; import com.budwk.app.flow.engine.core.Execution; import com.budwk.app.flow.engine.core.ServiceContext; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.outlayManage.club.model.OutlayManageClub; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; -import com.budwk.app.zhgh.outlay.outlayReimburse.model.OutlayReimburse; -import lombok.SneakyThrows; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayManageClub; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.json.Json; -import java.io.IOException; - /** * @author zhf * @date 2025/7/30 16:02 diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/model/OutlayReimburse.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java similarity index 97% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/model/OutlayReimburse.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java index badf91a0..04b369fe 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/model/OutlayReimburse.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/model/OutlayReimburse.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.model; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/OutlayReimburseApplyService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/OutlayReimburseApplyService.java similarity index 86% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/OutlayReimburseApplyService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/OutlayReimburseApplyService.java index 4ba5ff23..06bd962f 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/OutlayReimburseApplyService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/OutlayReimburseApplyService.java @@ -1,8 +1,8 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.service; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.outlay.outlayReimburse.model.OutlayReimburse; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse; import org.nutz.lang.util.NutMap; import java.math.BigDecimal; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java similarity index 56% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java index ba3accae..d207dc8d 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/OutlayReimburseSummaryService.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.service; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo.OutlayReimbursePageForm; import org.nutz.dao.sql.Sql; public interface OutlayReimburseSummaryService extends BaseService { diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java similarity index 96% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java index 4683afbb..9ff6daa3 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.service.impl; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -10,12 +10,12 @@ import com.budwk.app.sys.models.Sys_role; import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.activityBudget.models.ActivityBudget; -import com.budwk.app.zhgh.outlay.outlayManage.club.model.OutlayManageClub; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; -import com.budwk.app.zhgh.outlay.outlayReimburse.model.OutlayReimburse; -import com.budwk.app.zhgh.outlay.outlayReimburse.service.OutlayReimburseApplyService; +import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayManageClub; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.model.OutlayReimburse; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.OutlayReimburseApplyService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java index 6b670d5e..b55159aa 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java @@ -1,11 +1,11 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.service.impl; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.impl; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.zhgh.outlay.outlayReimburse.service.OutlayReimburseSummaryService; -import com.budwk.app.zhgh.outlay.outlayReimburse.vo.OutlayReimbursePageForm; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.OutlayReimburseSummaryService; +import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo.OutlayReimbursePageForm; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java similarity index 84% rename from src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java rename to src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java index 72986f05..6354e05a 100644 --- a/src/main/java/com/budwk/app/zhgh/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/vo/OutlayReimbursePageForm.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.outlay.outlayReimburse.vo; +package com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.vo; import com.budwk.app.base.param.PageForm; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeMemberController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeMemberController.java index e7ffb50a..12b4a8a3 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeMemberController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeMemberController.java @@ -6,12 +6,9 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.zhgh.democratic.executiveCommittee.param.ExecutiveCommitteePageForm; -import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeConfigService; import com.budwk.app.zhgh.democratic.executiveCommittee.service.ExecutiveCommitteeMemberService; -import com.budwk.app.zhgh.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationSummaryController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationSummaryController.java index e1343321..03f163d0 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/excellentRecuperation/controller/ExcellentRecuperationSummaryController.java @@ -8,15 +8,9 @@ import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.base.service.BaseService; import com.budwk.app.flow.engine.FlowEngine; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.sys.models.Sys_dict; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; -import com.budwk.app.zhgh.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; +import com.budwk.app.zhgh.dayofficework.enrollmentRegistration.model.EnrollmentRegistration; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.model.ExcellentRecuperationActivity; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.service.ExcellentRecuperationSummaryService; import com.budwk.app.zhgh.staffbenefit.excellentRecuperation.vo.ExcellentRecuperationPageForm; @@ -25,9 +19,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; 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; diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageManageController.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageManageController.java index 967f99ef..a5e1fe86 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageManageController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.controller; +package com.budwk.app.zhgh.staffmanage.childManage.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; @@ -12,11 +12,9 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.vo.EnrollmentRegistrationPageForm; -import com.budwk.app.zhgh.user.childManage.models.ChildManage; -import com.budwk.app.zhgh.user.childManage.service.ChildManageService; -import com.budwk.app.zhgh.user.childManage.vo.ChildManagePageForm; +import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage; +import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService; +import com.budwk.app.zhgh.staffmanage.childManage.vo.ChildManagePageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -54,7 +52,7 @@ public class ChildManageManageController { private SysDictService sysDictService; @At("") - @Ok("beetl:/platform/zhgh/user/childManage/manage/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/childManage/manage/index.html") @SaCheckPermission public void index() {} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageMineController.java similarity index 86% rename from src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageMineController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageMineController.java index 7e8ff689..8167c07f 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageMineController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.controller; +package com.budwk.app.zhgh.staffmanage.childManage.controller; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -7,9 +7,8 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; -import com.budwk.app.zhgh.user.childManage.models.ChildManage; -import com.budwk.app.zhgh.user.childManage.service.ChildManageService; +import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage; +import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -34,7 +33,7 @@ public class ChildManageMineController { private ChildManageService childManageService; @At("") - @Ok("beetl:/platform/zhgh/user/childManage/mine/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/childManage/mine/index.html") @SaCheckPermission public void index() {} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageWriteController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageWriteController.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageWriteController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageWriteController.java index ce7a2df5..3959cd1e 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageWriteController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.controller; +package com.budwk.app.zhgh.staffmanage.childManage.controller; import cn.dev33.satoken.annotation.SaCheckLogin; @@ -12,9 +12,8 @@ import com.budwk.app.base.result.Result; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.enrollmentRegistration.model.EnrollmentRegistration; -import com.budwk.app.zhgh.user.childManage.models.ChildManage; -import com.budwk.app.zhgh.user.childManage.service.ChildManageService; +import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage; +import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -43,7 +42,7 @@ public class ChildManageWriteController { @At("") - @Ok("beetl:/platform/zhgh/user/childManage/write/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/childManage/write/index.html") @SaCheckPermission public void index() {} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageManageController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageManageController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageManageController.java index bdade995..de8949ea 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageManageController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.h5controller; +package com.budwk.app.zhgh.staffmanage.childManage.h5controller; import cn.dev33.satoken.annotation.SaCheckPermission; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageMineController.java new file mode 100644 index 00000000..a9605406 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageMineController.java @@ -0,0 +1,27 @@ +package com.budwk.app.zhgh.staffmanage.childManage.h5controller; + + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService; +import lombok.extern.slf4j.Slf4j; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +@IocBean +@At("/platform/h5/childManage/mine") +@Ok("json:full") +@Slf4j +public class H5ChildManageMineController { + + @Inject + private ChildManageService childManageService; + + @At("") + @Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html") + @SaCheckPermission("h5.childManage.mine") + public void index() {} + + +} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageWriteController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageWriteController.java similarity index 91% rename from src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageWriteController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageWriteController.java index edda5d8f..d66ea421 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageWriteController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.h5controller; +package com.budwk.app.zhgh.staffmanage.childManage.h5controller; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/models/ChildManage.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/models/ChildManage.java similarity index 98% rename from src/main/java/com/budwk/app/zhgh/user/childManage/models/ChildManage.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/models/ChildManage.java index 83955f5c..310440a4 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/models/ChildManage.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/models/ChildManage.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.models; +package com.budwk.app.zhgh.staffmanage.childManage.models; import cn.hutool.json.JSONObject; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/ChildManageService.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/ChildManageService.java new file mode 100644 index 00000000..380d9524 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/ChildManageService.java @@ -0,0 +1,10 @@ +package com.budwk.app.zhgh.staffmanage.childManage.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage; +import com.budwk.app.zhgh.staffmanage.childManage.vo.ChildManagePageForm; +import org.nutz.dao.sql.Sql; + +public interface ChildManageService extends BaseService { + Sql getSql(ChildManagePageForm pageForm); +} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/service/impl/ChildManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/impl/ChildManageServiceImpl.java similarity index 89% rename from src/main/java/com/budwk/app/zhgh/user/childManage/service/impl/ChildManageServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/impl/ChildManageServiceImpl.java index 17de89e3..693ea30a 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/service/impl/ChildManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/service/impl/ChildManageServiceImpl.java @@ -1,9 +1,9 @@ -package com.budwk.app.zhgh.user.childManage.service.impl; +package com.budwk.app.zhgh.staffmanage.childManage.service.impl; import com.budwk.app.base.service.impl.BaseServiceImpl; -import com.budwk.app.zhgh.user.childManage.models.ChildManage; -import com.budwk.app.zhgh.user.childManage.service.ChildManageService; -import com.budwk.app.zhgh.user.childManage.vo.ChildManagePageForm; +import com.budwk.app.zhgh.staffmanage.childManage.models.ChildManage; +import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService; +import com.budwk.app.zhgh.staffmanage.childManage.vo.ChildManagePageForm; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/vo/ChildManagePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/vo/ChildManagePageForm.java similarity index 84% rename from src/main/java/com/budwk/app/zhgh/user/childManage/vo/ChildManagePageForm.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/childManage/vo/ChildManagePageForm.java index 9fb907a1..3021d8b2 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/vo/ChildManagePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/childManage/vo/ChildManagePageForm.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.childManage.vo; +package com.budwk.app.zhgh.staffmanage.childManage.vo; import com.budwk.app.base.param.PageForm; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/controller/SingleTeacherChartController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherChartController.java similarity index 86% rename from src/main/java/com/budwk/app/zhgh/user/singleTeacher/controller/SingleTeacherChartController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherChartController.java index 4bb8d231..c0a7f5f2 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/controller/SingleTeacherChartController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherChartController.java @@ -1,8 +1,8 @@ -package com.budwk.app.zhgh.user.singleTeacher.controller; +package com.budwk.app.zhgh.staffmanage.singleTeacher.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.user.singleTeacher.service.SingleTeacherService; +import com.budwk.app.zhgh.staffmanage.singleTeacher.service.SingleTeacherService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.dao.Cnd; @@ -13,7 +13,6 @@ import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; import java.util.List; @@ -27,7 +26,7 @@ public class SingleTeacherChartController { private SingleTeacherService singleTeacherService; @At("") - @Ok("beetl:/platform/zhgh/user/singleTeacher/chart/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/singleTeacher/chart/index.html") @SaCheckPermission("singleTeacher.chart") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/controller/SingleTeacherLedgerController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/user/singleTeacher/controller/SingleTeacherLedgerController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java index 36f1bd5c..de192f07 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/controller/SingleTeacherLedgerController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/controller/SingleTeacherLedgerController.java @@ -1,14 +1,12 @@ -package com.budwk.app.zhgh.user.singleTeacher.controller; +package com.budwk.app.zhgh.staffmanage.singleTeacher.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.zhgh.user.singleTeacher.models.SingleTeacher; -import com.budwk.app.zhgh.user.singleTeacher.param.SingleTeacherPageForm; -import com.budwk.app.zhgh.user.singleTeacher.service.SingleTeacherService; +import com.budwk.app.zhgh.staffmanage.singleTeacher.models.SingleTeacher; +import com.budwk.app.zhgh.staffmanage.singleTeacher.param.SingleTeacherPageForm; +import com.budwk.app.zhgh.staffmanage.singleTeacher.service.SingleTeacherService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.dao.Cnd; @@ -18,13 +16,11 @@ import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletResponse; -import java.util.List; @IocBean @At("/platform/singleTeacher/ledger") @@ -38,7 +34,7 @@ public class SingleTeacherLedgerController { private SingleTeacherService singleTeacherService; @At("") - @Ok("beetl:/platform/zhgh/user/singleTeacher/ledger/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/singleTeacher/ledger/index.html") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/models/SingleTeacher.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/models/SingleTeacher.java similarity index 97% rename from src/main/java/com/budwk/app/zhgh/user/singleTeacher/models/SingleTeacher.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/models/SingleTeacher.java index 2494781b..b32937fb 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/models/SingleTeacher.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/models/SingleTeacher.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.singleTeacher.models; +package com.budwk.app.zhgh.staffmanage.singleTeacher.models; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java index e23a382a..1286c0d0 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.singleTeacher.param; +package com.budwk.app.zhgh.staffmanage.singleTeacher.param; import com.budwk.app.base.param.PageForm; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/SingleTeacherService.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/SingleTeacherService.java similarity index 62% rename from src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/SingleTeacherService.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/SingleTeacherService.java index 948f30d9..e506e92f 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/SingleTeacherService.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/SingleTeacherService.java @@ -1,9 +1,9 @@ -package com.budwk.app.zhgh.user.singleTeacher.service; +package com.budwk.app.zhgh.staffmanage.singleTeacher.service; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.user.singleTeacher.models.SingleTeacher; -import com.budwk.app.zhgh.user.singleTeacher.param.SingleTeacherPageForm; +import com.budwk.app.zhgh.staffmanage.singleTeacher.models.SingleTeacher; +import com.budwk.app.zhgh.staffmanage.singleTeacher.param.SingleTeacherPageForm; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java index a6db069a..468d0f71 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.user.singleTeacher.service.impl; +package com.budwk.app.zhgh.staffmanage.singleTeacher.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -9,9 +9,9 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.zhgh.user.singleTeacher.models.SingleTeacher; -import com.budwk.app.zhgh.user.singleTeacher.param.SingleTeacherPageForm; -import com.budwk.app.zhgh.user.singleTeacher.service.SingleTeacherService; +import com.budwk.app.zhgh.staffmanage.singleTeacher.models.SingleTeacher; +import com.budwk.app.zhgh.staffmanage.singleTeacher.param.SingleTeacherPageForm; +import com.budwk.app.zhgh.staffmanage.singleTeacher.service.SingleTeacherService; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; diff --git a/src/main/java/com/budwk/app/zhgh/thirtyTeach/controller/ThirtyTeachController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/thirtyTeach/controller/ThirtyTeachController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java index cf3e2a07..cb7c37dd 100644 --- a/src/main/java/com/budwk/app/zhgh/thirtyTeach/controller/ThirtyTeachController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java @@ -1,30 +1,23 @@ -package com.budwk.app.zhgh.thirtyTeach.controller; +package com.budwk.app.zhgh.staffmanage.thirtyTeach.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; -import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.EasyExcelUtil; -import com.budwk.app.base.utils.PageUtil; import com.budwk.app.sys.models.Sys_user; import com.budwk.app.sys.services.SysUserService; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.integral.controller.IntegralManageController; -import com.budwk.app.zhgh.thirtyTeach.param.ThirtyTeachPageForm; -import com.budwk.app.zhgh.thirtyTeach.service.ThirtyTeachService; -import com.budwk.app.zhgh.thirtyTeach.template.ThirtyTeachTemp; +import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm; +import com.budwk.app.zhgh.staffmanage.thirtyTeach.service.ThirtyTeachService; +import com.budwk.app.zhgh.staffmanage.thirtyTeach.template.ThirtyTeachTemp; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -33,9 +26,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; 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; @@ -74,7 +65,7 @@ public class ThirtyTeachController { private SysUserService sysUserService; @At("") - @Ok("beetl:/platform/zhgh/thirtyTeach/manage/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/thirtyTeach/manage/index.html") @SaCheckPermission("thirtyTeach.manage") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/thirtyTeach/controller/ThirtyTeachSummaryController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachSummaryController.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/thirtyTeach/controller/ThirtyTeachSummaryController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachSummaryController.java index cbd71ffb..6ee98697 100644 --- a/src/main/java/com/budwk/app/zhgh/thirtyTeach/controller/ThirtyTeachSummaryController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachSummaryController.java @@ -1,20 +1,16 @@ -package com.budwk.app.zhgh.thirtyTeach.controller; +package com.budwk.app.zhgh.staffmanage.thirtyTeach.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; -import com.budwk.app.base.service.BaseService; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.sys.services.SysUserService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.thirtyTeach.param.ThirtyTeachPageForm; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -22,7 +18,6 @@ import org.apache.poi.ss.usermodel.Workbook; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; @@ -50,7 +45,7 @@ public class ThirtyTeachSummaryController { @At("") - @Ok("beetl:/platform/zhgh/thirtyTeach/summary/index.html") + @Ok("beetl:/platform/zhgh/staffmanage/thirtyTeach/summary/index.html") @SaCheckPermission("thirtyTeach.summary") public void index() { } diff --git a/src/main/java/com/budwk/app/zhgh/thirtyTeach/param/ThirtyTeachPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/param/ThirtyTeachPageForm.java similarity index 88% rename from src/main/java/com/budwk/app/zhgh/thirtyTeach/param/ThirtyTeachPageForm.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/param/ThirtyTeachPageForm.java index c6400d6c..7e0f41e9 100644 --- a/src/main/java/com/budwk/app/zhgh/thirtyTeach/param/ThirtyTeachPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/param/ThirtyTeachPageForm.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.thirtyTeach.param; +package com.budwk.app.zhgh.staffmanage.thirtyTeach.param; import com.budwk.app.base.param.PageForm; import lombok.Data; diff --git a/src/main/java/com/budwk/app/zhgh/thirtyTeach/service/ThirtyTeachService.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/ThirtyTeachService.java similarity index 64% rename from src/main/java/com/budwk/app/zhgh/thirtyTeach/service/ThirtyTeachService.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/ThirtyTeachService.java index 2e53e6a8..4734c4f7 100644 --- a/src/main/java/com/budwk/app/zhgh/thirtyTeach/service/ThirtyTeachService.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/ThirtyTeachService.java @@ -1,7 +1,7 @@ -package com.budwk.app.zhgh.thirtyTeach.service; +package com.budwk.app.zhgh.staffmanage.thirtyTeach.service; import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.thirtyTeach.param.ThirtyTeachPageForm; +import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm; import org.nutz.dao.sql.Sql; /** diff --git a/src/main/java/com/budwk/app/zhgh/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java index 01834148..1ca70fb6 100644 --- a/src/main/java/com/budwk/app/zhgh/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/service/impl/ThirtyTeachServiceImpl.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.thirtyTeach.service.impl; +package com.budwk.app.zhgh.staffmanage.thirtyTeach.service.impl; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; @@ -6,8 +6,8 @@ import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.thirtyTeach.param.ThirtyTeachPageForm; -import com.budwk.app.zhgh.thirtyTeach.service.ThirtyTeachService; +import com.budwk.app.zhgh.staffmanage.thirtyTeach.param.ThirtyTeachPageForm; +import com.budwk.app.zhgh.staffmanage.thirtyTeach.service.ThirtyTeachService; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; diff --git a/src/main/java/com/budwk/app/zhgh/thirtyTeach/template/ThirtyTeachTemp.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/template/ThirtyTeachTemp.java similarity index 92% rename from src/main/java/com/budwk/app/zhgh/thirtyTeach/template/ThirtyTeachTemp.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/template/ThirtyTeachTemp.java index aef5fa23..a450e502 100644 --- a/src/main/java/com/budwk/app/zhgh/thirtyTeach/template/ThirtyTeachTemp.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/template/ThirtyTeachTemp.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.thirtyTeach.template; +package com.budwk.app.zhgh.staffmanage.thirtyTeach.template; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseApplyController.java b/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseApplyController.java index ee439bd0..975393d6 100644 --- a/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/unionReimburse/controller/UnionReimburseApplyController.java @@ -18,14 +18,12 @@ import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox; -import com.budwk.app.zhgh.outlay.outlayManage.club.model.OutlayManageClub; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayManageClub; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceTypeService; import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse; import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType; -import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse; import com.budwk.app.zhgh.unionReimburse.service.UnionReimburseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/budwk/app/zhgh/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java b/src/main/java/com/budwk/app/zhgh/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java index 7668f9fd..a0b5de08 100644 --- a/src/main/java/com/budwk/app/zhgh/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java @@ -7,19 +7,16 @@ import com.budwk.app.flow.engine.FlowInterceptor; import com.budwk.app.flow.engine.core.Execution; import com.budwk.app.flow.engine.core.ServiceContext; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.outlay.outlayManage.club.model.OutlayManageClub; -import com.budwk.app.zhgh.outlay.outlayManage.model.OutlayUseDetail; -import com.budwk.app.zhgh.outlay.outlayManage.school.model.OutlayManageSchool; -import com.budwk.app.zhgh.outlay.outlayManage.union.model.OutlayManageUnion; -import com.budwk.app.zhgh.outlay.outlayReimburse.model.OutlayReimburse; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayManageClub; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool; +import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion; import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; -import org.nutz.ioc.loader.annotation.Inject; import org.nutz.json.Json; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Date; //审核同意后扣除校工会、分工会、社团的经费 diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java deleted file mode 100644 index 21e08a3a..00000000 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.budwk.app.zhgh.user.childManage.h5controller; - - -import cn.dev33.satoken.annotation.SaCheckPermission; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; -import com.budwk.app.base.result.Result; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.user.childManage.models.ChildManage; -import com.budwk.app.zhgh.user.childManage.service.ChildManageService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -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.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -@IocBean -@At("/platform/h5/childManage/mine") -@Ok("json:full") -@Slf4j -public class H5ChildManageMineController { - - @Inject - private ChildManageService childManageService; - - @At("") - @Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html") - @SaCheckPermission("h5.childManage.mine") - public void index() {} - - -} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/service/ChildManageService.java b/src/main/java/com/budwk/app/zhgh/user/childManage/service/ChildManageService.java deleted file mode 100644 index bbc30ce5..00000000 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/service/ChildManageService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.budwk.app.zhgh.user.childManage.service; - -import com.budwk.app.base.service.BaseService; -import com.budwk.app.zhgh.user.childManage.models.ChildManage; -import com.budwk.app.zhgh.user.childManage.vo.ChildManagePageForm; -import org.nutz.dao.sql.Sql; - -public interface ChildManageService extends BaseService { - Sql getSql(ChildManagePageForm pageForm); -} diff --git a/src/main/resources/static/components/plugins/sysUpload/h5Index.vue b/src/main/resources/static/components/plugins/sysUpload/h5Index.vue index 1640b206..884f44ea 100644 --- a/src/main/resources/static/components/plugins/sysUpload/h5Index.vue +++ b/src/main/resources/static/components/plugins/sysUpload/h5Index.vue @@ -1,190 +1,194 @@ diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html index f958a1b4..49de0e2b 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html @@ -26,8 +26,8 @@ layout("/layouts/platform.html"){ - 未报名 已报名 + 未报名 @@ -186,7 +186,7 @@ layout("/layouts/platform.html"){ activityList: [], pageForm: { isActivity: 2, - applyStatus: 2, + applyStatus: 1, year: new Date().getFullYear() + "" }, activityData: {}, diff --git a/src/main/resources/views/platform/zhgh/asset/category/index.html b/src/main/resources/views/platform/zhgh/dayofficework/asset/category/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/category/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/asset/category/index.html diff --git a/src/main/resources/views/platform/zhgh/asset/common/assetForm.js b/src/main/resources/views/platform/zhgh/dayofficework/asset/common/assetForm.js similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/common/assetForm.js rename to src/main/resources/views/platform/zhgh/dayofficework/asset/common/assetForm.js diff --git a/src/main/resources/views/platform/zhgh/asset/common/assetInfo.js b/src/main/resources/views/platform/zhgh/dayofficework/asset/common/assetInfo.js similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/common/assetInfo.js rename to src/main/resources/views/platform/zhgh/dayofficework/asset/common/assetInfo.js diff --git a/src/main/resources/views/platform/zhgh/asset/common/assetStocktakingForm.js b/src/main/resources/views/platform/zhgh/dayofficework/asset/common/assetStocktakingForm.js similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/common/assetStocktakingForm.js rename to src/main/resources/views/platform/zhgh/dayofficework/asset/common/assetStocktakingForm.js diff --git a/src/main/resources/views/platform/zhgh/asset/depreciation/index.html b/src/main/resources/views/platform/zhgh/dayofficework/asset/depreciation/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/depreciation/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/asset/depreciation/index.html diff --git a/src/main/resources/views/platform/zhgh/asset/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/asset/manage/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/manage/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/asset/manage/index.html diff --git a/src/main/resources/views/platform/zhgh/asset/stocktaking/index.html b/src/main/resources/views/platform/zhgh/dayofficework/asset/stocktaking/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/stocktaking/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/asset/stocktaking/index.html diff --git a/src/main/resources/views/platform/zhgh/asset/stocktakingPlan/index.html b/src/main/resources/views/platform/zhgh/dayofficework/asset/stocktakingPlan/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/asset/stocktakingPlan/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/asset/stocktakingPlan/index.html diff --git a/src/main/resources/views/platform/zhgh/enrollmentRegistration/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/apply/index.html similarity index 85% rename from src/main/resources/views/platform/zhgh/enrollmentRegistration/apply/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/apply/index.html index ae43c5ca..5ff0b25f 100644 --- a/src/main/resources/views/platform/zhgh/enrollmentRegistration/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/apply/index.html @@ -124,7 +124,6 @@ layout("/layouts/platform.html"){ - @@ -224,7 +223,7 @@ layout("/layouts/platform.html"){ // 保存 onSave() { const msg = this.validateBirthday() - if ( msg){ + if (msg) { this.$message.warning(msg) return } @@ -250,28 +249,32 @@ layout("/layouts/platform.html"){ // 提交 onSubmit() { const msg = this.validateBirthday() - if ( msg){ + if (msg) { this.$message.warning(msg) return } - this.getIsRepeatByIdCard().then(flag => { - if (flag) { + this.$refs.formRef.validate((valid) => { + if (valid) { + this.getIsRepeatByIdCard().then(flag => { + if (flag) { - } else { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post('/platform/enrollmentRegistration/apply/submit', { - data: JSON.stringify(this.formData), - taskId: GetQueryString("taskId") - }).then(res => { - if (res.code === 0) { - this.$message.success("提交成功") - window.location.href = '/platform/enrollmentRegistration/applyList/index' - } - }) + } else { + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.$axios.post('/platform/enrollmentRegistration/apply/submit', { + data: JSON.stringify(this.formData), + taskId: GetQueryString("taskId") + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + window.location.href = '/platform/enrollmentRegistration/applyList/index' + } + }) + }) + } }) } }) @@ -279,28 +282,32 @@ layout("/layouts/platform.html"){ }, onFinishTask() { const msg = this.validateBirthday() - if ( msg){ + if (msg) { this.$message.warning(msg) return } - this.getIsRepeatByIdCard().then(flag => { - if (flag) { + this.$refs.formRef.validate((valid) => { + if (valid) { + this.getIsRepeatByIdCard().then(flag => { + if (flag) { - } else { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post('/platform/enrollmentRegistration/apply/submitAgain', { - data: JSON.stringify(this.formData), - taskId: GetQueryString("taskId") - }).then(res => { - if (res.code === 0) { - this.$message.success("提交成功") - window.location.href = '/platform/enrollmentRegistration/applyList/index' - } - }) + } else { + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.$axios.post('/platform/enrollmentRegistration/apply/submitAgain', { + data: JSON.stringify(this.formData), + taskId: GetQueryString("taskId") + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + window.location.href = '/platform/enrollmentRegistration/applyList/index' + } + }) + }) + } }) } }) diff --git a/src/main/resources/views/platform/zhgh/enrollmentRegistration/applyList/index.html b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/applyList/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/enrollmentRegistration/applyList/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/applyList/index.html diff --git a/src/main/resources/views/platform/zhgh/enrollmentRegistration/info.js b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/info.js similarity index 100% rename from src/main/resources/views/platform/zhgh/enrollmentRegistration/info.js rename to src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/info.js diff --git a/src/main/resources/views/platform/zhgh/enrollmentRegistration/plan/index.html b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/plan/index.html similarity index 100% rename from src/main/resources/views/platform/zhgh/enrollmentRegistration/plan/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/plan/index.html diff --git a/src/main/resources/views/platform/zhgh/enrollmentRegistration/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html similarity index 99% rename from src/main/resources/views/platform/zhgh/enrollmentRegistration/schoolAudit/index.html rename to src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html index 09d46060..6a934a7b 100644 --- a/src/main/resources/views/platform/zhgh/enrollmentRegistration/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html @@ -75,7 +75,7 @@ layout("/layouts/platform.html"){ - +