From ced8f45c3e59e4fdee2001f53efa101fdbd23a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 6 Jul 2022 17:58:10 +0800 Subject: [PATCH] task_order --- .../mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml | 2 +- .../resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) 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 ce060d25..a8186717 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 @@ -89,7 +89,7 @@ t.bid_step= case when t.crowd='0' then t.bid_step when t.crowd='1' and t.estate in('0','4') and e1.executor_userid is not null and t.bid_step in('0','1','2','3') then '4' - when t.crowd='1' and t.estate ='2' and e1.executor_userid is not and t.bid_step in('0','1','2','3','4') then '5' + when t.crowd='1' and t.estate ='2' and e1.executor_userid is not null and t.bid_step in('0','1','2','3','4') then '5' when t.crowd='1' and e1.executor_userid is null and t.task_state in('0') then '2' else t.bid_step end, t.quote_final_at=ifnull(e1.quote_amount,t.quote_final_at) 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 b5bc0b41..8158a01e 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 @@ -473,10 +473,9 @@ - res.rate=case when res.task_state in('2','3','4') then 100 - when res.budget_workload>0 then ifnull(res.act_workload,0)*100/ res.budget_workload - when res.act_workload>0 then 100 - else res.rate end + bid_step=case when crowd='1' and #{taskState}='2' and bid_step in('5') then '6' + when crowd='1' and #{taskState} in('0','1') and bid_step in('6') then '5' + else bid_step end where (id) in