|
@@ -463,7 +463,7 @@ func (*sLocalLife) FullSLocalTaskBillList(ctx context.Context, request *http_mod
|
|
currSLocalTaskBillData.DraftFeeSettle = 0
|
|
currSLocalTaskBillData.DraftFeeSettle = 0
|
|
|
|
|
|
// 1. 查找子任务
|
|
// 1. 查找子任务
|
|
- taskList, total, taskListErr := db.GetSLocalTaskList(ctx, request.SProjectId, request.TalentId, request.PageSize, request.PageNum)
|
|
|
|
|
|
+ taskList, total, taskListErr := db.GetSLocalTaskList(ctx, request.SLocalId, request.TalentId, request.PageSize, request.PageNum)
|
|
if taskListErr != nil {
|
|
if taskListErr != nil {
|
|
return nil, taskListErr
|
|
return nil, taskListErr
|
|
}
|
|
}
|
|
@@ -490,15 +490,15 @@ func (*sLocalLife) FullSLocalTaskBillList(ctx context.Context, request *http_mod
|
|
}
|
|
}
|
|
|
|
|
|
// 2. 补充任务信息
|
|
// 2. 补充任务信息
|
|
- sProjectInfo, sProjectErr := db.GetSProjectDetail(ctx, request.SProjectId)
|
|
|
|
- if sProjectErr != nil {
|
|
|
|
- return nil, sProjectErr
|
|
|
|
|
|
+ sLocalInfo, sLocalErr := db.GetSLocalLifeDetail(ctx, request.SLocalId)
|
|
|
|
+ if sLocalErr != nil {
|
|
|
|
+ return nil, sLocalErr
|
|
}
|
|
}
|
|
- if sProjectInfo != nil {
|
|
|
|
- currSLocalTaskBillData.SettleNum = sProjectInfo.SettleNum
|
|
|
|
- currSLocalTaskBillData.ChooseNum = sProjectInfo.ApplyNum
|
|
|
|
- currSLocalTaskBillData.ServiceCharge = sProjectInfo.ServiceCharge
|
|
|
|
- currSLocalTaskBillData.ServiceChargeSettle = sProjectInfo.ServiceChargeSettle
|
|
|
|
|
|
+ if sLocalInfo != nil {
|
|
|
|
+ currSLocalTaskBillData.SettleNum = sLocalInfo.SettleNum
|
|
|
|
+ currSLocalTaskBillData.ChooseNum = sLocalInfo.ApplyNum
|
|
|
|
+ currSLocalTaskBillData.ServiceCharge = sLocalInfo.ServiceCharge
|
|
|
|
+ currSLocalTaskBillData.ServiceChargeSettle = sLocalInfo.ServiceChargeSettle
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return currSLocalTaskBillData, nil
|
|
return currSLocalTaskBillData, nil
|