wanjia9506
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(周报):个人周报统计加用户传参

This commit is contained in:
wanjia 2025-06-16 16:58:39 +08:00
parent bb9a5ec58b
commit 9a032cb840
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsPersonalWeeklyReportSearchVo.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
@ApiModel("个人周报工作项统计对象")
public class PmsPersonalWeeklyReportSearchVo {
@ApiModelProperty(value = "用户gitlink用户id", hidden = true)
@ApiModelProperty(value = "用户gitlink用户id")
private Long userId;
@ApiModelProperty(value = "企业标识", hidden = true)

2
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsIssueCompletionMapper.java
View File

@ -12,4 +12,6 @@ public interface PmsIssueCompletionMapper {
int insert(PmsIssueCompletion completion);
int updateDescription(PmsIssueCompletion completion);
int deleteByGitlinkIssueIdAndUserId(@Param("gitlinkIssueId") String gitlinkIssueId, @Param("gitlinkUserId") String gitlinkUserId);
}

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

@ -690,7 +690,7 @@ public class PmsProjectIssuesService {
}
public JSONObject getPersonalIssuesStatistics(String enterpriseIdentifier, PmsPersonalWeeklyReportSearchVo pmsPersonalWeeklyReportSearchVo) {
Long gitlinkUserId = SecurityUtils.getGitlinkUserId();
Long gitlinkUserId = pmsPersonalWeeklyReportSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyReportSearchVo.getUserId();
pmsPersonalWeeklyReportSearchVo.setUserId(gitlinkUserId);
pmsPersonalWeeklyReportSearchVo.setEnterpriseIdentifier(enterpriseIdentifier);
JSONObject issueSearch = new JSONObject();
@ -768,7 +768,7 @@ public class PmsProjectIssuesService {
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(gitlinkUserId);
JSONObject issueSearch = new JSONObject();
convertObjectToJSONObject(pmsPersonalWeeklyIssuesSearchVo, issueSearch, null);
try {

5
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsIssueCompletionServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.microservices.pms.project.service.impl;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.pms.project.domain.PmsIssueCompletion;
import com.microservices.pms.project.domain.vo.PmsProjectIssuesCompletionInputVo;
@ -25,6 +26,10 @@ public class PmsIssueCompletionServiceImpl implements IPmsIssueCompletionService
completion.setGitlinkIssueId(completionInputVo.getGitlinkIssueId());
completion.setDescription(completionInputVo.getDescription());
completion.setGitlinkUserId(String.valueOf(SecurityUtils.getGitlinkUserId()));
if (StringUtils.isBlank(completionInputVo.getDescription())) {
issueCompletionMapper.deleteByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
return true;
}
// 判断是否已存在该 gitlink_issue_id 记录
PmsIssueCompletion existing = issueCompletionMapper.selectByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
if (existing == null) {

4
microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsIssueCompletionMapper.xml
View File

@ -66,6 +66,10 @@
</if>
where gitlink_issue_id = #{gitlinkIssueId} and gitlink_user_id = #{gitlinkUserId}
</update>
<delete id="deleteByGitlinkIssueIdAndUserId">
delete from pms_issue_completion
where gitlink_issue_id = #{gitlinkIssueId} and gitlink_user_id = #{gitlinkUserId}
</delete>
<select id="selectByGitlinkIssueIdAndUserId" resultType="com.microservices.pms.project.domain.PmsIssueCompletion">
select description
from pms_issue_completion