|
@@ -399,6 +399,7 @@ func (this *CompanyController) SearchList() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
func (this *CompanyController) List() {
|
|
func (this *CompanyController) List() {
|
|
@@ -434,8 +435,9 @@ func (this *CompanyController) List() {
|
|
city := this.GetString("City")
|
|
city := this.GetString("City")
|
|
keyWord = strings.Trim(keyWord, " ")
|
|
keyWord = strings.Trim(keyWord, " ")
|
|
keyWord = strings.Replace(keyWord, "'", "", -1)
|
|
keyWord = strings.Replace(keyWord, "'", "", -1)
|
|
- todoStatus := this.GetString("TodoStatus")
|
|
+ todoStatus := this.GetString("TodoStatus")
|
|
- tryStage, _ := this.GetInt("TryStage")
|
|
+ tryStage, _ := this.GetInt("TryStage")
|
|
|
|
+ includeShare, _ := this.GetBool("IncludeShare")
|
|
|
|
|
|
|
|
|
|
packageType, _ := this.GetInt("PackageType")
|
|
packageType, _ := this.GetInt("PackageType")
|
|
@@ -753,8 +755,17 @@ func (this *CompanyController) List() {
|
|
|
|
|
|
if sysUser.Authority <= 0 {
|
|
if sysUser.Authority <= 0 {
|
|
if status != utils.COMPANY_STATUS_LOSE {
|
|
if status != utils.COMPANY_STATUS_LOSE {
|
|
- condition += ` AND b.seller_id=? `
|
|
+
|
|
- pars = append(pars, sysUser.AdminId)
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if includeShare {
|
|
|
|
+ condition += ` AND (b.seller_id = ? OR (a.share_seller_id = ? AND a.is_share = 1)) `
|
|
|
|
+ pars = append(pars, sysUser.AdminId, sysUser.AdminId)
|
|
|
|
+ } else {
|
|
|
|
+ condition += ` AND b.seller_id=? `
|
|
|
|
+ pars = append(pars, sysUser.AdminId)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
permissionCondition += ` AND b.seller_id=? `
|
|
permissionCondition += ` AND b.seller_id=? `
|
|
@@ -8506,12 +8517,13 @@ func (this *CompanyController) AddRemark() {
|
|
}
|
|
}
|
|
|
|
|
|
remark := company.CompanyProductRemark{
|
|
remark := company.CompanyProductRemark{
|
|
- CompanyProductRemakrId: 0,
|
|
+ CompanyId: companyProduct.CompanyId,
|
|
- CompanyId: companyProduct.CompanyId,
|
|
+ ProductId: companyProduct.ProductId,
|
|
- ProductId: companyProduct.ProductId,
|
|
+ ProductName: companyProduct.ProductName,
|
|
- ProductName: companyProduct.ProductName,
|
|
+ Remark: req.Remark,
|
|
- Remark: req.Remark,
|
|
+ CreateTime: time.Now(),
|
|
- CreateTime: time.Now(),
|
|
+ SysUserId: sysUser.AdminId,
|
|
|
|
+ SysRealName: sysUser.RealName,
|
|
}
|
|
}
|
|
|
|
|
|
err = company.AddCompanyRemark(&remark)
|
|
err = company.AddCompanyRemark(&remark)
|
|
@@ -8594,9 +8606,14 @@ func (this *CompanyController) RemarkList() {
|
|
resp := make([]company.RemarkResp, len(remarkList))
|
|
resp := make([]company.RemarkResp, len(remarkList))
|
|
for i, remark := range remarkList {
|
|
for i, remark := range remarkList {
|
|
createDate := remark.CreateTime.Format(utils.FormatDateTime)
|
|
createDate := remark.CreateTime.Format(utils.FormatDateTime)
|
|
|
|
+ resp[i].RemarkId = remark.CompanyProductRemarkId
|
|
resp[i].Remark = remark.Remark
|
|
resp[i].Remark = remark.Remark
|
|
resp[i].ProductName = remark.ProductName
|
|
resp[i].ProductName = remark.ProductName
|
|
resp[i].CreateTime = createDate
|
|
resp[i].CreateTime = createDate
|
|
|
|
+
|
|
|
|
+ if remark.SysUserId == sysUser.AdminId {
|
|
|
|
+ resp[i].ButtonDel = true
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
br.Ret = 200
|
|
br.Ret = 200
|
|
@@ -9088,3 +9105,73 @@ func (this *CompanyTodoController) CompanyActivityPointsBill() {
|
|
br.Msg = "获取成功"
|
|
br.Msg = "获取成功"
|
|
br.Data = resp
|
|
br.Data = resp
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+func (this *CompanyController) DelRemark() {
|
|
|
|
+ br := new(models.BaseResponse).Init()
|
|
|
|
+ defer func() {
|
|
|
|
+ if br.ErrMsg == "" {
|
|
|
|
+ br.IsSendEmail = false
|
|
|
|
+ }
|
|
|
|
+ this.Data["json"] = br
|
|
|
|
+ this.ServeJSON()
|
|
|
|
+ }()
|
|
|
|
+ sysUser := this.SysUser
|
|
|
|
+ if sysUser == nil {
|
|
|
|
+ br.Msg = "请登录"
|
|
|
|
+ br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
|
+ br.Ret = 408
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ var req company.RemarkDelReq
|
|
|
|
+ err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
|
+ if err != nil {
|
|
|
|
+ br.Msg = "参数解析异常!"
|
|
|
|
+ br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if req.RemarkId <= 0 {
|
|
|
|
+ br.Msg = "参数有误"
|
|
|
|
+ br.ErrMsg = "参数有误, 备注ID有误"
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ item, e := company.GetCompanyRemarkById(req.RemarkId)
|
|
|
|
+ if e != nil {
|
|
|
|
+ if e.Error() == utils.ErrNoRow() {
|
|
|
|
+ br.Msg = "备注已被删除, 请刷新页面"
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ br.Msg = "备注信息有误"
|
|
|
|
+ br.ErrMsg = "获取客户备注失败, Err: " + e.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if item.SysUserId != sysUser.AdminId {
|
|
|
|
+ br.Msg = "仅备注添加人可删除"
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ product, e := company.GetCompanyProductByCompanyIdAndProductId(item.CompanyId, item.ProductId)
|
|
|
|
+ if e != nil {
|
|
|
|
+ br.Msg = "操作失败"
|
|
|
|
+ br.ErrMsg = "获取客户产品信息失败, Err: " + e.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if e := company.DelCompanyRemark(req.RemarkId); e != nil {
|
|
|
|
+ br.Msg = "操作失败"
|
|
|
|
+ br.ErrMsg = "删除客户备注失败, Err: " + e.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ content := fmt.Sprintf("%s%s", "删除备注: ", item.Remark)
|
|
|
|
+ _ = services.AddCompanyOperationRecord(product.CompanyId, product.SellerId, sysUser.AdminId, product.ProductId, sysUser.AdminId, product.CompanyName, product.ProductName, sysUser.RealName, "删除备注", "del_remark", content, sysUser.RealName, "", product.Status)
|
|
|
|
+
|
|
|
|
+ br.Ret = 200
|
|
|
|
+ br.Success = true
|
|
|
|
+ br.Msg = "操作成功"
|
|
|
|
+}
|