diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/TokenListVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/TokenListVo.java new file mode 100644 index 000000000..f76cb9f9e --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/TokenListVo.java @@ -0,0 +1,18 @@ +package com.microservices.dms.achievementLibrary.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +@Data +public class TokenListVo { + + private Long id; // 项目ID + private String name; // 项目名称 + private Long totalToken; // 项目总Token + private String createBy; // 创建人 + private Long currentToken; // 当前Token + private String repositoryName; // 仓库名称 + private Long repositoryId; // 仓库名称 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Data createdOn; // 项目创建时间（以毫秒为单位） +} diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java index f8870f8f8..5b62f6a4d 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java @@ -117,7 +117,7 @@ public class BigScreenStatisticService { c.put("key","浏览"); c.put("value", cres); Map d = new HashMap<>(); - c.put("key","下载"); + d.put("key","下载"); d.put("value", dres); Map f = new HashMap<>(); f.put("key", "收藏"); diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java index 59ecb66ac..6c361f43a 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java @@ -117,4 +117,7 @@ public interface IAchievementsService { List getRelatedAchTaskOfExpert(Long id); List getRelatedAchCompetitionOfExpert(Long id); + + List projectTokenList(); + } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java index 7411fc03d..a22505481 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java @@ -5,8 +5,10 @@ import java.util.stream.Collectors; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; +import com.alibaba.fastjson2.JSONObject; import com.microservices.common.core.utils.DateUtils; import com.microservices.common.core.utils.StringUtils; +import com.microservices.common.httpClient.service.HttpAPIService; import com.microservices.common.security.utils.SecurityUtils; import com.microservices.dms.achievementLibrary.domain.*; import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo; @@ -21,6 +23,7 @@ import com.microservices.dms.resourceLibrary.mapper.ExpertResourceLibraryMapper; import com.microservices.dms.resourceLibrary.mapper.ProjectResourceLibraryMapper; import com.microservices.dms.resourceLibrary.mapper.TaskResourceLibraryMapper; import com.microservices.dms.utils.DateUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; @@ -37,6 +40,7 @@ import static com.microservices.dms.utils.UrlUtil.getUrlPath; * @date 2025-04-02 */ @Service +@Slf4j public class AchievementsServiceImpl implements IAchievementsService { @Autowired private AchievementsMapper achievementsMapper; @@ -62,6 +66,11 @@ public class AchievementsServiceImpl implements IAchievementsService { @Value("${http.gatewayUrl}") public String gatewayUrl; + @Value("${gitlink.fiscobcosUrl}") + public String fiscobcosUrl; + + @Autowired + private HttpAPIService httpAPIService; /** * 查询成果 @@ -72,16 +81,16 @@ public class AchievementsServiceImpl implements IAchievementsService { @Override public Achievements selectAchievementsById(Long id) { Achievements a = achievementsMapper.selectAchievementsById(id); - if(StringUtils.isNotNull(a)){ + if (StringUtils.isNotNull(a)) { String gender = a.getGender(); String img = ""; - if(StringUtils.isNotEmpty(gender) && gender.equals("1")){ + if (StringUtils.isNotEmpty(gender) && gender.equals("1")) { img = "images/avatars/User/girl.jpg"; } else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) { img = "images/avatars/User/boy.jpg"; } a.setUserImg(img); - if(StringUtils.isNotEmpty(a.getField1())) { + if (StringUtils.isNotEmpty(a.getField1())) { String field1Name = achievementsMapper.getField1NameByParam(a.getSource(), a.getId()); if (StringUtils.isNotNull(field1Name)) { a.setField1Name(field1Name); @@ -107,14 +116,14 @@ public class AchievementsServiceImpl implements IAchievementsService { for (Achievements a : list) { String gender = a.getGender(); String img = ""; - if(StringUtils.isNotEmpty(gender) && gender.equals("1")){ + if (StringUtils.isNotEmpty(gender) && gender.equals("1")) { img = "images/avatars/User/girl.jpg"; - }else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) { + } else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) { img = "images/avatars/User/boy.jpg"; } a.setUserImg(img); //根据id获取领域名称 - if(StringUtils.isNotEmpty(a.getField1())) { + if (StringUtils.isNotEmpty(a.getField1())) { String field1Name = achievementsMapper.getField1NameByParam(a.getSource(), a.getId()); if (StringUtils.isNotNull(field1Name)) { a.setField1Name(field1Name); @@ -192,25 +201,26 @@ public class AchievementsServiceImpl implements IAchievementsService { return aStr; } - List> list = JSON.parseObject(aStr,new TypeReference>>() {}); + List> list = JSON.parseObject(aStr, new TypeReference>>() { + }); if (Objects.equals(source, "1") || Objects.equals(source, "3")) { - concatUrl(list,gitLinkUrl); + concatUrl(list, gitLinkUrl); } if (Objects.equals(source, "2")) { - concatUrl(list,markerSpaceUrl); + concatUrl(list, markerSpaceUrl); } if (Objects.equals(source, "4")) { - concatUrl(list,gatewayUrl); + concatUrl(list, gatewayUrl); } return JSON.toJSONString(list); } private void concatUrl(List> list, String url) { - for (Map map : list) { + for (Map map : list) { String v = map.getOrDefault("v", ""); String urlPath = getUrlPath(v); map.put("v", url + urlPath); @@ -241,14 +251,14 @@ public class AchievementsServiceImpl implements IAchievementsService { for (Achievements a : list) { String gender = a.getGender(); String img = ""; - if(StringUtils.isNotEmpty(gender) && gender.equals("1")){ + if (StringUtils.isNotEmpty(gender) && gender.equals("1")) { img = "images/avatars/User/girl.jpg"; - }else if(StringUtils.isNotEmpty(gender) && gender.equals("0")){ + } else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) { img = "images/avatars/User/boy.jpg"; } a.setUserImg(img); //根据id获取领域名称 - if(StringUtils.isEmpty(achQueryVo.getSource()) && StringUtils.isNotEmpty(a.getField1())) { + if (StringUtils.isEmpty(achQueryVo.getSource()) && StringUtils.isNotEmpty(a.getField1())) { String field1Name = achievementsMapper.getField1NameByParam(a.getSource(), a.getId()); if (StringUtils.isNotNull(field1Name)) { a.setField1Name(field1Name); @@ -294,14 +304,14 @@ public class AchievementsServiceImpl implements IAchievementsService { @Override public List getHotAchievement() { //根据查询条件获取所有的成果数据 - List resultList = achievementsMapper.getHotAchievement(); + List resultList = achievementsMapper.getHotAchievement(); //遍历成果数据，获取对应成果的点击数 for (HotAchVo a : resultList) { String gender = a.getGender(); String img = ""; - if(StringUtils.isNotEmpty(gender) && gender.equals("1")){ + if (StringUtils.isNotEmpty(gender) && gender.equals("1")) { img = "images/avatars/User/girl.jpg"; - }else if (StringUtils.isNotEmpty(gender) && gender.equals("0")){ + } else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) { img = "images/avatars/User/boy.jpg"; } a.setUserImg(img); @@ -391,7 +401,7 @@ public class AchievementsServiceImpl implements IAchievementsService { } @Override - public List> get7AddClickById(String id,String clickType) { + public List> get7AddClickById(String id, String clickType) { if (StringUtils.isEmpty(clickType)) { clickType = "Achievements"; @@ -496,7 +506,7 @@ public class AchievementsServiceImpl implements IAchievementsService { @Override public List getRelatedAchTaskOfExpert(Long id) { - return achievementsMapper.getRelatedAchTaskOfExpert(id); + return achievementsMapper.getRelatedAchTaskOfExpert(id); } @Override @@ -504,6 +514,7 @@ public class AchievementsServiceImpl implements IAchievementsService { return achievementsMapper.getRelatedAchCompetitionOfExpert(id); } + /** * 根据查询内容，调用搜索行为接口 * @@ -541,4 +552,37 @@ public class AchievementsServiceImpl implements IAchievementsService { public List getExpertAreasByName(String areaName) { return achievementsMapper.getExpertAreasByName(areaName); } + + + @Override + public List projectTokenList() { + List list = projectResourceLibraryMapper.selectProjectInfos(); + for (TokenListVo v : list) { + Long totalToken = queryTotalToken(v); + Long issueTokenSum = projectResourceLibraryMapper.sumProjectIssueToken(v.getId()); + v.setCurrentToken(totalToken - issueTokenSum); + v.setTotalToken(totalToken); + } + return list; + } + + private Long queryTotalToken(TokenListVo v) { + JSONObject param = new JSONObject(); + param.put("request-type","query repo basic info"); + param.put("token_name",v.getId()); + + try { + JSONObject reps = httpAPIService.doPost(fiscobcosUrl,param); + if (reps.containsKey("status") && reps.getString("status").equals("0")) { + Long totalSupply = reps.getLong("total_supply"); +// Long curSupply = reps.getLong("cur_supply"); + return totalSupply; + } + } catch (Exception e) { + log.error("区块链信息查询失败", e); + return -1L; + } + + return -1L; + } } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/mapper/TalentReferralMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/mapper/TalentReferralMapper.java index 758b22bde..3d83d85b8 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/mapper/TalentReferralMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/mapper/TalentReferralMapper.java @@ -2,10 +2,7 @@ package com.microservices.dms.referral.mapper; import com.microservices.common.datasource.annotation.Slave; import com.microservices.dms.achievementLibrary.domain.KeyValueVo; -import com.microservices.dms.referral.vo.ExpertVo; -import com.microservices.dms.referral.vo.IssuesVo; -import com.microservices.dms.referral.vo.PullRequestVo; -import com.microservices.dms.referral.vo.TaskVo; +import com.microservices.dms.referral.vo.*; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -46,4 +43,7 @@ public interface TalentReferralMapper { TaskVo selectCompetitionById(Long competitionId); List selectCompetitionIdByStatus(); + + PrInfoVo selectPRInfoById(@Param("id") Integer id); + } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java index 0bd2d9ab0..8f0eb3f62 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java @@ -11,10 +11,7 @@ import com.microservices.dms.achievementLibrary.mapper.AchievementsMapper; import com.microservices.dms.constant.ReferralConstant; import com.microservices.dms.constant.TaskConstant; import com.microservices.dms.referral.mapper.TalentReferralMapper; -import com.microservices.dms.referral.vo.ExpertVo; -import com.microservices.dms.referral.vo.IssueDto; -import com.microservices.dms.referral.vo.IssuesVo; -import com.microservices.dms.referral.vo.TaskVo; +import com.microservices.dms.referral.vo.*; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import com.microservices.dms.utils.DmsGitLinkRequestUrl; import com.microservices.dms.utils.DmsRequestHelper; @@ -94,9 +91,9 @@ public class TalentReferralService { return collaborators; } - public List> doIssueTalentReferral(Long projectId, Long issueId) { + public List> doIssueTalentReferral(Long issueId , Long projectId) { List> entries = issueTalentReferral(projectId, issueId); - return entries.stream().map(s -> { + return entries.stream().limit(3).map(s -> { Map mm = talentReferralMapper.selectUsersById(s.getKey()); return mm; }).collect(Collectors.toList()); @@ -111,12 +108,12 @@ public class TalentReferralService { List curIssueAssigners = talentReferralMapper.selectIssuesAssigners(curIssue.getId()); if (!curIssueAssigners.isEmpty()) { - return new ArrayList<>(); + // return new ArrayList<>(); } IssuesVo vo = new IssuesVo(); vo.setProjectId(projectId); - vo.setStatusIds(Collections.singletonList(ReferralConstant.ISSUE_CLOSED)); + vo.setStatusIds(Lists.newArrayList(ReferralConstant.ISSUE_CLOSED,ReferralConstant.ISSUE_RESOLVED)); List issuesVos = talentReferralMapper.selectIssuesCondition(vo); Map userFractionMap = new HashMap<>(); // 计算与解决issue的相似度， 标题+描述 @@ -153,36 +150,41 @@ public class TalentReferralService { Map userFractionMap = new HashMap<>(); Map userNameFractionMap = new HashMap<>(); Map> PRFilesMap = new HashMap<>(); - List closedPullRequests = getPullRequests(projectId, "11"); + List closedPullRequests = getPullRequests(projectId, "11").stream() + .filter(e->StringUtils.isNotBlank(e.getAssignUserLogin())).collect(Collectors.toList()); for (IssueDto pr : prs) { + PrInfoVo curPrInfoVo = talentReferralMapper.selectPRInfoById(pr.getPullRequestId()); //关闭PR的对比 for (IssueDto dto : closedPullRequests) { - List reviewers = dto.getReviewers(); - for (String reviewer : reviewers) { - Set prFiles = getPRFiles(projectId, dto.getPullRequestNumber()); - PRFilesMap.merge(reviewer, prFiles, (a, b) -> { - HashSet set = new HashSet<>(); - set.addAll(a); - set.addAll(b); - return set; - }); - } + String reviewer = dto.getAssignUserLogin(); + Set prFiles = getPRFiles(projectId, dto.getPullRequestNumber()); + PRFilesMap.merge(reviewer, prFiles, (a, b) -> { + HashSet set = new HashSet<>(); + set.addAll(a); + set.addAll(b); + return set; + }); + + //标题、content匹配 + PrInfoVo prInfoVo = talentReferralMapper.selectPRInfoById(dto.getPullRequestId()); + double subjectFraction = SimilarityService.sentence(curPrInfoVo.getTitle(), prInfoVo.getTitle()); + double descFraction = SimilarityService.text(curPrInfoVo.getContent(), prInfoVo.getContent()); + //这个数据可以缓存下来 + userNameFractionMap.merge(dto.getAssignUserLogin(), (subjectFraction + descFraction) * 40.0D, Double::sum); } Set curPrFiles = getPRFiles(projectId, pr.getPullRequestNumber()); for (String curPrFile : curPrFiles) { PRFilesMap.forEach((k, v) -> { if (v.contains(curPrFile)) { - userNameFractionMap.merge(k, 60.0D, Double::sum); + userNameFractionMap.merge(k, 30.0D, Double::sum); } }); } // 计算每个负责人关闭的 PR数量 - closedPullRequests.stream().map(IssueDto::getReviewers).flatMap(List::stream).forEach(s -> userNameFractionMap.merge(s, 40.0D, Double::sum)); - - + closedPullRequests.stream().map(IssueDto::getAssignUserLogin).forEach(s -> userNameFractionMap.merge(s, 30.0D, Double::sum)); } userNameFractionMap.forEach((k, v) -> { @@ -224,7 +226,7 @@ public class TalentReferralService { } try { - JSONArray allDataByPage = dmsRequestHelper.getAllDataByPage(DmsGitLinkRequestUrl.GET_PR_FILES(projectFullName, PRNum), "issues", "files"); + JSONArray allDataByPage = dmsRequestHelper.getAllDataByPage(DmsGitLinkRequestUrl.GET_PR_FILES(projectFullName, PRNum), "files", "file_nums"); return allDataByPage.stream().map(o -> (JSONObject) o).map(o -> (String) o.get("filename")).collect(Collectors.toSet()); } catch (ServiceException e) { logger.error("【{}】获取PR文件失败：{}", projectFullName, e.getMessage()); @@ -232,9 +234,9 @@ public class TalentReferralService { return new HashSet<>(); } - public List> doPRTalentReferral(Long projectId, Long prId) { + public List> doPRTalentReferral(Long prId, Long projectId) { List> entries = PRTalentReferral(projectId, prId); - return entries.stream().map(s -> { + return entries.stream().limit(3).map(s -> { Map mm = talentReferralMapper.selectUsersById(s.getKey()); return mm; }).collect(Collectors.toList()); @@ -242,14 +244,14 @@ public class TalentReferralService { public List> PRTalentReferral(Long projectId, Long prId) { List openPullRequests = getPullRequests(projectId, "1"); - openPullRequests = openPullRequests.stream().filter(e -> e.getReviewers().isEmpty()).collect(Collectors.toList()); + openPullRequests = openPullRequests.stream().filter(e -> StringUtils.isEmpty(e.getAssignUserLogin())).collect(Collectors.toList()); if (prId != null) { - openPullRequests = openPullRequests.stream().filter(e -> Objects.equals((long) (e.getId()), prId)).filter(e -> e.getReviewers().isEmpty()).collect(Collectors.toList()); + openPullRequests = openPullRequests.stream().filter(e -> Objects.equals((long) (e.getPullRequestId()), prId)).collect(Collectors.toList()); return PRTalentReferral(projectId, prId, openPullRequests); } - return PRTalentReferral(projectId, prId, openPullRequests); + return PRTalentReferral(projectId, null, openPullRequests); } //定时统计 diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/PrInfoVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/PrInfoVo.java new file mode 100644 index 000000000..c3e153d25 --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/PrInfoVo.java @@ -0,0 +1,10 @@ +package com.microservices.dms.referral.vo; + +import lombok.Data; + +@Data +public class PrInfoVo { + private Long id; + private String title; + private String content; +} diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java index 8a853fa36..a88896b7e 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/CompetitionResourceLibrary.java @@ -33,7 +33,7 @@ public class CompetitionResourceLibrary extends BaseEntity { */ private String competitionField; /** - * 竞赛状态 0进行中 1已结束 + * 竞赛状态 status: 0 未上架 1上架 */ private String competitionStatus; /** diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java index 0d076ebb6..a90c3a960 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java @@ -1,6 +1,7 @@ package com.microservices.dms.resourceLibrary.mapper; import com.microservices.common.datasource.annotation.Slave; +import com.microservices.dms.achievementLibrary.domain.TokenListVo; import com.microservices.dms.resourceLibrary.domain.ProjectResourceLibrary; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import com.microservices.dms.resourceLibrary.domain.vo.ProjectListVo; @@ -51,4 +52,8 @@ public interface ProjectResourceLibraryMapper { List> getAttachments(@Param("containerId") Long containerId); String getProjectDomainNameByKey(@Param("projectDomain") String projectDomain ); + + List selectProjectInfos(); + + Long sumProjectIssueToken(@Param("id") Long id); } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsRequestHelper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsRequestHelper.java index d2e7e4ee2..078814d2b 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsRequestHelper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsRequestHelper.java @@ -46,7 +46,7 @@ public class DmsRequestHelper extends GitLinkRequestHelper { int pageNum = 1; // 循环分页获取gitlink组织下所有成员 while (!isAllData) { - JSONObject result = doGet(GitLinkRequestUrl.GET_LIST_BY_PAGES(url, pageNum, 50) + JSONObject result = doGet(GET_LIST_BY_PAGES(url, pageNum, 50) ); allList.addAll(result.getList(listKey, tClass)); long total = result.getLong("search_count"); @@ -84,7 +84,7 @@ public class DmsRequestHelper extends GitLinkRequestHelper { public static GitLinkRequestUrl GET_LIST_BY_PAGES(String url, Integer page, Integer limit) { - String p = url.contains("?")? "&page=%d&limit=%d": "%s?page=%d&limit=%d"; + String p = url.contains("?")? "%s&page=%s&limit=%s": "%s?page=%s&limit=%s"; return getAdminGitLinkRequestUrl(String.format(p, url, page, limit)); } diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml index e03c1ca4e..ee6eab0c6 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml @@ -355,6 +355,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from achievements a left join users u on a.owner_name = u.login left join user_extensions ue on u.id = ue.user_id + where a.status = '1' ) as t order by (f+w) desc limit 0,3 diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml index cf9729b5d..d339ac807 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml @@ -369,4 +369,16 @@ select name from project_categories where id=#{projectDomain} + + + + diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TalentReferralMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TalentReferralMapper.xml index d5aca4823..d5a952adf 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TalentReferralMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TalentReferralMapper.xml @@ -4,7 +4,7 @@ - +