wanghui пре 7 година
родитељ
комит
2f6b4d9fda

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -29,7 +29,7 @@ public interface AchievementService {
 	Pagination<AchievementObject> listMyAchievement(Integer auditStatus, String name,Integer dataCategory,  String startDate,
 			String endDate,  Integer pNo, Integer pSize);
 
-	Pagination<AchievementListBo> listAchievement(String name,String ownerName,Integer category,Integer dataCategory,Integer auditStatus, 
+	Pagination<AchievementObject> listAchievement(String name,String ownerName,Integer category,Integer dataCategory,Integer auditStatus, 
 			String startDate,String endDate,Integer pageNo,Integer pageSize);
 	
 	int updateAuditAchievement(Achievement a, String techBroderId, Integer auditStatus);

+ 2 - 2
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -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);
 	}