...
|
...
|
@@ -746,7 +746,7 @@ func (cooperationContractService *CooperationContractService) BatchOperateCooper |
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
for _, cooperationContractOperated := range cooperationContractsOperated {
|
|
|
for _, cooperationContractOperated := range cooperationContracts {
|
|
|
// 新增共创合约变更记录
|
|
|
var operationType int32
|
|
|
if batchOperateCooperationContractCommand.Action == 1 {
|
...
|
...
|
@@ -764,6 +764,7 @@ func (cooperationContractService *CooperationContractService) BatchOperateCooper |
|
|
Org: cooperationContractOperated.Org,
|
|
|
Operator: operator,
|
|
|
CreatedAt: time.Now(),
|
|
|
OperatorTime: time.Now(),
|
|
|
}
|
|
|
|
|
|
// 保存共创合约变更记录
|
...
|
...
|
@@ -1255,7 +1256,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
|
|
// 拼接规则变更
|
|
|
incentivesRuleChangeDetail = moneyIncentivesRuleOriginalTmp + " 变更为 " + dividendsIncentivesRuleOriginalTmp
|
|
|
}
|
|
|
} else if cooperationContractFound.IncentivesType == cooperationContractSaved.IncentivesType { // 2.激励规则内容变更
|
|
|
} else if cooperationContractFound.IncentivesType == cooperationContract.IncentivesType { // 2.激励规则内容变更
|
|
|
if cooperationContractFound.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES { // 业绩分红规则内容变更
|
|
|
if !cooperationContract.DividendsIncentivesRuleSliceEqualBCE(cooperationContractFound.DividendsIncentivesRules, cooperationContract.DividendsIncentivesRules) {
|
|
|
// 业绩分红-->业绩分红
|
...
|
...
|
@@ -1357,7 +1358,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
|
|
|
|
|
// 变更承接人
|
|
|
var undertakersChanged string
|
|
|
for i, undertaker := range cooperationContractSaved.Undertakers {
|
|
|
for i, undertaker := range cooperationContract.Undertakers {
|
|
|
if undertaker.Referrer == nil {
|
|
|
undertaker.Referrer = &domain.Referrer{
|
|
|
UserId: 0,
|
...
|
...
|
|