diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 5de473f0..ba9da356 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -323,6 +323,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl implements IProcessFbStandardConsultationService { +public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl + implements IProcessFbStandardConsultationService, WorkCenterService { @Resource private IProcessHandleService processHandleService; @@ -383,6 +387,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl() + .eq(ProcessApprovalRecord::getTaskId, taskId) + .set(ProcessApprovalRecord::getCommitFlag, null)); } /** @@ -905,4 +916,37 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl() + .eq(ProcessApprovalRecord::getProcessInstanceId, processAll.getProcessInstanceId()) + .orderByAsc(ProcessApprovalRecord::getCreateTime) + .last("limit 1")); + + // 处理业务表信息 + IProcessFbStandardPurchaseService processFbStandardPurchaseService = SpringContextUtil.getBean(IProcessFbStandardPurchaseService.class); + ProcessFbStandardPurchase processFbStandardPurchase = processFbStandardPurchaseService.getById(processAll.getProjectId()); + processFbStandardPurchase.setId(projectId); + processFbStandardPurchase.setCreateTime(new Date()); + ISysUserService sysUserService = SpringContextUtil.getBean(ISysUserService.class); + SysUser sysUser = sysUserService.getById(processApprovalRecord.getOriginUserId()); + processFbStandardPurchase.setCreateBy(sysUser.getUsername()); + processFbStandardPurchaseService.save(processFbStandardPurchase); + + ProcessDraft processDraft = new ProcessDraft(); + processDraft.setProjectId(projectId); // 业务id + processDraft.setPrcType(processAll.getPrcType()); // 流程类型 + processDraft.setUserId(processApprovalRecord.getOriginUserId()); // 用户id + // 保存草稿 + ProcessDraftService processDraftService = SpringContextUtil.getBean(ProcessDraftService.class); + processDraftService.save(processDraft); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java index 608cd961..f6072afa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java @@ -6,7 +6,11 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.UUIDUtils; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.common.entity.ProcessDraft; +import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; @@ -14,7 +18,12 @@ import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardPurchaseMapp import com.jero.modules.activiti.process.fb.service.IProcessFbStandardPurchaseService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.service.ProcessApprovalRecordService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.laws.common.util.CurrentUserUtil; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -26,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.Map; @@ -39,7 +49,8 @@ import java.util.Map; @Service @Slf4j @Transactional(rollbackFor = JeroBootException.class) -public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl implements IProcessFbStandardPurchaseService { +public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl + implements IProcessFbStandardPurchaseService, WorkCenterService { @Resource private IProcessHandleService processHandleService; @@ -188,4 +199,37 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl() + .eq(ProcessApprovalRecord::getProcessInstanceId, processAll.getProcessInstanceId()) + .orderByAsc(ProcessApprovalRecord::getCreateTime) + .last("limit 1")); + + // 处理业务表信息 + IProcessFbStandardPurchaseService processFbStandardPurchaseService = SpringContextUtil.getBean(IProcessFbStandardPurchaseService.class); + ProcessFbStandardPurchase processFbStandardPurchase = processFbStandardPurchaseService.getById(processAll.getProjectId()); + processFbStandardPurchase.setId(projectId); + processFbStandardPurchase.setCreateTime(new Date()); + ISysUserService sysUserService = SpringContextUtil.getBean(ISysUserService.class); + SysUser sysUser = sysUserService.getById(processApprovalRecord.getOriginUserId()); + processFbStandardPurchase.setCreateBy(sysUser.getUsername()); + processFbStandardPurchaseService.save(processFbStandardPurchase); + + ProcessDraft processDraft = new ProcessDraft(); + processDraft.setProjectId(projectId); // 业务id + processDraft.setPrcType(processAll.getPrcType()); // 流程类型 + processDraft.setUserId(processApprovalRecord.getOriginUserId()); // 用户id + // 保存草稿 + ProcessDraftService processDraftService = SpringContextUtil.getBean(ProcessDraftService.class); + processDraftService.save(processDraft); + } }