Merge pull request '个人周报完成情况置空' (#915) from wanjia9506/microservices:dev_weeklyReport_refact into master
This commit is contained in:
commit
f51dbdccef
|
@ -12,4 +12,6 @@ public interface PmsIssueCompletionMapper {
|
||||||
int insert(PmsIssueCompletion completion);
|
int insert(PmsIssueCompletion completion);
|
||||||
|
|
||||||
int updateDescription(PmsIssueCompletion completion);
|
int updateDescription(PmsIssueCompletion completion);
|
||||||
|
|
||||||
|
int deleteByGitlinkIssueIdAndUserId(@Param("gitlinkIssueId") String gitlinkIssueId, @Param("gitlinkUserId") String gitlinkUserId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.microservices.pms.project.service.impl;
|
package com.microservices.pms.project.service.impl;
|
||||||
|
|
||||||
|
import com.microservices.common.core.utils.StringUtils;
|
||||||
import com.microservices.common.security.utils.SecurityUtils;
|
import com.microservices.common.security.utils.SecurityUtils;
|
||||||
import com.microservices.pms.project.domain.PmsIssueCompletion;
|
import com.microservices.pms.project.domain.PmsIssueCompletion;
|
||||||
import com.microservices.pms.project.domain.vo.PmsProjectIssuesCompletionInputVo;
|
import com.microservices.pms.project.domain.vo.PmsProjectIssuesCompletionInputVo;
|
||||||
|
@ -25,6 +26,10 @@ public class PmsIssueCompletionServiceImpl implements IPmsIssueCompletionService
|
||||||
completion.setGitlinkIssueId(completionInputVo.getGitlinkIssueId());
|
completion.setGitlinkIssueId(completionInputVo.getGitlinkIssueId());
|
||||||
completion.setDescription(completionInputVo.getDescription());
|
completion.setDescription(completionInputVo.getDescription());
|
||||||
completion.setGitlinkUserId(String.valueOf(SecurityUtils.getGitlinkUserId()));
|
completion.setGitlinkUserId(String.valueOf(SecurityUtils.getGitlinkUserId()));
|
||||||
|
if (StringUtils.isBlank(completionInputVo.getDescription())) {
|
||||||
|
issueCompletionMapper.deleteByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
// 判断是否已存在该 gitlink_issue_id 记录
|
// 判断是否已存在该 gitlink_issue_id 记录
|
||||||
PmsIssueCompletion existing = issueCompletionMapper.selectByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
|
PmsIssueCompletion existing = issueCompletionMapper.selectByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
|
||||||
if (existing == null) {
|
if (existing == null) {
|
||||||
|
|
|
@ -66,6 +66,10 @@
|
||||||
</if>
|
</if>
|
||||||
where gitlink_issue_id = #{gitlinkIssueId} and gitlink_user_id = #{gitlinkUserId}
|
where gitlink_issue_id = #{gitlinkIssueId} and gitlink_user_id = #{gitlinkUserId}
|
||||||
</update>
|
</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 id="selectByGitlinkIssueIdAndUserId" resultType="com.microservices.pms.project.domain.PmsIssueCompletion">
|
||||||
select description
|
select description
|
||||||
from pms_issue_completion
|
from pms_issue_completion
|
||||||
|
|
Loading…
Reference in New Issue