|
@@ -295,11 +295,11 @@ public class OkrServiceImpl implements OkrService {
|
|
|
public Map<String, Object> getSyncUserListByMemberId(Integer year, Integer quarter, String name){
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String memberId = sysUser.getOpenId();
|
|
|
- //String memberId = "ou_03c4826ae66623a53f2af456ff3661a1";
|
|
|
+ //String memberId = "obQGf1fqw5_RJGrLzhWBioxUH0T0";
|
|
|
Integer isCurrentQuarter = null;
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
//List<List<Map<String, Object>>> list = new ArrayList<>();
|
|
|
- //List<UserInfoDto> userList = okrMemberMapper.getSyncUserListByMemberId(memberId, year, quarter);
|
|
|
+ List<String> userList = okrMemberMapper.getSyncUserListByMemberId(memberId, year, quarter, name);
|
|
|
|
|
|
Integer todayQuarter = DateUtils.getQuarter(new Date());
|
|
|
Integer todayYear = DateUtils.getYear(new Date());
|
|
@@ -316,16 +316,19 @@ public class OkrServiceImpl implements OkrService {
|
|
|
}
|
|
|
|
|
|
List<Map<String, Object>> mapList = new ArrayList<>();
|
|
|
- List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getAllQuarterObject(memberId, year, quarter, name);
|
|
|
-
|
|
|
- for(OkrObjectInfo object:OkrObjectInfoList){
|
|
|
- Map<String, Object> okrmap = new HashMap<>();
|
|
|
- List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(object.getId(), object.getUserId(), year, quarter);
|
|
|
- QYWxUserInfo userInfo = wxUserInfoMapper.getUserInfoByOpenId(object.getUserId());
|
|
|
- okrmap.put("krList", krList);
|
|
|
- okrmap.put("object", object);
|
|
|
- okrmap.put("name",userInfo.getName());
|
|
|
- mapList.add(okrmap);
|
|
|
+ if(userList!=null && userList.size()!=0){
|
|
|
+ List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getAllQuarterObject(userList, year, quarter);
|
|
|
+
|
|
|
+ for(OkrObjectInfo object:OkrObjectInfoList){
|
|
|
+ Map<String, Object> okrmap = new HashMap<>();
|
|
|
+ List<OkrKrInfo> krList = okrKrInfoMapper.getKrByObjectId(object.getId(), object.getUserId(), year, quarter);
|
|
|
+ QYWxUserInfo userInfo = wxUserInfoMapper.getUserInfoByOpenId(object.getUserId());
|
|
|
+ okrmap.put("krList", krList);
|
|
|
+ okrmap.put("object", object);
|
|
|
+ okrmap.put("name",userInfo.getName());
|
|
|
+ mapList.add(okrmap);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|