diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index ffb23af..47b674a 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.business.service.impl; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import org.dromara.business.domain.BusinessTask; @@ -9,6 +10,7 @@ import org.dromara.business.domain.vo.BusinessTaskVo; import org.dromara.business.mapper.BusinessTaskMapper; import org.dromara.business.service.IBusinessTaskService; import org.dromara.common.core.constant.BusinessConstants; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -160,22 +162,21 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { @Override public Boolean updateTaskStatus(String waylineId, String status, String jobId, String jobName) { - try { - BusinessTaskVo businessTaskVo = this.queryBusinessTask(waylineId); - if(businessTaskVo != null){ - BusinessTask businessTask = new BusinessTask(); - businessTask.setId(businessTaskVo.getId()); - businessTask.setStatus(status); - if(BusinessConstants.TASK_STATUS_3.equals(status)){ - businessTask.setJobId(jobId); - businessTask.setJobName(jobName); - businessTask.setCompleteTime(new Date()); - } - this.update(businessTask); - } - } catch (Exception e) { - return false; + BusinessTaskVo businessTaskVo = this.queryBusinessTask(waylineId); + + if (ObjectUtil.isEmpty(businessTaskVo)) { + throw new ServiceException("工单不存在!"); + } + + BusinessTask businessTask = new BusinessTask(); + businessTask.setId(businessTaskVo.getId()); + businessTask.setStatus(status); + if(BusinessConstants.TASK_STATUS_3.equals(status)){ + businessTask.setJobId(jobId); + businessTask.setJobName(jobName); + businessTask.setCompleteTime(new Date()); } - return true; + + return this.update(businessTask); } }