|
@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.dromara.common.core.domain.dto.RoleDTO;
|
|
import org.dromara.common.core.domain.dto.RoleDTO;
|
|
import org.dromara.common.core.domain.dto.UserDTO;
|
|
import org.dromara.common.core.domain.dto.UserDTO;
|
|
import org.dromara.common.core.exception.ServiceException;
|
|
import org.dromara.common.core.exception.ServiceException;
|
|
@@ -65,6 +66,7 @@ import static org.dromara.workflow.common.constant.FlowConstant.*;
|
|
*
|
|
*
|
|
* @author may
|
|
* @author may
|
|
*/
|
|
*/
|
|
|
|
+@Slf4j
|
|
@RequiredArgsConstructor
|
|
@RequiredArgsConstructor
|
|
@Service
|
|
@Service
|
|
public class ActTaskServiceImpl implements IActTaskService {
|
|
public class ActTaskServiceImpl implements IActTaskService {
|
|
@@ -227,6 +229,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
throw new ServiceException(e.getMessage());
|
|
throw new ServiceException(e.getMessage());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -475,7 +478,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
taskService.complete(newTask.getId());
|
|
taskService.complete(newTask.getId());
|
|
return true;
|
|
return true;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
throw new ServiceException(e.getMessage());
|
|
throw new ServiceException(e.getMessage());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -545,7 +548,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
taskService.setAssignee(task.getId(), transmitBo.getUserId());
|
|
taskService.setAssignee(task.getId(), transmitBo.getUserId());
|
|
return true;
|
|
return true;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
throw new ServiceException(e.getMessage());
|
|
throw new ServiceException(e.getMessage());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -593,7 +596,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
taskService.complete(newTask.getId());
|
|
taskService.complete(newTask.getId());
|
|
return true;
|
|
return true;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
throw new ServiceException(e.getMessage());
|
|
throw new ServiceException(e.getMessage());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -643,7 +646,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
taskService.complete(newTask.getId());
|
|
taskService.complete(newTask.getId());
|
|
return true;
|
|
return true;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
throw new ServiceException(e.getMessage());
|
|
throw new ServiceException(e.getMessage());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -723,6 +726,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
//删除驳回后的流程节点
|
|
//删除驳回后的流程节点
|
|
wfTaskBackNodeService.deleteBackTaskNode(processInstanceId, backProcessBo.getTargetActivityId());
|
|
wfTaskBackNodeService.deleteBackTaskNode(processInstanceId, backProcessBo.getTargetActivityId());
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
throw new ServiceException(e.getMessage());
|
|
throw new ServiceException(e.getMessage());
|
|
}
|
|
}
|
|
return task.getProcessInstanceId();
|
|
return task.getProcessInstanceId();
|
|
@@ -743,6 +747,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
taskService.setAssignee(task.getId(), userId);
|
|
taskService.setAssignee(task.getId(), userId);
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
+ log.error("修改失败:" + e.getMessage(), e);
|
|
throw new ServiceException("修改失败:" + e.getMessage());
|
|
throw new ServiceException("修改失败:" + e.getMessage());
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|