Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

feat(周报):#128092 个人周报完成情况查询逻辑优化

This commit is contained in:
wanjia 2025-06-13 09:10:51 +08:00
parent 506c54ef5f
commit bb9a5ec58b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/PmsProjectIssuesService.java
View File

@ -115,9 +115,8 @@ public class PmsProjectIssuesService {
return issueListResult; return issueListResult;
} }
public JSONObject enrichProjectIssueList(JSONObject issueListResult) { public JSONObject enrichProjectIssueList(JSONObject issueListResult, Long gitlinkUserId) {
HashMap<Long, String> gitlinkUserNickNameMap = new HashMap<>(); HashMap<Long, String> gitlinkUserNickNameMap = new HashMap<>();
Long gitlinkUserId = SecurityUtils.getGitlinkUserId();
processIssues(issueListResult, "this_week_all_issues", gitlinkUserNickNameMap, gitlinkUserId); processIssues(issueListResult, "this_week_all_issues", gitlinkUserNickNameMap, gitlinkUserId);
processIssues(issueListResult, "next_week_all_issues", gitlinkUserNickNameMap, gitlinkUserId); processIssues(issueListResult, "next_week_all_issues", gitlinkUserNickNameMap, gitlinkUserId);
processIssues(issueListResult, "close_task_issues", gitlinkUserNickNameMap, gitlinkUserId); processIssues(issueListResult, "close_task_issues", gitlinkUserNickNameMap, gitlinkUserId);
@ -697,7 +696,7 @@ public class PmsProjectIssuesService {
JSONObject issueSearch = new JSONObject(); JSONObject issueSearch = new JSONObject();
convertObjectToJSONObject(pmsPersonalWeeklyReportSearchVo, issueSearch, null); convertObjectToJSONObject(pmsPersonalWeeklyReportSearchVo, issueSearch, null);
try { try {
return enrichProjectIssueList(gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_WEEKLY_ISSUES_PERSONAL(issueSearch))); return enrichProjectIssueList(gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_WEEKLY_ISSUES_PERSONAL(issueSearch)), gitlinkUserId);
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -768,11 +767,12 @@ public class PmsProjectIssuesService {
} }
public JSONObject getPersonalIssueList(PmsPersonalWeeklyIssuesSearchVo pmsPersonalWeeklyIssuesSearchVo) { public JSONObject getPersonalIssueList(PmsPersonalWeeklyIssuesSearchVo pmsPersonalWeeklyIssuesSearchVo) {
Long gitlinkUserId = pmsPersonalWeeklyIssuesSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyIssuesSearchVo.getUserId();
pmsPersonalWeeklyIssuesSearchVo.setUserId(pmsPersonalWeeklyIssuesSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyIssuesSearchVo.getUserId()); pmsPersonalWeeklyIssuesSearchVo.setUserId(pmsPersonalWeeklyIssuesSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyIssuesSearchVo.getUserId());
JSONObject issueSearch = new JSONObject(); JSONObject issueSearch = new JSONObject();
convertObjectToJSONObject(pmsPersonalWeeklyIssuesSearchVo, issueSearch, null); convertObjectToJSONObject(pmsPersonalWeeklyIssuesSearchVo, issueSearch, null);
try { try {
return enrichProjectIssueList(gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_PERSONAL_ISSUE_LIST(issueSearch))); return enrichProjectIssueList(gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_PERSONAL_ISSUE_LIST(issueSearch)), gitlinkUserId);
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }