anderx 4 years ago
parent
commit
862b8f3864

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -160,6 +160,8 @@ public class AFTConstants {
 	/** 转公公共客户签单时限 **/
 	public static final long PROJECT_SIGN_LIMIT_MS						= 24*3600*1000*900L;
 	
+	public static final long USER_CHENNL_LIMIT_MS						= 24*3600*1000*90L;
+	
 	public static final Integer USER_STATUS = 1;
 	/** 领取员工上线 **/
 	public static final Integer USER_RCEIVE_MAX= 9;

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

@@ -2086,8 +2086,9 @@ inner join(
   
   <select id="selectChannelCustomerList" resultType="com.goafanti.user.bo.OutUserChannel">
    select a.id,a.uid,b.nickname userName,a.aid,a.status,date_format(a.distribution_time,'%Y-%m-%d %H:%i:%S')distributionTimes,
- 	date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,c.contacts ,c.contact_mobile contactMobile,e.name channelName,
- 	b.society_tag societyTag ,d1.name province,d2.name city,f.name adminName ,b.guidance,a.recovery,a.remarks from user_channel a
+   a.distribution_time distributionTime,date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,c.contacts ,
+   c.contact_mobile contactMobile,e.name channelName,b.society_tag societyTag ,d1.name province,d2.name city,
+   f.name adminName ,b.guidance,a.recovery,a.remarks from user_channel a
     left join user b on a.uid=b.id  left join organization_identity c on a.uid =c.uid 
     left join district_glossory d1 on c.location_province =d1.id 
     left join district_glossory d2 on c.location_city =d2.id

+ 12 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3,6 +3,7 @@ package com.goafanti.customer.service.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -92,6 +93,8 @@ import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.StatisticBo;
 import com.goafanti.customer.bo.transferListBo;
 import com.goafanti.customer.service.CustomerService;
+import com.goafanti.user.bo.OutUserChannel;
+import com.mysql.fabric.xmlrpc.base.Data;
 
 @Service
 public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements CustomerService {
@@ -2082,8 +2085,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			params.put("maid", TokenManager.getAdminId());
 		}
 		params.put("aid", in.getAid() == null ? TokenManager.getAdminId() : in.getAid());
-		return findPage("selectChannelCustomerList", "selectChannelCustomerCount", params, in.getPageNo(),
+		Pagination<?> p=findPage("selectChannelCustomerList", "selectChannelCustomerCount", params, in.getPageNo(),
 				in.getPageSize());
+		@SuppressWarnings("unchecked")
+		List<OutUserChannel> list=(List<OutUserChannel>) p.getList();
+		Date date=new Date();
+		for (OutUserChannel o : list) {
+			int days = (int) ((o.getDistributionTime().getTime() + AFTConstants.USER_CHENNL_LIMIT_MS - date.getTime()) / (24 * 3600 * 1000));
+			o.setDays(days);
+		}
+		return p;
 
 	}
 

+ 10 - 0
src/main/java/com/goafanti/user/bo/OutUserChannel.java

@@ -93,6 +93,8 @@ public class OutUserChannel  {
 	private Integer recovery;
 	@Excel(name = "未导入原因",readConverterExp = "3=已存在私有,4=已存在公共,5=已存在签单")
 	private Integer status;
+	
+	private Integer days;
     public String getRemarks() {
 		return remarks;
 	}
@@ -335,4 +337,12 @@ public class OutUserChannel  {
 		this.recovery = recovery;
 	}
 
+	public Integer getDays() {
+		return days;
+	}
+
+	public void setDays(Integer days) {
+		this.days = days;
+	}
+
 }