Procházet zdrojové kódy

移除,转交修改为批量操作

anderx před 1 rokem
rodič
revize
d9fbea3e77

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

@@ -524,7 +524,8 @@
 			a.society_tag as societyTag,
 			a.nickname as name,
 			a.share_type as shareType,
-			date_format(a.transfer_time,'%Y-%m-%d %H:%i:%S') as transferTime,
+			a.transfer_time  as transferTime,
+			um.last_follow_time lastFollowTime ,
 			dg1.name as province,
 			dg2.name as city,
 			dg3.name as area,
@@ -535,6 +536,7 @@
 			b.org_code orgCode,
 			d.name as adminName
 		from user a
+		left join user_mid um on a.id=um.uid
 		left join organization_identity b on a.id = b.uid
 		left join district_glossory dg1 on b.location_province = dg1.id
 		left join district_glossory dg2 on b.location_city = dg2.id

+ 15 - 6
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -1,5 +1,9 @@
 package com.goafanti.customer.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
 public class CustomerListOut extends CustomerListIn{
 	/** 客户ID **/
 	private String uid;
@@ -14,7 +18,7 @@ public class CustomerListOut extends CustomerListIn{
 	private String createTime;
 
 	/** 转换时间  **/
-	private String transferTime;
+	private Date  transferTime;
 
 	/** 营销员姓名 **/
 	private String adminName;
@@ -32,7 +36,7 @@ public class CustomerListOut extends CustomerListIn{
 	private String expertAudit ;
 
 	/** 最后跟进时间 **/
-	private String lastFollowTime;
+	private Date lastFollowTime;
 
 	/** 最后签单时间 **/
 	private String lastSignTime;
@@ -131,14 +135,18 @@ public class CustomerListOut extends CustomerListIn{
 		this.createTime = createTime;
 	}
 
-	public String getTransferTime() {
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getTransferTime() {
 		return transferTime;
 	}
 
-	public void setTransferTime(String transferTime) {
+	public void setTransferTime(Date transferTime) {
 		this.transferTime = transferTime;
 	}
 
+
+
+
 	public String getAdminName() {
 		return adminName;
 	}
@@ -162,11 +170,12 @@ public class CustomerListOut extends CustomerListIn{
 		this.consultant = consultant;
 	}
 
-	public String getLastFollowTime() {
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getLastFollowTime() {
 		return lastFollowTime;
 	}
 
-	public void setLastFollowTime(String lastFollowTime) {
+	public void setLastFollowTime(Date lastFollowTime) {
 		this.lastFollowTime = lastFollowTime;
 	}
 

+ 28 - 33
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2136,41 +2136,36 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	 */
 	private void setCustomerList(List<CustomerListOut> tmpList, int i, Integer power) {
 		Date now = new Date();
-		String s1, s2;
-		Long l1, l2;
+		Date s1, s2;
+		long l1, l2;
 		int diff1 = 0, diff2 = 0;
 		for (CustomerListOut clo : tmpList) {
-			try {
-				// 如果最近跟进为空直接取转换时间
-				if (StringUtils.isNotBlank(clo.getLastFollowTime())) {
-					// 如果最近跟进小于转换取转换时间
-					if (StringUtils.isNotBlank(clo.getTransferTime())&&(DateUtils.parseDate(clo.getLastFollowTime(), AFTConstants.YYYYMMDDHHMMSS).getTime() > DateUtils
-							.parseDate(clo.getTransferTime(), AFTConstants.YYYYMMDDHHMMSS).getTime())
-							) {
-						s1 = clo.getLastFollowTime();
-					} else {
-						s1 = clo.getTransferTime();
-					}
-				} else {
-					s1 = clo.getTransferTime();
-				}
-				// 另外一个时间取转换时间
-				s2 = clo.getTransferTime();
-				l1 = DateUtils.parseDate(s1, AFTConstants.YYYYMMDDHHMMSS).getTime();
-				l2 = DateUtils.parseDate(s2, AFTConstants.YYYYMMDDHHMMSS).getTime();
-				if (i == 0) {
-					diff1 = (int) ((l1 + AFTConstants.USER_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
-					diff2 = (int) ((l2 + AFTConstants.USER_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
-				} else if (i == 1) {
-					diff1 = (int) ((l1 + AFTConstants.PROJECT_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
-					diff2 = (int) ((l2 + AFTConstants.PROJECT_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
-				}
-				clo.setSurplusFollowTime(diff1 + "");
-				clo.setSurplusSignTime(diff2 + "");
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			if (power == 1) {
+            // 如果最近跟进为空直接取转换时间
+            if (clo.getLastFollowTime()!=null) {
+                // 如果最近跟进小于转换取转换时间
+                if (clo.getTransferTime()!=null&&(clo.getLastFollowTime().getTime() > clo.getTransferTime().getTime())
+                        ) {
+                    s1 = clo.getLastFollowTime();
+                } else {
+                    s1 = clo.getTransferTime();
+                }
+            } else {
+                s1 = clo.getTransferTime();
+            }
+            // 另外一个时间取转换时间
+            s2 = clo.getTransferTime();
+            l1 = s1.getTime();
+            l2 = s2.getTime();
+            if (i == 0) {
+                diff1 = (int) ((l1 + AFTConstants.USER_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+                diff2 = (int) ((l2 + AFTConstants.USER_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+            } else if (i == 1) {
+                diff1 = (int) ((l1 + AFTConstants.PROJECT_FOLLOW_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+                diff2 = (int) ((l2 + AFTConstants.PROJECT_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+            }
+            clo.setSurplusFollowTime(diff1 + "");
+            clo.setSurplusSignTime(diff2 + "");
+            if (power == 1) {
 				if (!clo.getAid().equals(TokenManager.getAdminId())) {
 					clo.setContacts("***");
 					clo.setContactMobile("***");