结案数据等

db/number_info.go

@@ -201,13 +201,13 @@ func GetFinishNumberInfo(ctx context.Context, projectId string, strategyIds []in
 		var FinishNumberInfoData http_model.FinishNumberInfo
 		FinishNumberInfoData.StrategyId = strategyId
 		db := GetReadDB(ctx).Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and strategy_id = ? and task_status = 2", projectId, strategyId)
-		err := db.Where("task_stage = 15").Count(&FinishNumberInfoData.ShouldFinishNumber).Error
+		err := db.Count(&FinishNumberInfoData.ShouldFinishNumber).Error
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 			return nil, err
 		}
 		db = GetReadDB(ctx).Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and strategy_id = ? and task_status = 2", projectId, strategyId)
-		err = db.Where("task_stage = 16").Count(&FinishNumberInfoData.FinishedNumber).Error
+		err = db.Where("task_stage = 15").Count(&FinishNumberInfoData.FinishedNumber).Error
 		if err != nil {
 			logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 			return nil, err

db/project.go

@@ -249,34 +249,17 @@ func GetFeeDetail(ctx context.Context, enterpriseID string, EndTime string) (*ht
 
 func SetProjectFinish(ctx context.Context, projectId string) error {
 	db := GetReadDB(ctx)
-	// 1. 更新项目状态为已结束
-	err := db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(map[string]interface{}{"project_status": 10}).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
-		return err
-	}
 	var finishedNum int64
 	var unfinishedNum int64
-	err1 := db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = 2 AND task_stage < 15", projectId).Count(&unfinishedNum).Error
-	if err1 != nil {
-		logrus.WithContext(ctx).Errorf("[Data db] Count YoungeeTaskInfo error,err:%+v", err)
-		return err1
-	}
+	db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = 2 AND task_stage < 15", projectId).Count(&unfinishedNum)
 	db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Count(&finishedNum)
 	if unfinishedNum == 0 && finishedNum != 0 {
-		// 1. 更新项目状态为结束
-		err2 := db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates("project_status = 10").Error
-		if err2 != nil {
-			logrus.WithContext(ctx).Errorf("[Data db] Count YoungeeTaskInfo error,err:%+v", err)
-			return err2
-		}
-
 		// 2. 释放企业账户因项目冻结的资金
 		// 1） 计算剩余资金
 		db1 := GetReadDB(ctx)
 		var allPayment float64
 		var realPayment float64
-		err = db1.Model(gorm_model.YoungeeTaskInfo{}).
+		err := db1.Model(gorm_model.YoungeeTaskInfo{}).
 			Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(all_payment), 0) as allPayment", &allPayment).Error
 		if err != nil {
 			log.Println("DB GetAutoCaseCloseTask error in data:", err)
@@ -302,6 +285,13 @@ func SetProjectFinish(ctx context.Context, projectId string) error {
 			log.Println("DB GetAutoCaseCloseTask error in data:", err)
 			return err
 		}
+
+		// 1. 更新项目状态为已结束
+		err = db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(map[string]interface{}{"project_status": 10, "payment_amount": realPayment}).Error
+		if err != nil {
+			logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
+			return err
+		}
 	}
 	return nil
 }

db/task.go

@@ -151,11 +151,11 @@ func GetUnfinishedTaskNumber(ctx context.Context, projectID string) (*int64, err
 	return &unFinishedTaskNumber, nil
 }
 
-// 任务结案
+// SetTaskFinish 任务结案
 func SetTaskFinish(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	// 1. 修改任务表，更新任务阶段为已结案，结案方式为正常结束，数据状态为已通过，
-	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).Updates(gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15, CompleteStatus: 2}).Error
+	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).Updates(gorm_model.YoungeeTaskInfo{DataStatus: 5, TaskStage: 15, CompleteStatus: 2, WithdrawStatus: 2, CompleteDate: time.Now()}).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Task db] Update YoungeeTaskInfo error,err:%+v", err)
 		return err
@@ -270,6 +270,7 @@ func GetSpecialTaskInviteList(ctx context.Context, projectID string, pageSize, p
 func SetTalentIncome(ctx context.Context, TaskIDs []string) error {
 	db := GetReadDB(ctx)
 	var TaskInfoList []gorm_model.YoungeeTaskInfo
+	fmt.Println("收入", TaskIDs)
 	err := db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).Scan(&TaskInfoList).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Task db] Update SetTalentIncome error,err:%+v", err)