Merge branch 'master_activity' into base-modify

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

@@ -5,12 +5,14 @@ import com.xxfc.platform.summit.dto.ActivityShowDto;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.entity.ActivityShow;
 import com.xxfc.platform.summit.mapper.ActivityShowMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.GetMapping;
+import sun.rmi.runtime.Log;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -18,6 +20,7 @@ import java.lang.reflect.InvocationTargetException;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
 
     @Autowired
@@ -46,6 +49,7 @@ public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.error(e.toString());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return false;
         }

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityMapper.xml

@@ -12,7 +12,7 @@
             and title like CONCAT('%',#{title},'%')
         </if>
         <if test="startTime != null">
-            and from_unixtime(start_time,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
+            and from_unixtime(start_time/1000,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
         </if>
         <if test="status != null and status == 1">
             and (status=#{status} or (status=0 and  (start_time/1000) &gt;= unix_timestamp())  )