|
|
|
@ -653,9 +653,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
|
|
|
|
|
JSONObject variable = JSONObject.parseObject(JSON.toJSONString(variablesObj)); |
|
|
|
|
Boolean signFlag = Func.isNotEmpty(variable.getBoolean("signFlag")) ? variable.getBoolean("signFlag") : true; |
|
|
|
|
Boolean receiveFlag = Func.isNotEmpty(variable.getBoolean("recieveFlag")) ? variable.getBoolean("recieveFlag") : true; |
|
|
|
|
if(StringUtil.isNotBlank(taskId)) { |
|
|
|
|
workTicket.setFlowUserId(response.getUserId()); |
|
|
|
|
workTicket.setNextStepOperator(response.getNextStepOperator()); |
|
|
|
|
if(StringUtil.isNotBlank(taskId)) { |
|
|
|
|
String flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(response.getNextStepOperator()).concat("审批"); |
|
|
|
|
workTicket.setFlowDescription(flowDescription); |
|
|
|
|
workTicket.setFlowTaskId(taskId); |
|
|
|
@ -665,15 +665,11 @@ public class TicketProcessServiceImpl implements TicketProcessService {
|
|
|
|
|
// 作废
|
|
|
|
|
workTicket.setFlowDescription("作废"); |
|
|
|
|
workTicket.setFlowTaskName("作废"); |
|
|
|
|
workTicket.setNextStepOperator(null); |
|
|
|
|
workTicket.setStepOperator(null); |
|
|
|
|
} |
|
|
|
|
else { |
|
|
|
|
// 结束
|
|
|
|
|
workTicket.setFlowDescription("结束"); |
|
|
|
|
workTicket.setFlowTaskName("结束"); |
|
|
|
|
workTicket.setNextStepOperator(null); |
|
|
|
|
workTicket.setStepOperator(null); |
|
|
|
|
workTicket.setFlowStatus(999); |
|
|
|
|
workTicket.setImplementStatus("3"); |
|
|
|
|
} |
|
|
|
|