diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 45aba42baeb527fbfa418ba59e4157c16e9b6d0d..00e6c228b49c852c1d14100d0ddde51bca40d12e 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -174,8 +174,6 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { int updateProcessTaskStepUserStatus(ProcessTaskStepUserVo processTaskStepUserVo); - int updateProcessTaskStepMajorUserUserTypeAndStatus(ProcessTaskStepUserVo processTaskStepUserVo); - int updateProcessTaskTitleOwnerPriorityUuid(ProcessTaskVo processTaskVo); int updateProcessTaskStepWorkerUuid(ProcessTaskStepWorkerVo processTaskStepWorkerVo); diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java index d1ffb85bfff88c4e5395e9d0c01c762d17b9b307..427fd0c0403bf4beaa3692d7d7d3adaeb254c00f 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -384,16 +384,13 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { if (changeMajorUser) { oldUserVo.setUserType(ProcessTaskStepUserType.HISTORY_MAJOR.getValue()); oldUserVo.setStatus(ProcessTaskStepUserStatus.DONE.getValue()); - int count = processTaskCrossoverMapper.updateProcessTaskStepMajorUserUserTypeAndStatus(oldUserVo); - System.out.println("count = " + count); - List processTaskStepUserList = processTaskCrossoverMapper.getProcessTaskStepUserListByProcessTaskIdList(Collections.singletonList(currentProcessTaskStepVo.getProcessTaskId())); - System.out.println("processTaskStepUserList = " + JSONObject.toJSONString(processTaskStepUserList)); - } else { - ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); - processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); - processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue());// 只删除主处理人人 - processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); + oldUserVo.setEndTime(new Date()); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepUser(oldUserVo); } + ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); + processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); + processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue());// 只删除主处理人 + processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); } /* 当只分配到一个用户时,自动设置为处理人,不需要抢单 **/ if (workerSet.size() == 1 && autoStart == 1) { @@ -1712,7 +1709,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 更新处理人状态 **/ oldUser.setUserType(ProcessTaskStepUserType.HISTORY_MAJOR.getValue()); oldUser.setStatus(ProcessTaskStepUserStatus.TRANSFERRED.getValue()); - processTaskCrossoverMapper.updateProcessTaskStepMajorUserUserTypeAndStatus(oldUser); + oldUser.setEndTime(new Date()); + processTaskCrossoverMapper.insertIgnoreProcessTaskStepUser(oldUser); if (workerUserUuidList.contains(oldUser.getUserUuid())) { String userName = oldUser.getUserName(); if (StringUtils.isBlank(userName)) { @@ -1725,10 +1723,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } /* 清空user表 **/ -// ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); -// processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); -// processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue()); -// processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); + ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); + processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); + processTaskStepUserVo.setUserType(ProcessUserType.MAJOR.getValue()); + processTaskCrossoverMapper.deleteProcessTaskStepUser(processTaskStepUserVo); } /* 保存描述内容 **/