Sfoglia il codice sorgente

签单客户列表修改

anderx 1 anno fa
parent
commit
9573ac2232

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

@@ -199,7 +199,7 @@ public class AFTConstants {
 	public static final long USER_SIGN_LIMIT_MS						= 24*3600*1000*270L;
 
 	/** 转公共客户拜访时限 **/
-	public static final long PROJECT_FOLLOW_LIMIT_MS					= 24*3600*1000*360L;
+	public static final long PROJECT_FOLLOW_LIMIT_MS					= 24*3600*1000*30L;
 	/** 转公公共客户签单时限 **/
 	public static final long PROJECT_SIGN_LIMIT_MS						= 24*3600*1000*900L;
 

+ 6 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2161,11 +2161,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
                 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));
+//                diff2 = (int) ((l2 + AFTConstants.PROJECT_SIGN_LIMIT_MS - now.getTime()) / (24 * 3600 * 1000));
+
             }
             clo.setSurplusFollowTime(diff1 + "");
             clo.setSurplusSignTime(diff2 + "");
-            if (power == 1) {
+            if (power!=null&&power == 1) {
 				if (!clo.getAid().equals(TokenManager.getAdminId())) {
 					clo.setContacts("***");
 					clo.setContactMobile("***");
@@ -2182,6 +2183,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		Map<String, Object> params = disposeParams(cli);
 		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectSignOrganizationCustomerList",
 				"selectSignOrganizationCustomerCount", params, pageNo, pageSize);
+		List<CustomerListOut> tmpList = (List<CustomerListOut>) list.getList();
+		setCustomerList(tmpList, 1, null);
+		list.setList(tmpList);
 		return list;
 	}