|
|
@@ -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("***");
|