0218bug修改

db/data.go

@@ -16,7 +16,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// GetTaskDataList 查询上传链接的task list
+// GetTaskDataList 查询上传数据的task list
 func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskDataInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息
@@ -183,7 +183,7 @@ func AcceptData(ctx context.Context, TaskIDs []string) error {
 	return nil
 }
 
-// GetSpecialTaskDataList 专项任务-查询上传链接的task list
+// GetSpecialTaskDataList 专项任务-查询上传数据的task list
 func GetSpecialTaskDataList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.SpecialTaskDataInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息

db/workspace.go

@@ -107,7 +107,7 @@ func GetWorkspaceBarNums(ctx context.Context, enterpriseID string, projectType i
 	//在一个db上持续操作，会默认一直AND连接
 
 	//1 招募中-待选
-	err := db1.Where("task_stage = 1").Count(&AccSelecting).Error
+	err := db1.Where("task_status = 1").Count(&AccSelecting).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find AccSelecting error,err:%+v", err)
 		return nil, err
@@ -159,7 +159,7 @@ func GetWorkspaceBarNums(ctx context.Context, enterpriseID string, projectType i
 
 	//6 待签收
 	db1 = GetReadDB(ctx)
-	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ?  AND task_stage = 5", ExecutingProjectIDs).Count(&ShippedNum).Error
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_status = 2  AND logistics_status = 2", ExecutingProjectIDs).Count(&ShippedNum).Error
 	//err = db1.Where("task_stage = 5").Count(&ShippedNum).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find ShippedNum error,err:%+v", err)
@@ -168,7 +168,7 @@ func GetWorkspaceBarNums(ctx context.Context, enterpriseID string, projectType i
 
 	//7 待发货
 	db1 = GetReadDB(ctx)
-	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 4", ExecutingProjectIDs).Count(&ShipmentPendingNum).Error
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_status = 2 AND logistics_status = 1", ExecutingProjectIDs).Count(&ShipmentPendingNum).Error
 	//err = db1.Where("task_stage = 4").Count(&ShipmentPendingNum).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find ShipmentPendingNum error,err:%+v", err)