Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!174

src/main/java/cn/timer/api/controller/crm/CrmRuleController.java

@@ -62,21 +62,25 @@ public class CrmRuleController {
 				Integer status = crmClientData.getClientStatus();
 				String belongUserName = crmClientData.getBelongUserName();
 				String clientName = crmClientData.getClientName();
+				Date now = new Date();
 				// 客户创建时间+ x天 = 过期释放时间
 				DateTime overDate1 = DateUtil.offsetDay(createTime, one);
+				Long compare2 = null;
+				if (lastFollowTime != null) {
 					DateTime overDate2 = DateUtil.offsetDay(lastFollowTime, two);
+					 compare2 = DateUtil.between(overDate2, now, DateUnit.DAY, false);
+				}
 				DateTime overDate3 = DateUtil.offsetDay(createTime, three);
 				// 时间比较
-				Date now = new Date();
 				long compare1 = DateUtil.between(overDate1, now, DateUnit.DAY, false);
-				long compare2 = DateUtil.between(overDate2, now, DateUnit.DAY, false);
+				
 				long compare3 = DateUtil.between(overDate3, now, DateUnit.DAY, false);
 				// 判断1和2和3
 				if ((lastFollowTime == null && compare1 >= 0) || (lastFollowTime != null && compare2 >= 0)
 						|| (compare3 >= 0 && status != 3 && status != 4))
 					release(crmClientData);
 				// 判断4
-				if (compare1 == -four || compare2 == -four || compare3 == -four)
+				if (compare1 == -four || compare2 == -four || compare3 == -four) // TODO
 					remind(belongUserName, clientName, four);
 			}
 		}

src/main/java/cn/timer/api/dto/crm/CrmClientDataImportVo.java

+/**  
+* Title: CrmClientDataImportVo.java 
+* Description: 
+* @author dsc  
+* @date 2020年6月12日  
+* @version 1.0  
+*/
+package cn.timer.api.dto.crm;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Title: CrmClientDataImportVo.java
+ * 
+ * @Description:
+ * @author dsc
+ * @date 2020年6月12日
+ * @version 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CrmClientDataImportVo implements Serializable {
+
+	private static final long serialVersionUID = 3241644321635711815L;
+	// 客户名
+	private String clientName;
+	// 组
+	private String belongGroupName;
+	// 行业
+	private String industryName;
+	// 客户类型
+	private String clientTypeName;
+	// 手机号
+	private String clientCellphone;
+	// 客户座机
+	private String clientTelephone;
+	// 客户官网
+	private String clientUrl;
+	// 邮箱
+	private String clientEmail;
+	// 详细地址
+	private String address;
+
+	// 联系人信息
+	private String linkName;
+	private String cellphone;
+	private String company;
+	private String gender;
+	private String position;
+	private String telephone;
+	private String email;
+	private String linkAddress;
+
+}

src/main/resources/application-dev.yml

@@ -202,6 +202,9 @@ config-8timer:
     three: 30
   init-password: 123456
   
+  # 客户管理导入服务器保存路径
+  crm-excel:
+     realPath: 'D:/excel/'
    
    
   
\ No newline at end of file

src/main/resources/application-pro.yml

@@ -172,3 +172,7 @@ config-8timer:
     two: 7
     three: 30
   init-password: 123456
+  
+  # 客户管理导入服务器保存路径
+  crm-excel:
+     realPath: 'crm-excel/'
\ No newline at end of file

src/main/resources/application-test.yml

@@ -171,3 +171,7 @@ config-8timer:
     two: 7
     three: 30
   init-password: 123456
+  
+  # 客户管理导入服务器保存路径
+  crm-excel:
+     realPath: 'crm-excel/'
\ No newline at end of file