commit

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java

@@ -3,12 +3,10 @@ package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
-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.result.Result;
-import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.entity.ProcessInstance;
@@ -19,9 +17,6 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
-import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
-import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
@@ -33,12 +28,10 @@ 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;
 import org.nutz.mvc.annotation.Param;
 
-import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -76,6 +69,11 @@ public class DifficultHelpApplyController {
     public void form() {
     }
 
+    @At
+    @SaCheckPermission("h5.difficultHelp.apply")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html")
+    public void h5() {
+    }
 
     @At
     @ApiOperation("保存申请")

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java

@@ -52,6 +52,12 @@ public class DifficultHelpMineController {
     public void index() {
     }
 
+    @At
+    @SaCheckPermission("h5.difficultHelp.mine")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html")
+    public void h5() {
+    }
+
 
     @At
     @ApiOperation("困难补助申请,我的申请列表")

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/h5controller/H5DifficultHelpController.java

@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.staffbenefit.difficulthelp.h5controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：H5DifficultHelpController
+ * @Date 2025/9/6 14:21
+ * @注释
+ */
+@IocBean
+@Ok("json:full")
+@Api("h5困难帮扶")
+@At("/platform/h5/difficultHelp")
+public class H5DifficultHelpController {
+
+    @At
+    @SaCheckPermission("difficultHelp.h5.apply")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html")
+    public void apply() {
+    }
+
+    @At
+    @SaCheckPermission("difficultHelp.h5.mine")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html")
+    public void mine() {
+    }
+}

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java

@@ -67,6 +67,7 @@ public class MemberApplyMineController {
                     info.userState,
                     info.preparedBy,
                     info.personType,
+                    info.applyDateTime,
                     info.sign,
                     ins.id AS instanceId,
                     ins.businessNo,