Browse Source

显示BUG修复

anderx 2 years ago
parent
commit
51cfac33a8

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

@@ -378,7 +378,7 @@
 
   <select id="selectWaitReleaseCustomer" resultType="com.goafanti.customer.bo.LockingReleaseBo">
 	select
-		t0.id, t0.uid, t0.aid, t0.lock_time lockTime,u.new_channel newChannel,
+		t0.id, t0.uid, t0.aid, DATE_FORMAT(t0.lock_time , '%Y-%m-%d') lockTime,u.new_channel newChannel,
 		t1.last_follow_time lastFollowTime,u.nickname userName ,um.channel_type channelType
 	from
 		(select id,uid,aid,lock_time from user_lock_release where aid = #{aid} and type = 0 and status = 0)t0

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

@@ -11,7 +11,6 @@ import com.goafanti.common.model.AdminUserCount;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.AsyncUtils;
-import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.customer.bo.LockingReleaseBo;
@@ -161,7 +160,7 @@ public class ReleaseUserTask {
 
 	private void pushSalesmanCount(List<LockingReleaseBo> aidList) {
 		for (LockingReleaseBo e : aidList) {
-			String dates= DateUtils.formatDate(e.getLockTime(),AFTConstants.YYYYMMDD);
+			String dates= e.getLockTime();
 			AdminUserCount adminUserCount = customerService.getAdminUserCount(e.getAid(), dates);
 			if (adminUserCount!=null&&adminUserCount.getPrivateCount()>0){
 				AdminUserCount newAdminUserCount = new AdminUserCount();

+ 3 - 5
src/main/java/com/goafanti/customer/bo/LockingReleaseBo.java

@@ -1,12 +1,10 @@
 package com.goafanti.customer.bo;
 
-import java.util.Date;
-
 public class LockingReleaseBo {
 	private String id;
 	private String uid;
 	private String aid;
-	private Date lockTime;
+	private String lockTime;
 	private String type;
 	private String businessProjectId;
 	private String businessProjectName;
@@ -53,11 +51,11 @@ public class LockingReleaseBo {
 		this.aid = aid;
 	}
 
-	public Date getLockTime() {
+	public String getLockTime() {
 		return lockTime;
 	}
 
-	public void setLockTime(Date lockTime) {
+	public void setLockTime(String lockTime) {
 		this.lockTime = lockTime;
 	}