|
@@ -2516,12 +2516,15 @@ func (this *ContractController) BusinessContractCompanyList() {
|
|
|
|
|
|
|
|
|
keyword := this.GetString("Keyword")
|
|
|
+ keyword = strings.TrimSpace(keyword)
|
|
|
if keyword == "" {
|
|
|
br.Msg = "请输入客户名称"
|
|
|
br.ErrMsg = "请输入客户名称"
|
|
|
return
|
|
|
}
|
|
|
- condition += ` AND (contract_code LIKE '%` + keyword + `%' OR company_name LIKE '%` + keyword + `%' OR credit_code LIKE '%` + keyword + `%' ) `
|
|
|
+ kw := fmt.Sprint("%", keyword, "%")
|
|
|
+ condition += ` AND (contract_code LIKE ? OR company_name LIKE ? OR credit_code LIKE ? ) `
|
|
|
+ pars = append(pars, kw, kw, kw)
|
|
|
|
|
|
list, err := contract.GetContractCompanyNameList(condition, pars)
|
|
|
if err != nil {
|
|
@@ -2535,6 +2538,25 @@ func (this *ContractController) BusinessContractCompanyList() {
|
|
|
companyNameList = append(companyNameList, v.CompanyName)
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ {
|
|
|
+
|
|
|
+ cond := ` AND share_seller_id = ? AND is_share = 1 AND company_name LIKE ?`
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
+ pars = append(pars, sysUser.AdminId, kw)
|
|
|
+ shares, e := company.GetCompanyListByCondition(cond, pars, []string{"company_id", "company_name"}, "")
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取共享客户信息失败, Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, v := range shares {
|
|
|
+ if !utils.InArrayByStr(companyNameList, v.CompanyName) {
|
|
|
+ companyNameList = append(companyNameList, v.CompanyName)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|
|
@@ -2576,8 +2598,13 @@ func (this *ContractController) BusinessContractListByCompanyName() {
|
|
|
|
|
|
|
|
|
|
|
|
- condition += ` AND a.seller_id = ? `
|
|
|
- pars = append(pars, sysUser.AdminId)
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ joinStr := ` LEFT JOIN company AS b ON a.company_name = b.company_name `
|
|
|
+ condition += ` AND (a.seller_id = ? OR (b.is_share = 1 AND b.share_seller_id = ?))`
|
|
|
+ pars = append(pars, sysUser.AdminId, sysUser.AdminId)
|
|
|
|
|
|
|
|
|
companyName := this.GetString("CompanyName")
|
|
@@ -2586,7 +2613,7 @@ func (this *ContractController) BusinessContractListByCompanyName() {
|
|
|
br.ErrMsg = "请输入客户名称"
|
|
|
return
|
|
|
}
|
|
|
- condition += ` AND company_name = ? `
|
|
|
+ condition += ` AND a.company_name = ? `
|
|
|
pars = append(pars, companyName)
|
|
|
|
|
|
pageSize, _ := this.GetInt("PageSize")
|
|
@@ -2601,14 +2628,14 @@ func (this *ContractController) BusinessContractListByCompanyName() {
|
|
|
}
|
|
|
startSize = paging.StartIndex(currentIndex, pageSize)
|
|
|
|
|
|
- total, err := contract.GetContractListCount(condition, "", pars)
|
|
|
+ total, err := contract.GetContractListCount(condition, joinStr, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = "获取数据总数失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- list, err := contract.GetContractList(condition, "", pars, startSize, pageSize)
|
|
|
+ list, err := contract.GetContractList(condition, joinStr, pars, startSize, pageSize)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取合同列表失败!"
|
|
|
br.ErrMsg = "获取合同列表失败,Err:" + err.Error()
|
|
@@ -2824,25 +2851,42 @@ func (this *ContractController) GetListBySeal() {
|
|
|
this.Data["json"] = br
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
+ sysUser := this.SysUser
|
|
|
+ if sysUser == nil {
|
|
|
+ br.Msg = "请登录"
|
|
|
+ br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
+ br.Ret = 408
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
keyword := this.GetString("Keyword")
|
|
|
- condition := ""
|
|
|
+ condition := ` AND a.status = "已审批"`
|
|
|
pars := make([]interface{}, 0)
|
|
|
if keyword != "" {
|
|
|
- condition += ` AND (company_name LIKE '%` + keyword + `%') `
|
|
|
- }
|
|
|
-
|
|
|
- if this.SysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
|
|
|
- condition += ` AND seller_id = ? `
|
|
|
- pars = append(pars, this.SysUser.AdminId)
|
|
|
+ kw := fmt.Sprint("%", keyword, "%")
|
|
|
+ condition += ` AND (a.company_name LIKE ?) `
|
|
|
+ pars = append(pars, kw)
|
|
|
}
|
|
|
|
|
|
- list, err := contract.GetSearchListBySeal(condition, pars)
|
|
|
- if err != nil {
|
|
|
+
|
|
|
+ joinStr := ` LEFT JOIN company AS b ON a.company_name = b.company_name `
|
|
|
+
|
|
|
+ if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
|
|
|
+ condition += ` AND (a.seller_id = ? OR (b.is_share = 1 AND b.share_seller_id = ?))`
|
|
|
+ pars = append(pars, sysUser.AdminId, sysUser.AdminId)
|
|
|
+ }
|
|
|
+ list, e := contract.GetContractList(condition, joinStr, pars, 0, 100)
|
|
|
+ if e != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ br.ErrMsg = "获取合同列表失败, Err:" + e.Error()
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
newList := make([]response.ContractListBySealResp, 0)
|
|
|
if len(list) > 0 {
|