修改违约处理

db/default.go

@@ -53,7 +53,7 @@ func BreachPending(ctx context.Context, pageSize, pageNum int32, req *http_model
 		db = db.Where("break_type = ?", req.DefaultType)
 	}
 	if req.TaskId != "" {
-		db = db.Where("task_id = ?", req.TaskId)
+		db = db.Debug().Where("task_id = ?", req.TaskId)
 	}
 	var findProjectIds []int64
 	if req.ProjectName != "" {
@@ -149,6 +149,7 @@ func BreachPending(ctx context.Context, pageSize, pageNum int32, req *http_model
 	}
 	var BreachPendingPreviews []*http_model.BreachPendingPreview
 	for _, contractInfo := range contractInfos {
+		fmt.Println(contractInfo.TerminateAt)
 		BreachPendingPreview := new(http_model.BreachPendingPreview)
 		BreachPendingPreview.ContractId = int32(contractInfo.ContractID)
 		BreachPendingPreview.ProjectId = taskIdToProjectMap[contractInfo.TaskID]
@@ -326,7 +327,7 @@ func BreachHandled(ctx context.Context, pageSize, pageNum int32, req *http_model
 			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		}
 	}
-	if req.TaskId != 0 {
+	if req.TaskId != "" {
 		db = db.Where("task_id = ?", req.TaskId)
 	}
 	var findProjectIds []string

db/operate.go

@@ -953,7 +953,7 @@ func GetAutoDraftDefaultInPicTask() error {
 		}
 
 		//	添加初稿违约自动处理时间
-		if taskLogisticNeedMod.AutoSketchBreakAt == nil || taskLogisticNeedMod.AutoSketchBreakAt.IsZero() {
+		if taskLogisticNeedMod.TaskID != "" && taskLogisticNeedMod.AutoSketchBreakAt == nil || taskLogisticNeedMod.AutoSketchBreakAt.IsZero() {
 			dd, _ := time.ParseDuration(conv.MustString(DraftDefaultInPic, "") + "h")
 			db4 := GetReadDB(context.Background())
 			t := taskLogisticNeedMod.SignedTime.Add(dd)
@@ -965,7 +965,7 @@ func GetAutoDraftDefaultInPicTask() error {
 		}
 
 		// 判断是否超时违约
-		if taskLogisticNeedMod.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
+		if taskLogisticNeedMod.TaskID != "" && taskLogisticNeedMod.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
 			// 超时违约处理
 			db5 := GetReadDB(context.Background())
 			err1 := db5.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
@@ -1048,7 +1048,7 @@ func GetAutoDraftDefaultInPicTask() error {
 		}
 
 		// 判断是否违约
-		if taskSketchInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
+		if taskSketchInfo.TaskID != "" && taskSketchInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
 			db4 := GetReadDB(context.Background())
 			err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 				TaskID: submitTaskNeedModId, ProjectID: TaskIdToProjectId[submitTaskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1179,7 +1179,7 @@ func GetAutoDraftDefaultInMvTask() error {
 			fmt.Println("已添加视频形式的初稿违约自动处理时间")
 		}
 
-		if taskScriptInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
+		if taskScriptInfo.TaskID != "" && taskScriptInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
 			db4 := GetReadDB(context.Background())
 			err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 				TaskID: videoTaskNeedModId, ProjectID: taskIdToProjectIdMap[videoTaskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1259,7 +1259,7 @@ func GetAutoDraftDefaultInMvTask() error {
 			taskSketchInfo.AutoSketchBreakAt = taskSketchInfo.RejectAt.Add(dd)
 			fmt.Println("已添加视频形式的初稿违约自动处理时间")
 		}
-		if taskSketchInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
+		if taskSketchInfo.TaskID != "" && taskSketchInfo.AutoSketchBreakAt.Sub(time.Now()) <= 0 {
 			db4 := GetReadDB(context.Background())
 			err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 				TaskID: submitVideoTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitVideoTaskNeedModId], BreakType: 2, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1369,7 +1369,7 @@ func GetAutoScriptDefaultTask() error {
 		autoDefaultHandle := gorm_model.InfoAutoDefaultHandle{}
 		db6 := GetReadDB(context.Background())
 		db6.Model(gorm_model.InfoAutoDefaultHandle{}).Where("auto_default_id = ?", projectIdToAutoDefaultIdMap[taskIdToProjectIdMap[videoTaskNeedModId]]).Find(&autoDefaultHandle)
-		fmt.Printf("autoDefaultHandle%+v\n", autoDefaultHandle)
+		//fmt.Printf("autoDefaultHandle%+v\n", autoDefaultHandle)
 		var scriptDefaultRate int
 		var scriptErrRate int
 		if taskIdToFeeFormMap[videoTaskNeedModId] == 1 {
@@ -1387,7 +1387,7 @@ func GetAutoScriptDefaultTask() error {
 			t := taskLogisticInfo.SignedTime.Add(dd)
 			db1.Where("task_id = ?", videoTaskNeedModId).Updates(&gorm_model.YoungeeTaskLogistics{AutoScriptBreakAt: &t})
 			fmt.Println("已添加视频形式的脚本违约自动处理时间")
-			if taskLogisticInfo.SignedTime.Add(dd).Sub(time.Now()) <= 0 {
+			if taskLogisticInfo.TaskID != "" && taskLogisticInfo.SignedTime.Add(dd).Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: videoTaskNeedModId, ProjectID: taskIdToProjectIdMap[videoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1431,7 +1431,7 @@ func GetAutoScriptDefaultTask() error {
 				fmt.Println("创建时已违约则创建视频类型的脚本违约记录")
 			}
 		} else {
-			if taskLogisticInfo.AutoScriptBreakAt.Sub(time.Now()) <= 0 {
+			if taskLogisticInfo.TaskID != "" && taskLogisticInfo.AutoScriptBreakAt.Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: videoTaskNeedModId, ProjectID: taskIdToProjectIdMap[videoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1510,7 +1510,7 @@ func GetAutoScriptDefaultTask() error {
 				return err4
 			}
 			fmt.Println("已添加视频形式的脚本违约自动处理时间")
-			if taskScriptInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
+			if taskScriptInfo.TaskID != "" && taskScriptInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: submitVideoTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitVideoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1554,7 +1554,7 @@ func GetAutoScriptDefaultTask() error {
 				fmt.Println("创建时已违约则创建已提交脚本的视频类型的脚本违约记录")
 			}
 		} else {
-			if taskScriptInfo.AutoScriptBreakAt.Sub(time.Now()) <= 0 {
+			if taskScriptInfo.TaskID != "" && taskScriptInfo.AutoScriptBreakAt.Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: submitVideoTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitVideoTaskNeedModId], BreakType: 1, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1680,7 +1680,7 @@ func GetAutoLinkBreachTask() error {
 		if taskSketchInfo.AutoLinkBreakAt.IsZero() {
 			db1.Where("task_id = ?", taskNeedModId).Updates(&gorm_model.YounggeeSketchInfo{AutoLinkBreakAt: taskSketchInfo.AgreeAt.Add(dd)})
 			fmt.Println("已添加链接违约自动处理时间")
-			if taskSketchInfo.AgreeAt.Add(dd).Sub(time.Now()) <= 0 {
+			if taskSketchInfo.TaskID != "" && taskSketchInfo.AgreeAt.Add(dd).Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1724,7 +1724,7 @@ func GetAutoLinkBreachTask() error {
 				fmt.Println("创建时已违约则创建链接违约记录")
 			}
 		} else {
-			if taskSketchInfo.AutoLinkBreakAt.Sub(time.Now()) <= 0 {
+			if taskSketchInfo.TaskID != "" && taskSketchInfo.AutoLinkBreakAt.Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1802,7 +1802,7 @@ func GetAutoLinkBreachTask() error {
 				return err4
 			}
 			fmt.Println("已添加链接违约自动处理时间")
-			if taskLinkInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
+			if taskLinkInfo.TaskID != "" && taskLinkInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1846,7 +1846,7 @@ func GetAutoLinkBreachTask() error {
 				fmt.Println("创建时已违约则创建已提交链接的链接违约记录")
 			}
 		} else {
-			if taskLinkInfo.AutoLinkBreakAt.Sub(time.Now()) <= 0 {
+			if taskLinkInfo.TaskID != "" && taskLinkInfo.AutoLinkBreakAt.Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 3, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -1973,7 +1973,7 @@ func GetAutoCaseCloseDefaultTask() error {
 		if taskLinkInfo.AutoDataBreakAt.IsZero() {
 			db1.Where("task_id = ?", taskNeedModId).Updates(&gorm_model.YounggeeLinkInfo{AutoDataBreakAt: taskLinkInfo.AgreeAt.Add(dd)})
 			fmt.Println("已添加数据违约自动处理时间")
-			if taskLinkInfo.AgreeAt.Add(dd).Sub(time.Now()) <= 0 {
+			if taskLinkInfo.TaskID != "" && taskLinkInfo.AgreeAt.Add(dd).Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -2017,7 +2017,7 @@ func GetAutoCaseCloseDefaultTask() error {
 				fmt.Println("创建时已违约则创建数据违约记录")
 			}
 		} else {
-			if taskLinkInfo.AutoDataBreakAt.Sub(time.Now()) <= 0 {
+			if taskLinkInfo.TaskID != "" && taskLinkInfo.AutoDataBreakAt.Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: taskNeedModId, ProjectID: taskIdToProjectIdMap[taskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -2096,7 +2096,7 @@ func GetAutoCaseCloseDefaultTask() error {
 				return err4
 			}
 			fmt.Println("已添加数据违约自动处理时间")
-			if taskDataInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
+			if taskDataInfo.TaskID != "" && taskDataInfo.RejectAt.Add(dd).Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error
@@ -2140,7 +2140,7 @@ func GetAutoCaseCloseDefaultTask() error {
 				fmt.Println("创建时已违约则创建已提交数据的数据违约记录")
 			}
 		} else {
-			if taskDataInfo.AutoDataBreakAt.Sub(time.Now()) <= 0 {
+			if taskDataInfo.TaskID != "" && taskDataInfo.AutoDataBreakAt.Sub(time.Now()) <= 0 {
 				db4 := GetReadDB(context.Background())
 				err1 := db4.Model(gorm_model.YoungeeContractInfo{}).Create(&gorm_model.YoungeeContractInfo{
 					TaskID: submitTaskNeedModId, ProjectID: taskIdToProjectIdMap[submitTaskNeedModId], BreakType: 4, BreakAt: time.Now(), DefaultStatus: 1}).Error

model/http_model/breach_handled.go

@@ -5,7 +5,7 @@ type BreachHandledRequest struct {
 	PageNum         int32  `json:"page_num"`
 	HandleResult    string `json:"default_status"` // 处理结果
 	TerminateReason string `json:"break_type"`     // 解约原因
-	TaskId          int32  `json:"task_id"`        //	 任务id
+	TaskId          string `json:"task_id"`        // 任务id
 	ProjectName     string `json:"project_name"`   // 项目名称
 }