调整

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -202,7 +202,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
             return getRequestService().getUnfinishedAffair(getTemplateCode(), sysUser.getSyAccount());
         }
-        return R.ok(123456L);
+        return R.ok(0L);
     }
 
     /**

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -15,13 +15,19 @@ import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysAttachService;
+import com.qs.serve.modules.sys.service.SysPostUserService;
 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.TbsActivityPayCondition;
 import com.qs.serve.modules.tbs.entity.TbsActivitySubject;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
 import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
+import com.qs.serve.modules.tbs.service.TbsActivityPayConditionService;
+import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.tbs.service.TbsActivitySubjectService;
+import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import com.qs.serve.modules.vtb.entity.*;
 import com.qs.serve.modules.vtb.service.*;
 import com.qs.serve.modules.vtb.service.impl.VtbVerificationOperationServiceImpl;
@@ -53,8 +59,12 @@ public class VtbVerificationController {
     private VtbVerificationChannelPointService vtbVerificationChannelPointService;
     private VtbVerificationSubjectService vtbVerificationSubjectService;
     private TbsActivitySubjectService activitySubjectService;
+    private TbsCostApplyService tbsCostApplyService;
+    private TbsActivityService tbsActivityService;
+    private TbsActivityPayConditionService tbsActivityPayConditionService;
     private SysAttachService attachService;
     private SysUserService sysUserService;
+    private SysPostUserService sysPostUserService;
     private SeeYonRequestService seeYonService;
     private VtbVerificationApplication verificationApplication;
     private VtbVerificationYardService verificationYardService;
@@ -62,13 +72,15 @@ public class VtbVerificationController {
     private VtbVerificationOperationServiceImpl vtbVerificationOperationService;
 
     /**
-     * 翻页
+     * 管理员
      * @param param
+     * @param loadMy
+     * @param loadChild
      * @return
      */
     @GetMapping("/page")
     @PreAuthorize("hasRole('vtb:verification:query')")
-    public R<PageVo<VtbVerification>> getPage(VtbVerificationSo param){
+    public R<PageVo<VtbVerification>> getPage(VtbVerificationSo param,Integer loadMy,Integer loadChild){
         VtbVerification entity = CopierUtil.copy(param,new VtbVerification());
         LambdaQueryWrapper<VtbVerification> lqw = new LambdaQueryWrapper<>(entity);
         if(param.getQueryStartTime()!=null){
@@ -77,11 +89,36 @@ public class VtbVerificationController {
         if(param.getQueryEndTime()!=null){
             lqw.le(VtbVerification::getFinishedTime,param.getQueryEndTime());
         }
+        if(loadChild!=null&&loadChild.equals(1)){
+            List<String> userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId());
+            userIds.add("0");
+            lqw.in(VtbVerification::getCreateBy,userIds);
+        }else if(loadMy!=null&&loadMy.equals(1)){
+            lqw.eq(VtbVerification::getCreateBy,AuthContextUtils.getSysUserId());
+        }
         PageUtil.startPage();
         List<VtbVerification> list = vtbVerificationService.list(lqw);
+        for (VtbVerification verification : list) {
+            TbsActivity activity = tbsActivityService.getById(verification.getActivityId());
+            TbsCostApply costApply = tbsCostApplyService.getById(activity.getCostApplyId());
+            verification.setActivityInfo(activity);
+            verification.setCostApplyInfo(costApply);
+        }
         return R.byPageHelperList(list);
     }
 
+    /**
+     * 翻页(个人)
+     * @param param
+     * @param loadChild loadChild=1 分页查询所属活动核销
+     * @return
+     */
+    @GetMapping("/pageMy")
+    @PreAuthorize("hasRole('vtb:verification:query')")
+    public R<PageVo<VtbVerification>> pageMy(VtbVerificationSo param,Integer loadChild){
+        return getPage(param,1,loadChild);
+    }
+
     /**
      * ID查询
      * @param id

src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java

@@ -155,5 +155,18 @@ public class VtbVerification implements Serializable {
 
     @TableField(exist = false)
     List<?> subjectList;
+
+    /**
+     * 活动信息
+     */
+    @TableField(exist = false)
+    private Object activityInfo;
+
+    /**
+     * 费用申请
+     */
+    @TableField(exist = false)
+    private Object costApplyInfo;
+
 }