修改探店时间的签收时间及解约信息

db/default.go

@@ -393,7 +393,7 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 	db1 = db1.Debug().Model(gorm_model.YoungeeContractInfo{})
 
 	var TerminatedInfos []gorm_model.YoungeeContractInfo
-	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 4)", taskIds)
+	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 5)", taskIds)
 	err := db1.Find(&TerminatedInfos).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetTaskTerminatedList] error query mysql total, err:%+v", err)
@@ -410,16 +410,9 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 		logrus.WithContext(ctx).Errorf("[GetTaskTerminatedList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	var misNum int64
-	if totalTerminated > totalTask {
-		misNum = totalTerminated - totalTask
-	} else {
-		misNum = totalTask - totalTerminated
-	}
-	logrus.Println("totalTerminated,totalTalent,misNum:", totalTerminated, 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
 

model/http_model/task_terminated.go

@@ -1,7 +1,6 @@
 package http_model
 
 import (
-	"time"
 	"youngee_b_api/model/gorm_model"
 )
 
@@ -35,7 +34,7 @@ type TaskTerminatedInfo struct {
 	StrategyID        int       `json:"strategy_id"`         // 报名选择的招募策略id
 	AllPayment        float64   `json:"all_payment"`         // 企业支付
 	RealPayment       float64   `json:"real_payment"`        // 企业实际支付（扣除违约扣款）
-	HandleAt          time.Time `json:"handle_at"`           // 处理时间
+	HandleAt          string `json:"handle_at"`           // 处理时间
 	BreakType         int       `json:"break_type"`          // 违约类型（4类严重违约）：1（脚本）2（初稿）3（链接）4（数据）
 }
 

pack/task_terminated_list.go

@@ -27,6 +27,7 @@ func MGormTaskTerminatedInfoToHttpTaskTerminatedPreview(TaskTerminatedInfo *http
 		AllPayment:        TaskTerminatedInfo.AllPayment,
 		RealPayment:       TaskTerminatedInfo.RealPayment,
 		BreakType:         conv.MustString(TaskTerminatedInfo.BreakType),
+		HandleAt: conv.MustString(TaskTerminatedInfo.HandleAt),
 	}
 }
 
@@ -49,5 +50,6 @@ func GetTerminatedInfoStruct(TaskTerminated *http_model.TaskTerminated) *http_mo
 		AllPayment:       TaskTerminated.Talent.AllPayment,
 		RealPayment:      TaskTerminated.Talent.RealPayment,
 		BreakType:        TaskTerminated.Default.BreakType,
+		HandleAt:         conv.MustString(TaskTerminated.Default.HandleAt, "")[:19],
 	}
 }