diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java index 58f59345..7e815f3d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java @@ -65,7 +65,7 @@ public class ProcessAspect { public void processServiceFlowReject() { } - @Before("processServiceFlowApproval() || processServiceFlowTransfer() || processServiceFlowReject()") + @Before("processServiceFlowApproval() || processServiceFlowReject()") @Order(1) public void doBefore(JoinPoint jp) { log.info("==========流程合法性校验前置方法开始=========="); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/EsDeclareFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/EsDeclareFlowController.java index e7b79511..13d8230a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/EsDeclareFlowController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/EsDeclareFlowController.java @@ -12,9 +12,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.TaskService; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; + /** * @ClassName: EsDeclareController * @Description: @@ -32,6 +35,8 @@ public class EsDeclareFlowController { public EsDeclareFlowController(IEsDeclareFlowService esDeclareFlowService) { this.esDeclareFlowService = esDeclareFlowService; } + @Resource + private TaskService taskService; /** * 标准宣贯流程-生成项目id diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java index 4b813853..1e7e5836 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java @@ -115,6 +115,7 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { processApprovalRecord.setUserId(loginUser.getId()); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 12afe7a2..3a09a2a4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -137,6 +137,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { processApprovalRecord.setUserId(loginUser.getId()); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); @@ -189,7 +190,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { // 流程总表信息 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue())); + processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT.getValue())); ProcessDraft processDraft = new ProcessDraft(); // 属性拷贝 BeanUtils.copyProperties(processAll, processDraft); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java index 288547e8..14bf1ff9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -204,7 +204,10 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl() .eq(LawsEnterpriseStandard::getStandardNumber, enterpriseStandardInspect.getInspectNo()), false); if (!Objects.isNull(lawsEnterpriseStandard)){ - List list = ossFileService.list(new LambdaQueryWrapper().eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId())); + List list = ossFileService.list( + new LambdaQueryWrapper() + .eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId()) + .orderByDesc(OSSFile::getCreateTime)); // 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 if (!list.isEmpty()){ String[] fileTypeArr = {FieldCommon.FILE_PUBLISH_OF_ORIGINAL, FieldCommon.FILE_MODIFICATION_LIST, @@ -214,7 +217,7 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl fileType.equals(v.getStandardFileType())).findFirst() .ifPresent(ossFile::set); - if (!Objects.isNull(ossFile.get())){ + if (!Objects.isNull(ossFile.get()) && StringUtils.isNotBlank(ossFile.get().getId())){ return ossFile.get(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index 9e18372b..4e5d4bba 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -107,6 +107,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF processApprovalRecord.setUserId(loginUser.getId()); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); @@ -144,7 +145,7 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF // 流程总表信息 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue())); + processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_DELAY_APPLY.getValue())); ProcessDraft processDraft = new ProcessDraft(); // 属性拷贝 BeanUtils.copyProperties(processAll, processDraft); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 17343247..10d3e813 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.esinspectplan.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -36,6 +37,7 @@ import org.activiti.engine.*; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -129,6 +131,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { processApprovalRecord.setUserId(loginUser.getId()); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); @@ -245,6 +248,19 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) , false); } + if (StringUtils.isNotBlank(taskId)){ + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + if (EsInspectPlanCommon.PROCESS_NODE_3.equals(task.getTaskDefinitionKey())){ + Object obj = taskService.getVariable(taskId, "involveList"); + List involveList = JSON.parseObject(JSON.toJSONString(obj), List.class); + if (!CollectionUtils.isEmpty(involveList)){ + HashMap stringObjectHashMap = new HashMap<>(); + String join = String.join(",", involveList); + esInspectPlanFlowVO.setCountersign(join); + esInspectPlanFlowVO.setCountersignDictText(sysUserService.dictByIdsOrUserNames(join, "")); + } + } + } esInspectPlanFlowVO.setProcessAll(processAll); esInspectPlanFlowVO.setProcessApprovalRecord(processApprovalRecord); return esInspectPlanFlowVO; @@ -303,8 +319,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task != null) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java index 8c0da383..16610516 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java @@ -30,4 +30,16 @@ public class EsInspectPlanFlowVO { /**map*/ @ApiModelProperty(value = "map") private Map map; + + /** + * 会签人员 + */ + @ApiModelProperty(value="会签人员") + private String countersign; + + /** + * 会签人员 翻译 + */ + @ApiModelProperty(value="会签人员 翻译") + private String countersignDictText; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index d558f983..e35b7e7e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -111,6 +111,7 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer // 更新流程审批信息 processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.INCOMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); 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 7ef78446..3f647e4c 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 @@ -114,6 +114,7 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe processApprovalRecord.setUserId(loginUser.getId()); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index 957eb8e2..2aad324b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java @@ -117,6 +117,7 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { processApprovalRecord.setUserId(loginUser.getId()); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecord.setEndTime(new Date()); processApprovalRecordService.update(processApprovalRecord, new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId()));