Administrator %!s(int64=4) %!d(string=hai) anos
pai
achega
2a31174b7f

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

@@ -6,6 +6,33 @@ public class InputPublicReleaseList {
 	private Integer pageNo;
 	private Integer type;
 	private String clockTime;
+//	公出时间搜索,按公出名称搜索,按审核状态搜索(审核中、已撤销、已审核),按打卡状态搜索(已打卡、未打卡)
+	private String releaseStarts;
+	private String releaseEnds;
+	private String userName;
+	private String status;
+	private String clockIn;
+	
+	
+	
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getClockIn() {
+		return clockIn;
+	}
+	public void setClockIn(String clockIn) {
+		this.clockIn = clockIn;
+	}
 	public Integer getPageSize() {
 		return pageSize;
 	}
@@ -31,6 +58,18 @@ public class InputPublicReleaseList {
 	public void setClockTime(String clockTime) {
 		this.clockTime = clockTime;
 	}
+	public String getReleaseStarts() {
+		return releaseStarts;
+	}
+	public void setReleaseStarts(String releaseStarts) {
+		this.releaseStarts = releaseStarts;
+	}
+	public String getReleaseEnds() {
+		return releaseEnds;
+	}
+	public void setReleaseEnds(String releaseEnds) {
+		this.releaseEnds = releaseEnds;
+	}
 	
 
 }

+ 0 - 1
src/main/java/com/goafanti/admin/controller/AdminReleaseApiController.java

@@ -23,7 +23,6 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.user.bo.OutUserChannel;
 
 @RestController
 @RequestMapping(value = "/api/admin/release")

+ 6 - 3
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -173,9 +173,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
 		map.put("aid", TokenManager.getAdminId());
-		if (StringUtils.isNotEmpty(in.getClockTime())) {
-			map.put("clockTime", in.getClockTime());	
-		}
+		if (StringUtils.isNotEmpty(in.getClockTime()))	map.put("clockTime", in.getClockTime());	
+		if(StringUtils.isNotEmpty(in.getReleaseStarts()))	map.put("releaseStarts", in.getReleaseStarts());
+		if(StringUtils.isNotEmpty(in.getReleaseEnds()))	map.put("publicEnd", in.getReleaseEnds());
+		if(StringUtils.isNotEmpty(in.getUserName()))	map.put("userName", in.getUserName());
+		if(in.getStatus()!=null)	map.put("status", in.getStatus());
+		if(in.getClockIn()!=null)	map.put("clockIn", in.getClockIn());
 		return (Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
 	}
 

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

@@ -496,6 +496,18 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	<if test="clockTime !=null">
 	and a.release_start &lt; #{clockTime} and a.release_end &gt; #{clockTime}
 	</if>
+	<if test="releaseStarts != null and publicEnd != null">
+	and a.release_start  BETWEEN #{releaseStarts} and #{publicEnd}
+	</if>
+	<if test="clockTime !=null">
+	and b.nickname like CONCAT('%',#{userName},'%')
+	</if>
+	<if test="clockTime !=null">
+	and a.status = #{status}
+	</if>
+	<if test="clockTime !=null">
+	and a.clock_in = #{clockIn}
+	</if>
 	ORDER BY (case when a.status=1 then 1 else 2 end),a.status ,a.create_time 
   	<if test="page_sql!=null">
 			${page_sql}
@@ -514,6 +526,18 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	<if test="clockTime !=null">
 	and a.release_start &lt; #{clockTime} and a.release_end &gt; #{clockTime}
 	</if>
+		<if test="releaseStarts != null and publicEnd != null">
+	and a.release_start  BETWEEN #{releaseStarts} and #{publicEnd}
+	</if>
+	<if test="clockTime !=null">
+	and b.nickname like CONCAT('%',#{userName},'%')
+	</if>
+	<if test="clockTime !=null">
+	and a.status = #{status}
+	</if>
+	<if test="clockTime !=null">
+	and a.clock_in = #{clockIn}
+	</if>
   </select>
   
   <select id="selectDtails" resultType="com.goafanti.admin.bo.OutPublicRelease">

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -783,7 +783,7 @@
 	</select>
 	
 	<select id="selectFollowHistoryList" resultType="com.goafanti.customer.bo.FollowListBo">
-		select a.id as followId, a.aid, a.create_time as followTime, a.contact_type as contactType,
+		select a.id as followId, a.aid,date_format( a.create_time,'%Y-%m-%d %H:%i:%S') as followTime, a.contact_type as contactType,
 			a.result,a.guidance, b.identify_name as identifyName, c.name as contacts, c.mobile as contactMobile,
 			d.name as adminName,date_format(a.guidance_time,'%Y-%m-%d %H:%i:%S') as guidanceTime
 		<if test="businessProjectId != null and businessProjectId != ''"><!--  客户甲项目A所有的跟进记录 -->