task_order

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)

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -473,10 +473,9 @@
         <set>
             <include refid="someFieldSet"/>
 			<if test="taskState!=null and taskState!=''">
-				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
 			</if>
         </set>
         where  (id) in