gdxz/case-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gdxz:377e2b7eeb40dc7b281643ca3d5d068b43db559a
Branches Tags
gdxz:master
gdxz:dev
..
compare: gdxz:70592b99a6234e286e63ef4b36a50bf23a88bbc6
Branches Tags
gdxz:master
gdxz:dev

No commits in common. "377e2b7eeb40dc7b281643ca3d5d068b43db559a" and "70592b99a6234e286e63ef4b36a50bf23a88bbc6" have entirely different histories.
377e2b7eeb ... 70592b99a6

2 changed files with 12 additions and 12 deletions
Show Stats Expand all files Collapse all files

16
api/controller/Case.go
View File

@ -394,7 +394,7 @@ func (b *Case) FinishCase(c *gin.Context) {
startRead, err := time.Parse("2006-01-02 15:04:05", req.StartRead) startRead, err := time.Parse("2006-01-02 15:04:05", req.StartRead)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败9", c)
return return
} }
caseUser.StartTime = model.LocalTime(startRead) caseUser.StartTime = model.LocalTime(startRead)
@ -403,7 +403,7 @@ func (b *Case) FinishCase(c *gin.Context) {
endRead, err := time.Parse("2006-01-02 15:04:05", req.EndRead) endRead, err := time.Parse("2006-01-02 15:04:05", req.EndRead)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败8", c)
return return
} }
caseUser.EndTime = model.LocalTime(endRead) caseUser.EndTime = model.LocalTime(endRead)
@ -412,7 +412,7 @@ func (b *Case) FinishCase(c *gin.Context) {
readDuration := endRead.Sub(startRead) readDuration := endRead.Sub(startRead)
if readDuration <= 0 { if readDuration <= 0 {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败7", c)
return return
} }
caseUser.ReadDuration = int(readDuration.Seconds()) caseUser.ReadDuration = int(readDuration.Seconds())
@ -420,7 +420,7 @@ func (b *Case) FinishCase(c *gin.Context) {
_, err = caseUserDao.AddCaseUser(tx, caseUser) _, err = caseUserDao.AddCaseUser(tx, caseUser)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败6", c)
return return
} }
@ -437,7 +437,7 @@ func (b *Case) FinishCase(c *gin.Context) {
err = userService.AddCaseUserAnswer(tx, caseId, platformId, userId, caseUser.CaseUserId, req.Answer) err = userService.AddCaseUserAnswer(tx, caseId, platformId, userId, caseUser.CaseUserId, req.Answer)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败4", c)
return return
} }
} }
@ -446,7 +446,7 @@ func (b *Case) FinishCase(c *gin.Context) {
err = userService.ReportUserScore(tx, caseResult.ProjectId, caseId, platformId, 1, user) err = userService.ReportUserScore(tx, caseResult.ProjectId, caseId, platformId, 1, user)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败3", c)
return return
} }
@ -458,7 +458,7 @@ func (b *Case) FinishCase(c *gin.Context) {
projectPlatform, err := projectPlatformDao.GetProjectPlatform(maps) projectPlatform, err := projectPlatformDao.GetProjectPlatform(maps)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败1", c)
return return
} }
@ -467,7 +467,7 @@ func (b *Case) FinishCase(c *gin.Context) {
err = userService.ReportUserScore(tx, caseResult.ProjectId, caseId, platformId, 2, user) err = userService.ReportUserScore(tx, caseResult.ProjectId, caseId, platformId, 2, user)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage("评论失败", c) responses.FailWithMessage("评论失败2", c)
return return
} }
} }

8
api/controller/User.go
View File

@ -119,12 +119,12 @@ func (b *User) GetUserScore(c *gin.Context) {
for _, score := range recordScores { for _, score := range recordScores {
d := score.NodeName + ":" d := score.NodeName + ":"
if score.Type == 4 { if mergedScore != 0 {
continue score.Score = mergedScore
} }
if score.Type == 3 && mergedScore != 0 { if score.Type == 4 {
score.Score = mergedScore continue
} }
if platformId == 2 { if platformId == 2 {