From 9bf5081e21d0fd9718e165fba69b931e7c2c1558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 20 May 2022 09:51:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=8F=8A=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/dao/XmBranchStateMapper.xml       | 109 ++++++++++--------
 .../xm/core/dao/XmProjectStateMapper.xml      |   6 +
 2 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
index 16f30b6a..50f88255 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml
@@ -14,54 +14,69 @@
 	</sql>
 	<select id="listPortalAllXmBranchSumState" parameterType="HashMap" resultType="HashMap">
 		SELECT
-		sum( ifnull( total_file_cnt, 0 ) ) total_file_cnt,
-		sum( ifnull( total_bug_cnt, 0 ) ) total_bug_cnt,
-		sum( ifnull( total_task_cnt, 0 ) ) total_task_cnt,
-		sum( ifnull( total_budget_nouser_amount, 0 ) ) total_budget_nouser_amount,
-		sum( ifnull( total_staff_cnt, 0 ) ) total_staff_cnt,
-		sum( ifnull( total_cost_nouser_amount, 0 ) ) total_cost_nouser_amount,
-		sum( ifnull( total_closed_bug_cnt, 0 ) ) total_closed_bug_cnt,
-		sum( ifnull( total_resolved_bug_cnt, 0 ) ) total_resolved_bug_cnt,
-		sum( ifnull( total_complete_task_cnt, 0 ) ) total_complete_task_cnt,
-		sum( ifnull( total_phase_cnt, 0 ) ) total_phase_cnt,
-		sum( ifnull( total_complete_phase_cnt, 0 ) ) total_complete_phase_cnt,
-		sum( ifnull( total_need_pay_amount, 0 ) ) total_need_pay_amount,
-		sum( ifnull( total_finish_pay_amount, 0 ) ) total_finish_pay_amount,
-		sum( ifnull( total_need_col_amount, 0 ) ) total_need_col_amount,
-		sum( ifnull( total_finish_col_amount, 0 ) ) total_finish_col_amount,
-		sum( ifnull( total_cost_user_amount, 0 ) ) total_cost_user_amount,
-		sum( ifnull( total_budget_iuser_amount, 0 ) ) total_budget_iuser_amount,
-		sum( ifnull( total_plan_workload, 0 ) ) total_plan_workload,
-		sum( ifnull( total_risk_cnt, 0 ) ) total_risk_cnt,
-		sum( ifnull( total_complete_risk_cnt, 0 ) ) total_complete_risk_cnt,
-		sum( ifnull( total_budget_ouser_amount, 0 ) ) total_budget_ouser_amount,
-		sum( ifnull( total_complete_workload, 0 ) ) total_complete_workload,
-		sum( ifnull( total_cost_iuser_amount, 0 ) ) total_cost_iuser_amount,
-		sum( ifnull( total_cost_ouser_amount, 0 ) ) total_cost_ouser_amount,
-		sum( ifnull( total_progress, 0 ) )/count(1) total_progress,
-		sum( ifnull( total_active_bug_cnt, 0 ) ) total_active_bug_cnt,
-		sum( ifnull( total_confirmed_bug_cnt, 0 ) ) total_confirmed_bug_cnt,
-		sum( ifnull( project_status, 0 ) ) project_status,
-		sum( ifnull( total_act_workload, 0 ) ) total_act_workload,
-		sum( ifnull( total_act_out_workload, 0 ) ) total_act_out_workload,
-		sum( ifnull( total_act_inner_workload, 0 ) ) total_act_inner_workload,
-		sum( ifnull( total_task_budget_cost_at, 0 ) ) total_task_budget_cost_at,
-		sum( ifnull( total_task_out_cnt, 0 ) ),
-		sum( ifnull( total_need_pay_cnt, 0 ) ) total_need_pay_cnt,
-		sum( ifnull( total_finish_pay_cnt, 0 ) ) total_finish_pay_cnt,
-		sum( ifnull( total_finish_pay_user_cnt, 0 ) ) total_finish_pay_user_cnt,
-		sum( ifnull( total_need_pay_user_cnt, 0 ) ) total_need_pay_user_cnt,
-		sum( ifnull( total_plan_iuser_workload, 0 ) ) total_plan_iuser_workload,
-		sum( ifnull( total_plan_ouser_workload, 0 ) ) total_plan_ouser_workload,
-		sum( ifnull( test_cases, 0 ) ) test_cases,
-		sum( ifnull( exec_cases, 0 ) ) exec_cases,
-		sum( ifnull( design_cases, 0 ) ) design_cases,
-		sum( ifnull( finish_cases, 0 ) ) finish_cases,
-		sum( ifnull( iteration_cnt, 0 ) ) iteration_cnt,
-		sum( ifnull( product_cnt, 0 ) ) product_cnt,
-		sum( ifnull( menu_cnt, 0 ) ) menu_cnt
+		sum(ifnull(`project_cnt`,0)) AS `project_cnt`,
+		sum(ifnull(`file_cnt`,0)) AS `file_cnt`,
+		sum(ifnull(`phase_cnt`,0)) AS `phase_cnt`,
+		sum(ifnull(`phase_finish_cnt`,0)) AS `phase_finish_cnt`,
+		sum(ifnull(`need_pay_at`,0)) AS `need_pay_at`,
+		sum(ifnull(`finish_pay_at`,0)) AS `finish_pay_at`,
+		sum(ifnull(`need_col_at`,0)) AS `need_col_at`,
+		sum(ifnull(`finish_col_at`,0)) AS `finish_col_at`,
+		sum(ifnull(`risk_cnt`,0)) AS `risk_cnt`,
+		sum(ifnull(`risk_finish_cnt`,0)) AS `risk_finish_cnt`,
+		sum(ifnull(`budget_nouser_at`,0)) AS `budget_nouser_at`,
+		sum(ifnull(`budget_ouser_at`,0)) AS `budget_ouser_at`,
+		sum(ifnull(`budget_iuser_at`,0)) AS `budget_iuser_at`,
+		sum(ifnull(`act_user_at`,0)) AS `act_user_at`,
+		sum(ifnull(`act_iuser_at`,0)) AS `act_iuser_at`,
+		sum(ifnull(`act_ouser_at`,0)) AS `act_ouser_at`,
+		sum(ifnull(`act_nouser_at`,0)) AS `act_nouser_at`,
+		sum(ifnull(`finish_rate`,0)) AS `finish_rate`,
+		sum(ifnull(`budget_workload`,0)) AS `budget_workload`,
+		sum(ifnull(`budget_ouser_workload`,0)) AS `budget_ouser_workload`,
+		sum(ifnull(`budget_iuser_workload`,0)) AS `budget_iuser_workload`,
+		sum(ifnull(`estimate_workload`,0)) AS `estimate_workload`,
+		sum(ifnull(`act_workload`,0)) AS `act_workload`,
+		sum(ifnull(`act_ouser_workload`,0)) AS `act_ouser_workload`,
+		sum(ifnull(`act_iuser_workload`,0)) AS `act_iuser_workload`,
+		sum(ifnull(`need_pay_cnt`,0)) AS `need_pay_cnt`,
+		sum(ifnull(`finish_pay_cnt`,0)) AS `finish_pay_cnt`,
+		sum(ifnull(`finish_pay_user_cnt`,0)) AS `finish_pay_user_cnt`,
+		sum(ifnull(`need_pay_user_cnt`,0)) AS `need_pay_user_cnt`,
+		sum(ifnull(`test_cases`,0)) AS `test_cases`,
+		sum(ifnull(`exec_cases`,0)) AS `exec_cases`,
+		sum(ifnull(`design_cases`,0)) AS `design_cases`,
+		sum(ifnull(`finish_cases`,0)) AS `finish_cases`,
+		sum(ifnull(`iteration_cnt`,0)) AS `iteration_cnt`,
+		sum(ifnull(`product_cnt`,0)) AS `product_cnt`,
+		sum(ifnull(`min_start_time`,0)) AS `min_start_time`,
+		sum(ifnull(`max_end_time`,0)) AS `max_end_time`,
+		sum(ifnull(`menu_cnt`,0)) AS `menu_cnt`,
+		sum(ifnull(`menu_finish_cnt`,0)) AS `menu_finish_cnt`,
+		sum(ifnull(`menu_exec_cnt`,0)) AS `menu_exec_cnt`,
+		sum(ifnull(`menu_unstart_cnt`,0)) AS `menu_unstart_cnt`,
+		sum(ifnull(`menu_close_cnt`,0)) AS `menu_close_cnt`,
+		sum(ifnull(`task_cnt`,0)) AS `task_cnt`,
+		sum(ifnull(`task_unstart_cnt`,0)) AS `task_unstart_cnt`,
+		sum(ifnull(`task_exec_cnt`,0)) AS `task_exec_cnt`,
+		sum(ifnull(`task_finish_cnt`,0)) AS `task_finish_cnt`,
+		sum(ifnull(`task_set_cnt`,0)) AS `task_set_cnt`,
+		sum(ifnull(`task_out_cnt`,0)) AS `task_out_cnt`,
+		sum(ifnull(`task_close_cnt`,0)) AS `task_close_cnt`,
+		sum(ifnull(`bug_cnt`,0)) AS `bug_cnt`,
+		sum(ifnull(`closed_bugs`,0)) AS `closed_bugs`,
+		sum(ifnull(`resolved_bugs`,0)) AS `resolved_bugs`,
+		sum(ifnull(`active_bugs`,0)) AS `active_bugs`,
+		sum(ifnull(`confirmed_bugs`,0)) AS `confirmed_bugs`,
+		sum(ifnull(`plan_workhours`,0)) AS `plan_workhours`,
+		sum(ifnull(`plan_worker_cnt`,0)) AS `plan_worker_cnt`,
+		sum(ifnull(`act_worker_cnt`,0)) AS `act_worker_cnt`,
+		sum(ifnull(`budget_at`,0)) AS `budget_at`,
+		sum(ifnull(`act_at`,0)) AS `act_at`,
+		sum(ifnull(`product_budget_workload`,0)) AS `product_budget_workload`,
+		sum(ifnull(`product_act_workload`,0)) AS `product_act_workload`
 		FROM
-		XM.xm_branch_state res
+		`xm_branch_state`
 	<!-- where res.biz_date = DATE_FORMAT(date_sub(now(),INTERVAL 1 DAY), '%Y-%m-%d')-->
 
 </select>
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
index 37826e3a..42b92295 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml
@@ -21,6 +21,12 @@
 	</update>
 
 
+	<select id="selectPortalProjectStates" parameterType="HashMap" resultType="HashMap">
+		select * from XM.xm_project_state res
+		<where>
+			res.calc_time > DATE_SUB(now(),INTERVAL 7 DAY)
+		</where>
+	</select>
 	<!--结束 自定义sql函数区域-->