allied-creation / performance · 提交

转到一个项目

作者 tangxvhui
提交 0864880a286be176a6d7b539029ff4d799f871ab 1 个父辈 1efe30be

更新任务列表

内嵌 并排对比
正在显示 3 个修改的文件 包含 2 行增加 和 11 行删除
@@ -25,7 +25,6 @@ type TaskStage struct { @@ -25,7 +25,6 @@ type TaskStage struct {
25 Id int `json:"id,string"` 25 Id int `json:"id,string"`
26 Name string `json:"name"` //里程碑名称 26 Name string `json:"name"` //里程碑名称
27 StatusDescription string `json:"statusDescription,omitempty"` //里程碑的完成情况 27 StatusDescription string `json:"statusDescription,omitempty"` //里程碑的完成情况
28 - Status int `json:"status"` //里程碑状态  
29 SortBy int `json:"sortBy"` 28 SortBy int `json:"sortBy"`
30 PlanCompletedAt string `json:"planCompletedAt,omitempty"` //计划完成时间, 例:2006-01-02 29 PlanCompletedAt string `json:"planCompletedAt,omitempty"` //计划完成时间, 例:2006-01-02
31 RealCompletedAt string `json:"realCompletedAt,omitempty"` //实际完成时间, 例:2006-01-02 30 RealCompletedAt string `json:"realCompletedAt,omitempty"` //实际完成时间, 例:2006-01-02
@@ -682,7 +682,6 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i @@ -682,7 +682,6 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
682 stage := adapter.TaskStage{ 682 stage := adapter.TaskStage{
683 Id: val.StageId, 683 Id: val.StageId,
684 Name: val.StageName, 684 Name: val.StageName,
685 - Status: val.StageStatus,  
686 SortBy: val.StageSortBy, 685 SortBy: val.StageSortBy,
687 } 686 }
688 switch val.StageSortBy { 687 switch val.StageSortBy {
@@ -787,7 +786,6 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s @@ -787,7 +786,6 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s
787 stage := adapter.TaskStage{ 786 stage := adapter.TaskStage{
788 Id: val.StageId, 787 Id: val.StageId,
789 Name: val.StageName, 788 Name: val.StageName,
790 - Status: val.StageStatus,  
791 SortBy: val.StageSortBy, 789 SortBy: val.StageSortBy,
792 } 790 }
793 switch val.StageSortBy { 791 switch val.StageSortBy {
@@ -85,7 +85,6 @@ type ListTaskStage struct { @@ -85,7 +85,6 @@ type ListTaskStage struct {
85 StageId int `pg:"stage_id"` 85 StageId int `pg:"stage_id"`
86 StageName string `pg:"stage_name"` 86 StageName string `pg:"stage_name"`
87 StageSortBy int `pg:"stage_sort_by"` 87 StageSortBy int `pg:"stage_sort_by"`
88 - StageStatus int `pg:"stage_status"`  
89 PlanCompletedAt int `pg:"plan_completed_at"` 88 PlanCompletedAt int `pg:"plan_completed_at"`
90 } 89 }
91 90
@@ -113,7 +112,6 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage @@ -113,7 +112,6 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
113 task_stage."id" as stage_id, 112 task_stage."id" as stage_id,
114 task_stage."name" as stage_name, 113 task_stage."name" as stage_name,
115 task_stage.sort_by as stage_sort_by, 114 task_stage.sort_by as stage_sort_by,
116 - task_stage.status as stage_status,  
117 task_stage.plan_completed_at, 115 task_stage.plan_completed_at,
118 (case 116 (case
119 when task_stage.real_completed_at =0 117 when task_stage.real_completed_at =0
@@ -138,7 +136,6 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage @@ -138,7 +136,6 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
138 t_task_tage_1.task_id, 136 t_task_tage_1.task_id,
139 t_task_tage_1.task_name, 137 t_task_tage_1.task_name,
140 t_task_tage_1.task_alias_name, 138 t_task_tage_1.task_alias_name,
141 - t_task_tage_1.task_status,  
142 t_task_tage_1.leader_name, 139 t_task_tage_1.leader_name,
143 t_task_tage_1.level_name , 140 t_task_tage_1.level_name ,
144 t_task_tage_1.anomaly , 141 t_task_tage_1.anomaly ,
@@ -148,8 +145,7 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage @@ -148,8 +145,7 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
148 t_task_tage_1.plan_completed_at, 145 t_task_tage_1.plan_completed_at,
149 t_task_tage_1.stage_name, 146 t_task_tage_1.stage_name,
150 t_task_tage_1.stage_id, 147 t_task_tage_1.stage_id,
151 - t_task_tage_1.stage_sort_by,  
152 - t_task_tage_1.stage_status 148 + t_task_tage_1.stage_sort_by
153 from t_task_tage_1 149 from t_task_tage_1
154 where t_task_tage_1.task_id in( 150 where t_task_tage_1.task_id in(
155 select t_task_page.task_id from t_task_page 151 select t_task_page.task_id from t_task_page
@@ -235,7 +231,6 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage, @@ -235,7 +231,6 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
235 task_stage."id" as stage_id, 231 task_stage."id" as stage_id,
236 task_stage."name" as stage_name, 232 task_stage."name" as stage_name,
237 task_stage.sort_by as stage_sort_by, 233 task_stage.sort_by as stage_sort_by,
238 - task_stage.status as stage_status,  
239 task_stage.plan_completed_at, 234 task_stage.plan_completed_at,
240 (case 235 (case
241 when task_stage.real_completed_at =0 236 when task_stage.real_completed_at =0
@@ -270,8 +265,7 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage, @@ -270,8 +265,7 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
270 t_task_tage_1.plan_completed_at, 265 t_task_tage_1.plan_completed_at,
271 t_task_tage_1.stage_name, 266 t_task_tage_1.stage_name,
272 t_task_tage_1.stage_id, 267 t_task_tage_1.stage_id,
273 - t_task_tage_1.stage_sort_by,  
274 - t_task_tage_1.stage_status 268 + t_task_tage_1.stage_sort_by
275 from t_task_tage_1 269 from t_task_tage_1
276 where t_task_tage_1.task_id in( 270 where t_task_tage_1.task_id in(
277 select t_task_page.task_id from t_task_page 271 select t_task_page.task_id from t_task_page