From 4cd28190113c0996f16af41d57ea9f46e43697c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 17 Mar 2022 02:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/xm/core/dao/XmProductStateMapper.xml   | 3 +++
 .../mybatis/mapper/xm/core/dao/XmProjectMapper.xml        | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
index 6dd8a69f..581a60d2 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml
@@ -14,6 +14,9 @@
         <if test="key != null and key !='' ">       </if>
     </sql>
 
+	<update id="loadTasksToXmProductState" parameterType="String" statementType="CALLABLE">
+		{call load_tasks_to_xm_product_state(#{productId,mode=IN})}
+	</update>
 
 	<!--结束 自定义sql函数区域-->
 	
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index c57efec7..0291e415 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -116,13 +116,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select res.*,s.project_id,s.biz_date,s.total_file_cnt,s.total_bug_cnt,s.total_task_cnt,s.total_budget_nouser_amount,s.project_name,s.total_staff_cnt,s.calc_time,s.calc_status,
-		s.total_cost_nouser_amount,s.total_closed_bug_cnt,s.total_resolved_bug_cnt,s.total_complete_task_cnt,s.total_phase_cnt,s.total_complete_phase_cnt,s.total_need_pay_amount,
-		s.total_finish_pay_amount,s.total_need_col_amount,s.total_finish_col_amount,s.total_cost_user_amount,s.total_budget_iuser_amount,s.total_plan_workload,
-		s.total_risk_cnt,s.total_complete_risk_cnt,s.branch_name,s.total_budget_ouser_amount,s.total_complete_workload,s.total_cost_iuser_amount,s.total_cost_ouser_amount,
-		s.total_progress,s.total_active_bug_cnt,s.total_confirmed_bug_cnt,s.project_status,s.total_act_workload,s.total_act_out_workload,s.total_act_inner_workload,
-		s.total_task_budget_cost_at,s.total_task_out_cnt,s.total_need_pay_cnt,s.total_finish_pay_cnt,s.total_finish_pay_user_cnt,s.total_need_pay_user_cnt,s.total_plan_iuser_workload,
-		s.total_plan_ouser_workload,s.test_cases,s.exec_cases,s.design_cases,s.finish_cases,s.iteration_cnt,s.product_cnt,s.menu_cnt,
+		select res.*,s.*,
 		pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_project res
 		left join xm_project_state s on s.project_id=res.id
 		left join  xm_project_process_approva pa on res.id=pa.project_id and res.biz_proc_inst_id=pa.proc_inst_id