commit

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 {

src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java

@@ -64,8 +64,10 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl<Activit
         if (Strings.isNotBlank(name)) {
             cnd.where().andLike("tissue.name", name);
         }
-        // 只查询流程实例状态为20的数据（已完成状态）
-        cnd.and("ins.state", "=", 20);
+        // 只查询流程实例状态为20的数据（已完成状态）校工会活动除外
+        if (!List.of(40001).contains(activity_type)) {
+            cnd.and("ins.state", "=", 20);
+        }
 
         cnd.andEX("YEAR(tissue.startTime)", "=", year);
         cnd.andEX("tissue.isUnseal", "=", true);

src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepManageController.java

@@ -11,7 +11,7 @@ import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity;
 import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkStep;
 import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService;
 import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil;
-import com.budwk.app.zhgh.integral.model.IntegralDetail;
+import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;

src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRaffleController.java

@@ -19,7 +19,7 @@ import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleRules;
 import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleUser;
 import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService;
 import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkStepRaffleService;
-import com.budwk.app.zhgh.integral.model.IntegralDetail;
+import com.budwk.app.zhgh.dayofficework.integral.model.IntegralDetail;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.nutz.aop.interceptor.ioc.TransAop;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetCategoryController.java

@@ -1,13 +1,12 @@
-package com.budwk.app.zhgh.asset.controller;
+package com.budwk.app.zhgh.dayofficework.asset.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 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.zhgh.asset.model.AssetCategory;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
-import com.budwk.app.zhgh.asset.service.AssetService;
+import com.budwk.app.zhgh.dayofficework.asset.model.AssetCategory;
+import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +37,7 @@ public class AssetCategoryController {
     private BaseService baseService;
 
     @At("")
-    @Ok("beetl:/platform/zhgh/asset/category/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/asset/category/index.html")
     @SaCheckPermission("asset.category")
     public void index() {
     }

src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetDepreciationRecordController.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.controller;
+package com.budwk.app.zhgh.dayofficework.asset.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
@@ -9,16 +9,14 @@ 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.CommonDownloadUtil;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
-import com.budwk.app.zhgh.asset.service.AssetDepreciationRecordService;
+import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.service.AssetDepreciationRecordService;
 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.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.sql.Sql;
-import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -46,7 +44,7 @@ public class AssetDepreciationRecordController {
     private AssetDepreciationRecordService assetDepreciationRecordService;
 
     @At("")
-    @Ok("beetl:/platform/zhgh/asset/depreciation/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/asset/depreciation/index.html")
     @SaCheckPermission("asset.depreciation")
     public void index() {
     }

src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetManageController.java

@@ -1,11 +1,10 @@
-package com.budwk.app.zhgh.asset.controller;
+package com.budwk.app.zhgh.dayofficework.asset.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.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -13,13 +12,12 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 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.model.AssetStocktaking;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
-import com.budwk.app.zhgh.asset.service.AssetDepreciationRecordService;
-import com.budwk.app.zhgh.asset.service.AssetService;
-import com.budwk.app.zhgh.staffmanage.member.param.MemberInfoPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.model.Asset;
+import com.budwk.app.zhgh.dayofficework.asset.model.AssetDepreciationRecord;
+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.AssetDepreciationRecordService;
+import com.budwk.app.zhgh.dayofficework.asset.service.AssetService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -58,7 +56,7 @@ public class AssetManageController {
     private AssetDepreciationRecordService assetDepreciationRecordService;
 
     @At("")
-    @Ok("beetl:/platform/zhgh/asset/manage/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/asset/manage/index.html")
     @SaCheckPermission("asset.manage")
     public void index() {
     }

src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingController.java

@@ -1,13 +1,12 @@
-package com.budwk.app.zhgh.asset.controller;
+package com.budwk.app.zhgh.dayofficework.asset.controller;
 
 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.result.Result;
-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.AssetStocktaking;
+import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.service.AssetStocktakingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -36,7 +35,7 @@ public class AssetStocktakingController {
     private AssetStocktakingService assetStocktakingService;
 
     @At("")
-    @Ok("beetl:/platform/zhgh/asset/stocktaking/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/asset/stocktaking/index.html")
     @SaCheckPermission("asset.stocktaking")
     public void index() {
     }

src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingPlanController.java

@@ -1,14 +1,12 @@
-package com.budwk.app.zhgh.asset.controller;
+package com.budwk.app.zhgh.dayofficework.asset.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.date.DateUtil;
 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.asset.model.AssetStocktakingPlan;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.model.AssetStocktakingPlan;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +38,7 @@ public class AssetStocktakingPlanController {
 
 
     @At("")
-    @Ok("beetl:/platform/zhgh/asset/stocktakingPlan/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/asset/stocktakingPlan/index.html")
     @SaCheckPermission("asset.stocktakingPlan")
     public void index() {
     }

src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/Asset.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.model;
+package com.budwk.app.zhgh.dayofficework.asset.model;
 
 import cn.hutool.json.JSONObject;
 import com.budwk.app.base.model.BaseModel;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetCategory.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.model;
+package com.budwk.app.zhgh.dayofficework.asset.model;
 
 import com.budwk.app.base.model.BaseModel;
 import lombok.Data;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetDepreciationRecord.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.model;
+package com.budwk.app.zhgh.dayofficework.asset.model;
 
 import com.budwk.app.base.model.BaseModel;
 import lombok.Data;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetStocktaking.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.model;
+package com.budwk.app.zhgh.dayofficework.asset.model;
 
 import cn.hutool.json.JSONObject;
 import com.budwk.app.base.model.BaseModel;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/model/AssetStocktakingPlan.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.model;
+package com.budwk.app.zhgh.dayofficework.asset.model;
 
 import com.budwk.app.base.model.BaseModel;
 import lombok.Data;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/param/AssetPageForm.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.asset.param;
+package com.budwk.app.zhgh.dayofficework.asset.param;
 
 import com.budwk.app.base.param.PageForm;
 import lombok.Data;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/AssetDepreciationRecordService.java

@@ -1,8 +1,8 @@
-package com.budwk.app.zhgh.asset.service;
+package com.budwk.app.zhgh.dayofficework.asset.service;
 
 import com.budwk.app.base.service.BaseService;
-import com.budwk.app.zhgh.asset.model.AssetDepreciationRecord;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.model.AssetDepreciationRecord;
+import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm;
 import org.nutz.dao.sql.Sql;
 
 import java.math.BigDecimal;

src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/AssetService.java

@@ -1,8 +1,8 @@
-package com.budwk.app.zhgh.asset.service;
+package com.budwk.app.zhgh.dayofficework.asset.service;
 
 import com.budwk.app.base.service.BaseService;
-import com.budwk.app.zhgh.asset.model.Asset;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.model.Asset;
+import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm;
 import org.nutz.dao.sql.Sql;
 import org.nutz.lang.util.NutMap;
 

src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/AssetStocktakingService.java

@@ -1,8 +1,8 @@
-package com.budwk.app.zhgh.asset.service;
+package com.budwk.app.zhgh.dayofficework.asset.service;
 
 import com.budwk.app.base.service.BaseService;
-import com.budwk.app.zhgh.asset.model.AssetStocktaking;
-import com.budwk.app.zhgh.asset.param.AssetPageForm;
+import com.budwk.app.zhgh.dayofficework.asset.model.AssetStocktaking;
+import com.budwk.app.zhgh.dayofficework.asset.param.AssetPageForm;
 import org.nutz.dao.sql.Sql;
 
 public interface AssetStocktakingService extends BaseService<AssetStocktaking> {

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;

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;

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;
 
 /**

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());

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);

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() {
     }

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()));

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() {
     }

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,

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;

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;

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 {

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;

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;

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() {
     }

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() {
     }

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() {
     }

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() {
     }

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;

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;

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;

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;

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;

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;

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;

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<HealthCheckupProject> {
 

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;

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;

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;

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;

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;

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() {
     }

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() {
     }

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() {
     }

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;

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;

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<IntegralDetail> {

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<IntegralConfig> {
 

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;

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;

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;

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;

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() {
     }

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);

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() {
     }

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() {
     }

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() {
     }

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;

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;

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;

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;

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;

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;

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;

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

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;

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<ActivityBudget> i
 
     @Inject
     private SysDictService sysDictService;
+    @Inject
+    private SysClubService sysClubService;
 
     @Inject
     private FlowEngine flowEngine;
@@ -100,23 +98,24 @@ public class ActivityBudgetServiceImpl extends BaseServiceImpl<ActivityBudget> 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<SysClub> myManageClub = sysClubService.getMyManageClub();
+            List<String> 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<String> 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);

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;

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() {
     }

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() {
     }

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;

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;

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() {
     }

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() {
     }

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;

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<OutlayUseDetail> {
 

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

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() {
     }

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() {
     }

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;

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) {

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();
+    }
 
 }

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,

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,

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,

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,

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,

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() {
 

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,

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;
 

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

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;