|
|
@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import com.goafanti.activity.bo.ActivityListBo;
|
|
|
import com.goafanti.activity.service.ActivityService;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.ActivityMapper;
|
|
|
@@ -23,7 +24,7 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<Activity> listActivity(String sTime, String eTime, String name, String host, Integer type,
|
|
|
+ public Pagination<ActivityListBo> listActivity(String sTime, String eTime, String name, String host, Integer type,
|
|
|
Integer form, Integer pNo, Integer pSize) {
|
|
|
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
@@ -58,7 +59,7 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
|
|
|
if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
- return (Pagination<Activity>) findPage("findActivityListByPage", "findActivityCount", params, pNo, pSize);
|
|
|
+ return (Pagination<ActivityListBo>) findPage("findActivityListByPage", "findActivityCount", params, pNo, pSize);
|
|
|
}
|
|
|
|
|
|
@Override
|