diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 292ff9b8..4c45df71 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -194,9 +194,9 @@ - update xm_menu res left join (select t.menu_id, + update xm_menu_state res left join (select t.menu_id, sum(ifnull(t.budget_workload,0)) as budget_workload, - sum(ifnull(t.budget_cost,0)) as budget_cost, + sum(ifnull(t.budget_at,0)) as budget_at, sum(ifnull(t.act_workload,0)) as act_workload, sum(ifnull(t.act_cost,0)) as act_cost from xm_task t where t.menu_id in @@ -209,9 +209,9 @@ left join ( select q.menu_id, sum(ifnull(q.budget_workload,0)) as budget_workload, - sum(ifnull(q.budget_cost,0)) as budget_cost, + sum(ifnull(q.budget_at,0)) as budget_at, sum(ifnull(q.act_workload,0)) as act_workload, - sum(ifnull(q.act_cost,0)) as act_cost + sum(ifnull(q.act_at,0)) as act_at from xm_question q where q.menu_id in ( #{item}) @@ -219,7 +219,7 @@ group by q.menu_id ) as q on q.menu_id=res.menu_id set res.budget_workload=ifnull(t.budget_workload,0)+ifnull(q.budget_workload,0), - res.budget_cost=ifnull(t.budget_cost,0)+ifnull(q.budget_cost,0), + res.budget_at=ifnull(t.budget_at,0)+ifnull(q.budget_at,0), res.mact_workload=ifnull(t.act_workload,0)+ifnull(q.act_workload,0), res.mact_cost=ifnull(t.act_cost,0)+ifnull(q.act_cost,0), res.mact_rate=case when (ifnull(t.budget_workload,0)+ifnull(q.budget_workload,0) )!=0 then (ifnull(t.act_workload,0)+ifnull(q.act_workload,0))*100/(ifnull(t.budget_workload,0)+ifnull(q.budget_workload,0) ) @@ -379,7 +379,7 @@ - start_time,menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_cost,phase_id,iteration_id,calc_type,mact_workload,mact_cost,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time + start_time,menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_at,phase_id,iteration_id,calc_type,mact_workload,mact_cost,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time @@ -414,7 +414,7 @@ and res.budget_hours = #{budgetHours} and res.budget_staff_nu = #{budgetStaffNu} and res.budget_workload = #{budgetWorkload} - and res.budget_cost = #{budgetCost} + and res.budget_at = #{budgetCost} and res.phase_id = #{phaseId} and res.iteration_id = #{iterationId} and res.calc_type = #{calcType} @@ -462,7 +462,7 @@ budget_hours = #{budgetHours}, budget_staff_nu = #{budgetStaffNu}, budget_workload = #{budgetWorkload}, - budget_cost = #{budgetCost}, + budget_at = #{budgetCost}, phase_id = #{phaseId}, iteration_id = #{iterationId}, calc_type = #{calcType}, @@ -509,7 +509,7 @@ budget_hours = #{budgetHours}, budget_staff_nu = #{budgetStaffNu}, budget_workload = #{budgetWorkload}, - budget_cost = #{budgetCost}, + budget_at = #{budgetCost}, phase_id = #{phaseId}, iteration_id = #{iterationId}, calc_type = #{calcType}, @@ -557,7 +557,7 @@ budget_hours = #{item.budgetHours}, budget_staff_nu = #{item.budgetStaffNu}, budget_workload = #{item.budgetWorkload}, - budget_cost = #{item.budgetCost}, + budget_at = #{item.budgetCost}, phase_id = #{item.phaseId}, iteration_id = #{item.iterationId}, calc_type = #{item.calcType}, diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml index ed4b774d..a778cb70 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml @@ -81,8 +81,6 @@ e.username ELSE NULL END ) AS executor_username, - sum( case when e.status='3' or e.status='6' then e.settle_amount else 0 end ) as act_cost, - sum( case when e.status='3' or e.status='6' then e.settle_workload else 0 end ) as act_workload, group_concat( concat( e.userid, '(', e.STATUS, ')' ) SEPARATOR ',' ) AS exe_userids, group_concat( concat( @@ -117,8 +115,6 @@ t.exe_usernames = e1.exe_usernames, t.executor_userid = e1.executor_userid, t.executor_username = e1.executor_username, - t.act_cost=e1.act_cost, - t.act_workload=e1.act_workload, t.task_state=case when e1.executor_userid is null and t.task_state='1' then '0' when e1.executor_userid is not null and t.task_state='0' then '1' else t.task_state end WHERE t.id = #{taskId}