Administrator лет назад: 4
Родитель
Сommit
c8ba5278b5

+ 8 - 0
src/main/java/com/goafanti/admin/bo/InputPublicReleaseList.java

@@ -5,6 +5,7 @@ public class InputPublicReleaseList {
 	private Integer pageSize;
 	private Integer pageSize;
 	private Integer pageNo;
 	private Integer pageNo;
 	private Integer type;
 	private Integer type;
+	private String clockTime;
 	public Integer getPageSize() {
 	public Integer getPageSize() {
 		return pageSize;
 		return pageSize;
 	}
 	}
@@ -24,5 +25,12 @@ public class InputPublicReleaseList {
 		this.type = type;
 		this.type = type;
 	}
 	}
 	
 	
+	public String getClockTime() {
+		return clockTime;
+	}
+	public void setClockTime(String clockTime) {
+		this.clockTime = clockTime;
+	}
+	
 
 
 }
 }

+ 5 - 0
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -36,6 +36,8 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.customer.service.CustomerService;
 
 
+import cn.jiguang.common.utils.StringUtils;
+
 @Service
 @Service
 public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper> implements PublicReleaseService {
 public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper> implements PublicReleaseService {
 	@Autowired
 	@Autowired
@@ -101,6 +103,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Map<String,Object> map =new HashMap<String, Object>();
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
 		map.put("type", in.getType()==null?0:in.getType());
 		map.put("aid", TokenManager.getAdminId());
 		map.put("aid", TokenManager.getAdminId());
+		if (StringUtils.isNotEmpty(in.getClockTime())) {
+			map.put("clockTime", in.getClockTime());	
+		}
 		return (Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
 		return (Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
 	}
 	}
 
 

+ 6 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -462,6 +462,9 @@ date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create
 	<if test="type==1">
 	<if test="type==1">
 	and c.superior_id = #{aid}
 	and c.superior_id = #{aid}
 	</if>
 	</if>
+	<if test="clockTime !=null">
+	and a.release_start &lt; #{clockTime} and a.release_end &gt; #{clockTime}
+	</if>
 	order by a.status,a.create_time 
 	order by a.status,a.create_time 
   	<if test="page_sql!=null">
   	<if test="page_sql!=null">
 			${page_sql}
 			${page_sql}
@@ -477,6 +480,9 @@ date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create
 	<if test="type==1">
 	<if test="type==1">
 	and c.superior_id = #{aid}
 	and c.superior_id = #{aid}
 	</if>
 	</if>
+	<if test="clockTime !=null">
+	and a.release_start &lt; #{clockTime} and a.release_end &gt; #{clockTime}
+	</if>
   </select>
   </select>
   
   
   <select id="selectByUfid" resultType="com.goafanti.admin.bo.OutPublicRelease">
   <select id="selectByUfid" resultType="com.goafanti.admin.bo.OutPublicRelease">