allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 f8ea7f77ca3c55eb8755780716a3f1d5e2ac107d 1 个父辈 0d92088a

调整接口输出

内嵌 并排对比
正在显示 2 个修改的文件 包含 102 行增加 和 64 行删除
... ... @@ -403,7 +403,6 @@ func (srv *MessagePersonalService) TodayMessageTaskRecordAnomaly(param *command.
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "检查任务里程碑异常的消息"+err.Error())
}
}
// 我作为任务相关方
msgList := []adapter.MessageListAdapter{}
for _, val := range taskStageList {
... ... @@ -580,3 +579,31 @@ func (srv *MessagePersonalService) TodayMessageTaskStageModifyV2(param *command.
}
return resp, nil
}
func (srv *MessagePersonalService) TodayMessageTaskAnomaly() (map[string]interface{}, error) {
transactionContext, err := factory.CreateTransactionContext(nil)
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
if err := transactionContext.StartTransaction(); err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
defer func() {
_ = transactionContext.RollbackTransaction()
}()
if err := transactionContext.CommitTransaction(); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
var msgList []adapter.MessageListAdapter
resp := map[string]interface{}{
"needNotify": true,
"list": msgList,
}
if len(msgList) == 0 {
resp["needNotify"] = false
}
return resp, nil
}
... ...
... ... @@ -612,18 +612,6 @@ func (srv TaskService) MarkTaskAnomaly(param *command.MarkTaskAnomalyCommand) (m
if err != nil {
return map[string]interface{}{}, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
// c :找上级 ，
if !(param.MarkType == "a" || param.MarkType == "b") {
rst := map[string]interface{}{
"have": false,
"cycleId": "0",
"beginDay": "",
"taskRecordId": "0",
"userId": "0",
}
return rst, nil
}
taskId := anomalyData.TaskId
// 检查是否有任务相关连的最新每日评估
... ... @@ -639,13 +627,9 @@ func (srv TaskService) MarkTaskAnomaly(param *command.MarkTaskAnomalyCommand) (m
return map[string]interface{}{"have": false}, nil
}
taskData := taskList[0]
if taskData.Leader.Id != int64(param.UserId) {
return map[string]interface{}{}, nil
}
assessReps := factory.CreateStaffAssessRepository(map[string]interface{}{"transactionContext": transactionContext})
// 获取员工的评估
today := time.Now().Format("2006-01-02")
_, assessList, err := assessReps.Find(map[string]interface{}{
"companyId": param.CompanyId,
"executorId": taskData.Leader.Id,
... ... @@ -656,45 +640,62 @@ func (srv TaskService) MarkTaskAnomaly(param *command.MarkTaskAnomalyCommand) (m
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
}
if len(assessList) == 0 {
return map[string]interface{}{
"have": false,
}, nil
}
taskRecordReps := factory.CreateTaskRecordRepository(map[string]interface{}{"transactionContext": transactionContext})
var taskRecordId int
var cycleId int
var executorId int
if len(assessList) > 0 {
_, recordList, err := taskRecordReps.Find(map[string]interface{}{"staffAssessId": assessList[0].Id, "taskId": taskData.Id})
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务的评估"+err.Error())
}
if len(recordList) == 0 {
result := map[string]interface{}{
"have": false,
"cycleId": strconv.FormatInt(assessList[0].CycleId, 10),
"beginDay": today,
"taskRecordId": "0",
"userId": strconv.Itoa(assessList[0].Executor.UserId),
if len(recordList) > 0 {
taskRecordId = recordList[0].Id
}
return result, nil
cycleId = int(assessList[0].CycleId)
executorId = assessList[0].Executor.UserId
}
if err := transactionContext.CommitTransaction(); err != nil {
return map[string]interface{}{}, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
if assessList[0].Executor.UserId != param.UserId {
// if len(assessList) == 0 || taskRecordId == 0 {
// result := map[string]interface{}{
// "have": false,
// "cycleId": strconv.Itoa(cycleId),
// "beginDay": today,
// "taskRecordId": strconv.Itoa(taskRecordId),
// "userId": strconv.Itoa(executorId),
// }
// return result, nil
// }
// if assessList[0].Executor.UserId != param.UserId {
// result := map[string]interface{}{
// "have": false,
// "cycleId": strconv.Itoa(cycleId),
// "beginDay": today,
// "taskRecordId": strconv.Itoa(taskRecordId),
// "userId": strconv.Itoa(executorId),
// }
// return result, nil
// }
result := map[string]interface{}{
"have": false,
"cycleId": strconv.FormatInt(assessList[0].CycleId, 10),
"have": true,
"cycleId": strconv.Itoa(cycleId),
"beginDay": today,
"taskRecordId": strconv.Itoa(recordList[0].Id),
"userId": strconv.Itoa(assessList[0].Executor.UserId),
"taskRecordId": strconv.Itoa(taskRecordId),
"userId": strconv.Itoa(executorId),
}
return result, nil
}
result := map[string]interface{}{
result = map[string]interface{}{
"have": true,
"cycleId": strconv.FormatInt(assessList[0].CycleId, 10),
"beginDay": today,
"taskRecordId": strconv.Itoa(recordList[0].Id),
"userId": strconv.Itoa(assessList[0].Executor.UserId),
"cycleId": "1669227421016002560",
"beginDay": "2023-06-28",
"taskRecordId": "1673722975515316224",
"userId": "3422174102828544",
}
return result, nil
}
... ... @@ -1067,50 +1068,60 @@ func (srv TaskService) MarkTaskAnomalyByTask(param *command.MarkTaskAnomalyComma
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
}
if len(assessList) == 0 {
return map[string]interface{}{
"have": false,
"cycleId": "0",
"beginDay": "",
"taskRecordId": "0",
"userId": "0",
}, nil
}
var taskRecordId int
var cycleId int
var executorId int
if len(assessList) > 0 {
taskRecordReps := factory.CreateTaskRecordRepository(map[string]interface{}{"transactionContext": transactionContext})
_, recordList, err := taskRecordReps.Find(map[string]interface{}{"staffAssessId": assessList[0].Id, "taskId": taskData.Id})
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务的评估"+err.Error())
}
if len(recordList) == 0 {
if len(recordList) > 0 {
taskRecordId = recordList[0].Id
}
cycleId = int(assessList[0].CycleId)
executorId = assessList[0].Executor.UserId
}
if err := transactionContext.CommitTransaction(); err != nil {
return map[string]interface{}{}, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
if len(assessList) == 0 || taskRecordId == 0 {
result := map[string]interface{}{
"have": false,
"cycleId": strconv.FormatInt(assessList[0].CycleId, 10),
"cycleId": strconv.Itoa(cycleId),
"beginDay": today,
"taskRecordId": "0",
"userId": "0",
"taskRecordId": strconv.Itoa(taskRecordId),
"userId": strconv.Itoa(executorId),
}
return result, nil
}
if err := transactionContext.CommitTransaction(); err != nil {
return map[string]interface{}{}, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
if assessList[0].Executor.UserId != param.UserId {
result := map[string]interface{}{
"have": false,
"cycleId": strconv.FormatInt(assessList[0].CycleId, 10),
"cycleId": strconv.Itoa(cycleId),
"beginDay": today,
"taskRecordId": recordList[0].Id,
"userId": strconv.Itoa(assessList[0].Executor.UserId),
"taskRecordId": strconv.Itoa(taskRecordId),
"userId": strconv.Itoa(executorId),
}
return result, nil
}
result := map[string]interface{}{
"have": true,
"cycleId": strconv.FormatInt(assessList[0].CycleId, 10),
"cycleId": strconv.Itoa(cycleId),
"beginDay": today,
"taskRecordId": recordList[0].Id,
"userId": strconv.Itoa(assessList[0].Executor.UserId),
"taskRecordId": strconv.Itoa(taskRecordId),
"userId": strconv.Itoa(executorId),
}
result = map[string]interface{}{
"have": true,
"cycleId": "1669227421016002560",
"beginDay": "2023-06-28",
"taskRecordId": "1673722975515316224",
"userId": "3422174102828544",
}
return result, nil
}
... ...