Merge branch 'crm_14.4' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

models/tables/company_contract_permission/company_contract_permission.go

@@ -17,6 +17,8 @@ type CompanyContractPermission struct {
 	EndDate           string    `description:"结束日期"`
 	CreateTime        time.Time `description:"创建时间"`
 	ModifyTime        time.Time `description:"修改时间"`
+	ContractType      string    `description:"签约合同时，当前行业类型：枚举值：'行业新签','行业续约'"`
+	PermissionName    string    `description:"权限名称"`
 }
 
 // 获取合同对应的权限列表
@@ -30,3 +32,35 @@ func GetCompanyContractPermissionList(condition string, pars []interface{}) (ite
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// UpdateCompanyContractPermissionMulti 批量修改
+func UpdateCompanyContractPermissionMulti(items []*CompanyContractPermission) (err error) {
+	o, err := orm.NewOrm().Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err == nil {
+			o.Commit()
+		} else {
+			o.Rollback()
+		}
+	}()
+
+	//批量修改公司剩余点数
+	p, err := o.Raw("UPDATE company_contract_permission SET permission_name = ? ,contract_type = ? WHERE id = ?").Prepare()
+	if err != nil {
+		return
+	}
+	defer func() {
+		_ = p.Close() // 别忘记关闭 statement
+	}()
+
+	for _, v := range items {
+		_, err = p.Exec(v.PermissionName, v.ContractType, v.Id)
+		if err != nil {
+			return
+		}
+	}
+	return
+}

services/company_approval/company_approval.go

@@ -440,6 +440,7 @@ func Approved(approvalRecord *contract_approval_record.ContractApprovalRecord, o
 				cygxService.YanXuanCompanyApproval(recordInfo.CompanyId) //研选审批通过的时候研选扣点更新
 				cygxService.HandleAllocationCompanyContractByYanXuan(recordInfo.CompanyContractId)   //如果合同只有研选的时候，自动处理派点
 				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)   // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
+				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId)   // 更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）
 			}
 		}()
 	} else {

services/cygx/contract_allocation.go

@@ -3,6 +3,7 @@ package cygxService
 import (
 	"fmt"
 	"errors"
+	"hongze/hongze_mobile_admin/models/tables/chart_permission"
 	"hongze/hongze_mobile_admin/models/tables/company_contract_permission"
 	"hongze/hongze_mobile_admin/models/tables/cygx_allocation_company_contract"
 	"hongze/hongze_mobile_admin/services/alarm_msg"
@@ -140,4 +141,86 @@ func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 	}
 	return
 
+}
+
+// HandleCompanyContractPermissionContractType 更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）
+func HandleCompanyContractPermissionContractType(companyContractId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg(fmt.Sprint("更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）失败，HandleCompanyContractPermissionContractType Err：", err.Error(), "companyContractId", companyContractId), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+
+	condition = " AND company_contract_id = ?  "
+	pars = append(pars, companyContractId)
+	detail, e := company_contract.GetCompanyContracDetail(condition, pars)
+	if e != nil {
+		err = errors.New("GetCompanyContracDetail,detail Err: " + e.Error())
+		return
+	}
+
+	//获取权限ID与名称的map映射
+	permissionList, e := chart_permission.GetChartPermissionList()
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetChartPermissionList Err: " + e.Error())
+		return
+	}
+
+	mapChartPermission := make(map[int]string)
+	for _, v := range permissionList {
+		mapChartPermission[v.ChartPermissionId] = v.PermissionName
+	}
+
+	companyId := detail.CompanyId
+	//如果不是续约合同就不做对比处理
+	pars = make([]interface{}, 0)
+	condition = " AND  company_contract_id  != ?   AND  company_id = ? "
+	pars = append(pars, companyContractId, companyId)
+
+	//获取历史签约信息
+	companyContractPermissionListHistory, e := company_contract_permission.GetCompanyContractPermissionList(condition, pars)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("companyContractPermissionListHistory Err: " + e.Error())
+		return
+	}
+
+	var mapHistoryPerssionName []string
+	for _, v := range companyContractPermissionListHistory {
+		mapHistoryPerssionName = append(mapHistoryPerssionName, mapChartPermission[v.ChartPermissionId])
+	}
+
+	pars = make([]interface{}, 0)
+	condition = " AND  company_contract_id  = ?   "
+	pars = append(pars, companyContractId)
+	//获取当前签约的合同信息
+	companyContractPermissionLisThis, e := company_contract_permission.GetCompanyContractPermissionList(condition, pars)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("companyContractPermissionLisThis Err: " + e.Error())
+		return
+	}
+
+	var items []*company_contract_permission.CompanyContractPermission
+	for _, v := range companyContractPermissionLisThis {
+		v.PermissionName = mapChartPermission[v.ChartPermissionId]
+		if v.PermissionName == "" {
+			continue
+		}
+		//已经存在的属于行业续约、不存在的属于行业新签
+		if utils.InArrayByStr(mapHistoryPerssionName, v.PermissionName) {
+			v.ContractType = "行业续约"
+		} else {
+			v.ContractType = "行业新签"
+		}
+		items = append(items, v)
+	}
+	//批量更新合同权限表的权限行业名称，以及签约合同时，当前行业类型（行业续约、行业新签）
+	e = company_contract_permission.UpdateCompanyContractPermissionMulti(items)
+	if e != nil {
+		err = errors.New("UpdateCompanyContractPermissionMulti Err: " + e.Error())
+		return
+	}
+	return
 }