Commit 12fcc6cc authored by suhuiguang's avatar suhuiguang

1.修改下一节点无审核人时,提升内容多余显示类,需要同步升级工作流

parent 0f926ac4
...@@ -13,6 +13,8 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO; ...@@ -13,6 +13,8 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO; import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -44,8 +46,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService { ...@@ -44,8 +46,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
processTasks = Workflow.taskV2Client.startForBatch(params).getResult(); processTasks = Workflow.taskV2Client.startForBatch(params).getResult();
} catch (InnerInvokException e) { } catch (InnerInvokException e) {
//拦截无审核人异常信息 //拦截无审核人异常信息
String devMessage = e.getDevMessage(); String devMessage = getErrorMessage(e);
devMessage = devMessage.contains(";") ? devMessage.split(";")[0] : devMessage;
log.error(devMessage); log.error(devMessage);
throw new LocalBadRequest(devMessage); throw new LocalBadRequest(devMessage);
} catch (Exception e) { } catch (Exception e) {
...@@ -55,6 +56,17 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService { ...@@ -55,6 +56,17 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
return processTasks; return processTasks;
} }
private String getErrorMessage(BaseException e){
String devMessage = e.getDevMessage();
if(devMessage.contains(";")){
String tempMsg = devMessage.split(";")[0];
if(tempMsg.split(":").length > 0){
devMessage = tempMsg.split(":")[1];
}
}
return devMessage;
}
@Override @Override
public ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate) { public ProcessTaskDTO completeOrReject(String taskId, TaskResultDTO data, String operate) {
ProcessTaskDTO processTaskDTO; ProcessTaskDTO processTaskDTO;
...@@ -74,8 +86,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService { ...@@ -74,8 +86,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
} }
} catch (InnerInvokException e) { } catch (InnerInvokException e) {
//拦截无审核人异常信息 //拦截无审核人异常信息
String devMessage = e.getDevMessage(); String devMessage = getErrorMessage(e);
devMessage = devMessage.contains(";") ? devMessage.split(";")[0] : devMessage;
log.error(devMessage); log.error(devMessage);
throw new LocalBadRequest(devMessage); throw new LocalBadRequest(devMessage);
} catch (Exception e) { } catch (Exception e) {
...@@ -100,8 +111,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService { ...@@ -100,8 +111,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
processTaskDTO = Workflow.taskV2Client.assign(taskVo).getResult(); processTaskDTO = Workflow.taskV2Client.assign(taskVo).getResult();
} catch (InnerInvokException e) { } catch (InnerInvokException e) {
//拦截无审核人异常信息 //拦截无审核人异常信息
String devMessage = e.getDevMessage(); String devMessage = getErrorMessage(e);
devMessage = devMessage.contains(";") ? devMessage.split(";")[0] : devMessage;
log.error(devMessage); log.error(devMessage);
throw new LocalBadRequest(devMessage); throw new LocalBadRequest(devMessage);
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment