|
|
@@ -766,7 +766,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<AchievementListBo> listAchievement(String name, String ownerName, Integer category,
|
|
|
+ public Pagination<AchievementObject> listAchievement(String name, String ownerName, Integer category,
|
|
|
Integer dataCategory, Integer auditStatus, String startDate, String endDate, Integer pageNo,
|
|
|
Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
@@ -777,7 +777,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
if (null != dataCategory) params.put("dataCategory", dataCategory);
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if (StringUtils.isNotBlank(ownerName)) params.put("ownerName", ownerName);
|
|
|
- return (Pagination<AchievementListBo>) findPage("listMyAchievementByPage", "listMyAchievementCount",params,
|
|
|
+ return (Pagination<AchievementObject>) findPage("listMyAchievementByPage", "listMyAchievementCount",params,
|
|
|
pageNo, pageSize);
|
|
|
}
|
|
|
|