|
|
|
@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
|
|
import org.dromara.common.core.exception.ServiceException;
|
|
|
|
|
import org.dromara.common.core.utils.StreamUtils;
|
|
|
|
@ -66,6 +67,7 @@ import static org.dromara.workflow.common.constant.FlowConstant.*;
|
|
|
|
|
*
|
|
|
|
|
* @author may
|
|
|
|
|
*/
|
|
|
|
|
@Slf4j
|
|
|
|
|
@RequiredArgsConstructor
|
|
|
|
|
@Service
|
|
|
|
|
public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
@ -230,6 +232,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -478,7 +481,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
taskService.complete(newTask.getId());
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -548,7 +551,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
taskService.setAssignee(task.getId(), transmitBo.getUserId());
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -596,7 +599,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
taskService.complete(newTask.getId());
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -646,7 +649,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
taskService.complete(newTask.getId());
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -726,6 +729,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
//删除驳回后的流程节点
|
|
|
|
|
wfTaskBackNodeService.deleteBackTaskNode(processInstanceId, backProcessBo.getTargetActivityId());
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
return task.getProcessInstanceId();
|
|
|
|
@ -746,6 +750,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
|
taskService.setAssignee(task.getId(), userId);
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
throw new ServiceException("修改失败:" + e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|