修改峰会

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityBm.java

@@ -61,9 +61,6 @@ public class ActivityBm {
     @ApiModelProperty("创建时间")
     private Long updTime;
 
-    @Column(name = "qd_status")
-    @ApiModelProperty("0-未签到；1-已签到")
-    private Integer qdStatus;
 
     @Column(name = "is_del")
     @ApiModelProperty("是否删除：0-正常；1-删除")

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -31,7 +31,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
      */
     private Integer PUBLISHED=1;
 
-    public PageInfo<Activity> getList(ActivityQuery query) {
+    public Object getList(ActivityQuery query) {
 
         Example exa= new Example(Activity.class);
         Example.Criteria criteria = exa.createCriteria();
@@ -45,13 +45,19 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         if (query.getStatus()!=null) {
             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);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
+        if(AccessType.BACKSTAGE.getCode().equals(query.getType())){
+            return mapper.selectByExample(exa);
+        }
+
+
+
         PageHelper.startPage(query.getPage(),query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
-        return   new PageInfo<Activity>(activities);
+        return new PageInfo<Activity>(activities);
     }
 
     @Transactional(rollbackFor = Exception.class)

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java

@@ -247,4 +247,8 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
         List<ActivityBm> activityBms = mapper.selectByExample(exa);
         return PageInfo.of(activityBms);
     }
+
+    public ActivityBm userBm(ActivityBm activityBm, Integer id) {
+        return null;
+    }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityBmController.java

@@ -29,7 +29,7 @@ public class ActivityBmController extends BaseController<ActivityBmBiz,ActivityB
     public ObjectRestResponse bm(@RequestBody ActivityBm activityBm, HttpServletRequest request){
         User user=userBiz.getSession(request);
         try {
-            return baseBiz.userBm(activityBm,user.getId());
+            return ObjectRestResponse.succ(baseBiz.userBm(activityBm,user.getId()));
         }catch (Exception e){
             e.printStackTrace();
             return  ObjectRestResponse.createDefaultFail();