工会报销移动端

src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java

@@ -5,7 +5,6 @@ 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;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.result.Result;
@@ -22,7 +21,6 @@ import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
 import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.service.SysClubService;
-import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java

@@ -1,7 +1,8 @@
-package com.budwk.app.zhgh.unionReimburse.controller;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.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;
@@ -22,11 +23,12 @@ import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayMan
 import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool;
 import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion;
 import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceTypeService;
-import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.model.UnionReimburse;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType;
-import com.budwk.app.zhgh.unionReimburse.service.UnionReimburseService;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.service.UnionReimburseService;
 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.Dao;
@@ -51,6 +53,7 @@ import java.util.List;
 @At("/platform/unionReimburse/apply")
 @Api("工会报销申请")
 @Ok("json:full")
+@Slf4j
 public class UnionReimburseApplyController {
 
     @Inject
@@ -65,26 +68,32 @@ public class UnionReimburseApplyController {
     private CondolenceTypeService typeService;
 
 
-    @At("")
+    @At("/index")
-    @Ok("beetl:/platform/zhgh/unionReimburse/apply/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/unionReimburse/apply/index.html")
-    @SaCheckLogin
+    @SaCheckPermission("unionReimburse.apply")
-    public void index() {}
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/unionReimburse/apply/index.html")
+    @SaCheckPermission("h5.unionReimburse.apply")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("保存申请")
-    @SaCheckPermission("unionReimburse.apply")
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     @SLog(type = "unionReimburse", tag = "工会报销-报销申请", msg = "保存报销申请")
     public Result save(@Param("data") UnionReimburse unionReimburse) {
-        if(StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(DateUtil.now());
+        if (StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(DateUtil.now());
         dao.insertOrUpdate(unionReimburse);
         return Result.success();
     }
 
     @At
-    @SaCheckLogin
     @ApiOperation("提交申请")
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result submit(@Param("data") UnionReimburse unionReimburse) {
-        if(StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(DateUtil.now());
+        if (StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(DateUtil.now());
 
         dao.insertOrUpdate(unionReimburse);
         // 开启流程实例
@@ -102,11 +111,11 @@ public class UnionReimburseApplyController {
     }
 
     @At
-    @SaCheckLogin
     @ApiOperation("重新提交申请")
     @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result submitAgain(@Param("data") UnionReimburse unionReimburse, @Param("taskId") Long taskId) {
-        if(StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(DateUtil.now());
+        if (StrUtil.isBlank(unionReimburse.getId())) unionReimburse.setCreateTime(DateUtil.now());
 
         dao.insertOrUpdate(unionReimburse);
 
@@ -133,25 +142,25 @@ public class UnionReimburseApplyController {
 
     @At
     @ApiOperation("查询用户")
-    @SaCheckPermission("unionReimburse.apply")
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     @SLog(type = "unionReimburse", tag = "查询用户", msg = "查询用户")
     public Object listUser(String keyword) {
         Sql sql = Sqls.create("""
-				select
+                select
-					id,
+                	id,
-					username as userName,
+                	username as userName,
-					loginname as loginName,
+                	loginname as loginName,
-					sex,
+                	sex,
-					mobile,
+                	mobile,
-					technicalTitle,
+                	technicalTitle,
-					IFNULL(unitname, '暂无') as unitName,
+                	IFNULL(unitname, '暂无') as unitName,
-					unitid as unitId,
+                	unitid as unitId,
-					unionid as unionId,
+                	unionid as unionId,
-					unionname as unionName
+                	unionname as unionName
-				from
+                from
-					vw_user
+                	vw_user
-				$condition
+                $condition
-				""");
+                """);
         Cnd cnd = Cnd.NEW();
         if (StrUtil.isNotBlank(keyword)) {
             SqlExpressionGroup seg = new SqlExpressionGroup();
@@ -159,8 +168,8 @@ public class UnionReimburseApplyController {
             seg.or(View_user::getUsername, "like", "%" + keyword + "%");
             cnd.and(seg);
         }
-        if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-            if(AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
                 cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId());
             } else {
                 cnd.and(View_user::getId, "=", SecurityUtil.getUserId());
@@ -174,7 +183,7 @@ public class UnionReimburseApplyController {
 
     @At
     @ApiOperation("查询职工慰问类型")
-    @SaCheckLogin
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result queryCondolenceType() {
         List<CondolenceType> list = typeService.query(Cnd.NEW().desc(CondolenceType::getCode));
         return Result.success(list);
@@ -182,7 +191,7 @@ public class UnionReimburseApplyController {
 
     @At
     @ApiOperation("查询校工会经费余额")
-    @SaCheckPermission("unionReimburse.apply")
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result getSchoolBudget() {
         OutlayManageSchool outlayManageSchool = dao.fetch(OutlayManageSchool.class,
                 Cnd.where("year", "=", DateUtil.year(new Date())));
@@ -197,7 +206,7 @@ public class UnionReimburseApplyController {
 
     @At
     @ApiOperation("查询分工会经费余额")
-    @SaCheckPermission("unionReimburse.apply")
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result getUnionBalance() {
         OutlayManageUnion outlayManageUnion = dao.fetch(OutlayManageUnion.class,
                 Cnd.where("unionId", "=", SecurityUtil.getUnionId()).and("year", "=", DateUtil.year(new Date())));
@@ -211,7 +220,7 @@ public class UnionReimburseApplyController {
 
     @At
     @ApiOperation("查询社团经费余额")
-    @SaCheckPermission("unionReimburse.apply")
+    @SaCheckPermission(value = {"unionReimburse.apply", "h5.unionReimburse.apply"}, mode = SaMode.OR)
     public Result getClubBudget(@Param("clubId") String clubId) {
         // 检查clubId参数是否为空
         if (StrUtil.isBlank(clubId)) {
@@ -233,6 +242,4 @@ public class UnionReimburseApplyController {
     }
 
 
-
-
 }

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java

@@ -1,10 +1,11 @@
-package com.budwk.app.zhgh.unionReimburse.controller;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 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;
@@ -13,10 +14,11 @@ import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.sys.models.Sys_dict;
 import com.budwk.app.sys.services.SysDictService;
-import com.budwk.app.zhgh.unionReimburse.service.UnionReimburseService;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.service.UnionReimburseService;
-import com.budwk.app.zhgh.unionReimburse.vo.UnionReimburseCollectExcelVO;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.vo.UnionReimburseCollectExcelVO;
 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.Dao;
@@ -36,6 +38,7 @@ import java.util.List;
 @At("/platform/unionReimburse/collect")
 @Ok("json:full")
 @Api("查询统计")
+@Slf4j
 public class UnionReimburseCollectController {
 
     @Inject
@@ -49,14 +52,20 @@ public class UnionReimburseCollectController {
     @Inject
     private UnionReimburseService unionReimburseService;
 
-    @At("")
+    @At("/index")
-    @Ok("beetl:/platform/zhgh/unionReimburse/collect/index.html")
+    @Ok("beetl:/platform/zhgh/dayofficework/unionReimburse/collect/index.html")
-    @SaCheckLogin
+    @SaCheckPermission("unionReimburse.collect")
-    public void index() {}
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/unionReimburse/collect/index.html")
+    @SaCheckPermission("h5.unionReimburse.collect")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission("unionReimburse.collect")
+    @SaCheckPermission(value = {"unionReimburse.collect", "h5.unionReimburse.collect"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            @Param(value = "year") Integer year,
                            @Param(value = "unionId") String unionId,
@@ -115,7 +124,7 @@ public class UnionReimburseCollectController {
 
     @At
     @Ok("void")
-    @SaCheckPermission("unionReimburse.collect")
+    @SaCheckPermission(value = {"unionReimburse.collect", "h5.unionReimburse.collect"}, mode = SaMode.OR)
     @ApiOperation("导出报销汇总表")
     public void onExport(@Param(value = "year") Integer year,
                          @Param(value = "unionId") String unionId,

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java

@@ -1,7 +1,8 @@
-package com.budwk.app.zhgh.unionReimburse.controller;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+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;
@@ -9,15 +10,14 @@ import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
-import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.service.UnionReimburseService;
-import com.budwk.app.zhgh.unionReimburse.service.UnionReimburseService;
 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.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -37,6 +37,7 @@ import org.nutz.mvc.annotation.Param;
 @At("/platform/unionReimburse/mine")
 @Api("工会报销我的")
 @Ok("json:full")
+@Slf4j
 public class  UnionReimburseMineController {
 
     @Inject
@@ -44,14 +45,21 @@ public class  UnionReimburseMineController {
     @Inject
     private FlowEngine flowEngine;
 
-    @At("")
+
-    @Ok("beetl:/platform/zhgh/unionReimburse/mine/index.html")
+    @At("/index")
-    @SaCheckLogin
+    @Ok("beetl:/platform/zhgh/dayofficework/unionReimburse/mine/index.html")
-    public void index() {}
+    @SaCheckPermission("unionReimburse.mine")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/unionReimburse/mine/index.html")
+    @SaCheckPermission("h5.unionReimburse.mine")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission("unionReimburse.mine")
+    @SaCheckPermission(value = {"unionReimburse.mine", "h5.unionReimburse.mine"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            @Param(value = "year") Integer year,
                            @Param(value = "unionId") String unionId,
@@ -108,8 +116,8 @@ public class  UnionReimburseMineController {
     @At
     @ApiOperation("删除")
     @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("unionReimburse.mine")
+    @SaCheckPermission(value = {"unionReimburse.mine", "h5.unionReimburse.mine"}, mode = SaMode.OR)
-    @SLog(type = "unionReimburse", tag = "删除工会报销", msg = "删除工会报销")
+    @SLog( tag = "删除工会报销", msg = "删除工会报销")
     public Result delete(@Param("id") String id) {
         unionReimburseService.delete(id);
         flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java

@@ -1,8 +1,9 @@
-package com.budwk.app.zhgh.unionReimburse.controller;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.controller;
 
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
 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;
@@ -10,9 +11,10 @@ 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.unionReimburse.service.UnionReimburseService;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.service.UnionReimburseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
@@ -21,7 +23,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;
 
@@ -29,19 +30,27 @@ import java.util.List;
 @At("/platform/unionReimburse/review")
 @Ok("json:full")
 @Api("审核报销")
+@Slf4j
 public class UnionReimburseReviewController {
 
     @Inject
     private UnionReimburseService unionReimburseService;
 
-    @At("")
+
-    @Ok("beetl:/platform/zhgh/unionReimburse/review/index.html")
+    @At("/index")
-    @SaCheckLogin
+    @Ok("beetl:/platform/zhgh/dayofficework/unionReimburse/review/index.html")
-    public void index() {}
+    @SaCheckPermission("unionReimburse.review")
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/unionReimburse/review/index.html")
+    @SaCheckPermission("h5.unionReimburse.review")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission("unionReimburse.review")
+    @SaCheckPermission(value = {"unionReimburse.review", "h5.unionReimburse.review"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            boolean approval,
                            Integer year,

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.unionReimburse.interceptor;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.interceptor;
 
 import cn.hutool.core.date.DateUtil;
 import com.budwk.app.base.exception.BaseException;
@@ -11,7 +11,7 @@ import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.club.model.OutlayMan
 import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.model.OutlayUseDetail;
 import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.school.model.OutlayManageSchool;
 import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion;
-import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.model.UnionReimburse;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.json.Json;

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburse.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.unionReimburse.model;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.model;
 
 import cn.hutool.db.DaoTemplate;
 import cn.hutool.json.JSONObject;
@@ -187,8 +187,8 @@ public class UnionReimburse extends BaseModel {
 
     @Column
     @Comment("活动类型（1.分工会，2.校工会，3.社团）")
-    @ColDefine(type = ColType.INT, width = 2)
+    @ColDefine(type = ColType.VARCHAR, width = 32)
-    private Integer activityType;
+    private String activityType;
 
     @Column
     @Comment("活动人数")

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/UnionReimburseService.java

@@ -0,0 +1,7 @@
+package com.budwk.app.zhgh.dayofficework.unionReimburse.service;
+
+import com.budwk.app.base.service.BaseService;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.model.UnionReimburse;
+
+public interface UnionReimburseService  extends BaseService<UnionReimburse> {
+}

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java

@@ -1,10 +1,9 @@
-package com.budwk.app.zhgh.unionReimburse.service.impl;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.service.impl;
 
 
-import com.budwk.app.base.service.BaseService;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
-import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.model.UnionReimburse;
-import com.budwk.app.zhgh.unionReimburse.service.UnionReimburseService;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.service.UnionReimburseService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.IocBean;

src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/vo/UnionReimburseCollectExcelVO.java

@@ -1,4 +1,4 @@
-package com.budwk.app.zhgh.unionReimburse.vo;
+package com.budwk.app.zhgh.dayofficework.unionReimburse.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageManageController.java

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
@@ -51,14 +52,21 @@ public class ChildManageManageController {
     @Inject
     private SysDictService sysDictService;
 
-    @At("")
+
+    @At("/index")
     @Ok("beetl:/platform/zhgh/staffmanage/childManage/manage/index.html")
-    @SaCheckPermission
+    @SaCheckPermission("childManage.manage")
-    public void index() {}
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/manage/index.html")
+    @SaCheckPermission("h5.childManage.manage")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission("childManage.manage")
+    @SaCheckPermission(value = {"childManage.manage", "h5.childManage.manage"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            Integer year,
                            String searchName,
@@ -114,7 +122,7 @@ public class ChildManageManageController {
     @At
     @ApiOperation("删除子女信息")
     @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("childManage.manage")
+    @SaCheckPermission(value = {"childManage.manage", "h5.childManage.manage"}, mode = SaMode.OR)
     @SLog(tag = "子女信息-我的填报", msg = "删除id: ${args[0]}")
     public Result doDelete(String id) {
         childManageService.dao().delete(ChildManage.class, id);
@@ -123,7 +131,7 @@ public class ChildManageManageController {
 
     @At
     @Ok("void")
-    @SaCheckPermission("childManage.manage")
+    @SaCheckPermission(value = {"childManage.manage", "h5.childManage.manage"}, mode = SaMode.OR)
     public void doExportExcel(@Param("data") ChildManagePageForm pageForm, HttpServletResponse response) {
         try {
             Sql sql = childManageService.getSql(pageForm);

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageMineController.java

@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.staffmanage.childManage.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;
@@ -32,14 +33,20 @@ public class ChildManageMineController {
     @Inject
     private ChildManageService childManageService;
 
-    @At("")
+    @At("/index")
     @Ok("beetl:/platform/zhgh/staffmanage/childManage/mine/index.html")
-    @SaCheckPermission
+    @SaCheckPermission("childManage.mine")
-    public void index() {}
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html")
+    @SaCheckPermission("h5.childManage.mine")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission("childManage.mine")
+    @SaCheckPermission(value = {"childManage.mine", "h5.childManage.mine"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm, Integer year) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -62,8 +69,8 @@ public class ChildManageMineController {
     @At
     @ApiOperation("删除子女信息")
     @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("childManage.mine")
+    @SaCheckPermission(value = {"childManage.mine", "h5.childManage.mine"}, mode = SaMode.OR)
-    @SLog(tag = "子女信息-我的填报", msg = "删除id: ${args[0]}")
+      @SLog(tag = "子女信息-我的填报", msg = "删除id: ${args[0]}")
     public Result doDelete(String id) {
         childManageService.dao().delete(ChildManage.class, id);
         return Result.success();

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/controller/ChildManageWriteController.java

@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.staffmanage.childManage.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.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -41,14 +42,20 @@ public class ChildManageWriteController {
     private ChildManageService childManageService;
 
 
-    @At("")
+    @At("/index")
     @Ok("beetl:/platform/zhgh/staffmanage/childManage/write/index.html")
-    @SaCheckPermission
+    @SaCheckPermission("childManage.write")
-    public void index() {}
+    public void index() {
+    }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/write/index.html")
+    @SaCheckPermission("h5.childManage.write")
+    public void h5Index() {
+    }
 
     @At
     @ApiOperation("保存子女信息")
-    @SaCheckPermission("childManage.write")
+    @SaCheckPermission(value = {"childManage.write", "h5.childManage.write"}, mode = SaMode.OR)
     @SLog(tag = "子女信息管理-信息填写", msg = "保存子女信息")
     public Result save(@Param("data") ChildManage childManage) {
         if(StrUtil.isBlank(childManage.getId())) childManage.setApplyTime(DateUtil.now());
@@ -58,7 +65,7 @@ public class ChildManageWriteController {
 
     @At
     @ApiOperation("查询用户")
-    @SaCheckPermission("childManage.write")
+    @SaCheckPermission(value = {"childManage.write", "h5.childManage.write"}, mode = SaMode.OR)
     @SLog(tag = "查询用户", msg = "查询用户")
     public Object listUser(String keyword) {
         Sql sql = Sqls.create("""
@@ -98,7 +105,7 @@ public class ChildManageWriteController {
     }
 
     @At
-    @SaCheckLogin
+    @SaCheckPermission(value = {"childManage.write", "h5.childManage.write"}, mode = SaMode.OR)
     @ApiOperation("查询身份证是否重复")
     public Result getIsRepeatByIdCard(String idCard, String id) {
         int count = childManageService.dao().count(ChildManage.class,

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageManageController.java

@@ -1,20 +0,0 @@
-package com.budwk.app.zhgh.staffmanage.childManage.h5controller;
-
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import lombok.extern.slf4j.Slf4j;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-
-@IocBean
-@At("/platform/h5/childManage/manage")
-@Ok("json:full")
-@Slf4j
-public class H5ChildManageManageController {
-
-    @At("")
-    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/manage/index.html")
-    @SaCheckPermission("h5.childManage.manage")
-    public void index() {}
-}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageMineController.java

@@ -1,27 +0,0 @@
-package com.budwk.app.zhgh.staffmanage.childManage.h5controller;
-
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.budwk.app.zhgh.staffmanage.childManage.service.ChildManageService;
-import lombok.extern.slf4j.Slf4j;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-
-@IocBean
-@At("/platform/h5/childManage/mine")
-@Ok("json:full")
-@Slf4j
-public class H5ChildManageMineController {
-
-    @Inject
-    private ChildManageService childManageService;
-
-    @At("")
-    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html")
-    @SaCheckPermission("h5.childManage.mine")
-    public void index() {}
-
-
-}

src/main/java/com/budwk/app/zhgh/staffmanage/childManage/h5controller/H5ChildManageWriteController.java

@@ -1,30 +0,0 @@
-package com.budwk.app.zhgh.staffmanage.childManage.h5controller;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import lombok.extern.slf4j.Slf4j;
-import org.nutz.dao.Dao;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-
-/**
- * @version 1.0
- * @Author hqw
- * @name：H5ChildManageController
- * @Date 2025/9/4 8:52
- * @注释
- */
-@Slf4j
-@IocBean
-@Ok("json")
-@At("/platform/h5/childManage/write")
-public class H5ChildManageWriteController {
-
-    @At("")
-    @Ok("beetl:/platform/zhghh5/staffmanage/childManage/write/index.html")
-    @SaCheckPermission("h5.childManage.write")
-    public void index() {
-    }
-
-}

src/main/java/com/budwk/app/zhgh/unionReimburse/service/UnionReimburseService.java

@@ -1,7 +0,0 @@
-package com.budwk.app.zhgh.unionReimburse.service;
-
-import com.budwk.app.base.service.BaseService;
-import com.budwk.app.zhgh.unionReimburse.model.UnionReimburse;
-
-public interface UnionReimburseService  extends BaseService<UnionReimburse> {
-}

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html

@@ -153,9 +153,9 @@ layout("/layouts/platform.html"){
                 <el-descriptions-item label="活动类型" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">
                     <el-form-item label="活动类型" prop="activityType">
                         <el-select v-model="formData.activityType" placeholder="请选择活动类型" style="width: 100%">
-                            <el-option label="分工会活动" value="1"></el-option>
+                            <el-option label="分工会活动" value="分工会活动"></el-option>
-                            <el-option label="校工会活动" value="2"></el-option>
+                            <el-option label="校工会活动" value="校工会活动"></el-option>
-                            <el-option label="协会(社团)活动" value="3"></el-option>
+                            <el-option label="协会(社团)活动" value="协会(社团)活动"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-descriptions-item>
@@ -216,7 +216,7 @@ layout("/layouts/platform.html"){
                     <el-form-item prop="files" label="附件">
                         <file-upload
                                 :value.sync="formData.files"
-                                :upload_number="5"
+                                :upload_number="10"
                                 upload_result_category="array"
                                 complete_result
                                 upload_mode="drag"
@@ -251,7 +251,6 @@ layout("/layouts/platform.html"){
                     paymentWay: [{required: true, message: '请选择支付方式', trigger: ["change", "blur"]}],
                     reimburseProject: [{required: true, message: '请选择报销项目', trigger: ["change", "blur"]}],
                     reimburseFundSource: [{required: true, message: '请选择经费来源', trigger: ["change", "blur"]}],
-                    mobile: [{required: true, message: '请填写联系方式', trigger: ["change", "blur"]}],
                     bankUserName: [{required: true, message: '请填写户名', trigger: ["change", "blur"]}],
                     bankCardNumber: [{required: true, message: '请填写银行账号', trigger: ["change", "blur"]}],
                     bankOfDeposit: [{required: true, message: '请填写开户行', trigger: ["change", "blur"]}],
@@ -349,7 +348,7 @@ layout("/layouts/platform.html"){
                     this.$axios.post('/platform/unionReimburse/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
-                            window.location.href = '/platform/unionReimburse/mine'
+                            window.location.href = '/platform/unionReimburse/mine/index'
                         }
                     })
                 })
@@ -375,7 +374,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/unionReimburse/mine'
+                            window.location.href = '/platform/unionReimburse/mine/index'
                         }
                     })
                 })
@@ -402,7 +401,7 @@ layout("/layouts/platform.html"){
                     }).then(res => {
                         if (res.code === 0) {
                             this.$message.success("提交成功")
-                            window.location.href = '/platform/unionReimburse/mine'
+                            window.location.href = '/platform/unionReimburse/mine/index'
                         }
                     })
                 })

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html

@@ -126,6 +126,7 @@ layout("/layouts/platform.html"){
         },
         data() {
             return {
+                pageDataUrl: "/platform/unionReimburse/collect/pageData",
                 unionOptions: [],
                 unitOptions: [],
                 userOptions: [],
@@ -175,7 +176,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onExport() {
-                this.$downLoad(loc() + '/onExport', this.pageForm)
+                this.$downLoad('/platform/unionReimburse/collect/onExport', this.pageForm)
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html

@@ -126,6 +126,7 @@ layout("/layouts/platform.html"){
         },
         data() {
             return {
+                pageDataUrl: "/platform/unionReimburse/mine/pageData",
                 unionOptions: [],
                 unitOptions: [],
                 userOptions: [],
@@ -161,7 +162,7 @@ layout("/layouts/platform.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/unionReimburse/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
+                window.location.href = '/platform/unionReimburse/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
             },
             onRevoke(row) {
                 this.$confirm("您确定要撤回吗？", "提示", {

src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html

@@ -150,6 +150,7 @@ layout("/layouts/platform.html"){
         },
         data() {
             return {
+                pageDataUrl: "/platform/unionReimburse/review/pageData",
                 pageForm: {
                     approval: false
                 },

src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html

@@ -172,7 +172,7 @@ layout("/layouts/platform.html"){
                 return age >= 0 ? age : '未出生';
             },
             openEdit(row) {
-                window.location.href = '/platform/childManage/write?bizId=' + row.id + '&manage=1'
+                window.location.href = '/platform/childManage/write/index?bizId=' + row.id + '&manage=1'
             },
             doDelete(id) {
                 this.$confirm("您确定要删除吗？", "提示", {

src/main/resources/views/platform/zhgh/staffmanage/childManage/mine/index.html

@@ -119,7 +119,7 @@ layout("/layouts/platform.html"){
                 return age >= 0 ? age : '未出生';
             },
             openEdit(row) {
-                window.location.href = '/platform/childManage/write?bizId=' + row.id
+                window.location.href = '/platform/childManage/write/index?bizId=' + row.id
             },
             doDelete(id) {
                 this.$confirm("您确定要删除吗？", "提示", {

src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html

@@ -309,9 +309,9 @@ layout("/layouts/platform.html"){
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             if (GetQueryString('manage') === '1') {
-                                window.location.href = '/platform/childManage/manage'
+                                window.location.href = '/platform/childManage/manage/index'
                             }else {
-                                window.location.href = '/platform/childManage/mine'
+                                window.location.href = '/platform/childManage/mine/index'
                             }
                         }
                     })

src/main/resources/views/platform/zhghh5/staffmanage/childmanage/manage/index.html

@@ -94,7 +94,7 @@ layout("/layouts/platform_h5.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/h5/childManage/write?bizId=' + row.id
+                window.location.href = '/platform/childManage/write/h5?bizId=' + row.id
             },
             onDelete(id) {
                 this.$dialog.confirm({

src/main/resources/views/platform/zhghh5/staffmanage/childmanage/mine/index.html

@@ -87,14 +87,14 @@ layout("/layouts/platform_h5.html"){
                 })
             },
             onEdit(row) {
-                window.location.href = '/platform/h5/childManage/write?bizId=' + row.id
+                window.location.href = '/platform/childManage/write/h5?bizId=' + row.id
             },
-            onDelete(id) {
+            onDelete(row) {
                 this.$dialog.confirm({
                     title: '温馨提示',
                     message: '您确定要删除吗？',
                 }).then(() => {
-                    this.$axios.post("/platform/childManage/mine/doDelete", {id}).then((res) => {
+                    this.$axios.post("/platform/childManage/mine/doDelete", {id: row.id}).then((res) => {
                         if (res.code === 0) {
                             this.$toast.success(res.msg)
                             this.doSearch()

src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html

@@ -22,7 +22,7 @@ layout("/layouts/platform_h5.html"){
 					   name="childrenGrade"
 					   label="就读年级"
 					   readonly
-					   placeholder="请点击就读年级"
+					   placeholder="请选择就读年级"
 					   @click="showChildrenGradePicker = true"
 					   clickable
 			></van-field>
@@ -208,7 +208,7 @@ layout("/layouts/platform_h5.html"){
 					this.$axios.post("/platform/childManage/write/save", { data: JSON.stringify(submitData) }).then(res => {
 						if (res.code === 0) {
 							this.$toast(res.msg)
-							this.$pjaxReplace('/platform/h5/childManage/mine')
+							this.$pjaxReplace('/platform/childManage/mine/h5')
 						}
 					})
 				})