diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 95996c53..cf8b3148 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -183,6 +183,7 @@ public class XmTaskExecuserController { } if(user.getUserid().equals(xmTaskExecuser.getUserid())){//自己作为候选人 xmTaskExecuserService.addExecuser(xmTaskExecuser); + mkClient.pushBidsAfterBidSuccess(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); m.put("data",xmTaskExecuser); }else { boolean isPm=groupService.checkUserIsProjectAdm(xmTask.getProjectId(),user.getUserid()); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml index 0e337857..0987440b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml @@ -5,52 +5,7 @@ - - - - - insert into xm_env_list_process_approva ( - id,env_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id - ) values ( - #{id},#{envId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} - ) - - - - - update xm_env_list b ,XM.xm_env_list_process_approva pa - - pa.agree = #{agree}, - pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, - pa.task_name = #{taskName}, - pa.comment_msg = #{commentMsg}, - pa.flow_last_time = now(), - pa.event_name = #{eventName}, - pa.flow_state=#{flowState}, - b.biz_flow_state=#{bizFlowState}, - b.biz_proc_inst_id=#{bizProcInstId}, - - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.env_id - - - - update xm_env_list_process_approva pa set pa.flow_state='2' - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - - - - delete from xm_env_list - where biz_proc_inst_id=#{procInstId} - @@ -59,7 +14,7 @@ - select res.*,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_file res left join xm_file_process_approva pa on res.id=pa.file_id and res.biz_proc_inst_id=pa.proc_inst_id - + select res.* from xm_file res and id in diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml index 5bc14dc3..465bbd81 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml @@ -4,53 +4,6 @@ - - - - - - - insert into xm_project_env_list_process_approva ( - id,env_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id - ) values ( - #{id},#{envId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} - ) - - - - - update xm_project_env_list b ,XM.xm_project_env_list_process_approva pa - - pa.agree = #{agree}, - pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, - pa.task_name = #{taskName}, - pa.comment_msg = #{commentMsg}, - pa.flow_last_time = now(), - pa.event_name = #{eventName}, - pa.flow_state=#{flowState}, - b.biz_flow_state=#{bizFlowState}, - b.biz_proc_inst_id=#{bizProcInstId}, - - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.env_id - - - - update xm_project_env_list_process_approva pa set pa.flow_state='2' - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - - - - delete from xm_project_env_list - where biz_proc_inst_id=#{procInstId} - @@ -58,7 +11,7 @@ select res.project_id,res.subject_id,res.subject_name,bizz_month,sum(res.budget_cost) as budget_cost from xm_project_m_budget_cost_nouser res @@ -101,8 +59,7 @@ select res.project_id,res.userid,res.username,subject_id,subject_name,bizz_month,sum(res.budget_cost) as budget_cost from xm_project_m_budget_cost_user res @@ -105,8 +62,7 @@ SELECT @@ -101,7 +58,7 @@ - select res.*,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_m_cost_user res left join xm_project_m_cost_user_process_approva pa on res.id=pa.cost_id and res.biz_proc_inst_id=pa.proc_inst_id + select res.* from xm_project_m_cost_user res 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 e4361987..064ea3f6 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 @@ -61,48 +61,6 @@ and res.del!="1" - - insert into xm_project_process_approva ( - id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id - ) values ( - #{id},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} - ) - - - - - update xm_project b ,XM.xm_project_process_approva pa - - pa.agree = #{agree}, - pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, - pa.task_name = #{taskName}, - pa.comment_msg = #{commentMsg}, - pa.flow_last_time = now(), - pa.event_name = #{eventName}, - pa.flow_state=#{flowState}, - b.biz_flow_state=#{bizFlowState}, - b.biz_proc_inst_id=#{bizProcInstId}, - - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.project_id - - - - update xm_project_process_approva pa set pa.flow_state='2' - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - - - - delete from xm_project - where biz_proc_inst_id=#{procInstId} - diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index 88da72ff..62b0241b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -34,49 +34,6 @@ and exists (select 1 from xm_menu m where m.iteration_id=#{linkIterationId} and m.menu_id=res.menu_id) - - - insert into xm_question_process_approva ( - id,question_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id - ) values ( - #{id},#{questionId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} - ) - - - - - update xm_question b ,XM.xm_question_process_approva pa - - pa.agree = #{agree}, - pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, - pa.task_name = #{taskName}, - pa.comment_msg = #{commentMsg}, - pa.flow_last_time = now(), - pa.event_name = #{eventName}, - pa.flow_state=#{flowState}, - b.biz_flow_state=#{bizFlowState}, - b.biz_proc_inst_id=#{bizProcInstId}, - - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.question_id - - - - update xm_question_process_approva pa set pa.flow_state='2' - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - - - - delete from xm_question - where biz_proc_inst_id=#{procInstId} - update xm_question diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 266fb240..2900d2e0 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -123,49 +123,6 @@ and res.ntype='0' - - - insert into xm_task_process_approva ( - id,xm_task_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id - ) values ( - #{id},#{xmTaskId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} - ) - - - - - update xm_task b ,XM.xm_task_process_approva pa - - pa.agree = #{agree}, - pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, - pa.task_name = #{taskName}, - pa.comment_msg = #{commentMsg}, - pa.flow_last_time = now(), - pa.event_name = #{eventName}, - pa.flow_state=#{flowState}, - b.biz_flow_state=#{bizFlowState}, - b.biz_proc_inst_id=#{bizProcInstId}, - - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.xm_task_id - - - - update xm_task_process_approva pa set pa.flow_state='2' - where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - - - - delete from xm_task - where biz_proc_inst_id=#{procInstId} -