正在显示
2 个修改的文件
包含
16 行增加
和
14 行删除
@@ -4,7 +4,6 @@ import ( | @@ -4,7 +4,6 @@ import ( | ||
4 | "encoding/json" | 4 | "encoding/json" |
5 | "fmt" | 5 | "fmt" |
6 | "strconv" | 6 | "strconv" |
7 | - "strings" | ||
8 | "time" | 7 | "time" |
9 | 8 | ||
10 | "github.com/linmadan/egglib-go/core/application" | 9 | "github.com/linmadan/egglib-go/core/application" |
@@ -448,7 +447,8 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task | @@ -448,7 +447,8 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task | ||
448 | var relatedUserList []*domain.User | 447 | var relatedUserList []*domain.User |
449 | if len(relatedUserId) > 0 { | 448 | if len(relatedUserId) > 0 { |
450 | _, relatedUserList, err = userRepo.Find(map[string]interface{}{ | 449 | _, relatedUserList, err = userRepo.Find(map[string]interface{}{ |
451 | - "ids": relatedUserId, | 450 | + "ids": relatedUserId, |
451 | + "companyId": param.CompanyId, | ||
452 | }) | 452 | }) |
453 | if err != nil { | 453 | if err != nil { |
454 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取相关人员"+err.Error()) | 454 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取相关人员"+err.Error()) |
@@ -1006,19 +1006,17 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction | @@ -1006,19 +1006,17 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction | ||
1006 | if len(stageList) == 0 { | 1006 | if len(stageList) == 0 { |
1007 | continue | 1007 | continue |
1008 | } | 1008 | } |
1009 | - | ||
1010 | // 避免当天多次编辑提交,数量递增 | 1009 | // 避免当天多次编辑提交,数量递增 |
1011 | - if isFirstSubmit && val.AnomalyState == domain.AnomalyState0 { | ||
1012 | - taskData.Anomaly += 1 | ||
1013 | - } | ||
1014 | - trimSpace := strings.TrimLeft(val.AssistContent, "\n") // 去掉前换行符 | ||
1015 | - trimSpace = strings.TrimRight(trimSpace, "\n") // 去掉后换行符 | ||
1016 | - trimSpace = strings.TrimSpace(trimSpace) // 去掉前后空格符 | ||
1017 | - // 上级填写内容有值,选项是已辅导,变为正常 | ||
1018 | - if !(len(trimSpace) == 0 || trimSpace == "无") && val.AssistLevel >= domain.AssistLevel2 { | ||
1019 | - taskData.Anomaly = 0 | ||
1020 | - } | ||
1021 | - | 1010 | + // if isFirstSubmit && val.AnomalyState == domain.AnomalyState0 { |
1011 | + // taskData.Anomaly += 1 | ||
1012 | + // } | ||
1013 | + // trimSpace := strings.TrimLeft(val.AssistContent, "\n") // 去掉前换行符 | ||
1014 | + // trimSpace = strings.TrimRight(trimSpace, "\n") // 去掉后换行符 | ||
1015 | + // trimSpace = strings.TrimSpace(trimSpace) // 去掉前后空格符 | ||
1016 | + // // 上级填写内容有值,选项是已辅导,变为正常 | ||
1017 | + // if !(len(trimSpace) == 0 || trimSpace == "无") && val.AssistLevel >= domain.AssistLevel2 { | ||
1018 | + // taskData.Anomaly = 0 | ||
1019 | + // } | ||
1022 | for _, val2 := range stageList { | 1020 | for _, val2 := range stageList { |
1023 | if val2.Id != val.TaskStageCheck.Id { | 1021 | if val2.Id != val.TaskStageCheck.Id { |
1024 | continue | 1022 | continue |
-
请 注册 或 登录 后发表评论