|
@@ -105,7 +105,7 @@ func getContractServiceAndDetailList(contractId int) (serviceList []*crm.Contrac
|
|
|
for _, v := range serviceTempList {
|
|
|
if v.Title == "主观" || v.Title == "客观" {
|
|
|
pTitle := templateIdMap[v.Pid]
|
|
|
- templateMap[pTitle+v.Title] = v
|
|
|
+ templateMap[pTitle+"("+v.Title+")"] = v
|
|
|
}else {
|
|
|
templateMap[v.Title] = v
|
|
|
}
|
|
@@ -130,10 +130,9 @@ func getContractServiceAndDetailList(contractId int) (serviceList []*crm.Contrac
|
|
|
}
|
|
|
for _, v := range serviceList {
|
|
|
if v.Title == "主观" || v.Title == "客观" {
|
|
|
- pTitle := fmsTemplateIdMap[v.Pid]
|
|
|
- v.FMSServiceTemplateId = templateMap[pTitle+v.Title].ServiceTemplateId
|
|
|
+ v.FMSServiceTemplateId = templateMap[v.Title].ServiceTemplateId
|
|
|
v.FMSTitle = templateIdMap[v.FMSServiceTemplateId]
|
|
|
- v.FMSServiceTemplatePId =templateMap[pTitle+v.Title].Pid
|
|
|
+ v.FMSServiceTemplatePId =templateMap[v.Title].Pid
|
|
|
v.FMSPTitle = templateIdMap[v.Pid]
|
|
|
}else{
|
|
|
if templateMap[v.Title] != nil {
|