allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 d7bc4d8946ec846e8cbfa710e50c9ce6ccb9bd52 1 个父辈 d88a2538

更新

内嵌 并排对比
正在显示 11 个修改的文件 包含 209 行增加 和 67 行删除
@@ -204,7 +204,7 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G @@ -204,7 +204,7 @@ func (srv *MessagePersonalService) TodayMessageTaskStageAnomaly(param *command.G
204 } 204 }
205 } 205 }
206 for _, val := range taskStageList2 { 206 for _, val := range taskStageList2 {
207 - s := fmt.Sprintf("您下级%s负责的项目【%s】里程碑未按时完成，请前往辅导。", val.LeaderName, val.Name) 207 + s := fmt.Sprintf("【您下级%s负责的项目【%s】里程碑未按时完成，请前往辅导。】", val.LeaderName, val.Name)
208 msgList = append(msgList, adapter.MessageListAdapter{ 208 msgList = append(msgList, adapter.MessageListAdapter{
209 Content: s, 209 Content: s,
210 }) 210 })
@@ -134,6 +134,8 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat @@ -134,6 +134,8 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat
134 taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{"transactionContext": transactionContext}) 134 taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{"transactionContext": transactionContext})
135 // 保存 员工的需要填写的每日任务型 指标项 135 // 保存 员工的需要填写的每日任务型 指标项
136 taskDao := dao.NewTaskDao(map[string]interface{}{"transactionContext": transactionContext}) 136 taskDao := dao.NewTaskDao(map[string]interface{}{"transactionContext": transactionContext})
  137 +
  138 + newTaskIdList := []int{}
137 for i := range assessList { 139 for i := range assessList {
138 assessList[i].StaffAssessTaskId = assessTaskData.Id 140 assessList[i].StaffAssessTaskId = assessTaskData.Id
139 _, err = assessRepo.Save(&assessList[i]) 141 _, err = assessRepo.Save(&assessList[i])
@@ -156,13 +158,14 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat @@ -156,13 +158,14 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat
156 if err != nil { 158 if err != nil {
157 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存个人任务型指标项"+err.Error()) 159 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存个人任务型指标项"+err.Error())
158 } 160 }
159 - err = taskDao.IncreaseAnomaly([]int{val2.TaskId}, 1)  
160 - if err != nil {  
161 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存个人任务型指标项"+err.Error())  
162 - } 161 + newTaskIdList = append(newTaskIdList, val2.TaskId)
163 } 162 }
164 } 163 }
165 } 164 }
  165 + err = taskDao.IncreaseAnomaly(newTaskIdList, 1)
  166 + if err != nil {
  167 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存个人任务型指标项"+err.Error())
  168 + }
166 return map[string]interface{}{ 169 return map[string]interface{}{
167 "assessTaskId": assessTaskData.Id, 170 "assessTaskId": assessTaskData.Id,
168 }, nil 171 }, nil
  1 +package adapter
  2 +
  3 +type ConditionSelect struct {
  4 + Name string
  5 +}
  1 +package command
  2 +
  3 +type GetSelcetCommand struct {
  4 + Cmd string `json:"cmd"` // 任务名称,负责人,优先级
  5 + UserId int `json:"-"` //当前用户id
  6 + CompanyId int `json:"-"` //当前公司id
  7 +}
@@ -8,5 +8,5 @@ type SearchTaskCommand struct { @@ -8,5 +8,5 @@ type SearchTaskCommand struct {
8 TaskName string `json:"taskName"` //任务名称 8 TaskName string `json:"taskName"` //任务名称
9 LevelName string `json:"levelName"` //优先级 9 LevelName string `json:"levelName"` //优先级
10 OnlyMy bool `json:"onlyMy"` //只查看我负责的任务 10 OnlyMy bool `json:"onlyMy"` //只查看我负责的任务
11 - LeaderId string `json:"leaderId"` //任务负责人id 11 + LeaderName string `json:"leaderId"` //任务负责人id
12 } 12 }
@@ -681,13 +681,13 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i @@ -681,13 +681,13 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
681 } 681 }
682 } 682 }
683 condition := dao.ListTaskCondition{ 683 condition := dao.ListTaskCondition{
684 - Limit: limit,  
685 - Offset: offset,  
686 - UserId: param.UserId,  
687 - TaskName: param.TaskName,  
688 - LevelName: param.LevelName,  
689 - OnlyMy: param.OnlyMy,  
690 - LeaderId: param.LeaderId, 684 + Limit: limit,
  685 + Offset: offset,
  686 + UserId: param.UserId,
  687 + TaskName: param.TaskName,
  688 + LevelName: param.LevelName,
  689 + OnlyMy: param.OnlyMy,
  690 + LeaderName: param.LeaderName,
691 } 691 }
692 692
693 taskDao := dao.NewTaskDao(map[string]interface{}{ 693 taskDao := dao.NewTaskDao(map[string]interface{}{
@@ -780,13 +780,13 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s @@ -780,13 +780,13 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s
780 } 780 }
781 } 781 }
782 condition := dao.ListTaskCondition{ 782 condition := dao.ListTaskCondition{
783 - Limit: limit,  
784 - Offset: offset,  
785 - UserId: param.UserId,  
786 - TaskName: param.TaskName,  
787 - LevelName: param.LevelName,  
788 - OnlyMy: param.OnlyMy,  
789 - LeaderId: param.LeaderId, 783 + Limit: limit,
  784 + Offset: offset,
  785 + UserId: param.UserId,
  786 + TaskName: param.TaskName,
  787 + LevelName: param.LevelName,
  788 + OnlyMy: param.OnlyMy,
  789 + LeaderName: param.LeaderName,
790 } 790 }
791 transactionContext, err := factory.CreateTransactionContext(nil) 791 transactionContext, err := factory.CreateTransactionContext(nil)
792 if err != nil { 792 if err != nil {
@@ -987,7 +987,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map @@ -987,7 +987,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map
987 return result, nil 987 return result, nil
988 } 988 }
989 989
990 -// 获取任务详情 990 +// 删除任务
991 func (srv TaskService) DeleteTaskInfo(param *command.GetTaskCommand) (*adapter.TaskInfoAdapter, error) { 991 func (srv TaskService) DeleteTaskInfo(param *command.GetTaskCommand) (*adapter.TaskInfoAdapter, error) {
992 transactionContext, err := factory.CreateTransactionContext(nil) 992 transactionContext, err := factory.CreateTransactionContext(nil)
993 if err != nil { 993 if err != nil {
@@ -1022,3 +1022,70 @@ func (srv TaskService) DeleteTaskInfo(param *command.GetTaskCommand) (*adapter.T @@ -1022,3 +1022,70 @@ func (srv TaskService) DeleteTaskInfo(param *command.GetTaskCommand) (*adapter.T
1022 } 1022 }
1023 return nil, nil 1023 return nil, nil
1024 } 1024 }
  1025 +
  1026 +// 员工绩效-任务管理-列表筛选项
  1027 +func (srv TaskService) ConditionForListTask2(param *command.GetSelcetCommand) (map[string]interface{}, error) {
  1028 + transactionContext, err := factory.CreateTransactionContext(nil)
  1029 + if err != nil {
  1030 + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
  1031 + }
  1032 + if err := transactionContext.StartTransaction(); err != nil {
  1033 + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
  1034 + }
  1035 + defer func() {
  1036 + _ = transactionContext.RollbackTransaction()
  1037 + }()
  1038 + taskDao := dao.NewTaskDao(map[string]interface{}{
  1039 + "transactionContext": transactionContext,
  1040 + })
  1041 + hrbpFlag, err := roleService.GetHrBp(transactionContext, int(param.CompanyId), int(param.UserId))
  1042 + if err != nil {
  1043 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息"+err.Error())
  1044 + }
  1045 + var tasklistData []dao.TaskData1
  1046 + if hrbpFlag == domain.RoleTypeSystem {
  1047 + tasklistData, err = taskDao.ListTask2ForHrbp(param.UserId)
  1048 + if err != nil {
  1049 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务列表"+err.Error())
  1050 + }
  1051 + } else {
  1052 + tasklistData, err = taskDao.ListTask2(param.UserId)
  1053 + if err != nil {
  1054 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务列表"+err.Error())
  1055 + }
  1056 + }
  1057 + if err := transactionContext.CommitTransaction(); err != nil {
  1058 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  1059 + }
  1060 + selectList := []adapter.ConditionSelect{}
  1061 + uniqueMap := map[string]struct{}{}
  1062 + // 任务名称,负责人,优先级
  1063 + switch param.Cmd {
  1064 + case "任务名称":
  1065 + for _, val := range tasklistData {
  1066 + selectList = append(selectList, adapter.ConditionSelect{Name: val.Name})
  1067 + }
  1068 + case "负责人":
  1069 + for _, val := range tasklistData {
  1070 + if _, ok := uniqueMap[val.LeaderName]; ok {
  1071 + continue
  1072 + }
  1073 + uniqueMap[val.LeaderName] = struct{}{}
  1074 + selectList = append(selectList, adapter.ConditionSelect{Name: val.LeaderName})
  1075 + }
  1076 + case "优先级":
  1077 + for _, val := range tasklistData {
  1078 + if _, ok := uniqueMap[val.LevelName]; ok {
  1079 + continue
  1080 + }
  1081 + uniqueMap[val.LevelName] = struct{}{}
  1082 + if len(val.LevelName) > 0 {
  1083 + selectList = append(selectList, adapter.ConditionSelect{Name: val.LevelName})
  1084 + }
  1085 + }
  1086 + }
  1087 + result := map[string]interface{}{
  1088 + "list": selectList,
  1089 + }
  1090 + return result, nil
  1091 +}
@@ -26,7 +26,7 @@ type TaskRecord struct { @@ -26,7 +26,7 @@ type TaskRecord struct {
26 TaskLeader TaskLeader `json:"taskLeader" comment:"任务负责人"` 26 TaskLeader TaskLeader `json:"taskLeader" comment:"任务负责人"`
27 AssistLevel int `json:"assistLevel" comment:"上级辅导情况"` 27 AssistLevel int `json:"assistLevel" comment:"上级辅导情况"`
28 AssistContent string `json:"assistContent" comment:"上级辅导内容"` 28 AssistContent string `json:"assistContent" comment:"上级辅导内容"`
29 - AnomalyState int `json:"anomalyState" comment:"异常反馈状态（0异常、1正常）"` 29 + AnomalyState int `json:"anomalyState" comment:"异常是否反馈状态（0异常、1正常）"`
30 TaskStages []TaskStage `json:"taskStages" comment:"里程碑列表"` 30 TaskStages []TaskStage `json:"taskStages" comment:"里程碑列表"`
31 TaskStageCheck TaskStage `json:"taskStageCheck" comment:"提交的里程碑"` 31 TaskStageCheck TaskStage `json:"taskStageCheck" comment:"提交的里程碑"`
32 CreatedAt time.Time `json:"createdAt" comment:"创建时间"` 32 CreatedAt time.Time `json:"createdAt" comment:"创建时间"`
@@ -60,13 +60,13 @@ func (d *TaskDao) catchTaskIdByPermission(userId int) string { @@ -60,13 +60,13 @@ func (d *TaskDao) catchTaskIdByPermission(userId int) string {
60 } 60 }
61 61
62 type ListTaskCondition struct { 62 type ListTaskCondition struct {
63 - Limit int //分页  
64 - Offset int //分页  
65 - UserId int //谁要查看任务数据  
66 - TaskName string //任务名称  
67 - LevelName string //优先级  
68 - OnlyMy bool //只查看我负责的任务  
69 - LeaderId string //任务负责人id 63 + Limit int //分页
  64 + Offset int //分页
  65 + UserId int //谁要查看任务数据
  66 + TaskName string //任务名称
  67 + LevelName string //优先级
  68 + OnlyMy bool //只查看我负责的任务
  69 + LeaderName string //任务负责人名称
70 } 70 }
71 71
72 // 任务和里程碑列表 72 // 任务和里程碑列表
@@ -161,9 +161,9 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage @@ -161,9 +161,9 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
161 if param.OnlyMy { 161 if param.OnlyMy {
162 condition = append(condition, param.UserId) 162 condition = append(condition, param.UserId)
163 whereSql += ` and t_task_tage_1.leader_id = '?' ` 163 whereSql += ` and t_task_tage_1.leader_id = '?' `
164 - } else if param.LeaderId != "" && param.LeaderId != "0" {  
165 - condition = append(condition, param.LeaderId)  
166 - whereSql += ` and t_task_tage_1.leader_id = ? ` 164 + } else if param.LeaderName != "" {
  165 + condition = append(condition, param.LeaderName)
  166 + whereSql += ` and t_task_tage_1.leader_name = ? `
167 } 167 }
168 if len(param.TaskName) > 0 { 168 if len(param.TaskName) > 0 {
169 condition = append(condition, param.TaskName) 169 condition = append(condition, param.TaskName)
@@ -192,9 +192,9 @@ func (d *TaskDao) CountTaskStageNotHrbp(param ListTaskCondition) (int, error) { @@ -192,9 +192,9 @@ func (d *TaskDao) CountTaskStageNotHrbp(param ListTaskCondition) (int, error) {
192 if param.OnlyMy { 192 if param.OnlyMy {
193 condition = append(condition, param.UserId) 193 condition = append(condition, param.UserId)
194 whereSql += ` and task.leader ->>'id' = '?' ` 194 whereSql += ` and task.leader ->>'id' = '?' `
195 - } else if param.LeaderId != "" && param.LeaderId != "0" {  
196 - condition = append(condition, param.LeaderId)  
197 - whereSql += ` and task.leader ->>'id' = ? ` 195 + } else if param.LeaderName != "" {
  196 + condition = append(condition, param.LeaderName)
  197 + whereSql += ` and task.leader ->>'name' = ? `
198 } 198 }
199 if len(param.TaskName) > 0 { 199 if len(param.TaskName) > 0 {
200 condition = append(condition, param.TaskName) 200 condition = append(condition, param.TaskName)
@@ -285,9 +285,9 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage, @@ -285,9 +285,9 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
285 if param.OnlyMy { 285 if param.OnlyMy {
286 condition = append(condition, param.UserId) 286 condition = append(condition, param.UserId)
287 whereSql += ` and t_task_tage_1.leader_id = '?' ` 287 whereSql += ` and t_task_tage_1.leader_id = '?' `
288 - } else if param.LeaderId != "" && param.LeaderId != "0" {  
289 - condition = append(condition, param.LeaderId)  
290 - whereSql += ` and t_task_tage_1.leader_id = ? ` 288 + } else if param.LeaderName != "" {
  289 + condition = append(condition, param.LeaderName)
  290 + whereSql += ` and t_task_tage_1.leader_name = ? `
291 } 291 }
292 if len(param.TaskName) > 0 { 292 if len(param.TaskName) > 0 {
293 condition = append(condition, param.TaskName) 293 condition = append(condition, param.TaskName)
@@ -319,9 +319,9 @@ func (d *TaskDao) CountTaskStageByHrbp(param ListTaskCondition) (int, error) { @@ -319,9 +319,9 @@ func (d *TaskDao) CountTaskStageByHrbp(param ListTaskCondition) (int, error) {
319 if param.OnlyMy { 319 if param.OnlyMy {
320 condition = append(condition, param.UserId) 320 condition = append(condition, param.UserId)
321 whereSql += ` and task.leader ->>'id' = '?' ` 321 whereSql += ` and task.leader ->>'id' = '?' `
322 - } else if param.LeaderId != "" && param.LeaderId != "0" {  
323 - condition = append(condition, param.LeaderId)  
324 - whereSql += ` and task.leader ->>'id' = ? ` 322 + } else if param.LeaderName != "" {
  323 + condition = append(condition, param.LeaderName)
  324 + whereSql += ` and task.leader ->>'name' = ? `
325 } 325 }
326 if len(param.TaskName) > 0 { 326 if len(param.TaskName) > 0 {
327 condition = append(condition, param.TaskName) 327 condition = append(condition, param.TaskName)
@@ -356,9 +356,9 @@ func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, er @@ -356,9 +356,9 @@ func (d *TaskDao) CountTaskStageAnomalyNotHrbp(param ListTaskCondition) (int, er
356 if param.OnlyMy { 356 if param.OnlyMy {
357 condition = append(condition, param.UserId) 357 condition = append(condition, param.UserId)
358 whereSql += ` and task.leader ->>'id' = '?' ` 358 whereSql += ` and task.leader ->>'id' = '?' `
359 - } else if param.LeaderId != "" && param.LeaderId != "0" {  
360 - condition = append(condition, param.LeaderId)  
361 - whereSql += ` and task.leader ->>'id' = ? ` 359 + } else if param.LeaderName != "" {
  360 + condition = append(condition, param.LeaderName)
  361 + whereSql += ` and task.leader ->>'name' = ? `
362 } 362 }
363 if len(param.TaskName) > 0 { 363 if len(param.TaskName) > 0 {
364 condition = append(condition, param.TaskName) 364 condition = append(condition, param.TaskName)
@@ -395,9 +395,9 @@ func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, err @@ -395,9 +395,9 @@ func (d *TaskDao) CountTaskStageAnomalyByHrbp(param ListTaskCondition) (int, err
395 if param.OnlyMy { 395 if param.OnlyMy {
396 condition = append(condition, param.UserId) 396 condition = append(condition, param.UserId)
397 whereSql += ` and task.leader ->>'id' = '?' ` 397 whereSql += ` and task.leader ->>'id' = '?' `
398 - } else if param.LeaderId != "" && param.LeaderId != "0" {  
399 - condition = append(condition, param.LeaderId)  
400 - whereSql += ` and task.leader ->>'id' = ? ` 398 + } else if param.LeaderName != "" {
  399 + condition = append(condition, param.LeaderName)
  400 + whereSql += ` and task.leader ->>'name' = ? `
401 } 401 }
402 if len(param.TaskName) > 0 { 402 if len(param.TaskName) > 0 {
403 condition = append(condition, param.TaskName) 403 condition = append(condition, param.TaskName)
@@ -474,8 +474,8 @@ func (d *TaskDao) CountTaskAnomalyNotHrbp(param ListTaskCondition) (int, error) @@ -474,8 +474,8 @@ func (d *TaskDao) CountTaskAnomalyNotHrbp(param ListTaskCondition) (int, error)
474 if param.OnlyMy { 474 if param.OnlyMy {
475 condition = append(condition, param.UserId) 475 condition = append(condition, param.UserId)
476 whereSql += ` and task.leader ->>'id' = '?' ` 476 whereSql += ` and task.leader ->>'id' = '?' `
477 - } else if param.LeaderId != "" {  
478 - condition = append(condition, param.LeaderId) 477 + } else if param.LeaderName != "" {
  478 + condition = append(condition, param.LeaderName)
479 whereSql += ` and task.leader ->>'id' = ? ` 479 whereSql += ` and task.leader ->>'id' = ? `
480 } 480 }
481 if len(param.TaskName) > 0 { 481 if len(param.TaskName) > 0 {
@@ -507,8 +507,8 @@ func (d *TaskDao) CountTaskAnomalyByHrbp(param ListTaskCondition) (int, error) { @@ -507,8 +507,8 @@ func (d *TaskDao) CountTaskAnomalyByHrbp(param ListTaskCondition) (int, error) {
507 if param.OnlyMy { 507 if param.OnlyMy {
508 condition = append(condition, param.UserId) 508 condition = append(condition, param.UserId)
509 whereSql += ` and task.leader ->>'id' = '?' ` 509 whereSql += ` and task.leader ->>'id' = '?' `
510 - } else if param.LeaderId != "" {  
511 - condition = append(condition, param.LeaderId) 510 + } else if param.LeaderName != "" {
  511 + condition = append(condition, param.LeaderName)
512 whereSql += ` and task.leader ->>'id' = ? ` 512 whereSql += ` and task.leader ->>'id' = ? `
513 } 513 }
514 if len(param.TaskName) > 0 { 514 if len(param.TaskName) > 0 {
@@ -525,3 +525,45 @@ func (d *TaskDao) CountTaskAnomalyByHrbp(param ListTaskCondition) (int, error) { @@ -525,3 +525,45 @@ func (d *TaskDao) CountTaskAnomalyByHrbp(param ListTaskCondition) (int, error) {
525 _, err := tx.QueryOne(pg.Scan(&cnt), sqlStr, condition...) 525 _, err := tx.QueryOne(pg.Scan(&cnt), sqlStr, condition...)
526 return cnt, err 526 return cnt, err
527 } 527 }
  528 +
  529 +// 任务数据
  530 +type TaskData1 struct {
  531 + Name string `pg:"name"`
  532 + Alias string `pg:"alias"`
  533 + LeaderId string `pg:"leader_id"`
  534 + LeaderName string `pg:"leader_name"`
  535 + LevelName string `pg:"level_name"`
  536 +}
  537 +
  538 +// 获取任务列表
  539 +func (d *TaskDao) ListTask2(userId int) ([]TaskData1, error) {
  540 + task1 := d.catchTaskIdByPermission(userId)
  541 + sqlStr := task1 + ` select task."name" ,task.alias ,
  542 + task.leader ->>'id' as leader_id,
  543 + task.leader ->>'name' as leaer_name,
  544 + task.level_name
  545 + from task `
  546 + result := []TaskData1{}
  547 + tx := d.transactionContext.PgTx
  548 + _, err := tx.Query(&result, sqlStr)
  549 + return result, err
  550 +}
  551 +
  552 +// 获取任务列表
  553 +func (d *TaskDao) ListTask2ForHrbp(userId int) ([]TaskData1, error) {
  554 + sqlStr := `with
  555 + t_task_ignore as (
  556 + select task_ignore.task_id,task_ignore.id from task_ignore where task_ignore.user_id =?
  557 + )select task."name" ,task.alias ,
  558 + task.leader ->>'id' as leader_id,
  559 + task.leader ->>'name' as leaer_name,
  560 + task.level_name
  561 + from task
  562 + left join t_task_ignore on t_task_ignore.task_id=task.id
  563 + where 1=1 `
  564 + result := []TaskData1{}
  565 + tx := d.transactionContext.PgTx
  566 + _, err := tx.Query(&result, sqlStr, userId)
  567 + return result, err
  568 +
  569 +}
@@ -9,20 +9,20 @@ import ( @@ -9,20 +9,20 @@ import (
9 // 任务 9 // 任务
10 type Task struct { 10 type Task struct {
11 tableName struct{} `comment:"任务" pg:"task"` 11 tableName struct{} `comment:"任务" pg:"task"`
12 - Id int `pg:"id,pk"` //  
13 - CreatedAt time.Time `pg:"created_at"` //  
14 - UpdatedAt time.Time `pg:"updated_at"` //  
15 - DeletedAt *time.Time `pg:"deleted_at"` //  
16 - Name string `pg:"name"` // 任务名称  
17 - Alias string `pg:"alias"` //  
18 - CompanyId int `pg:"company_id"` //  
19 - Leader domain.TaskLeader `pg:"leader"` // 任务负责人  
20 - Status int `pg:"status"` // 任务的状态  
21 - Level int `pg:"level"` // 优先级,值越小优先级越高  
22 - LevelName string `pg:"level_name"` // 优先级名称  
23 - RelatedUser []int `pg:"related_user"` //  
24 - RunAt int64 `pg:"run_at"` // 启动的时间  
25 - StopAt int64 `pg:"stop_at"` // 停止的时间  
26 - Anomaly int `pg:"anomaly"` // 异常反馈的数量  
27 - WarnFlag int `pg:"warn_flag"` // 里程碑异常标记 12 + Id int `pg:"id,pk"` //
  13 + CreatedAt time.Time `pg:"created_at"` //
  14 + UpdatedAt time.Time `pg:"updated_at"` //
  15 + DeletedAt *time.Time `pg:"deleted_at"` //
  16 + Name string `pg:"name"` // 任务名称
  17 + Alias string `pg:"alias"` //
  18 + CompanyId int `pg:"company_id"` //
  19 + Leader domain.TaskLeader `pg:"leader"` // 任务负责人
  20 + Status int `pg:"status,use_zero"` // 任务的状态
  21 + Level int `pg:"level,use_zero"` // 优先级,值越小优先级越高
  22 + LevelName string `pg:"level_name"` // 优先级名称
  23 + RelatedUser []int `pg:"related_user"` //
  24 + RunAt int64 `pg:"run_at,use_zero"` // 启动的时间
  25 + StopAt int64 `pg:"stop_at,use_zero" ` // 停止的时间
  26 + Anomaly int `pg:"anomaly,use_zero"` // 异常反馈的数量
  27 + WarnFlag int `pg:"warn_flag,use_zero"` // 里程碑异常标记
28 } 28 }
@@ -172,3 +172,20 @@ func (c *TaskController) DeleteTask() { @@ -172,3 +172,20 @@ func (c *TaskController) DeleteTask() {
172 data, err := srv.DeleteTaskInfo(paramReq) 172 data, err := srv.DeleteTaskInfo(paramReq)
173 c.Response(data, err) 173 c.Response(data, err)
174 } 174 }
  175 +
  176 +// SelectCondition 员工绩效-任务管理-任务列表-筛选条件
  177 +func (c *TaskController) SelectCondition() {
  178 + srv := service.NewTaskService()
  179 + paramReq := &command.GetSelcetCommand{}
  180 + err := c.BindJSON(paramReq)
  181 + if err != nil {
  182 + e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
  183 + c.Response(nil, e)
  184 + return
  185 + }
  186 + userReq := middlewares.GetUser(c.Ctx)
  187 + paramReq.CompanyId = int(userReq.CompanyId)
  188 + paramReq.UserId = int(userReq.UserId)
  189 + data, err := srv.ConditionForListTask2(paramReq)
  190 + c.Response(data, err)
  191 +}
@@ -24,6 +24,7 @@ func init() { @@ -24,6 +24,7 @@ func init() {
24 web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()), 24 web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
25 web.NSCtrlPost("/attention/cancel", (*controllers.TaskController).CancelAttention), 25 web.NSCtrlPost("/attention/cancel", (*controllers.TaskController).CancelAttention),
26 web.NSCtrlPost("/list", (*controllers.TaskController).ListTask2), 26 web.NSCtrlPost("/list", (*controllers.TaskController).ListTask2),
  27 + web.NSCtrlPost("/list/select", (*controllers.TaskController).SelectCondition),
27 web.NSCtrlPost("/task_record/list", (*controllers.TaskController).ListTaskRecord), 28 web.NSCtrlPost("/task_record/list", (*controllers.TaskController).ListTaskRecord),
28 web.NSCtrlPost("/info", (*controllers.TaskController).GetTaskInfo), 29 web.NSCtrlPost("/info", (*controllers.TaskController).GetTaskInfo),
29 ) 30 )