Browse Source

新增董事长特批审核

anderx 3 years ago
parent
commit
932b2f948a

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

@@ -336,7 +336,8 @@
 			a.sign_bills signBills,
 			a.share_type as shareType,
 			a.channel ,
-			a.information_maintainer as mid
+			a.information_maintainer as mid,
+	 		a.new_channel as newChannel
 		from  `user` a
 		left join user_names un on a.id=un.uid
 		left join organization_identity b on a.id = b.uid

+ 17 - 17
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -8,40 +8,40 @@ public class CustomerListIn {
 	private String id;
 	/** 客户类型  0-个人 1-单位**/
 	private String type;
-	
+
 	/** 客户名称 **/
 	private String name;
-	
+
 	/** 省 **/
 	private String province;
-	
+
 	/** 市 **/
 	private String city;
-	
+
 	/** 区 **/
 	private String area;
-	
+
 	/** 开始时间 **/
 	private String startDate;
-	
+
 	/** 结束时间 **/
 	private String endDate;
-	
+
 	/** 客户状态  0-正常 1-注销 2-锁定**/
 	private String status;
 
 	/** 行业 **/
 	private String industry;
-	
+
 	/** 共享类型 0-私有 1-公共 **/
 	private String shareType;
-	
+
 	/** 营销员 ID **/
 	private String aid;
 
 	/** 社会性质 **/
 	private String societyTag;
-	
+
 	/** 联系人 **/
 	private String contacts;
 	/** 联系人电话 **/
@@ -50,24 +50,24 @@ public class CustomerListIn {
 	 * 创建时间
 	 */
 	private String createTime;
-	
+
 	private String dataGrade;
-	
+
 	private Integer creditRating;
-	
+
 	private String departmentId;
 
 	private Integer level;
-	
+
 	private String follow;
-	
+
 	private String iname;
-	
+
 	/**
 	 * 	排序 0否 1转换倒序 2转换正序
 	 */
 	private Integer sort;
-	/** 渠道 0否 1是 */
+	/** 外联 0否 1是 */
 	private Integer channel;
 
 	private String businessScope;

+ 34 - 24
src/main/java/com/goafanti/customer/bo/CustomerListOut.java

@@ -1,57 +1,57 @@
 package com.goafanti.customer.bo;
 
-public class CustomerListOut extends CustomerListIn{	
+public class CustomerListOut extends CustomerListIn{
 	/** 客户ID **/
 	private String uid;
-	
+
 	/** 联系人 **/
 	private String contacts;
-	
+
 	/** 联系电话 **/
 	private String contactMobile;
-	
+
 	/** 创建时间 **/
 	private String createTime;
-	
+
 	/** 转换时间  **/
 	private String transferTime;
-	
+
 	/** 营销员姓名 **/
 	private String adminName;
-	
+
 	/** 专家发布状态**/
 	private String releaseStatus;
-	
+
 	/** 审核意见**/
 	private String auditOpinion;
-	
+
 	/** 是否为咨询师 **/
 	private String consultant;
-	
+
 	/** 专家审核状态 **/
 	private String expertAudit ;
-	
+
 	/** 最后跟进时间 **/
 	private String lastFollowTime;
-	
+
 	/** 最后签单时间 **/
 	private String lastSignTime;
-	
+
 	/** 剩余私有时间 **/
 	private String surplusFollowTime;
-	
+
 	/** 剩余签单时间 **/
 	private String surplusSignTime;
-	
+
 	/** 资料所属人 **/
 	private String informationMaintainer;
-	
+
 	private String shareType;
-	
+
 	private String mid;
-	
+
 	private Integer level;
-	
+
 	private String aName;
 	/**
 	 * 指导意见 0无 1有
@@ -61,10 +61,20 @@ public class CustomerListOut extends CustomerListIn{
 	 * 签单 0否 1是
 	 */
 	private Integer signBills;
-	
-	/** 渠道 0否 1是 */
+
+	/** 外联 0否 1是 */
 	private Integer channel;
-	
+	/** 渠道 0否 1是 */
+	private Integer newChannel;
+
+	public Integer getNewChannel() {
+		return newChannel;
+	}
+
+	public void setNewChannel(Integer newChannel) {
+		this.newChannel = newChannel;
+	}
+
 	public Integer getChannel() {
 		return channel;
 	}
@@ -240,6 +250,6 @@ public class CustomerListOut extends CustomerListIn{
 		this.signBills = signBills;
 	}
 
-	
 
-}
+
+}

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -426,6 +426,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t.setOrderDep(admin.getDepartmentId());
 		}
 		if (isSubmit==1) {//订单提交
+			t2.setApproval(t.getApproval());
 			if(t2.getProcessStatus()<ProcessStatus.YPYXGLY.getCode()) {
 				t.setOrderStatus(OrderNewState.QDDS.getCode());
 				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -46,7 +46,7 @@ user_remind_days=15
 user_channel_days=90
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.42
+static.host=//static.jishutao.com/1.2.43
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -43,7 +43,7 @@ user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.42
+static.host=//static.jishutao.com/1.2.43
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload