Browse Source

调整一下字段方便前端复用组件

hsun 2 years ago
parent
commit
c204f7ddfb

+ 6 - 6
models/fms/contract_register.go

@@ -198,14 +198,14 @@ func CreateContractRegisterAndServices(item *ContractRegister, serviceDetail []*
 		tx.Create(contractService)
 
 		// 合同服务详情
-		for j := 0; j < len(t.DetailList); j++ {
-			contractServiceDetail := t.DetailList[j]
+		for j := 0; j < len(t.Detail); j++ {
+			contractServiceDetail := t.Detail[j]
 			contractServiceDetail.ContractServiceId = contractService.ContractServiceId
 			contractServiceDetail.ContractRegisterId = item.ContractRegisterId
 			contractServiceDetail.ServiceTemplateId = contractService.ServiceTemplateId
 			contractServiceDetail.CreateTime = nowTime
 			tx.Create(contractServiceDetail)
-			t.DetailList[j] = contractServiceDetail
+			t.Detail[j] = contractServiceDetail
 		}
 	}
 	return
@@ -254,14 +254,14 @@ func UpdateContractRegisterAndServices(item *ContractRegister, updateCols []stri
 		tx.Create(contractService)
 
 		// 合同服务详情
-		for j := 0; j < len(t.DetailList); j++ {
-			contractServiceDetail := t.DetailList[j]
+		for j := 0; j < len(t.Detail); j++ {
+			contractServiceDetail := t.Detail[j]
 			contractServiceDetail.ContractServiceId = contractService.ContractServiceId
 			contractServiceDetail.ContractRegisterId = item.ContractRegisterId
 			contractServiceDetail.ServiceTemplateId = contractService.ServiceTemplateId
 			contractServiceDetail.CreateTime = nowTime
 			tx.Create(contractServiceDetail)
-			t.DetailList[j] = contractServiceDetail
+			t.Detail[j] = contractServiceDetail
 		}
 	}
 	return

+ 1 - 1
models/fms/contract_service.go

@@ -67,7 +67,7 @@ type ContractServiceAndDetail struct {
 	TableValue         string                   `json:"table_value" description:"表格数据,用于word生成时的json数据"`
 	ChartPermissionId  int                      `json:"chart_permission_id" description:"权限id"`
 	ChartPermissionIds string                   `json:"chart_permission_ids" description:"品种权限-小套餐"`
-	DetailList         []*ContractServiceDetail `json:"detail_list"`
+	Detail             []*ContractServiceDetail `json:"detail"`
 }
 
 // GetContractServiceAndDetailList 根据id获取合同列表数据

+ 2 - 2
services/fms/contract_register.go

@@ -188,7 +188,7 @@ func HandleContractServiceAndDetail(productId int, serviceList []fms.ContractSer
 			ProductId:          productId,
 			HasDetail:          hasDetail,
 			TableValue:         serviceTemp.TableValue,
-			DetailList:         detailList,
+			Detail:             detailList,
 			ChartPermissionId:  serviceTemp.ChartPermissionId,
 			ChartPermissionIds: item.ChartPermissionIds,
 		}
@@ -213,7 +213,7 @@ func GetContractServiceAndDetail(contractRegisterId int) (serviceList []*fms.Con
 				err = errors.New(fmt.Sprint("查找合同服务详情异常", e))
 				return
 			}
-			serviceList[i].DetailList = detail
+			serviceList[i].Detail = detail
 		}
 	}
 	return