|
@@ -1440,12 +1440,18 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
|
|
|
if req.ContractSignTime != nil {
|
|
if req.ContractSignTime != nil {
|
|
|
toupdate["contract_sign_time"] = req.ContractSignTime
|
|
toupdate["contract_sign_time"] = req.ContractSignTime
|
|
|
}
|
|
}
|
|
|
- //if req.InchargeId != 0 {
|
|
|
|
|
- // toupdate["incharge_id"] = req.InchargeId
|
|
|
|
|
- //}
|
|
|
|
|
- //if req.InchargeName != "" {
|
|
|
|
|
- // toupdate["incharge_name"] = req.InchargeName
|
|
|
|
|
- //}
|
|
|
|
|
|
|
+ if req.InchargeId != 0 {
|
|
|
|
|
+ toupdate["incharge_id"] = req.InchargeId
|
|
|
|
|
+ if ent.InchargeId != req.InchargeId {
|
|
|
|
|
+ toupdate["orig_incharge_id"] = ent.InchargeId
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if req.InchargeName != "" {
|
|
|
|
|
+ toupdate["incharge_name"] = req.InchargeName
|
|
|
|
|
+ if ent.InchargeName != req.InchargeName {
|
|
|
|
|
+ toupdate["orig_incharge_name"] = ent.InchargeName
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
if req.SignatoryId != 0 {
|
|
if req.SignatoryId != 0 {
|
|
|
toupdate["signatory_id"] = req.SignatoryId
|
|
toupdate["signatory_id"] = req.SignatoryId
|
|
|
}
|
|
}
|
|
@@ -1499,6 +1505,7 @@ func (s CtrContractService) Update(ctx context.Context, req *model.CtrContractUp
|
|
|
return err
|
|
return err
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ _ = s.AddDynamicsByCurrentUser(tx, ent.Id, "更新合同信息", toupdate)
|
|
|
return nil
|
|
return nil
|
|
|
})
|
|
})
|
|
|
if txerr != nil {
|
|
if txerr != nil {
|