Browse Source

版本切换

anderx 3 years ago
parent
commit
3a08ec37c4

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

@@ -671,6 +671,9 @@ a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_na
 	<if test="releaseStart != null and releaseEnd != null">
 	and (a.release_start  between #{releaseStart} and #{releaseEnd} or a.release_end  between #{releaseStart} and #{releaseEnd})
 	</if>
+    <if test="createStart != null and createEnd != null">
+      and a.create_time  between #{createStart} and #{createEnd}
+    </if>
 	<if test="status != null">
 	and a.status = #{status}
 	</if>
@@ -712,6 +715,9 @@ a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_na
     <if test="releaseStart != null and releaseEnd != null">
       and (a.release_start  between #{releaseStart} and #{releaseEnd} or a.release_end  between #{releaseStart} and #{releaseEnd})
     </if>
+    <if test="createStart != null and createEnd != null">
+      and a.create_time  between #{createStart} and #{createEnd}
+    </if>
     <if test="status != null">
       and a.status = #{status}
     </if>

+ 18 - 0
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -4,6 +4,8 @@ public class InputPublicDtails {
 
 	private String releaseStart;
 	private String releaseEnd;
+	private String createStart;
+	private String createEnd;
 	private String aid;
 	private String uid;
 	private Integer status;
@@ -21,6 +23,22 @@ public class InputPublicDtails {
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public String getCreateStart() {
+		return createStart;
+	}
+
+	public void setCreateStart(String createStart) {
+		this.createStart = createStart;
+	}
+
+	public String getCreateEnd() {
+		return createEnd;
+	}
+
+	public void setCreateEnd(String createEnd) {
+		this.createEnd = createEnd;
+	}
+
 	public Integer getPublicType() {
 		return publicType;
 	}

+ 2 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -457,7 +457,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public Object publicReleaseListDtails(InputPublicDtails in) {
 		Map<String,Object> map =new HashMap<String, Object>();
 		addParams(in, map);
-		Date date = new Date();
 		Pagination<OutPublicDtails> page = (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
 		return page;
 	}
@@ -468,6 +467,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getDepId()!=null) map.put("depId", in.getDepId());
 		if(in.getReleaseStart()!=null) map.put("releaseStart", in.getReleaseStart());
 		if(in.getReleaseEnd()!=null) map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
+		if(in.getCreateStart()!=null) map.put("createStart", in.getCreateStart());
+		if(in.getCreateEnd()!=null) map.put("createEnd", in.getCreateEnd()+" 23:59:59");
 		if(in.getUid()!=null) map.put("uid", in.getUid());
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());