From 44ce144130cba1675776d3867090ed2290f773c9 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 12 Jun 2023 17:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminPortalController.java | 19 +++++- .../serve/controller/util/SyKeyLoginUtil.java | 59 ++++++++++++++++--- 2 files changed, 67 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/qs/serve/controller/AdminPortalController.java b/src/main/java/com/qs/serve/controller/AdminPortalController.java index 5a166308..3fe5bc80 100644 --- a/src/main/java/com/qs/serve/controller/AdminPortalController.java +++ b/src/main/java/com/qs/serve/controller/AdminPortalController.java @@ -26,7 +26,9 @@ import com.qs.serve.modules.sys.service.SysTenantService; import com.qs.serve.modules.sys.service.SysUserLoginService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; +import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsCostApply; +import com.qs.serve.modules.tbs.service.TbsActivityService; import com.qs.serve.modules.tbs.service.TbsCostApplyService; import com.qs.serve.modules.tbs.service.impl.TbsCostApplyCompensateServiceImpl; import com.qs.serve.modules.third.ThirdTokenUtil; @@ -68,6 +70,7 @@ public class AdminPortalController { private TbsCostApplyService costApplyService; private VtbVerificationService verificationService; private TzcPolicyService policyService; + private TbsActivityService activityService; /** @@ -122,9 +125,21 @@ public class AdminPortalController { if(syId.equals(memberId)){ //待审列表 if (affairState==SyAffairState.next){ - jumpUrl = SyKeyLoginUtil.getPreCheckUrl(templateCode,targetId,affairId); + if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){ + VtbVerification object = verificationService.getById(targetId); + TbsActivity activity = activityService.getById(object.getActivityId()); + jumpUrl = SyKeyLoginUtil.getPreCheckUrl4Verification(activity.getCostApplyId(),activity.getId(),object.getId(),affairId); + }else{ + jumpUrl = SyKeyLoginUtil.getPreCheckUrl(templateCode,targetId,affairId); + } }else { - jumpUrl = SyKeyLoginUtil.getCheckedDetailUrl(templateCode,targetId); + if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){ + VtbVerification object = verificationService.getById(targetId); + TbsActivity activity = activityService.getById(object.getActivityId()); + jumpUrl = SyKeyLoginUtil.getCheckedDetailUrl4Verification(activity.getCostApplyId(),activity.getId(),object.getId()); + }else{ + jumpUrl = SyKeyLoginUtil.getCheckedDetailUrl(templateCode,targetId); + } } }else{ //判断是否创建人，创建人则跳转到详情 diff --git a/src/main/java/com/qs/serve/controller/util/SyKeyLoginUtil.java b/src/main/java/com/qs/serve/controller/util/SyKeyLoginUtil.java index e19da89d..c0ff012f 100644 --- a/src/main/java/com/qs/serve/controller/util/SyKeyLoginUtil.java +++ b/src/main/java/com/qs/serve/controller/util/SyKeyLoginUtil.java @@ -22,14 +22,39 @@ public class SyKeyLoginUtil { return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId="+affairId; } if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){ - return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId=0"; + return "my-expense-application-activity-write-off-approval-pending-detail?" + + "expenseApplicationId=382658" + //费用id + "&writeOffId=1936474" + //核销id + "&activityId=2277848" + //活动id + "&approvalId="+affairId; } if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){ - return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId=0"; + return "my-policy-application-approval-pending-detail?policyApplicationId=" + targetId + + "&approvalId="+affairId; } return "404"; } + /** + * 获取核销待审批详情 + * @param costApplyId + * @param activityId + * @param verificationId + * @param affairId + * @return + */ + public static String getPreCheckUrl4Verification(Long costApplyId, + Long activityId, + Long verificationId, + String affairId){ + return "my-expense-application-activity-write-off-approval-pending-detail?" + + "expenseApplicationId=" + costApplyId+ //费用id + "&writeOffId=" + verificationId +//核销id + "&activityId=" + activityId +//活动id + "&approvalId="+affairId; + } + + /** * 获取已审批详情 * @param templateCode @@ -38,17 +63,33 @@ public class SyKeyLoginUtil { */ public static String getCheckedDetailUrl(String templateCode,String targetId){ if(templateCode.equals(TbsSeeYonConst.CostApplyConf.Code())){ - return "my-expense-application-approval-approved-detail?expenseApplicationId="+targetId+"&approvalId=0"; - } - if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){ - return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId=0"; + return "my-expense-application-approval-approved-detail?expenseApplicationId="+targetId + +"&approvalId=0"; } if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){ - return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId=0"; + return "my-policy-application-approval-approved-detail?policyApplicationId=" + targetId + + "&approvalId=0"; } return "404"; } + /** + * 获取核销待审批详情 + * @param costApplyId + * @param activityId + * @param verificationId + * @return + */ + public static String getCheckedDetailUrl4Verification(Long costApplyId, + Long activityId, + Long verificationId){ + return "my-expense-application-activity-write-off-approval-approved-detail?" + + "expenseApplicationId=" + costApplyId+ //费用id + "&writeOffId=" + verificationId +//核销id + "&activityId=" + activityId +//活动id + "&approvalId=0"; + } + /** * 获取个人申请详情 * @param templateCode @@ -60,10 +101,10 @@ public class SyKeyLoginUtil { return "my-expense-application-detail?id="+targetId; } if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){ - return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId=0"; + return "my-expense-application-activity-write-off-management"; } if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){ - return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId=0"; + return "my-policy-application-detail?id="+targetId; } return "404"; }