峰会图片压缩包上传

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

+package com.xxfc.platform.summit.pojo;
+
+public enum  SummitStatus {
+    ENROLL("报名中",1),IN_PROGRESS("进行中",2),End("已结束",3);
+   private String msg;
+   private Integer code;
+
+    SummitStatus(String msg, Integer code) {
+        this.msg = msg;
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

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

@@ -7,6 +7,7 @@ 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 com.xxfc.platform.summit.pojo.SummitStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,10 +43,23 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
             criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
         }
         if (query.getStartTime() != null) {
-            criteria.andLike("startTime", query.getStartTime()/(1000*60*60)+"%");
+            criteria.andLike("startTime", query.getStartTime() / (1000 * 60 * 60) + "%");
         }
         if (query.getStatus() != null) {
             criteria.andEqualTo("status", query.getStatus());
+            switch (query.getStatus()) {
+                case 1:
+                     criteria.orLessThan("startTime", System.currentTimeMillis());
+                     break;
+                case 2:
+                    criteria.orBetween("startTime", System.currentTimeMillis(),"endTime");
+                    break;
+                case 3:
+                    criteria.orGreaterThan("endTime", System.currentTimeMillis());
+                    break;
+                default:
+                    throw new IllegalStateException("Unexpected value: " + query.getStatus());
+            }
         }
 
         if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {