重定向

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,10 +125,22 @@ public class AdminPortalController {
                 if(syId.equals(memberId)){
                     //待审列表
                     if (affairState==SyAffairState.next){
+                        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 {
+                        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{
                     //判断是否创建人，创建人则跳转到详情
                     SysUser sysUser = sysUserService.getBySyId(syId);

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";
     }