|
|
@ -59,6 +59,7 @@ import org.springblade.system.feign.ISysClient; |
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
import org.springblade.system.user.feign.IUserClient; |
|
|
|
import org.springblade.system.user.feign.IUserClient; |
|
|
|
|
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
@ -497,6 +498,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { |
|
|
|
* @param response |
|
|
|
* @param response |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private void saveWorkTicket(WorkTicketInfoEntity workTicket, ProcessWorkFlowResponse response) { |
|
|
|
private void saveWorkTicket(WorkTicketInfoEntity workTicket, ProcessWorkFlowResponse response) { |
|
|
|
|
|
|
|
String flowTaskName = workTicket.getFlowTaskName(); |
|
|
|
String flowDescription = ""; |
|
|
|
String flowDescription = ""; |
|
|
|
//如果response.getHandleType() 是0使用户
|
|
|
|
//如果response.getHandleType() 是0使用户
|
|
|
|
if ("0".equals(response.getHandleType())) { |
|
|
|
if ("0".equals(response.getHandleType())) { |
|
|
@ -534,11 +536,12 @@ public class TicketProcessServiceImpl implements TicketProcessService { |
|
|
|
workTicket.setFlowDescription(flowDescription); |
|
|
|
workTicket.setFlowDescription(flowDescription); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//如果签发人为false
|
|
|
|
//如果签发人为false
|
|
|
|
if (workTicket.getSignFlag() != null) { |
|
|
|
if (workTicket.getSignFlag() != null) { |
|
|
|
if (!workTicket.getSignFlag()) { |
|
|
|
if (!workTicket.getSignFlag()) { |
|
|
|
workTicket.setFlowDescription("errancy"); |
|
|
|
workTicket.setFlowDescription(flowTaskName); |
|
|
|
workTicket.setFlowTaskName("errancy"); |
|
|
|
workTicket.setFlowTaskName(flowTaskName); |
|
|
|
workTicket.setNextStepOperator(" "); |
|
|
|
workTicket.setNextStepOperator(" "); |
|
|
|
workTicket.setStepOperator(" "); |
|
|
|
workTicket.setStepOperator(" "); |
|
|
|
} |
|
|
|
} |
|
|
@ -548,8 +551,8 @@ public class TicketProcessServiceImpl implements TicketProcessService { |
|
|
|
//运行人员false
|
|
|
|
//运行人员false
|
|
|
|
if (workTicket.getRecieveFlag() != null) { |
|
|
|
if (workTicket.getRecieveFlag() != null) { |
|
|
|
if (!workTicket.getRecieveFlag()) { |
|
|
|
if (!workTicket.getRecieveFlag()) { |
|
|
|
workTicket.setFlowDescription("errancy"); |
|
|
|
workTicket.setFlowDescription(flowTaskName); |
|
|
|
workTicket.setFlowTaskName("errancy"); |
|
|
|
workTicket.setFlowTaskName(flowTaskName); |
|
|
|
workTicket.setNextStepOperator(" "); |
|
|
|
workTicket.setNextStepOperator(" "); |
|
|
|
workTicket.setStepOperator(" "); |
|
|
|
workTicket.setStepOperator(" "); |
|
|
|
} |
|
|
|
} |
|
|
|