🐛 fix bug

service/app/todes.go

@@ -3,12 +3,13 @@ package app
 import (
 	"miniapp/global"
 	"miniapp/model/common"
+	"miniapp/model/common/request"
 )
 
 type TodesService struct{}
 
-func (t TodesService) GetUserTodos(userId uint) (list []common.UserTodo, err error) {
-	err = global.GVA_DB.Where("user_id = ?", userId).Find(&list).Error
+func (t TodesService) GetUserTodos(notes *request.GetUserNotes) (list []common.UserTodo, err error) {
+	err = global.GVA_DB.Where("user_id = ? and is_finish = ?", notes.UserId, notes.IsFinish).Find(&list).Error
 	return
 
 }

service/app/user.go

@@ -10,7 +10,6 @@ import (
 	"miniapp/model/app/request"
 	"miniapp/model/app/response"
 	"miniapp/model/common"
-	"miniapp/model/types"
 	"time"
 )
 
@@ -104,7 +103,7 @@ func (UserService) UpdateLastLoginInfo(username int) {
 
 	global.GVA_DB.Model(&app.User{}).
 		Where("id = ?", username).
-		Updates(app.User{LastLoginAt: (*types.DateTime)(&now)})
+		Updates(app.User{LastLoginAt: &now})
 
 }
 
@@ -124,7 +123,7 @@ func (UserService) UpdateUserHospital(r *request.ChangeUserHospital) (err error)
 		return
 	}
 
-	if hospital.Todos != nil {
+	if len(hospital.Todos) != 0 {
 		var userTodos []common.UserTodo
 		for _, todo := range hospital.Todos {
 			userTodos = append(userTodos, common.UserTodo{
@@ -139,6 +138,14 @@ func (UserService) UpdateUserHospital(r *request.ChangeUserHospital) (err error)
 			return
 		}
 	}
+
+	t, _ := time.Parse("2006-01-02", r.SurgeryTime)
+
+	err = global.GVA_DB.Table("t_user").Where("id = ?", r.UserId).Updates(app.User{IsInfo: 1, HospitalId: r.HospitalId, SurgeryTime: t}).Error
+	if err != nil {
+		global.GVA_LOG.Error("更新用户信息失败", zap.Error(err))
+		return
+	}
 	return
 }
 
@@ -147,6 +154,11 @@ func (s UserService) GetUserInfo(id string) (user response.UserVO, err error) {
 	err = global.GVA_DB.Where("id = ?", id).First(&u).Error
 	user.ParseOrdinary(u)
 
+	global.GVA_DB.Table("t_user_todo").Where("user_id = ?", id).Find(&user.Todos)
+	var hid []string
+	global.GVA_DB.Table("hospital_notes").Where("hospital_id = ?", user.HospitalId).Select("notes_id").Find(&hid)
+	global.GVA_DB.Table("sys_notes").Where("id in (?)", hid).Find(&user.Notes)
+
 	if u.IsSurgery == 1 {
 		user.TimeNote = "距离下次复查时间还剩："
 	} else {

service/system/hospital.go

@@ -1,6 +1,7 @@
 package system
 
 import (
+	"go.uber.org/zap"
 	"miniapp/global"
 	"miniapp/model/common"
 	"miniapp/model/common/request"
@@ -35,3 +36,16 @@ func (h HospitalService) GetHospitalById(id uint) (hospital *common.Hospital, er
 	err = global.GVA_DB.Where("id = ?", id).Preload("Notes").Preload("Todos").First(&hospital).Error
 	return
 }
+
+func (h HospitalService) GetHospitalNotes(p request.GetHospitalNotes) (list []common.Notes, err error) {
+	var ids []string
+	err = global.GVA_DB.Table("hospital_notes").Where("hospital_id = ?", p.HospitalId).Pluck("notes_id", &ids).Error
+	if err != nil {
+		global.GVA_LOG.Error("获取医院注意事项失败", zap.Error(err))
+		return
+	}
+
+	err = global.GVA_DB.Where("id in ? and notestime_num = ?", ids, p.TimeNum).Find(&list).Error
+	return
+
+}

service/system/poster.go

@@ -16,7 +16,7 @@ func (p *PosterService) AddPoster(poster *common.Poster) (err error) {
 
 // UpdatePoster 更新
 func (p *PosterService) UpdatePoster(poster *common.Poster) (err error) {
-	err = global.GVA_DB.Save(&poster).Error
+	err = global.GVA_DB.Updates(&poster).Error
 	return
 }