db/project_task.go

@@ -87,14 +87,18 @@ func GetProjecttaskList(ctx context.Context, request http_model.GetTaskListReque
 	if request.FeeFrom != nil {
 		query = query.Where("fee_form = ?", request.FeeFrom)
 	}
+
 	if request.Type != nil {
 		switch *request.Type {
 		case 1:
-			query = query.Where("supplier_id = 0 AND supplier_status = 0")
+			query = query.Where("supplier_id = 0 AND supplier_status = 0") //服务商未选
 		case 2:
-			query = query.Where("supplier_id !=0 AND supplier_status = 2")
+			query = query.Where("supplier_id !=0 AND supplier_status = 2") //服务商已选
 		}
+	} else {
+		query = query.Where("(supplier_id = 0 AND supplier_status = 0) OR (supplier_id != 0 AND supplier_status = 2)")
 	}
+
 	if request.Others != "" {
 		query = query.Where("talent_name LIKE ? OR s_operate_name LIKE ?", "%"+request.Others+"%", "%"+request.Others+"%")
 	}
@@ -456,6 +460,13 @@ func PassProTaskCoop(ctx context.Context, projectId string, taskIds []string, op
 				}
 				projectinfo.RecruitNum += 1
 				projectinfo.NeedPay += taskInfo.DraftFee + taskInfo.ServiceCharge
+
+				//recruit_strategy total_offer
+				err = db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", taskInfo.StrategyID).Update("total_offer", gorm.Expr("total_offer + ?", taskInfo.DraftFee+taskInfo.ServiceCharge)).Error
+				if err != nil {
+					return nil
+				}
+
 				err = tx.Model(gorm_model.ProjectInfo{}).Where("project_id = ? ", projectId).Updates(projectinfo).Error
 				if err != nil {
 					return err

db/task.go

@@ -412,7 +412,7 @@ func SetSpecialTaskSettleNum(ctx context.Context, TaskIDs []string) error {
 				}
 				// 更新 YounggeeSProjectInfo
 				if err := tx.Model(gorm_model.YounggeeSProjectInfo{}).
-					Where("project_id = ?", taskInfo.SprojectId).
+					Where("s_project_id = ?", taskInfo.SprojectId).
 					Update("settle_num", gorm.Expr("settle_num + ?", 1)).
 					Error; err != nil {
 					return err
@@ -439,6 +439,7 @@ func SetSpecialTaskSettleNum(ctx context.Context, TaskIDs []string) error {
 	}
 	return nil
 }
+
 func SetLocalLifeSettleFlag(ctx context.Context, localid string) error {
 	db := GetReadDB(ctx)
 	var tasks []gorm_model.YoungeeLocalTaskInfo