修改峰会实体

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/AccessType.java

+package com.xxfc.platform.summit.pojo;
+
+import lombok.Data;
+
+
+public enum AccessType {
+    BACKSTAGE(1, "后台管理页面"),
+    PUBLIC(2,"公众号")
+    ;
+
+    AccessType(int code, String mas) {
+    }
+
+    private Integer code;
+
+    private String mas;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMas() {
+        return mas;
+    }
+}

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityBmQuery.java

+package com.xxfc.platform.summit.pojo;
+
+import lombok.Data;
+
+@Data
+public class ActivityBmQuery extends Query {
+    private String  inviter;
+    private String  name;
+    private Integer  qdStatus;
+    private Integer activityId;
+
+}

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.mapper.ActivityMapper;
+import com.xxfc.platform.summit.pojo.AccessType;
 import com.xxfc.platform.summit.pojo.ActivityQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -20,7 +21,15 @@ import java.util.List;
 @Service
 public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
 
+    /**
+     * 未删除
+     */
      private Integer NOT_DELETE=0;
+    private Activity activity;
+    /**
+     * 已发布
+     */
+    private Integer PUBLISHED=1;
 
     public PageInfo<Activity> getList(ActivityQuery query) {
 
@@ -28,19 +37,21 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         Example.Criteria criteria = exa.createCriteria();
         criteria.andEqualTo("isDel",NOT_DELETE );
         if (StringUtils.isNotBlank(query.getTitle())) {
-            criteria.andLike("title",query.getTitle());
+            criteria.andLike("title",String.format("%%%s%%",query.getTitle().trim()));
         }
         if (query.getStartTime()!=null) {
-            criteria.andGreaterThanOrEqualTo("startTime",query.getStartTime());
+            criteria.andLike("startTime",query.getStartTime()/1000+"%");
         }
         if (query.getStatus()!=null) {
-            criteria.andGreaterThanOrEqualTo("status",query.getStatus());
+            criteria.andEqualTo("status",query.getStatus());
+        }
+        if (query.getType()!=null&& AccessType.PUBLIC.getCode().equals(query.getType())) {
+            criteria.andEqualTo("isPublish",PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
         PageHelper.startPage(query.getPage(),query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
         return   new PageInfo<Activity>(activities);
-
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -56,4 +67,33 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         }
 
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean add(Activity activity) {
+        try {
+            activity.setCrtTime(System.currentTimeMillis());
+            activity.setIsDel(0);
+            if (activity.getIsOpenBm()==null) {
+                activity.setIsOpenBm(0);
+            }
+            if (activity.getIsPublish()==null) {
+                activity.setIsPublish(0);
+            }
+            if (activity.getIsShow()==null) {
+                activity.setIsShow(0);
+            }
+            mapper.insertSelective(activity);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+    }
+
+    @Override
+    public void updateSelectiveById(Activity activity) {
+        activity.setUpdTime(System.currentTimeMillis());
+          mapper.updateByPrimaryKeySelective(activity);
+    }
 }