diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java index 40e904b21..26f14e304 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java @@ -42,7 +42,8 @@ public class AchievementsController extends BaseController { @GetMapping("/list") public TableDataInfo list(AchQueryVo achQueryVo) { startPage(); - List list = achievementsService.selectAchievementsList(achQueryVo); + achQueryVo.setAllStatus(true); + List list = achievementsService.getAllResult(achQueryVo); return getDataTable(list); } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java index 51d3ebb48..0f19a0beb 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java @@ -15,6 +15,7 @@ public class AchQueryVo { private String sortBy; //排序字段 private String sortOrder; //升降序 private Boolean userSelf = false; //用户自己 + private Boolean allStatus = false; //所有状态 private List achievementTypeList;//成果类型 private List sourceList;//成果类型 @@ -123,4 +124,12 @@ public class AchQueryVo { public void setUserSelf(Boolean userSelf) { this.userSelf = userSelf; } + + public Boolean getAllStatus() { + return allStatus; + } + + public void setAllStatus(Boolean allStatus) { + this.allStatus = allStatus; + } } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java index b79c5e206..dec57be6e 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java @@ -40,7 +40,6 @@ public interface AchievementsMapper { * @return 成果集合 */ public List selectAchievementsList(Achievements achievements); - public List selectAchievementsListNew(AchQueryVo achQueryVo); /** * 新增成果 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 73e89820f..99fb6565e 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 @@ -30,7 +30,7 @@ public interface IAchievementsService { /** * 查询成果列表 * - * @param achievements 成果 + * @param achQueryVo 成果 * @return 成果集合 */ public List selectAchievementsList(AchQueryVo achQueryVo); 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 5a5d5687e..b038a471a 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 @@ -250,6 +250,7 @@ public class AchievementsServiceImpl implements IAchievementsService { logger.info("getAllResult USERID======={},user={}", SecurityUtils.getGitlinkUserId(),SecurityUtils.getUsername()); if (achQueryVo.getUserSelf() && SecurityUtils.getGitlinkUserId() != null) { achQueryVo.setUserId(SecurityUtils.getGitlinkUserId().toString()); + achQueryVo.setAllStatus(true); } List list = achievementsMapper.selectAchievementsByParamNew(achQueryVo); //遍历成果数据,获取对应成果的点击数 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 1b3ad585e..d98ed1510 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 @@ -89,50 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - -