Sfoglia il codice sorgente

公出详情列表新增创建时间

anderx 4 anni fa
parent
commit
0a38ad9b54

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

@@ -599,8 +599,9 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   </select>
   
   <select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
-  	select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
+	select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
 		date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,
+		date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,
 	date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds
 	from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
 	where 1=1

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

@@ -433,12 +433,13 @@
 		</if>
 		<if test="power ==1  or power ==2">
 			and a.aid
-			<if test="alist2 !=null">
+			<if test="alist != null">
+			in
 			<foreach item="item" collection="alist" separator="," open="(" close=")" index="">
-		      in #{item}
+		       #{item}
 		     </foreach> 
 			</if>
-			<if test="alist2 !=null">
+			<if test="alist == null">
 			 is null
 			 </if>
 		</if>

+ 0 - 1
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -95,7 +95,6 @@ public class ReleaseUserTask {
 		List<userDaysBo> userChannelList = new ArrayList<userDaysBo>();
 		for (User u : userList) {
 			if (StringUtils.isNotBlank(u.getId())) {
-				
 				userChannelList = customerService.selectChannelNotFollow(u.getId());
 			}
 			for (userDaysBo ub : userChannelList) {

+ 8 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -21,10 +21,18 @@ public class OutPublicDtails {
 	private Integer clockIn;
 	@Excel(name = "打卡时间" )
 	private String clockInTimes;
+	@Excel(name = "创建时间" )
+	private String createTimes;
 	private String annexUrl;
 	private String photoUrl;
 	
 	
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
 	public String getClockInTimes() {
 		return clockInTimes;
 	}