change orm

models/english_company.go

@@ -33,7 +33,7 @@ type EnglishCompany struct {
 type EnglishCompanyListItem struct {
 	EnglishCompany
 	TodoStatusStr string
-	TodoEndTime   time.Time
+	TodoEndTime   string
 	TodoSellerId  int
 }
 
@@ -145,7 +145,7 @@ IF
 	( ct.status IS NULL, '无任务', ct.status ) AS todo_status_str,
 	ct.seller_id as todo_seller_id,
 IF
-	( ct.end_time IS NULL or ct.status !="进行中", "9999-01-01", ct.end_time) AS todo_end_time
+	( ct.end_time IS NULL or ct.status != '进行中', '9999-01-01', ct.end_time) AS todo_end_time
 FROM
 	english_company AS c
 	LEFT JOIN (

models/english_company_todo.go

@@ -98,7 +98,7 @@ func GetEnglishCompanyTodoById(id int) (item *EnglishCompanyTodo, err error) {
 // GetCountDoingEnglishCompanyTodo 获取正在进行中的任务数量
 func GetCountDoingEnglishCompanyTodo(companyId int) (total int, err error) {
 	var totalNull sql2.NullInt64
-	sql := `SELECT count(1) AS total FROM english_company_todo WHERE status = "进行中" AND company_id = ? AND is_delete = 0 `
+	sql := `SELECT count(1) AS total FROM english_company_todo WHERE status = '进行中' AND company_id = ? AND is_delete = 0 `
 	err = global.DbMap[utils.DbNameReport].Raw(sql, companyId).Scan(&totalNull).Error
 	if err != nil {
 		return
@@ -152,7 +152,7 @@ func GetDoingEnglishCompanyTodoList(companyId int) (items []*EnglishCompanyTodo,
 				english_company_todo a
 			JOIN english_company b ON a.company_id = b.company_id
 			WHERE
-				a.company_id = ? AND a.status = "进行中" AND a.is_delete = 0
+				a.company_id = ? AND a.status = '进行中' AND a.is_delete = 0
 			ORDER BY
 				a.create_time ASC`
 	err = global.DbMap[utils.DbNameReport].Raw(sql, companyId).Find(&items).Error
@@ -237,7 +237,7 @@ func GetEnglishCompanyTodoDoingList(startSize, pageSize int, order string) (tota
 				english_company_todo a
 			JOIN english_company b ON a.company_id = b.company_id
 			WHERE
-				a.status = "进行中" AND a.is_delete = 0 `
+				a.status = '进行中' AND a.is_delete = 0 `
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	var totalNull sql2.NullInt64
 	err = global.DbMap[utils.DbNameReport].Raw(totalSql).Scan(&totalNull).Error

services/english_company_todo.go

@@ -90,9 +90,11 @@ func GetEnglishCompanyListTodoMap(companyList []*models.EnglishCompanyListItem,
 				v.TodoStatus = true
 				v.TodoButtonColor = TodoButtonColorDoing
 				//v.TodoEndTime = td.EndTime
-				v.TodoEndTimeStr = c.TodoEndTime.Format(utils.FormatDate)
+				//v.TodoEndTimeStr = c.TodoEndTime.Format(utils.FormatDate)
+				v.TodoEndTimeStr = c.TodoEndTime
+				currTodoEndTime, _ := time.ParseInLocation(utils.FormatDateTime, c.TodoEndTime, time.Local)
 				// 截止目前还剩余的天数
-				todoEndTime := time.Date(c.TodoEndTime.Year(), c.TodoEndTime.Month(), c.TodoEndTime.Day(), 0, 0, 0, 0, time.Local)
+				todoEndTime := time.Date(currTodoEndTime.Year(), currTodoEndTime.Month(), currTodoEndTime.Day(), 0, 0, 0, 0, time.Local)
 				deadline := int(todoEndTime.Sub(todayTime).Hours() / 24)
 				v.Deadline = strconv.Itoa(deadline)
 			}