费用申请对接OA调整

src/main/java/com/qs/serve/common/util/HttpUtil.java

@@ -2,6 +2,8 @@ package com.qs.serve.common.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qs.serve.common.model.dto.R;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.ParseException;
 import org.apache.http.client.ClientProtocolException;
@@ -23,6 +25,8 @@ import java.util.HashMap;
  * @author YenHex
  * @since 2022/11/23
  */
+@Slf4j
+@UtilityClass
 public class HttpUtil {
 
     private final static String CONTENT_TYPE = "application/json";
@@ -120,6 +124,7 @@ public class HttpUtil {
 
     public static R<String> doPostResult(String url, String jsonStr, HashMap<String,String> headers){
         String result = HttpUtil.doPost(url,jsonStr,headers);
+        log.debug("url:{},result:{}",url,result);
         JSONObject jsonObject = JSONObject.parseObject(result);
         Integer status = jsonObject.getInteger("status");
         String msg = jsonObject.getString("msg");

src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java

@@ -78,7 +78,18 @@ public class SeeYonServiceImpl implements SeeYonService {
     public R<List<CtpAffair>> listFormAffair(CtpAffairQo ctpAffairQo) {
         String title = "表单审批节点";
         R<String> result = postBase(TbsSeeYonConst.API_LIST_AFFAIR,ctpAffairQo,title);
-
+        if(result.getStatus()==200){
+            List<?> list = JsonUtil.jsonToPojo(result.getData(),List.class);
+            List<CtpAffair> affairList = new ArrayList<>();
+            if(CollectionUtil.isNotEmpty(list)){
+                for (Object o : list) {
+                    String json = JsonUtil.objectToJson(o);
+                    CtpAffair obj = JsonUtil.jsonToPojo(json,CtpAffair.class);
+                    affairList.add(obj);
+                }
+            }
+            return R.ok(affairList);
+        }
         return null;
     }
 

src/main/java/com/qs/serve/modules/sys/service/SysUserService.java

@@ -38,5 +38,9 @@ public interface SysUserService extends IService<SysUser> {
 
     LoginUser buildLoginUser(SysUser sysUser);
 
+    List<SysUser> listByOaMemberIds(List<String> memberIds);
+
+    SysUser listByOaMemberId(String memberId);
+
 }
 

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -133,5 +133,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return new LoginUser(sysUser.getId(),sysUser.getName(),sysUser.getPassword(), ServletUtils.getIp(null),userType,authorCodes,menuIds,sysUser.getTenantId());
     }
 
+    @Override
+    public List<SysUser> listByOaMemberIds(List<String> memberIds) {
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.in(SysUser::getSyUserId,memberIds);
+        return this.list(lqw);
+    }
+
+    @Override
+    public SysUser listByOaMemberId(String memberId) {
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysUser::getSyUserId,memberId);
+        return this.getOne(lqw,false);
+    }
 }
 

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -250,38 +250,34 @@ public class TbsCostApplyController {
      * @return
      */
     @GetMapping("/ListAffairs")
-    public R<PageVo<CtpAffairVo>> pageMemberAffair(Long costApplyId){
+    public R<List<CtpAffairVo>> pageMemberAffair(Long costApplyId){
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
             return R.error("当前账号未绑定致远用户信息");
         }
         TbsCostApply costApplyParam = tbsCostApplyService.getById(costApplyId);
         CtpAffairQo param = new CtpAffairQo();
-        param.setMemberId(sysUser.getSyUserId());
         param.setFormMainId(costApplyParam.getSyFormId());
         param.setTemplateCodes(Arrays.asList(TbsSeeYonConst.COST_APPLY_FORM));
-        R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
-        PageVo<CtpAffair> pageVo = syResult.getData();
-        List<CtpAffair> ctpAffairs = pageVo.getList();
+        R<List<CtpAffair>> syResult = seeYonService.listFormAffair(param);
+        List<CtpAffair> ctpAffairs = syResult.getData();
         if(ctpAffairs.size()>0){
-            List<String> costApplyIds = ctpAffairs.stream().map(CtpAffair::getCostApplyId).collect(Collectors.toList());
-            List<TbsCostApply> costApplyList = tbsCostApplyService.listByIds(costApplyIds);
+            List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
+            List<SysUser> userList = sysUserService.listByOaMemberIds(oaUserIds);
             List<CtpAffairVo> result = new ArrayList<>();
             for (CtpAffair ctpAffair : ctpAffairs) {
                 CtpAffairVo ctpAffairVo = new CtpAffairVo();
-                for (TbsCostApply costApply : costApplyList) {
-                    if(costApply.getId().toString().equals(ctpAffair.getCostApplyId())){
-                        ctpAffairVo.setCostApply(costApply);
-                        break;
+                ctpAffairVo.setAffairInfo(ctpAffair);
+                for (SysUser user : userList) {
+                    if(ctpAffair.getMemberId().equals(user.getSyUserId())){
+                        ctpAffairVo.setUserInfo(user.toSysUserVo());
                     }
                 }
-                ctpAffairVo.setAffairInfo(ctpAffair);
                 result.add(ctpAffairVo);
             }
-            PageVo<CtpAffairVo> costApplyPageVo = PageVo.initNewList(pageVo,result);
-            return R.ok(costApplyPageVo);
+            return R.ok(result);
         }
-        return R.byEmptyList();
+        return R.ok();
     }
 
     /**
@@ -307,6 +303,8 @@ public class TbsCostApplyController {
         PageVo<CtpAffair> pageVo = syResult.getData();
         List<CtpAffair> ctpAffairs = pageVo.getList();
         if(ctpAffairs.size()>0){
+            List<String> oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList());
+            List<SysUser> userList = sysUserService.listByOaMemberIds(oaUserIds);
             List<String> costApplyIds = ctpAffairs.stream().map(CtpAffair::getCostApplyId).collect(Collectors.toList());
             List<TbsCostApply> costApplyList = tbsCostApplyService.listByIds(costApplyIds);
             List<CtpAffairVo> result = new ArrayList<>();
@@ -318,6 +316,11 @@ public class TbsCostApplyController {
                         break;
                     }
                 }
+                for (SysUser user : userList) {
+                    if(ctpAffair.getMemberId().equals(user.getSyUserId())){
+                        ctpAffairVo.setUserInfo(user.toSysUserVo());
+                    }
+                }
                 ctpAffairVo.setAffairInfo(ctpAffair);
                 result.add(ctpAffairVo);
             }

src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java

@@ -21,4 +21,9 @@ public class CtpAffairVo {
      */
     private TbsCostApply costApply;
 
+    /**
+     * 审批人
+     */
+    private Object userInfo;
+
 }

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -56,7 +56,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final TbsCostApplyService costApplyService;
     private final TbsActivityService activityService;
     private final TbsActivitySubjectService activitySubjectService;
-    private final TbsActivityCenterService activityCenterService;
     private final TbsActivityCenterGoodsService activityCenterGoodsService;
 
     private final BmsSubjectService subjectService;