Commit b723845d authored by hanfeng's avatar hanfeng Committed by libin

修改峰会

parent 1001adf7
...@@ -31,7 +31,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> { ...@@ -31,7 +31,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
*/ */
private Integer PUBLISHED=1; private Integer PUBLISHED=1;
public PageInfo<Activity> getList(ActivityQuery query) { public Object getList(ActivityQuery query) {
Example exa= new Example(Activity.class); Example exa= new Example(Activity.class);
Example.Criteria criteria = exa.createCriteria(); Example.Criteria criteria = exa.createCriteria();
...@@ -45,13 +45,19 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> { ...@@ -45,13 +45,19 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
if (query.getStatus()!=null) { if (query.getStatus()!=null) {
criteria.andEqualTo("status",query.getStatus()); criteria.andEqualTo("status",query.getStatus());
} }
if (query.getType()!=null&& AccessType.PUBLIC.getCode().equals(query.getType())) { if (AccessType.PUBLIC.getCode().equals(query.getType())) {
criteria.andEqualTo("isPublish",PUBLISHED); criteria.andEqualTo("isPublish",PUBLISHED);
} }
exa.orderBy("rank").asc().orderBy("startTime").desc(); exa.orderBy("rank").asc().orderBy("startTime").desc();
if(AccessType.BACKSTAGE.getCode().equals(query.getType())){
return mapper.selectByExample(exa);
}
PageHelper.startPage(query.getPage(),query.getLimit()); PageHelper.startPage(query.getPage(),query.getLimit());
List<Activity> activities = mapper.selectByExample(exa); List<Activity> activities = mapper.selectByExample(exa);
return new PageInfo<Activity>(activities); return new PageInfo<Activity>(activities);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment