diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index c210eb36..47caa412 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -140,7 +140,7 @@ public class XmTaskExecuserService extends BaseService { XmTaskExecuser xmTaskExecuser2=new XmTaskExecuser(); xmTaskExecuser2.setId(xmTaskExecuser.getId()); xmTaskExecuser2.setStatus("7"); - this.updateSomeFieldByPk(xmTaskExecuser2); + this.updateSomeFieldByPk(xmTaskExecuser2); projectId=xmTaskExecuser.getProjectId(); taskId=xmTaskExecuser.getTaskId(); usernames.add(xmTaskExecuser.getUsername()); 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 f2e99c5d..20c6d5e9 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 @@ -118,7 +118,8 @@ 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.act_workload=e1.act_workload, + t.task_state=case when el.executor_userid is null and t.task_state='1' then '0' when el.executor_userid is not null and t.task_state='0' then '1' else t.task_state WHERE t.id = #{taskId}