allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 47b8f0c37ed24cbcab52536e9450aeec61174763 1 个父辈 2bce3a1d

fix:修复承接人创建时间错误

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 121 行删除
... ... @@ -1390,125 +1390,6 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
undertakerChange = undertakerChangeTmp1 + " 变更为 " + undertakerChangeTemp2
}
//if cooperationContractFound.IncentivesType != cooperationContractSaved.IncentivesType && cooperationContractFound.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES && cooperationContractSaved.IncentivesType == domain.TYPE_MONEY_INCENTIVES { // 1.激励类型变更
// // 业绩分红-->金额激励
// incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
// //【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
// // 原业绩分红激励规则
// var dividendsIncentivesRuleOriginal string
// for _, dividendsIncentivesRule := range cooperationContractFound.DividendsIncentivesRules {
// dividendsIncentivesRuleOriginal = dividendsIncentivesRuleOriginal + dividendsIncentivesRule.DividendsIncentivesStageCN +
// "：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
// "，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
// "~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
// "，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
// }
// dividendsIncentivesRuleOriginalTmp := "【" + dividendsIncentivesRuleOriginal + "】"
//
// // 变更后的金额激励规则
// var moneyIncentivesRuleChanged string
// for _, moneyIncentivesRule := range cooperationContractSaved.MoneyIncentivesRules {
// moneyIncentivesRuleChanged = moneyIncentivesRuleChanged + moneyIncentivesRule.MoneyIncentivesStageCN +
// "：" +
// "，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
// "，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
// }
// moneyIncentivesRuleOriginalTmp := "【" + moneyIncentivesRuleChanged + "】"
//
// // 拼接规则变更
// incentivesRuleChangeDetail = dividendsIncentivesRuleOriginalTmp + " 变更为 " + moneyIncentivesRuleOriginalTmp
//} else if cooperationContractFound.IncentivesType != cooperationContractSaved.IncentivesType && cooperationContractFound.IncentivesType == domain.TYPE_MONEY_INCENTIVES && cooperationContractSaved.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES {
// // 金额激励-->业绩分红
// incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
// //【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
// // 原金额激励规则
// var moneyIncentivesRuleOriginal string
// for _, moneyIncentivesRule := range cooperationContractFound.MoneyIncentivesRules {
// moneyIncentivesRuleOriginal = moneyIncentivesRuleOriginal + moneyIncentivesRule.MoneyIncentivesStageCN +
// "：" +
// "，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
// "，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
// }
// moneyIncentivesRuleOriginalTmp := "【" + moneyIncentivesRuleOriginal + "】"
//
// // 变更后的业绩分红激励规则
// var dividendsIncentivesRuleChanged string
// for _, dividendsIncentivesRule := range cooperationContractSaved.DividendsIncentivesRules {
// dividendsIncentivesRuleChanged = dividendsIncentivesRuleChanged + dividendsIncentivesRule.DividendsIncentivesStageCN +
// "：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
// "，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
// "~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
// "，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
// }
// dividendsIncentivesRuleOriginalTmp := "【" + dividendsIncentivesRuleChanged + "】"
//
// // 拼接规则变更
// incentivesRuleChangeDetail = moneyIncentivesRuleOriginalTmp + " 变更为 " + dividendsIncentivesRuleOriginalTmp
//} else { // 2.激励规则内容变更
// if cooperationContractFound.IncentivesType == domain.TYPE_DIVIDNEDS_INCENTIVES { // 业绩分红激励规则变更
// if !cooperationContract.DividendsIncentivesRuleSliceEqualBCE(cooperationContractFound.DividendsIncentivesRules, cooperationContractSaved.DividendsIncentivesRules) {
// // 业绩分红-->业绩分红
// incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
// //【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
// // 原业绩分红激励规则
// var dividendsIncentivesRuleOriginal string
// for _, dividendsIncentivesRule := range cooperationContractFound.DividendsIncentivesRules {
// dividendsIncentivesRuleOriginal = dividendsIncentivesRuleOriginal + dividendsIncentivesRule.DividendsIncentivesStageCN +
// "：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
// "，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
// "~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
// "，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
// }
// dividendsIncentivesRuleOriginalTmp := "【" + dividendsIncentivesRuleOriginal + "】"
// // 变更后的业绩分红激励规则
// var dividendsIncentivesRuleChanged string
// for _, dividendsIncentivesRule := range cooperationContractSaved.DividendsIncentivesRules {
// dividendsIncentivesRuleChanged = dividendsIncentivesRuleChanged + dividendsIncentivesRule.DividendsIncentivesStageCN +
// "：" + fmt.Sprint(dividendsIncentivesRule.DividendsIncentivesPercentage) +
// "，" + dividendsIncentivesRule.DividendsIncentivesStageStart.Format("2006-01-02") +
// "~" + dividendsIncentivesRule.DividendsIncentivesStageEnd.Format("2006-01-02") +
// "，" + fmt.Sprint(dividendsIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(dividendsIncentivesRule.SalesmanPercentage) + ";"
// }
// dividendsIncentivesRuleChangedTmp := "【" + dividendsIncentivesRuleChanged + "】"
// // 拼接规则变更
// incentivesRuleChangeDetail = dividendsIncentivesRuleOriginalTmp + " 变更为 " + dividendsIncentivesRuleChangedTmp
// }
// } else if cooperationContractFound.IncentivesType == domain.MONEY_INCENTIVES { // 金额激励规则变更
// if !cooperationContract.MoneyIncentivesRuleSliceEqualBCE(cooperationContractFound.MoneyIncentivesRules, cooperationContractSaved.MoneyIncentivesRules) {
// incentivesRuleChange = cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractFound.IncentivesType)) + "-->" + cooperationContract.ReturnIncentivesName(domain.IncentivesType(cooperationContractSaved.IncentivesType))
// //【第一阶段：20，2021-01-01~2021-12-31，，，；第二阶段：20，2021-01-01~2021-12-31，30，10】变更为【第一阶段：20，2021-01-01~2021-12-31，，，；】
// // 原金额激励规则
// var moneyIncentivesRuleOriginal string
// for _, moneyIncentivesRule := range cooperationContractFound.MoneyIncentivesRules {
// moneyIncentivesRuleOriginal = moneyIncentivesRuleOriginal + moneyIncentivesRule.MoneyIncentivesStageCN +
// "：" +
// "，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
// "，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
// }
// moneyIncentivesRuleOriginalTmp := "【" + moneyIncentivesRuleOriginal + "】"
// // 变更后的激励规则
// var moneyIncentivesRuleChanged string
// for _, moneyIncentivesRule := range cooperationContractSaved.MoneyIncentivesRules {
// moneyIncentivesRuleChanged = moneyIncentivesRuleChanged + moneyIncentivesRule.MoneyIncentivesStageCN +
// "：" +
// "，" + moneyIncentivesRule.MoneyIncentivesStageStart.Format("2006-01-02") +
// "，" + fmt.Sprint(moneyIncentivesRule.ReferrerPercentage) +
// "，" + fmt.Sprint(moneyIncentivesRule.SalesmanPercentage) + ";"
// }
// moneyIncentivesRuleChangedTmp := "【" + moneyIncentivesRuleChanged + "】"
// // 拼接规则变更
// incentivesRuleChangeDetail = moneyIncentivesRuleOriginalTmp + " 变更为 " + moneyIncentivesRuleChangedTmp
// }
// }
//}
// 新增共创合约变更记录
newCooperationContractChangeLog := &domain.CooperationContractChangeLog{
IncentivesRule: incentivesRuleChange,
... ...
... ... @@ -159,9 +159,9 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
Status: undertaker.Status,
Company: undertaker.Company,
ContractAttachment: undertaker.ContractAttachment,
CreatedAt: time.Time{},
CreatedAt: time.Now(),
UpdatedAt: time.Time{},
DeletedAt: time.Now(),
DeletedAt: time.Time{},
})
}
if len(undertakersModel) > 0 {
... ...