Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundApplyController.java

@@ -73,10 +73,16 @@ public class AidFundApplyController {
     public void index() {
     }
 
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/apply/index.html")
+    @SaCheckPermission("h5.medicalMutualAid.aidFund.apply")
+    public void h5() {
+    }
+
 
     @At
     @ApiOperation("查询申请状态")
-    @SaCheckPermission("medicalMutualAid.aidFund.apply")
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.apply", "h5.medicalMutualAid.aidFund.apply"}, mode = SaMode.OR)
     public Result canApply() {
         String aidFundMemberApplyEndTime = Globals.MyConfig.getString("AidFundMemberApplyEndTime");
         if (StrUtil.isBlank(aidFundMemberApplyEndTime)) {

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundApplyMineController.java

@@ -63,6 +63,12 @@ public class AidFundApplyMineController {
     public void index() {
     }
 
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/applyMine/index.html")
+    @SaCheckPermission("h5.medicalMutualAid.aidFund.applyMine")
+    public void h5() {
+    }
+
     @At
     @ApiOperation("分页查询")
     @SaCheckPermission(value = {"medicalMutualAid.aidFund.applyMine", "h5.medicalMutualAid.aidFund.applyMine"}, mode = SaMode.OR)

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundFoundationAuditController.java

@@ -9,6 +9,7 @@ import com.budwk.app.base.param.PageForm;
 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.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberChangeRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,6 +52,12 @@ public class AidFundFoundationAuditController {
     public void index() {
     }
 
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/foundationAudit/index.html")
+    @SaCheckPermission("h5.medicalMutualAid.aidFund.foundationAudit")
+    public void h5() {
+    }
+
     @At
     @ApiOperation("分页查询")
     @SaCheckPermission(value = {"medicalMutualAid.aidFund.foundationAudit", "h5.medicalMutualAid.aidFund.foundationAudit"}, mode = SaMode.OR)
@@ -112,7 +119,7 @@ public class AidFundFoundationAuditController {
         cnd.andEX("info.changeType", "=", changeType);
 
         cnd.and("t.taskName", "=", "85c7d148-44f5-4333-b854-ab225357fd3e");
-//        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
 
         if (approval) {
             cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundManageController.java

@@ -77,7 +77,7 @@ public class AidFundManageController {
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     public Result pageData(AidFundPageForm pageForm) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -130,7 +130,7 @@ public class AidFundManageController {
 
 
     @At
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     @Ok("void")
     @ApiOperation("导出本年新进会员")
     public void exportNewMember(HttpServletResponse response) {
@@ -166,7 +166,7 @@ public class AidFundManageController {
 
 
     @At
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     @ApiOperation("生成缴费名单")
     @Aop(TransAop.READ_COMMITTED)
     @SLog(tag = "基金会员-基金会员台账", msg = "生成缴费名单")
@@ -177,7 +177,7 @@ public class AidFundManageController {
     }
 
     @At
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     @SLog(tag = "基金会员-基金会员台账", msg = "备份基金会员")
     @ApiOperation("备份基金会员")
     @Aop(TransAop.READ_COMMITTED)
@@ -189,7 +189,7 @@ public class AidFundManageController {
 
 
     @At
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     @SLog(tag = "基金会员-基金会员台账", msg = "批量设置退会")
     @ApiOperation("批量设置退会")
     @Aop(TransAop.READ_COMMITTED)
@@ -213,7 +213,7 @@ public class AidFundManageController {
 
 
     @At
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     @SLog(tag = "基金会员-基金会员台账", msg = "修改基金会员类型")
     @ApiOperation("修改基金会员类型")
     public Result doEditAidFundMemberUserType(String userId, String aidFundMemberUserType) {
@@ -222,7 +222,7 @@ public class AidFundManageController {
     }
 
     @At
-    @SaCheckPermission(value = {"medicalMutualAid.aidFund.retirementAudit", "h5.medicalMutualAid.aidFund.retirementAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
     @SLog(tag = "基金会员-基金会员台账", msg = "更改基金会员状态")
     @ApiOperation("更改基金会员状态")
     @Aop(TransAop.READ_COMMITTED)
@@ -239,4 +239,38 @@ public class AidFundManageController {
     }
 
 
+    @At
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
+    public Result findOne(String userId){
+        Sql sql = Sqls.create("""
+                SELECT
+                  us.username,
+                  us.loginname,
+                  us.mobile,
+                  us.aidFundMemberUserType,
+                  us.aidFundDeductTime,
+                  us.arrivalAtSchoolDate,
+                  us.sex,
+                  us.unitName,
+                  us.unionName
+                FROM
+                  vw_user us
+                WHERE
+                  us.id = '%s'
+                """.formatted(userId));
+        View_user user = userService.fetchVO(sql, View_user.class);
+        return Result.success(user);
+    }
+
+
+
+    @At
+    @SaCheckPermission(value = {"medicalMutualAid.aidFund.manage", "h5.medicalMutualAid.aidFund.manage"}, mode = SaMode.OR)
+    public Result findChangeRecordList(String userId){
+
+        List<NutMap> changeRecordList = aidFundMemberService.findChangeRecordList(userId);
+        return Result.success(changeRecordList);
+    }
+
+
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundRetirementAuditController.java

@@ -46,6 +46,11 @@ public class AidFundRetirementAuditController {
     @SaCheckPermission("medicalMutualAid.aidFund.retirementAudit")
     public void index() {
     }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/retirementAudit/index.html")
+    @SaCheckPermission("h5.medicalMutualAid.aidFund.retirementAudit")
+    public void h5() {
+    }
 
 
     @At

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundUnionAuditController.java

@@ -48,6 +48,12 @@ public class AidFundUnionAuditController {
     public void index() {
     }
 
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/unionAudit/index.html")
+    @SaCheckPermission("h5.medicalMutualAid.aidFund.unionAudit")
+    public void h5() {
+    }
+
 
     @At
     @ApiOperation("分页查询")

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/AidFundMemberService.java

@@ -2,6 +2,9 @@ package com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service;
 
 import com.budwk.app.base.service.BaseService;
 import com.budwk.app.sys.models.Sys_user;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
 
 public interface AidFundMemberService extends BaseService {
 
@@ -26,4 +29,7 @@ public interface AidFundMemberService extends BaseService {
      * @return
      */
     Double getPayMoney(Sys_user user, Integer year);
+
+
+    List<NutMap> findChangeRecordList(String userId);
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/service/impl/AidFundMemberServiceImpl.java

@@ -11,8 +11,12 @@ import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.model.AidFundMem
 import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.service.AidFundMemberService;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Strings;
+import org.nutz.lang.util.NutMap;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -117,5 +121,52 @@ public class AidFundMemberServiceImpl extends BaseServiceImpl implements AidFund
         return (year + 1 - beforeYear) * money + (year - beforeYear) * money * 0.1;
     }
 
+    @Override
+    public List<NutMap> findChangeRecordList(String userId) {
+        Sql sql = Sqls.create("""
+                   SELECT
+                    info.*,
+                    us.sex,
+                    us.username,
+                    us.loginname,
+                    us.arrivalAtSchoolDate,
+                    us.mobile,
+                    us.unitName,
+                    us.unionName,
+                    us.aidFundMemberUserType,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    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
+                    `aid_fund_member_change_record` info
+                    LEFT JOIN vw_user us ON us.id = info.userId
+                    LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
+                    LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
+                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        SqlExpressionGroup group = new SqlExpressionGroup();
+        group.or("ins.state", "=", 20);
+        group.or("ins.state", "is", null);
+        cnd.and(group);
+        cnd.and("info.userId", "=", userId);
+        sql.setCondition(cnd);
+        return listMap(sql);
+    }
+
 
 }