Merge branch 'crm/need_1019' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_share.go

@@ -78,12 +78,19 @@ func (this *CompanyController) CompanyShare() {
 		return
 	}
 	//新增操作记录
-	//{
-	//	remark := "移动到：" + seller.RealName
-	//	operation := "move_seller"
-	//	services.AddCompanyOperationRecord(req.CompanyId, seller.AdminId, sysUser.AdminId, productId, sysUser.AdminId, cp.CompanyName,
-	//		cp.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", cp.Status)
-	//}
+	{
+		var remark string
+		var operation string
+		if req.IsShare == 1 {
+			remark = "设置共享"
+			operation = "set_share"
+		} else {
+			remark = "取消共享"
+			operation = "cancel_share"
+		}
+		services.AddCompanyOperationRecord(req.CompanyId, companyProductItem.SellerId, sysUser.AdminId, productId, sysUser.AdminId, companyProductItem.CompanyName,
+			companyProductItem.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", companyProductItem.Status)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -754,6 +761,7 @@ func (this *CompanyController) MoveShareSeller() {
 		br.ErrMsg = "查找客户失败,Err:" + err.Error()
 		return
 	}
+	oldShareSellerId := companyProductItem.ShareSellerId
 
 	//待更新字段
 	updateCol := make([]string, 0)
@@ -772,13 +780,21 @@ func (this *CompanyController) MoveShareSeller() {
 	{
 		services.UpdateCompanyContractSellerMove(req.CompanyId, productId) //益客户移动所属销售之后，更新所关联的销售信息
 	}
+
 	//新增操作记录
-	//{
-	//	remark := "移动到：" + seller.RealName
-	//	operation := "move_seller"
-	//	services.AddCompanyOperationRecord(req.CompanyId, seller.AdminId, sysUser.AdminId, productId, sysUser.AdminId, cp.CompanyName,
-	//		cp.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", cp.Status)
-	//}
+	{
+		var remark string
+		var operation string
+		if oldShareSellerId == 0 {
+			remark = "分配给" + seller.RealName
+			operation = "set_share_seller"
+		} else {
+			remark = "移动到" + seller.RealName
+			operation = "set_share_seller"
+		}
+		services.AddCompanyOperationRecord(req.CompanyId, seller.AdminId, sysUser.AdminId, productId, sysUser.AdminId, companyProductItem.CompanyName,
+			companyProductItem.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", companyProductItem.Status)
+	}
 	//变更销售员与联系人关系
 	//_ = models.UpdateUserSellerRelationByCompanyId(req.CompanyId, productId, seller.AdminId, seller.RealName)
 

controllers/cygx/rai_serve.go

@@ -595,7 +595,7 @@ func RaiServeListExport(this *RaiServeCoAntroller, resp *cygx.CygxRaiServeCompan
 
 	cellD := titleRow.AddCell()
 	cellD.SetStyle(style)
-	cellD.SetValue("咨询销售")
+	cellD.SetValue("服务销售")
 
 	cellE := titleRow.AddCell()
 	cellE.SetStyle(style)