diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index ffa2d1d8..c0340ada 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java @@ -21,9 +21,13 @@ import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermi import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO; +import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngines; import org.activiti.engine.RuntimeService; @@ -74,6 +78,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe @Resource private TaskService taskService; + @Resource + private EnterpriseStandardAuthUserService enterpriseStandardAuthUserService; + @Override public void flowStart(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { // 流程信息 @@ -127,9 +134,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe private void handleBusinessData(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply(); - if (StringUtils.isNotBlank(processEsPermissionApply.getId())){ + if (StringUtils.isNotBlank(processEsPermissionApply.getId())) { processEsPermissionApplyService.updateById(processEsPermissionApply); - }else { + } else { processEsPermissionApplyService.save(processEsPermissionApply); } } @@ -138,7 +145,7 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe Map stringObjectHashMap; stringObjectHashMap = map.entrySet().stream().map(v -> { if (v.getValue() instanceof List) { - List list = (List)v.getValue(); + List list = (List) v.getValue(); v.setValue(String.join(",", list)); } return v; @@ -183,12 +190,12 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe .eq(ProcessDraft::getUserId, loginUser.getId()) .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ + if (!processDraftList.isEmpty()) { String id = ""; - if(Objects.isNull(processAll)){ + if (Objects.isNull(processAll)) { processAll = new ProcessAll(); id = String.valueOf(SnowflakeUtils.snowflake()); - }else { + } else { id = processAll.getId(); } // 存在草稿 @@ -196,22 +203,22 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe // 属性拷贝 BeanUtils.copyProperties(processDraft, processAll); processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ + if (StringUtils.isNotBlank(processDraft.getHandleFile())) { processApprovalRecord.setCommitFile(processDraft.getHandleFile()); } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ + if (StringUtils.isNotBlank(processDraft.getHandleText())) { processApprovalRecord.setCommitText(processDraft.getHandleText()); } - if (!Objects.isNull(processDraft.getProcessDueDate())){ + if (!Objects.isNull(processDraft.getProcessDueDate())) { processAll.setDueTime(processDraft.getProcessDueDate()); } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + if (StringUtils.isNotBlank(processDraft.getProcessDescription())) { processAll.setPrcMes(processDraft.getProcessDescription()); } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ + if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())) { esPermissionApplyFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); } - }else { + } else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) @@ -253,7 +260,7 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task!= null) { + if (task != null) { // 完成任务 taskService.complete(task.getId(), map); // 处理业务表数据 @@ -265,18 +272,16 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 判断是否是最后一个节点 if (isLastNode(processAll.getProcessInstanceId()) - && map.containsKey("pass") && (boolean) map.get("pass")){ + && map.containsKey("pass") && (boolean) map.get("pass")) { // 临时权限设置 - /** - * ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId()); - * List lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList(); - * List idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); - * LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission(); - * lawsStandardTempPermission.setStandardIds(String.join(",", idList)); - * lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId()); - * lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate()); - * enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission); - */ + ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId()); + List lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList(); + List idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); + LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission(); + lawsStandardTempPermission.setStandardIds(String.join(",", idList)); + lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId()); + lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate()); + enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission); } } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index ddc291f6..a0c41ab0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -142,15 +142,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl