Merge branch 'CRM13.7' into debug

controllers/company.go

@@ -8610,11 +8610,10 @@ func (this *CompanyController) RemarkList() {
 	resp := make([]company.RemarkResp, len(remarkList))
 	for i, remark := range remarkList {
 		createDate := remark.CreateTime.Format(utils.FormatDateTime)
+		resp[i].RemarkId = remark.CompanyProductRemarkId
 		resp[i].Remark = remark.Remark
 		resp[i].ProductName = remark.ProductName
 		resp[i].CreateTime = createDate
-		resp[i].CompanyProductRemarkId = remark.CompanyProductRemarkId
-		resp[i].Mark = remark.Mark
 		// 仅自己添加的可删除
 		if remark.SysUserId == sysUser.AdminId {
 			resp[i].ButtonDel = true

controllers/company_share.go

@@ -766,17 +766,13 @@ func (this *CompanyController) CompanyShareMark() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	if req.CompanyProductRemakrId <= 0 {
+	if req.CompanyServiceRecordId <= 0 {
 		br.Msg = "参数缺失"
 		br.ErrMsg = "参数缺失，备注ID未传！"
 		return
 	}
-	if req.CompanyProductRemakrId < 0 {
-		br.Msg = "参数异常"
-		br.ErrMsg = "参数异常，备注id错误！"
-		return
-	}
-	err = company.UpdateCompanyProductRemark(req.CompanyProductRemakrId, req.Status)
+
+	err = company.UpdateCompanyServiceRecordMark(req.CompanyServiceRecordId, req.Status)
 	if err != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = "新增共享客户备注失败, Err: " + err.Error()

models/company/company.go

@@ -1547,12 +1547,11 @@ type RemarkDelReq struct {
 
 // RemarkResp 备注说明
 type RemarkResp struct {
-	Remark                 string `description:"未续约说明"`
-	ProductName            string `description:"客户产品：ficc：权益："`
-	CreateTime             string `description:"添加时间"`
-	CompanyProductRemarkId int
-	Mark                   int  `description:"是否标记 0不是 1是"`
-	ButtonDel              bool `description:"删除权限"`
+	RemarkId    int    `description:"备注ID"`
+	Remark      string `description:"未续约说明"`
+	ProductName string `description:"客户产品：ficc：权益："`
+	CreateTime  string `description:"添加时间"`
+	ButtonDel   bool   `description:"删除权限"`
 }
 
 type RoadShowTotalSlice struct {
@@ -1891,7 +1890,7 @@ func Close2Loss(companyId, productId int) (err error) {
 
 // CompanyMarkReq 标记请求
 type CompanyMarkReq struct {
-	CompanyProductRemakrId int `description:"备注id"`
+	CompanyServiceRecordId int `description:"服务记录ID"`
 	Status                 int `description:"0取消标记 1标记"`
 }
 

models/company/company_product.go

@@ -377,15 +377,6 @@ func GetRemarkListByCompanyId(CompanyId string) (items []*CompanyProductRemark,
 	_, err = o.Raw(sql, CompanyId).QueryRows(&items)
 	return
 }
-
-// 更新备注标记
-func UpdateCompanyProductRemark(remarkId, mark int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_product_remark SET mark=? WHERE company_product_remark_id=? `
-	_, err = o.Raw(sql, mark, remarkId).Exec()
-	return
-}
-
 // 冻结客户
 //func FreezeCompany(productId, companyId, adminId int, remark, realName string) (msg, errMsg string){
 //	time.Sleep(time.Second)

models/company/company_service_record.go

@@ -143,3 +143,12 @@ type CompanyServiceRecordItem struct {
 	SysAdminName           string `description:"创建人姓名"`
 	CreateTime             string `description:"创建时间"`
 }
+
+
+// 更新备注标记
+func UpdateCompanyServiceRecordMark(remarkId, mark int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE company_service_record SET mark=? WHERE company_service_record_id=? `
+	_, err = o.Raw(sql, mark, remarkId).Exec()
+	return
+}