0214

db/logistics.go

@@ -26,7 +26,6 @@ func CreateLogistics(ctx context.Context, logistics gorm_model.YoungeeTaskLogist
 		logrus.WithContext(ctx).Errorf("[logistics db] call CreateLogistics error,err:%+v", err)
 		return nil, err
 	}
-
 	return &logistics.LogisticsID, nil
 }
 
@@ -44,7 +43,10 @@ func UpdateLogistics(ctx context.Context, logistics gorm_model.YoungeeTaskLogist
 // 更改签收时间
 func SignForReceipt(ctx context.Context, taskID string) error {
 	db := GetReadDB(ctx)
-	err := db.Model(gorm_model.YoungeeTaskLogistics{}).Where("task_id = ?", taskID).Update("signed_time", time.Now()).Error
+	err := db.Model(gorm_model.YoungeeTaskLogistics{}).Where("task_id = ?", taskID).Updates(gorm_model.YoungeeTaskLogistics{
+		Status:     1,
+		SignedTime: time.Now(),
+	}).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[logistics db] call UpdateLogistics error,err:%+v", err)
 		return err
@@ -106,16 +108,9 @@ func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageN
 		logrus.WithContext(ctx).Errorf("[GetProjectTalentList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	var misNum int64
-	if totalLogistics > totalTask {
-		misNum = totalLogistics - totalTask
-	} else {
-		misNum = totalTask - totalLogistics
-	}
-	logrus.Println("totalLogistics,totalTalent,misNum:", totalLogistics, totalTask, misNum)
 
 	// 查询该页数据
-	limit := pageSize + misNum
+	limit := pageSize
 	offset := pageSize * pageNum // assert pageNum start with 0
 	err := db.Order("task_id").Limit(int(limit)).Offset(int(offset)).Error
 	if err != nil {

db/operate.go

@@ -270,7 +270,7 @@ func GetSignInOfflineTask(projectForm int32) error {
 		dbStart := GetReadDB(context.Background())
 		var autoTaskInfo gorm_model.InfoAutoTask
 		dbStart.Model(gorm_model.InfoAutoTask{}).Where("auto_task_id = ?", autoTaskId).First(&autoTaskInfo)
-		//fmt.Println("t:", autoTaskInfo.SignInOffline)
+		// fmt.Println("t:", autoTaskInfo.SignInOffline)
 		if projectForm == 3 {
 			t = autoTaskInfo.SignInOffline
 		} else {
@@ -869,7 +869,8 @@ func GetAutoInvalidTask() error {
 			fmt.Println("距离失效自动处理时间还有：,项目当前状态为", projectNeedMod.AutoFailAt.Sub(time.Now()), projectNeedMod.ProjectStatus)
 			if projectNeedMod.AutoFailAt.Sub(time.Now()) <= 0 && projectNeedMod.ProjectStatus < 8 {
 				db4 := GetReadDB(context.Background())
-				err1 := db4.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(&gorm_model.ProjectInfo{ProjectStatus: 8, FailReason: 1}).Error
+				t := time.Now()
+				err1 := db4.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).Updates(&gorm_model.ProjectInfo{ProjectStatus: 8, FinishAt: &t, FailReason: 1}).Error
 				if err1 != nil {
 					return err1
 				}
@@ -913,10 +914,10 @@ func GetAutoDraftDefaultInPicTask() error {
 			// 保存所有满足物流状态为 3 且 初稿上传状态为 1或 3 的任务记录的id
 			db2.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskInfo.TaskId).First(&taskNeedMod)
 			taskIdToFeeFormMap[taskInfo.TaskId] = taskInfo.FeeForm
-			if taskNeedMod.TaskStage == 9 && taskNeedMod.ScriptStatus == 1 {
+			if taskNeedMod.TaskStage == 9 && taskNeedMod.SketchStatus == 1 {
 				taskNeedModIds = append(taskNeedModIds, taskInfo.TaskId)
 			}
-			if taskNeedMod.TaskStage == 9 && taskNeedMod.ScriptStatus == 3 {
+			if taskNeedMod.TaskStage == 9 && taskNeedMod.SketchStatus == 3 {
 				submitTaskNeedModIds = append(submitTaskNeedModIds, taskInfo.TaskId)
 			}
 		}
@@ -969,7 +970,7 @@ func GetAutoDraftDefaultInPicTask() error {
 			// 超时违约处理
 			db5 := GetReadDB(context.Background())
 			err1 := db5.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
-				TaskID: taskNeedModId, ProjectID: TaskIdToProjectId[taskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
+				TaskID: taskLogisticNeedMod.TaskID, ProjectID: TaskIdToProjectId[taskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
 			if err1 != nil {
 				return err1
 			}