迭代需求

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -80,19 +80,19 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         if (getForsterwxMobileHandle.getWxFriendName() != null && !getForsterwxMobileHandle.getWxFriendName().isEmpty()) {
             //.当查询条件包含微信好友名称时
             List<FosterwxMobileWxfriend> hasWxfriendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>()
-                    .like("wx_name","%"+getForsterwxMobileHandle.getWxFriendName()+"%"));
-            List<Integer> mobileIds = hasWxfriendList.stream().map(FosterwxMobileWxfriend::getMobileId).collect(Collectors.toList());
-            if(hasWxfriendList == null || hasWxfriendList.size() <= 0){
+                    .like("wx_name", "%" + getForsterwxMobileHandle.getWxFriendName() + "%"));
+            List<Integer> mobileIds = hasWxfriendList.stream().map(FosterwxMobileWxfriend::getId).collect(Collectors.toList());
+            if (hasWxfriendList == null || hasWxfriendList.size() <= 0) {
                 return AjaxResult.success(res);
             }
-            if (getForsterwxMobileHandle.getId() == null){
+            if (getForsterwxMobileHandle.getId() == null) {
                 getForsterwxMobileHandle.setIds(mobileIds);
             }
             res = fosterwxMobileService.getList(getForsterwxMobileHandle);
             List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
             res.setList(list);
 
-        }else{
+        } else {
             //.正常查询
             res = fosterwxMobileService.getList(getForsterwxMobileHandle);
             List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileServiceImpl.java

@@ -62,11 +62,11 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
      * @param handle
      * @return
      */
-    public ResHandle<List<FosterwxMobile>> getList(GetForsterwxMobileHandle handle) {
+    public ResHandle<List<FosterwxMobileVo>> getList(GetForsterwxMobileHandle handle) {
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
-        Page<FosterwxMobile> pageObj = new Page<FosterwxMobile>(page, pagesize);
-        List<FosterwxMobile> list = fosterwxMobileMapper.getList(pageObj, handle);
+        Page<FosterwxMobileVo> pageObj = new Page<>(page, pagesize);
+        List<FosterwxMobileVo> list = fosterwxMobileMapper.getList(pageObj, handle);
         list.forEach(fosterwxMobile -> {
             // 获取企微主体信息
             Corp corp = corpService.getById(fosterwxMobile.getWorkWxCorpId());
@@ -82,7 +82,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
                 fosterwxMobile.setTaskTimeLists(fosterwxMobileTaskTimeLists);
             }
         });
-        ResHandle<List<FosterwxMobile>> resHandle = new ResHandle<>();
+        ResHandle<List<FosterwxMobileVo>> resHandle = new ResHandle<>();
         resHandle.setList(list);
         resHandle.setTotal(pageObj.getTotal());
         return resHandle;
@@ -218,6 +218,35 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
         return res;
     }
 
+    /**
+     * 给账号信息装载微信好友信息
+     *
+     * @param list
+     * @return
+     */
+    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list) {
+        for (FosterwxMobileVo fosterwxMobileVo : list) {
+            List<FosterwxMobileWxfriend> wxfriendList = fosterwxMobileWxfriendService.list(
+                    new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", fosterwxMobileVo.getId()).orderByAsc("seq"));
+            if (wxfriendList == null || wxfriendList.size() <= 0) {
+                continue;
+            }
+            for (FosterwxMobileWxfriend fosterwxMobileWxfriend : wxfriendList) {
+                if (fosterwxMobileWxfriend.getSeq().equals(1)) {
+                    fosterwxMobileVo.setWxName1(fosterwxMobileWxfriend.getWxName());
+                    fosterwxMobileVo.setWxUsername1(fosterwxMobileWxfriend.getWxUsername());
+                } else if (fosterwxMobileWxfriend.getSeq().equals(2)) {
+                    fosterwxMobileVo.setWxName2(fosterwxMobileWxfriend.getWxName());
+                    fosterwxMobileVo.setWxUsername2(fosterwxMobileWxfriend.getWxUsername());
+                } else if (fosterwxMobileWxfriend.getSeq().equals(3)) {
+                    fosterwxMobileVo.setWxName3(fosterwxMobileWxfriend.getWxName());
+                    fosterwxMobileVo.setWxUsername3(fosterwxMobileWxfriend.getWxUsername());
+                }
+            }
+        }
+        return list;
+    }
+
     private Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row, String wxName) {
         Integer findCnt = 0;
         for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row) {