添加节点类型、标签等

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml

@@ -162,7 +162,7 @@
 		sum(t.phase_act_workload) as phase_act_workload,
 		sum(t.act_inner_user_at) as act_inner_user_at,
 		sum(t.act_out_user_at) as act_out_user_at,
-		sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0))/ifnull(sum(ifnull(t.task_budget_workload,0.000001)),999999) as act_rate,
+		sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0)) as task_budget_workload_act_rate,
 		sum(t.task_budget_workload) as task_budget_workload,
 		sum(t.task_budget_at) as task_budget_at
 		FROM xm_project_phase t
@@ -177,7 +177,7 @@
 		res.phase_act_workload = tc.phase_act_workload,
 		res.act_inner_user_at = tc.act_inner_user_at,
 		res.act_out_user_at = tc.act_out_user_at,
-		res.act_rate= tc.act_rate,
+		res.act_rate= case when tc.task_budget_workload_act_rate=0 then 0 else  tc.task_budget_workload_act_rate / tc.task_budget_workload end,
 		res.task_budget_workload=tc.task_budget_workload,
 		res.task_budget_at=tc.task_budget_at,
 		res.calc_time=now(),
@@ -197,7 +197,7 @@
 			sum(t.phase_act_workload) as phase_act_workload,
 			sum(t.act_inner_user_at) as act_inner_user_at,
 			sum(t.act_out_user_at) as act_out_user_at,
-			sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0))/ifnull(sum(ifnull(t.task_budget_workload,0.000001)),999999) as act_rate,
+			sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0))  as task_budget_workload_act_rate,
 			sum(t.task_budget_workload) as task_budget_workload,
 			sum(t.task_budget_at) as task_budget_at
 			FROM xm_project_phase t
@@ -215,7 +215,7 @@
 			res.phase_act_workload = tc.phase_act_workload,
 			res.act_inner_user_at = tc.act_inner_user_at,
 			res.act_out_user_at = tc.act_out_user_at,
-			res.act_rate= tc.act_rate,
+			res.act_rate= case when tc.task_budget_workload_act_rate=0 then 0 else  tc.task_budget_workload_act_rate / tc.task_budget_workload end,
 			res.task_budget_workload=tc.task_budget_workload,
 			res.task_budget_at=tc.task_budget_at,
 			res.calc_time=now(),

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -222,7 +222,7 @@
 			sum( ifnull( t.budget_workload, 0 ) ) AS budget_workload,
 			sum( ifnull( t.act_cost, 0 ) ) AS act_cost,
 			sum( ifnull( t.act_workload, 0 ) ) AS act_workload,
-			sum( ifnull( t.budget_workload, 0 ) * ifnull( t.rate, 0 ) ) / sum( ifnull( t.budget_workload, 0.00001 ) ) AS rate,
+			sum( ifnull( t.budget_workload, 0 ) * ifnull( t.rate, 0 ) )   AS budget_workload_rate,
 			min( t.start_time ) AS start_time,
 			max( t.end_time ) AS end_time,
 			min( t.act_start_time ) AS act_start_time,
@@ -240,7 +240,7 @@
 			res.budget_workload = t2.budget_workload,
 			res.act_cost = t2.act_cost,
 			res.act_workload = t2.act_workload,
-			res.rate = t2.rate,
+		    res.rate = case when t2.budget_workload=0 then 0 else t2.budget_workload_rate / t2.budget_workload end,
 			res.start_time = t2.start_time,
 			res.end_time = t2.end_time,
 			res.act_start_time = t2.act_start_time,
@@ -265,7 +265,7 @@
 		sum( ifnull( t.budget_workload, 0 ) ) AS budget_workload,
 		sum( ifnull( t.act_cost, 0 ) ) AS act_cost,
 		sum( ifnull( t.act_workload, 0 ) ) AS act_workload,
-		sum( ifnull( t.budget_workload, 0 ) * ifnull( t.rate, 0 ) ) / sum( ifnull( t.budget_workload, 0.00001 ) ) AS rate,
+		sum( ifnull( t.budget_workload, 0 ) * ifnull( t.rate, 0 ) ) as budget_workload_rate,
 		min( t.start_time ) AS start_time,
 		max( t.end_time ) AS end_time,
 		min( t.act_start_time ) AS act_start_time,
@@ -279,7 +279,7 @@
 		res.budget_workload = t2.budget_workload,
 		res.act_cost = t2.act_cost,
 		res.act_workload = t2.act_workload,
-		res.rate = t2.rate,
+		res.rate = case when t2.budget_workload=0 then 0 else t2.budget_workload_rate / t2.budget_workload end,
 		res.start_time = t2.start_time,
 		res.end_time = t2.end_time,
 		res.act_start_time = t2.act_start_time,