diff --git a/db/es_index.josn b/db/es_index.json similarity index 100% rename from db/es_index.josn rename to db/es_index.json diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java deleted file mode 100644 index 3e52c3bf..00000000 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/PushWorkflowIntegrationAPI.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jero.common.api; - - -import com.jero.common.api.dto.message.HiworkTodoAdd; - -import java.util.List; - -/** - * @Author: liao - * @Date: 2023/10/27 15:15 - * @Description: 发送消息 - */ -public interface PushWorkflowIntegrationAPI { - - /** - * @Author: liao - * @Date: 2023/10/13 15:12 - * @Description: 统一待办集成 - **/ - void sendTodoTask(List hiworkTodoAddList); - - void sendActivityComplete(List processInstanceId); - - void sendDeleteTask(List todoAddList); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index 3d4547d7..e5bccac5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -6,7 +6,6 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.api.PushWorkflowIntegrationAPI; import com.jero.common.api.dto.message.HiworkTodoAdd; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.vo.LoginUser; @@ -160,13 +159,13 @@ public class MyGlobalEventListener implements ActivitiEventListener { processAllService.update(updateWrapper); // 对接统一平台生成待办任务 - PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class); +// PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class); List list = new ArrayList<>(); HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd(); hiworkTodoAdd.setRecordId(approvalRecord.getId()); hiworkTodoAdd.setProcessDefinitionId(processDefinitionId); list.add(hiworkTodoAdd); - pushWorkflowIntegrationAPI.sendTodoTask(list); +// pushWorkflowIntegrationAPI.sendTodoTask(list); } private void taskAssigned(ActivitiEvent event) { @@ -189,24 +188,24 @@ public class MyGlobalEventListener implements ActivitiEventListener { if (!Objects.equals(assignee,userId)) { log.info("由"+userId+"转办给"+assignee); // 对接统一平台生成完成任务 - PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class); +// PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class); List list = new ArrayList<>(); HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd(); hiworkTodoAdd.setRecordId(approvalRecord.getId()); hiworkTodoAdd.setType("2"); hiworkTodoAdd.setProcessDefinitionId(processDefinitionId); list.add(hiworkTodoAdd); - pushWorkflowIntegrationAPI.sendTodoTask(list); +// pushWorkflowIntegrationAPI.sendTodoTask(list); // 对接统一平台生成办结 - pushWorkflowIntegrationAPI.sendActivityComplete(list); +// pushWorkflowIntegrationAPI.sendActivityComplete(list); // 生成被转办人的待办 list.clear(); hiworkTodoAdd.setToUserId(assignee); hiworkTodoAdd.setType("1"); list.add(hiworkTodoAdd); - pushWorkflowIntegrationAPI.sendTodoTask(list); +// pushWorkflowIntegrationAPI.sendTodoTask(list); } } @@ -284,16 +283,16 @@ public class MyGlobalEventListener implements ActivitiEventListener { processAllService.update(updateWrapper); // 对接统一平台生成完成任务 - PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class); +// PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class); List list = new ArrayList<>(); HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd(); hiworkTodoAdd.setRecordId(approvalRecord.getId()); hiworkTodoAdd.setProcessDefinitionId(processDefinitionId); list.add(hiworkTodoAdd); - pushWorkflowIntegrationAPI.sendTodoTask(list); +// pushWorkflowIntegrationAPI.sendTodoTask(list); // 对接统一平台生成办结 - pushWorkflowIntegrationAPI.sendActivityComplete(list); +// pushWorkflowIntegrationAPI.sendActivityComplete(list); } private void activityComplete(ActivitiEvent event) { 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 deleted file mode 100644 index 4f6ab717..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ /dev/null @@ -1,379 +0,0 @@ -package com.jero.modules.activiti.process.aspect; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.entity.ProcessNode; -import com.jero.modules.activiti.enums.CommitFlagEnum; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessTypeEnum; -import com.jero.modules.activiti.enums.VariableTypeEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; -import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.activiti.service.ProcessNodeService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.activiti.bpmn.model.Process; -import org.activiti.bpmn.model.UserTask; -import org.activiti.engine.HistoryService; -import org.activiti.engine.RepositoryService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.history.HistoricProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; -import org.springframework.beans.BeanUtils; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; - -/** - * @ClassName: 流程aop - * @Description: - * @Author: yjz - * @Date: 2023-12-07 15:45 - * @Version: 1.0 - **/ -@Aspect -@Component -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -public class ProcessAspect { - @Resource - private TaskService taskService; - @Resource - private HistoryService historyService; - @Resource - private RepositoryService repositoryService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private ProcessDraftService processDraftService; - @Resource - private RuntimeService runtimeService; - @Resource - private ProcessAllService processAllService; - @Resource - private ProcessNodeService processNodeService; - private static final String PROCESS_ALL = "processAll"; - private static final List SPECIAL_NODE = Arrays.asList(EsInspectPlanCommon.PROCESS_NODE_3); - private static final String SAVE_BY_DRAFT = "2"; - /** - * 强制撤回 - */ - private static final String REVOCATION = "3"; - - - // 流程发起 - @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowStart(..))") - public void processServiceFlowStart() { - } - - // 流程保存 - @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowSave(..))") - public void processServiceFlowSave() { - } - - // 流程审批 - @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowApproval(..))") - public void processServiceFlowApproval() { - } - - // 流程转办 - @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowTransfer(..))") - public void processServiceFlowTransfer() { - } - - // 流程驳回 - @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowReject(..))") - public void processServiceFlowReject() { - } - - @Before("processServiceFlowApproval() || processServiceFlowReject()") - public void doBefore(JoinPoint jp) { - log.info("==========流程合法性校验前置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); - Object object = map.get(PROCESS_ALL); - ProcessAll processAll = JSON.parseObject(JSON.toJSONString(object), ProcessAll.class); - if (checkTaskExistence(processAll.getTaskId())){ - if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ - throw new JeroBootException("任务不存在!"); - }else { - throw new JeroBootException("The task does not exist!"); - } - } - - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (!getTaskAssignee(processAll.getTaskId()).equals(loginUser.getId())){ - if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ - throw new JeroBootException("非当前节点处理人!"); - }else { - throw new JeroBootException("Not the current node processor!"); - } - } - } - log.info("==========流程合法性校验前置方法结束=========="); - } - - @Before("processServiceFlowReject()") - public void doBeforeCountersignReject(JoinPoint jp){ - log.info("==========流程会签节点驳回一票否决前置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); - Object object = map.get(PROCESS_ALL); - ProcessAll processAll = JSON.parseObject(JSON.toJSONString(object), ProcessAll.class); - - Object objectMap = map.get("map"); - Map stringObjectMap = JSON.parseObject(JSON.toJSONString(objectMap), Map.class); - - if ((stringObjectMap.containsKey("pass") && !(boolean) stringObjectMap.get("pass")) && isMultiTask(processAll.getTaskId())){ - // 所有会签人数 - Integer all = (Integer) taskService.getVariable(processAll.getTaskId(), "nrOfInstances"); - taskService.setVariable(processAll.getTaskId(), "nrOfCompletedInstances", all); - // 其他会签人员审批信息，更新状态为未处理 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getProcessInstanceId, processAll.getProcessInstanceId()) - .eq(ProcessApprovalRecord::getNodeId, processAll.getNodeId()) - .isNull(ProcessApprovalRecord::getEndTime) - .ne(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, CommitFlagEnum.UNDISPOSED.getName()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.SUSPEND.getValue())); - } - } - log.info("==========流程会签节点驳回一票否决前置方法结束=========="); - } - - @AfterReturning("processServiceFlowReject()") - @Order(1) - public void doAfter(JoinPoint jp) { - log.info("==========流程驳回，若驳回到的节点之前经过转办，则驳回到转办人手里后置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); - Object object = map.get(PROCESS_ALL); - ProcessAll processAll = JSON.parseObject(JSON.toJSONString(object), ProcessAll.class); - - Object objectMap = map.get("map"); - Map stringObjectMap = JSON.parseObject(JSON.toJSONString(objectMap), Map.class); - // 特殊节点排除 - if ((stringObjectMap.containsKey("pass") && !(boolean) stringObjectMap.get("pass")) && !SPECIAL_NODE.contains(processAll.getNodeId())){ - // 驳回的节点 - List processApprovalRecordList = processApprovalRecordService.list( - new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProcessInstanceId, processAll.getProcessInstanceId()) - .orderByDesc(ProcessApprovalRecord::getCreateTime)); - if (!processApprovalRecordList.isEmpty()){ - ProcessApprovalRecord processApprovalRecord = processApprovalRecordList.get(0); - processApprovalRecordList.remove(0); - Optional optional = processApprovalRecordList.stream().filter(v -> - v.getTaskName().equals(processApprovalRecord.getTaskName()) - && v.getNodeId().equals(processApprovalRecord.getNodeId())).findFirst(); - optional.ifPresent(v -> { - // 是否转办过 - if (StringUtils.isNotBlank(v.getTransferBy())){ - // 转办给转办人 - taskService.setAssignee(processApprovalRecord.getTaskId(), v.getUserId()); - // 更新流程审批记录表 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processApprovalRecord.getTaskId()) - .set(ProcessApprovalRecord::getUserId, v.getUserId()) - .set(ProcessApprovalRecord::getOriginUserId, v.getUserId())); - } - }); - } - } - } - log.info("==========流程驳回，若驳回到的节点之前经过转办，则驳回到转办人手里后置方法结束=========="); - } - - @AfterReturning("processServiceFlowSave() || processServiceFlowStart()") - public void doAfterFlowSave(JoinPoint jp) { - log.info("==========流程保存到草稿后置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); - Object processApprovalRecordObject = map.get("processApprovalRecord"); - String infoJsonStr = String.valueOf(map.get("infoJsonStr")); - String saveSource = String.valueOf(map.get("saveSource")); - Object processAllObject = map.get(PROCESS_ALL); - if (!Objects.isNull(processApprovalRecordObject) && !Objects.isNull(processAllObject)){ - ProcessApprovalRecord processApprovalRecord = JSON.parseObject(JSON.toJSONString(processApprovalRecordObject), ProcessApprovalRecord.class); - ProcessAll processAll = JSON.parseObject(JSON.toJSONString(processAllObject), ProcessAll.class); - if (StringUtils.isBlank(processAll.getNodeId()) || SAVE_BY_DRAFT.equals(saveSource)){ - ProcessDraft processDraft = new ProcessDraft(); - setProperty(loginUser, infoJsonStr, processApprovalRecord, processAll, processDraft); - // 删除旧草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); - - // 保存新草稿(强制撤回用) - processDraft.setId(String.valueOf(SnowflakeUtils.snowflake())); - processDraft.setSaveSource(REVOCATION); - processDraft.setInfoJsonStr(processDraft.getInfoJsonStr().replaceFirst("\\{", "{\"revocation\": true,")); - processDraftService.save(processDraft); - - if (jp.getSignature().getName().equals("flowStart")){ - // 发起后删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, REVOCATION) - .or().isNull(ProcessDraft::getSaveSource))); - } - } - } - } - log.info("==========流程保存到草稿后置方法结束=========="); - } - - @AfterReturning("processServiceFlowStart() || processServiceFlowApproval() || processServiceFlowReject()") - public void doAfterRemoveDraft(JoinPoint jp) { - log.info("==========流程发起、审批、驳回。删除草稿后置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); - Object object = map.get(PROCESS_ALL); - if (!Objects.isNull(object)){ - // 发起、审批、驳回 - ProcessAll processAll = JSON.parseObject(JSON.toJSONString(object), ProcessAll.class); - // 删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, REVOCATION) - .or().isNull(ProcessDraft::getSaveSource))); - } - } - log.info("==========流程发起、审批、驳回。删除草稿后置方法结束=========="); - } - - - @AfterReturning("processServiceFlowTransfer()") - public void doAfterFlowTransfer(JoinPoint jp) { - log.info("==========流程转办后置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - String taskId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), String.class); - String toUserId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[1]), String.class); - ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); - String processInstanceId = processApprovalRecord.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - TaskService taskService = SpringContextUtil.getBean(TaskService.class); - Task task = taskService.createTaskQuery().taskId(processApprovalRecord.getTaskId()).singleResult(); - // 查询节点信息 - ProcessNode processNode = processNodeService.getOne( - new LambdaQueryWrapper() - .eq(ProcessNode::getProcessDefinitionId, processAll.getProcessDefinitionId()) - .eq(ProcessNode::getXmlNodeId, processApprovalRecord.getNodeId())); - if (!Objects.isNull(processNode) && VariableTypeEnum.STRING.getName().equals(processNode.getVariableType())){ - runtimeService.setVariable(task.getExecutionId(), processNode.getVariableName(), toUserId); - } - // 稽查延期申请流程 稽查联络人评估 节点特殊处理 - if (ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue().equals(processAll.getPrcType()) - && EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processApprovalRecord.getNodeId())){ - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class); - processEsInspectDelayApplyService.update( - new LambdaUpdateWrapper() - .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()) - .eq(ProcessEsInspectDelayApply::getLiaisons, loginUser.getId()) - .set(ProcessEsInspectDelayApply::getLiaisons, toUserId)); - } - } - log.info("==========流程转办后置方法结束=========="); - } - - private static void setProperty(LoginUser loginUser, String infoJsonStr, ProcessApprovalRecord processApprovalRecord, ProcessAll processAll, ProcessDraft processDraft) { - // 属性拷贝 - BeanUtils.copyProperties(processAll, processDraft); - processDraft.setCreateBy(""); - processDraft.setId(""); - processDraft.setUpdateBy(""); - Date date = new Date(); - if (Objects.isNull(processAll.getCreateTime())){ - processDraft.setCreateTime(date); - }else { - processDraft.setCreateTime(processAll.getCreateTime()); - } - processDraft.setUpdateBy(""); - processDraft.setUpdateTime(date); - // 保存草稿表 - if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){ - processDraft.setHandleFile(processApprovalRecord.getCommitFile()); - } - if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ - processDraft.setHandleText(processApprovalRecord.getCommitText()); - } - if (!Objects.isNull(processAll.getDueTime())){ - processDraft.setProcessDueDate(processAll.getDueTime()); - } - if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(processAll.getPrcMes())){ - processDraft.setProcessDescription(processAll.getPrcMes()); - } - if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(infoJsonStr)){ - processDraft.setInfoJsonStr(infoJsonStr); - } - processDraft.setUserId(loginUser.getId()); - } - - /** - * 是否会签节点 - * @param taskId - * @return - */ - public boolean isMultiTask(String taskId){ - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .taskId(taskId) - .singleResult(); - // 获取流程实例对象 - HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() - .processInstanceId(task.getProcessInstanceId()) - .singleResult(); - // 获取流程定义对象，主要用于判断流程任务结点是否为会签结点 - Process process = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId()) - .getProcessById(historicProcessInstance.getProcessDefinitionKey()); - // 获取当前任务结点 - Optional userTask = process.getFlowElements().stream() - .filter(flowElement -> task.getTaskDefinitionKey().equals(flowElement.getId())) - .map(UserTask.class::cast) - .findAny(); - return userTask.isPresent() && !Objects.isNull(userTask.get().getLoopCharacteristics()); - } - - public boolean checkTaskExistence(String taskId) { - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - return Objects.isNull(task); - } - - public String getTaskAssignee(String taskId) { - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - return task.getAssignee(); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 82a513c4..8a20eae1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -1,12 +1,10 @@ package com.jero.modules.activiti.process.common.service; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.CommitFlagEnum; @@ -17,14 +15,8 @@ import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.entity.StandTypeVO; import com.jero.modules.activiti.process.common.enums.StandardStateEnum; -import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; -import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; -import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; @@ -40,7 +32,6 @@ import org.activiti.engine.runtime.Execution; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; -import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -77,9 +68,6 @@ public class ActFlowCommonService { @Resource private ProcessDraftService processDraftService; - @Resource - private IProcessHandleService processHandleService; - @Resource private ILawsEnterpriseStandardService esService; @@ -249,7 +237,6 @@ public class ActFlowCommonService { * 转办 */ public void transfer(String taskId, String toUserId) { - processHandleService.transfer(taskId, toUserId); } /** @@ -484,56 +471,15 @@ public class ActFlowCommonService { * @param jsonData */ public void saveFirstNodeDraft(CommonVO common, ProcessTypeEnum processTypeEnum, Object data) { - ProcessInfoVO processInfoVo = this.getProcessInfoVo(common, processTypeEnum, data); - processHandleService.saveToDraft(processInfoVo); + } public void saveFirstNodeDraft(CommonVO common, ProcessTypeEnum processTypeEnum, String jsonData) { - ProcessInfoVO processInfoVo = this.getProcessInfoVo(common, processTypeEnum, jsonData); - processHandleService.saveToDraft(processInfoVo); + } public void saveFirstNodeDraftCustomUserId(CommonVO common, ProcessTypeEnum processTypeEnum, String jsonData, String userId) { - ProcessInfoVO processInfoVo = this.getProcessInfoVo(common, processTypeEnum, jsonData); - processHandleService.saveToDraftCustomUserId(processInfoVo, userId); - } - private ProcessInfoVO getProcessInfoVo(CommonVO common, ProcessTypeEnum processTypeEnum, Object data) { - // 将archiveData转为Json - String dataJson = JSON.toJSONString(data); - ProcessInfoVO processInfoVO = new ProcessInfoVO<>(); - processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); - BasicTaskInfoDTO basicTaskInfoDTO = new BasicTaskInfoDTO(); - basicTaskInfoDTO.setHandleFile(common.getCommitFile()); - basicTaskInfoDTO.setHandleText(common.getCommitText()); - BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessName(common.getPrcName()); - basicProcessInfoDTO.setProcessDescription(common.getPrcMes()); - basicProcessInfoDTO.setProcessType(processTypeEnum.getValue()); - basicProcessInfoDTO.setProcessDueDate(common.getDueTime()); - basicProcessInfoDTO.setProcessInstanceId(common.getProcessInstanceId()); - processInfoVO.setInfoJsonStr(dataJson); - processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); - processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); - return processInfoVO; - } - - private ProcessInfoVO getProcessInfoVo(CommonVO common, ProcessTypeEnum processTypeEnum, String jsonData) { - ProcessInfoVO processInfoVO = new ProcessInfoVO<>(); - processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); - BasicTaskInfoDTO basicTaskInfoDTO = new BasicTaskInfoDTO(); - basicTaskInfoDTO.setHandleFile(common.getCommitFile()); - basicTaskInfoDTO.setHandleText(common.getCommitText()); - BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessName(common.getPrcName()); - basicProcessInfoDTO.setProcessDescription(common.getPrcMes()); - basicProcessInfoDTO.setProcessType(processTypeEnum.getValue()); - basicProcessInfoDTO.setProcessDueDate(common.getDueTime()); - basicProcessInfoDTO.setProcessInstanceId(common.getProcessInstanceId()); - processInfoVO.setInfoJsonStr(jsonData); - processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); - processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); - return processInfoVO; } public void checkStandardState(String standardId) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java deleted file mode 100644 index 0e994d2c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.common; - -/** - * @ClassName: EsDeclareCommon - * @Description: - * @Author: yjz - * @Date: 2023-11-30 09:56 - * @Version: 1.0 - **/ -public class EsDeclareCommon { - private EsDeclareCommon(){ - } - - /** - * 标准宣贯流程key - */ - public static final String KEY = "standard_declare"; - - /** - * 标准宣贯流程name - */ - public static final String NAME = "标准宣贯流程"; - - /** - * 标准宣贯流程节点: 1:发起人发起 - */ - public static final String PROCESS_NODE_1 = "initiator_start"; -} 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 deleted file mode 100644 index 13d8230a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/EsDeclareFlowController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.esdeclare.service.IEsDeclareFlowService; -import com.jero.modules.activiti.process.esdeclare.vo.EsDeclareFlowVO; -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: - * @Author: yjz - * @Date: 2023-11-30 09:58 - * @Version: 1.0 - **/ -@Api(tags="标准宣贯流程") -@RestController -@RequestMapping("/esinspect/esDeclareFlowController") -@Slf4j -public class EsDeclareFlowController { - private final IEsDeclareFlowService esDeclareFlowService; - - public EsDeclareFlowController(IEsDeclareFlowService esDeclareFlowService) { - this.esDeclareFlowService = esDeclareFlowService; - } - @Resource - private TaskService taskService; - - /** - * 标准宣贯流程-生成项目id - * @return 项目id - */ - @AutoLog(value = "标准宣贯流程-生成项目id") - @ApiOperation(value="标准宣贯流程-生成项目id", notes="标准宣贯流程-生成项目id") - @GetMapping(value = "/getProjectId") - public String getProjectId() { - return String.valueOf(SnowflakeUtils.snowflake()); - } - - /** - * 标准宣贯流程-流程发起 - * @param esDeclareFlowVO 标准宣贯流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "标准宣贯流程-流程发起") - @ApiOperation(value="标准宣贯流程-流程发起", notes="标准宣贯流程-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody EsDeclareFlowVO esDeclareFlowVO) { - esDeclareFlowService.flowStart(esDeclareFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 标准宣贯流程-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "标准宣贯流程-办理详情") - @ApiOperation(value="标准宣贯流程-办理详情", notes="标准宣贯流程-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(esDeclareFlowService.queryDetailByProjectId(projectId, taskId)); - } - - - /** - * 标准宣贯流程-流程保存 - * @param esDeclareFlowVO 标准宣贯流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "标准宣贯流程-流程保存") - @ApiOperation(value="标准宣贯流程-流程保存", notes="标准宣贯流程-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody EsDeclareFlowVO esDeclareFlowVO) { - esDeclareFlowService.flowSave(esDeclareFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java deleted file mode 100644 index 446cbb31..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; -import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 标准宣贯业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Api(tags="标准宣贯业务表") -@RestController -@RequestMapping("/esdeclare/processEsDeclare") -@Slf4j -public class ProcessEsDeclareController extends JeroController { - @Autowired - private IProcessEsDeclareService processEsDeclareService; - - /** - * 分页列表查询 - * - * @param processEsDeclare - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "标准宣贯业务表-分页列表查询") - @ApiOperation(value="标准宣贯业务表-分页列表查询", notes="标准宣贯业务表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessEsDeclare processEsDeclare, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = processEsDeclareService.queryPage(processEsDeclare, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processEsDeclare - * @param req - * @return - */ - @AutoLog(value = "标准宣贯业务表-列表查询") - @ApiOperation(value="标准宣贯业务表-列表查询", notes="标准宣贯业务表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessEsDeclare processEsDeclare, HttpServletRequest req) { - List list = processEsDeclareService.queryList(processEsDeclare, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processEsDeclare - * @return - */ - @AutoLog(value = "标准宣贯业务表-添加") - @ApiOperation(value="标准宣贯业务表-添加", notes="标准宣贯业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsDeclare processEsDeclare) { - processEsDeclareService.add(processEsDeclare); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processEsDeclare - * @return - */ - @AutoLog(value = "标准宣贯业务表-编辑") - @ApiOperation(value="标准宣贯业务表-编辑", notes="标准宣贯业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsDeclare processEsDeclare) { - processEsDeclareService.editById(processEsDeclare); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准宣贯业务表-通过id删除") - @ApiOperation(value="标准宣贯业务表-通过id删除", notes="标准宣贯业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processEsDeclareService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准宣贯业务表-批量删除") - @ApiOperation(value="标准宣贯业务表-批量删除", notes="标准宣贯业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processEsDeclareService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "标准宣贯业务表-通过id查询") - @ApiOperation(value="标准宣贯业务表-通过id查询", notes="标准宣贯业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessEsDeclare processEsDeclare = processEsDeclareService.queryById(id); - if(processEsDeclare==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsDeclare); - } - - /** - * 通过项目id查询 - * - * @param projectId - * @return - */ - @AutoLog(value = "标准宣贯业务表-通过项目id查询") - @ApiOperation(value="标准宣贯业务表-通过项目id查询", notes="标准宣贯业务表-通过项目id查询") - @GetMapping(value = "/queryByProjectId") - public Result queryByProjectId(String projectId) { - ProcessEsDeclare processEsDeclare = processEsDeclareService.queryByProjectId(projectId); - if(processEsDeclare==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsDeclare); - } - - /** - * 导出excel - * - * @param request - * @param processEsDeclare - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsDeclare processEsDeclare) { - return super.exportXls(request, processEsDeclare, ProcessEsDeclare.class, "标准宣贯业务表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java deleted file mode 100644 index 6af3a6dc..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/entity/ProcessEsDeclare.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - - -/** - * @Description: 企标宣贯业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Data -@TableName("process_es_declare") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_declare对象", description="企标宣贯业务表") -public class ProcessEsDeclare extends BaseEntity { - /**企标id*/ - @Excel(name = "企标id", width = 15) - @ApiModelProperty(value = "企标id") - @TableField(exist = false) - private java.lang.String standardId; - /**企标编号*/ - @Excel(name = "企标编号", width = 15) - @ApiModelProperty(value = "企标编号") - private java.lang.String standardNo; - /**企标名称*/ - @Excel(name = "企标名称", width = 15) - @ApiModelProperty(value = "企标名称") - @TableField(exist = false) - private java.lang.String standardName; - /**宣贯日期*/ - @Excel(name = "宣贯日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "宣贯日期") - private java.util.Date declareDate; - /**宣贯人*/ - @Excel(name = "宣贯人", width = 15) - @ApiModelProperty(value = "宣贯人") - @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") - private java.lang.String declareUser; - /**宣贯人 翻译*/ - @ApiModelProperty(value = "宣贯人 翻译") - @TableField(exist = false) - private java.lang.String declareUserDictText; - /**主题*/ - @Excel(name = "主题", width = 15) - @ApiModelProperty(value = "主题") - private java.lang.String declareTopic; - /**相关材料*/ - @Excel(name = "相关材料", width = 15) - @ApiModelProperty(value = "相关材料") - private java.lang.String declareFile; - /**内容*/ - @Excel(name = "内容", width = 15) - @ApiModelProperty(value = "内容") - private java.lang.String declareContent; - /**主送部门*/ - @Excel(name = "主送部门", width = 15) - @ApiModelProperty(value = "主送部门") - private java.lang.String mainDepart; - /**参宣单位*/ - @Excel(name = "参宣单位", width = 15) - @ApiModelProperty(value = "参宣单位") - private java.lang.String attendUnit; - /**联络人*/ - @ApiModelProperty(value = "联络人") - private java.lang.String initiator; - /**联络人 翻译*/ - @ApiModelProperty(value = "联络人 翻译") - @TableField(exist = false) - private java.lang.String initiatorDictText; - /**紧急程度（1：一般 2：急）*/ - @Excel(name = "紧急程度（1：一般 2：急）", width = 15) - @ApiModelProperty(value = "紧急程度（1：一般 2：急）") - @Dict(dicCode = "emergency_degree") - private java.lang.String emergencyDegree; - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private java.lang.String projectId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/mapper/ProcessEsDeclareMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/mapper/ProcessEsDeclareMapper.java deleted file mode 100644 index a1689eee..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/mapper/ProcessEsDeclareMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; - -/** - * @Description: 企标宣贯业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -public interface ProcessEsDeclareMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/mapper/xml/ProcessEsDeclareMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/mapper/xml/ProcessEsDeclareMapper.xml deleted file mode 100644 index 2ba88383..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/mapper/xml/ProcessEsDeclareMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IEsDeclareFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IEsDeclareFlowService.java deleted file mode 100644 index fbdf781c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IEsDeclareFlowService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.service; - -import com.jero.modules.activiti.process.esdeclare.vo.EsDeclareFlowVO; - -/** - * @InterfaceName: IEsDeclareService - * @Description: - * @Author: yjz - * @Date: 2023-11-30 10:11 - * @Version: 1.0 - **/ -public interface IEsDeclareFlowService { - /** - * 标准宣贯流程-流程发起 - * @param esDeclareFlowVO - */ - void flowStart(EsDeclareFlowVO esDeclareFlowVO); - - /** - * 标准宣贯流程-流程保存 - * @param esDeclareFlowVO - */ - void flowSave(EsDeclareFlowVO esDeclareFlowVO); - - /** - * 标准宣贯流程-办理详情 - * @param projectId - * @param taskId - * @return - */ - EsDeclareFlowVO queryDetailByProjectId(String projectId, String taskId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IProcessEsDeclareService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IProcessEsDeclareService.java deleted file mode 100644 index 2f9f325a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/IProcessEsDeclareService.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 企标宣贯业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -public interface IProcessEsDeclareService extends IService { - - /** - * 分页查询 - * - * @param processEsDeclare - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessEsDeclare processEsDeclare, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param processEsDeclare - * @param req - * @return - */ - List queryList(ProcessEsDeclare processEsDeclare, HttpServletRequest req); - - /** - * 保存 - * - * @param processEsDeclare - * @return - */ - void add(ProcessEsDeclare processEsDeclare); - - /** - * 更新 - * - * @param processEsDeclare - * @return - */ - void editById(ProcessEsDeclare processEsDeclare); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsDeclare queryById(String id); - - /** - * 标准宣贯业务表-通过项目id查询 - * @param projectId - * @return - */ - ProcessEsDeclare queryByProjectId(String projectId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java deleted file mode 100644 index ba30a5cb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.service.impl; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsDeclareFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_es_declare", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index a7c9b773..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esdeclare.common.EsDeclareCommon; -import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; -import com.jero.modules.activiti.process.esdeclare.service.IEsDeclareFlowService; -import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService; -import com.jero.modules.activiti.process.esdeclare.vo.EsDeclareFlowVO; -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.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.system.service.ISysUserService; -import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: EsDeclareServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-11-30 10:11 - * @Version: 1.0 - **/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final ProcessNodeLinkService processNodeLinkService; - private final IProcessEsDeclareService processEsDeclareService; - private final EnterpriseStandardDeclareService enterpriseStandardDeclareService; - private final IOSSFileService ossFileService; - private final SendMessageAPI sendMessageAPI; - private final ISysUserService sysUserService; - - public EsDeclareFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - ProcessNodeLinkService processNodeLinkService, - IProcessEsDeclareService processEsDeclareService, - EnterpriseStandardDeclareService enterpriseStandardDeclareService, - IOSSFileService ossFileService, - SendMessageAPI sendMessageAPI, - ISysUserService sysUserService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processNodeLinkService = processNodeLinkService; - this.processEsDeclareService = processEsDeclareService; - this.enterpriseStandardDeclareService = enterpriseStandardDeclareService; - this.ossFileService = ossFileService; - this.sendMessageAPI = sendMessageAPI; - this.sysUserService = sysUserService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - - @Override - public void flowStart(EsDeclareFlowVO esDeclareFlowVO) { - // 流程信息 - ProcessAll processAll = esDeclareFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esDeclareFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esDeclareFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsDeclareCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 保存业务表 - ProcessEsDeclare processEsDeclares = esDeclareFlowVO.getProcessEsDeclare(); - processEsDeclareService.saveOrUpdate(processEsDeclares); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.STANDARD_DECLARE.getValue())); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息 - 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())); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - - // 发起即结束 - ProcessEsDeclare processEsDeclare = processEsDeclareService.queryByProjectId(processAll.getProjectId()); - // 保存数据至企标宣贯 - EnterpriseStandardDeclare enterpriseStandardDeclare = new EnterpriseStandardDeclare(); - BeanUtils.copyProperties(processEsDeclare, enterpriseStandardDeclare); - enterpriseStandardDeclare.setCreateTime(null); - enterpriseStandardDeclare.setUpdateTime(null); - enterpriseStandardDeclareService.save(enterpriseStandardDeclare); - // 保存企标关联文件 - if (!Objects.isNull(processEsDeclare.getDeclareFile()) && StringUtils.isNotBlank(enterpriseStandardDeclare.getStandardId())){ - List list = Arrays.asList(processEsDeclare.getDeclareFile().split(",")); - ossFileService.update( - new LambdaUpdateWrapper() - .in(OSSFile::getId, list) - .set(OSSFile::getStandardId, enterpriseStandardDeclare.getStandardId()) - .set(OSSFile::getStandardNo, enterpriseStandardDeclare.getStandardNo()) - .set(OSSFile::getStandardFileType, "associated_file")); - } - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.STANDARD_DECLARE); - sendMessageDTO.setToUserId(processEsDeclare.getInitiator()); - Map sendMap = new HashMap<>(); - sendMap.put("standardNumber", processEsDeclare.getStandardNo()); - sendMap.put("standardName", processEsDeclare.getStandardName()); - sendMap.put("declareUser", sysUserService.dictByIdsOrUserNames(processEsDeclare.getDeclareUser(), "")); - sendMessageDTO.setMap(sendMap); - sendMessageAPI.sendMessage(sendMessageDTO); - } - - @Override - public void flowSave(EsDeclareFlowVO esDeclareFlowVO) { - // 企标宣贯业务表 - processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare()); - // 流程信息 - ProcessAll processAll = esDeclareFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esDeclareFlowVO.getProcessApprovalRecord(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - @Override - public EsDeclareFlowVO queryDetailByProjectId(String projectId, String taskId) { - EsDeclareFlowVO esDeclareFlowVO = new EsDeclareFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ - String id = ""; - if(Objects.isNull(processAll)){ - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - }else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())){ - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ - esDeclareFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - }else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) - , false); - } - esDeclareFlowVO.setProcessAll(processAll); - esDeclareFlowVO.setProcessApprovalRecord(processApprovalRecord); - return esDeclareFlowVO; - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List)v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/ProcessEsDeclareServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/ProcessEsDeclareServiceImpl.java deleted file mode 100644 index 0d0bbf2b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/ProcessEsDeclareServiceImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; -import com.jero.modules.activiti.process.esdeclare.mapper.ProcessEsDeclareMapper; -import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.laws.system.service.ILawsContactManageService; -import com.jero.modules.system.service.ISysUserService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; -import java.util.Objects; - - -/** - * @Description: 企标宣贯业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsDeclareServiceImpl extends ServiceImpl implements IProcessEsDeclareService { - - private final ISysUserService sysUserService; - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - private final ILawsContactManageService lawsContactManageService; - - public ProcessEsDeclareServiceImpl(ISysUserService sysUserService, - ILawsEnterpriseStandardService lawsEnterpriseStandardService, - ILawsContactManageService lawsContactManageService) { - this.sysUserService = sysUserService; - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - this.lawsContactManageService = lawsContactManageService; - } - - /** - * 分页查询 - * - * @param processEsDeclare - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(ProcessEsDeclare processEsDeclare, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processEsDeclare, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processEsDeclare - * @param req - * @return - */ - @Override - public List queryList(ProcessEsDeclare processEsDeclare, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(processEsDeclare, req.getParameterMap())); - } - - /** - * 保存 - * - * @param processEsDeclare - * @return - */ - @Override - public void add(ProcessEsDeclare processEsDeclare) { - Date now = new Date(); - processEsDeclare.setCreateTime(now); - processEsDeclare.setUpdateTime(now); - save(processEsDeclare); - } - - /** - * 更新 - * - * @param processEsDeclare - * @return - */ - @Override - public void editById(ProcessEsDeclare processEsDeclare) { - Date now = new Date(); - processEsDeclare.setUpdateTime(now); - saveOrUpdate(processEsDeclare); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsDeclare queryById(String id) { - return getById(id); - } - - @Override - public ProcessEsDeclare queryByProjectId(String projectId) { - ProcessEsDeclare processEsDeclare = getOne(new LambdaQueryWrapper().eq(ProcessEsDeclare::getProjectId, projectId), false); - if (!Objects.isNull(processEsDeclare)){ - // 标准名称 - LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne( - new LambdaQueryWrapper() - .eq(LawsEnterpriseStandard::getStandardNumber, processEsDeclare.getStandardNo()), false); - if (!Objects.isNull(lawsEnterpriseStandard)){ - processEsDeclare.setStandardId(lawsEnterpriseStandard.getId()); - processEsDeclare.setStandardName(lawsEnterpriseStandard.getStandardName()); - } - // 宣贯人 - processEsDeclare.setDeclareUserDictText(sysUserService.dictByIdsOrUserNames(processEsDeclare.getDeclareUser(), "")); - // 联络人 - processEsDeclare.setInitiatorDictText(sysUserService.dictByIdsOrUserNames(processEsDeclare.getInitiator(), "")); - } - return processEsDeclare; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java deleted file mode 100644 index 55360745..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.jero.modules.activiti.process.esdeclare.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -/** - * @ClassName: EsDEclareFlowVO - * @Description: - * @Author: yjz - * @Date: 2023-11-30 09:57 - * @Version: 1.0 - **/ -@Data -public class EsDeclareFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessEsDeclare processEsDeclare; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - /** - * 保存来源 - */ - @ApiModelProperty(value="保存来源(1：待办 2：草稿)") - private String saveSource; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java deleted file mode 100644 index 5b9c8b4b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/common/EsInspectCommon.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.common; - -/** - * @ClassName: EsInspectCpmmon - * @Description: - * @Author: yjz - * @Date: 2023-11-09 13:47 - * @Version: 1.0 - **/ -public class EsInspectCommon { - private EsInspectCommon(){ - - } - - /** - * 企标稽查流程key - */ - public static final String KEY = "inspect_process"; - - /** - * 企标稽查流程name - */ - public static final String NAME = "企业稽查流程"; - - /** - * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 - */ - public static final String PROCESS_NODE_1 = "responsible_start"; - /** - * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 - */ - public static final String PROCESS_NODE_2 = "leader_approval"; - /** - * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 - */ - public static final String PROCESS_NODE_3 = "responsible_upload"; - /** - * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 - */ - public static final String PROCESS_NODE_4 = "leader_approval_again"; - /** - * 企标稽查流程节点: 1:稽查负责人发起,2:负责人主管级领导审批,3:稽查负责人上传稽查报告和整改计划,4:负责人主管级领导审批,5:相关人员会签 - */ - public static final String PROCESS_NODE_5 = "involve_countersign"; - - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_1 = "1"; - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_2 = "2"; - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_3 = "3"; - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_4 = "4"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java deleted file mode 100644 index 10eb034c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.esinspect.service.IEsInspectFlowService; -import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.*; - -/** - * @ClassName: EsInspectFlowController - * @Description: - * @Author: yjz - * @Date: 2023-11-23 09:22 - * @Version: 1.0 - **/ -@Api(tags="企标稽查流程") -@RestController -@RequestMapping("/esinspect/esInspectFlowController") -@Slf4j -public class EsInspectFlowController { - private final IEsInspectFlowService esInspectFlowService; - - public EsInspectFlowController(@Lazy IEsInspectFlowService esInspectFlowService) { - this.esInspectFlowService = esInspectFlowService; - } - - /** - * 企标稽查流程-生成项目id - * @return 项目id - */ - @AutoLog(value = "企标稽查流程-生成项目id") - @ApiOperation(value="企标稽查流程-生成项目id", notes="企标稽查流程-生成项目id") - @GetMapping(value = "/getProjectId") - public String getProjectId() { - return String.valueOf(SnowflakeUtils.snowflake()); - } - - /** - * 企标稽查流程-流程发起 - * @param esInspectFlowVO 企标稽查流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查流程-流程发起") - @ApiOperation(value="企标稽查流程-流程发起", notes="企标稽查流程-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody EsInspectFlowVO esInspectFlowVO) { - esInspectFlowService.flowStart(esInspectFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查流程-流程保存 - * @param esInspectFlowVO 企标稽查流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查流程-流程保存") - @ApiOperation(value="企标稽查流程-流程保存", notes="企标稽查流程-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody EsInspectFlowVO esInspectFlowVO) { - esInspectFlowService.flowSave(esInspectFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - - /** - * 企标稽查流程-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "企标稽查流程-办理详情") - @ApiOperation(value="企标稽查流程-办理详情", notes="企标稽查流程-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(esInspectFlowService.queryDetailByProjectId(projectId, taskId)); - } - - /** - * 企标稽查流程-流程审批 - * @param esInspectFlowVO 企标稽查流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查流程-流程审批") - @ApiOperation(value="企标稽查流程-流程审批", notes="企标稽查流程-流程审批") - @PostMapping(value = "/flowApproval") - public Result flowApproval(@RequestBody EsInspectFlowVO esInspectFlowVO) { - // TODO: 稽查内容回显通过企标制修订创建的稽查内容 - esInspectFlowService.flowApproval(esInspectFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查流程-驳回 - * @param esInspectFlowVO 企标稽查计划流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查流程-驳回") - @ApiOperation(value="企标稽查流程-驳回", notes="企标稽查流程-驳回") - @PostMapping(value = "/flowReject") - public Result flowReject(@RequestBody EsInspectFlowVO esInspectFlowVO) { - log.info(""); - esInspectFlowService.flowApproval(esInspectFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查流程-流程转办 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查流程-流程转办") - @ApiOperation(value="企标稽查流程-流程转办", notes="企标稽查流程-流程转办") - @GetMapping(value = "/flowTransfer") - public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { - esInspectFlowService.flowTransfer(taskId, userId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java deleted file mode 100644 index 95dd1dd5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; -import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; -import com.jero.modules.oss.entity.OSSFile; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 企标稽查流程业务表 - * @Author: jero-boot - * @Date: 2023-11-22 - * @Version: V1.0 - */ -@Api(tags="企标稽查流程业务表") -@RestController -@RequestMapping("/esinspect/processEsInspect") -@Slf4j -public class ProcessEsInspectController extends JeroController { - private final IProcessEsInspectService processEsInspectService; - - public ProcessEsInspectController(IProcessEsInspectService processEsInspectService) { - this.processEsInspectService = processEsInspectService; - } - - /** - * 分页列表查询 - * - * @param processEsInspectVO - * @param pageNo - * @param pageSize - * @return - */ - @AutoLog(value = "企标稽查流程业务表-分页列表查询") - @ApiOperation(value="企标稽查流程业务表-分页列表查询", notes="企标稽查流程业务表-分页列表查询") - @GetMapping(value = "/queryByPage") - @Translation - public Result> queryByPage(ProcessEsInspectVO processEsInspectVO, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(processEsInspectService.queryByPage(processEsInspectVO, pageNo, pageSize)); - } - - /** - * 列表查询 - * - * @param processEsInspectVO - * @return - */ - @AutoLog(value = "企标稽查流程业务表-列表查询") - @ApiOperation(value="企标稽查流程业务表-列表查询", notes="企标稽查流程业务表-列表查询") - @GetMapping(value = "/queryByList") - @Translation - public Result> queryByList(ProcessEsInspectVO processEsInspectVO) { - return Result.OK(processEsInspectService.queryByList(processEsInspectVO)); - } - - /** - * 企标文件查询 - * - * @param inspectId - * @return - */ - @AutoLog(value = "企标稽查流程业务表-企标文件查询") - @ApiOperation(value="企标稽查流程业务表-企标文件查询", notes="企标稽查流程业务表-企标文件查询") - @GetMapping(value = "/queryFileByInspectId") - @Translation - public Result queryFileByInspectId(String inspectId) { - return Result.OK(processEsInspectService.queryFileByInspectId(inspectId)); - } - - /** - * 添加 - * - * @param processEsInspect - * @return - */ - @AutoLog(value = "企标稽查流程业务表-添加") - @ApiOperation(value="企标稽查流程业务表-添加", notes="企标稽查流程业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsInspect processEsInspect) { - processEsInspectService.add(processEsInspect); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processEsInspect - * @return - */ - @AutoLog(value = "企标稽查流程业务表-编辑") - @ApiOperation(value="企标稽查流程业务表-编辑", notes="企标稽查流程业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsInspect processEsInspect) { - processEsInspectService.editById(processEsInspect); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查流程业务表-通过id删除") - @ApiOperation(value="企标稽查流程业务表-通过id删除", notes="企标稽查流程业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processEsInspectService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查流程业务表-批量删除") - @ApiOperation(value="企标稽查流程业务表-批量删除", notes="企标稽查流程业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processEsInspectService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查流程业务表-通过id查询") - @ApiOperation(value="企标稽查流程业务表-通过id查询", notes="企标稽查流程业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessEsInspect processEsInspect = processEsInspectService.queryById(id); - if(processEsInspect==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsInspect); - } - - /** - * 导出excel - * - * @param request - * @param processEsInspect - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspect processEsInspect) { - return super.exportXls(request, processEsInspect, ProcessEsInspect.class, "企标稽查流程业务表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java deleted file mode 100644 index 6f636483..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - - -/** - * @Description: 企标稽查流程业务表 - * @Author: jero-boot - * @Date: 2023-11-22 - * @Version: V1.0 - */ -@Data -@TableName("process_es_inspect") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_inspect对象", description="企标稽查流程业务表") -public class ProcessEsInspect extends BaseEntity { - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private java.lang.String projectId; - /**企标稽查id*/ - @Excel(name = "企标稽查id", width = 15) - @ApiModelProperty(value = "企标稽查id") - private java.lang.String inspectId; - /**实际稽查完成日期*/ - @Excel(name = "实际稽查完成日期", width = 15) - @ApiModelProperty(value = "实际稽查完成日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private Date completeDate; - /**实际稽查人*/ - @Excel(name = "实际稽查人", width = 15) - @ApiModelProperty(value = "实际稽查人") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private java.lang.String actualInspectUser; - - /**稽查内容*/ - @ApiModelProperty(value = "稽查内容") - @TableField(exist = false) - private List enterpriseStandardInspectContentList; - /**稽查报告*/ - @ApiModelProperty(value = "稽查报告") - @TableField(exist = false) - private List enterpriseStandardInspectReportList; - /**整改计划*/ - @ApiModelProperty(value = "整改计划") - @TableField(exist = false) - private List enterpriseStandardInspectRectifyPlanList; - /**ids 添加用*/ - @ApiModelProperty(value = "ids 添加用") - @TableField(exist = false) - private java.lang.String ids; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java deleted file mode 100644 index 27d8fe71..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/ProcessEsInspectMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 企标稽查流程业务表 - * @Author: jero-boot - * @Date: 2023-11-22 - * @Version: V1.0 - */ -public interface ProcessEsInspectMapper extends BaseMapper { - - /** - * 企标稽查流程业务表-分页查询 - * @param page - * @param queryWrapper - * @return - */ - IPage queryByPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - - /** - * 企标稽查流程业务表-列表查询 - * @param queryWrapper - * @return - */ - List queryByList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml deleted file mode 100644 index fbcd2f2b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - select * - from (select pesi.id, - pesi.create_by, - pesi.create_time, - pesi.update_by, - pesi.update_time, - pesi.del_flag, - pesi.project_id, - pesi.inspect_id, - pesi.complete_date, - pesi.actual_inspect_user, - inspect_no, - (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, - standardization_work_group, - belong_dept, - plan_inspect_date, - inspect_user, - standardization_docking_user, - inspect_status, - group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object, - (select count(id) count from laws_enterprise_standard_inspect_content where process_es_inspect_id = pesi.id) standard_inspect_content_count - from process_es_inspect pesi - left join laws_enterprise_standard_inspect lesi on pesi.inspect_id = lesi.id - left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0' - left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id - group by pesi.id) t - ${ew.customSqlSegment} - - diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java deleted file mode 100644 index 1fbc92fb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IEsInspectFlowService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.service; - -import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; - -/** - * @InterfaceName: IEsInspectFlowService - * @Description: - * @Author: yjz - * @Date: 2023-11-23 09:23 - * @Version: 1.0 - **/ -public interface IEsInspectFlowService { - - /** - * 企标稽查流程-流程发起 - * @param esInspectFlowVO - */ - void flowStart(EsInspectFlowVO esInspectFlowVO); - - /** - * 企标稽查流程-流程保存 - * @param esInspectFlowVO - */ - void flowSave(EsInspectFlowVO esInspectFlowVO); - - /** - * 企标稽查流程-办理详情 - * @param projectId - * @param taskId - * @return - */ - EsInspectFlowVO queryDetailByProjectId(String projectId, String taskId); - - /** - * 企标稽查流程-流程审批 - * @param esInspectFlowVO - */ - void flowApproval(EsInspectFlowVO esInspectFlowVO); - - /** - * 企标稽查流程-流程转办 - * @param taskId - * @param userId - */ - void flowTransfer(String taskId, String userId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java deleted file mode 100644 index 91ee14fa..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; -import com.jero.modules.oss.entity.OSSFile; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 企标稽查流程业务表 - * @Author: jero-boot - * @Date: 2023-11-22 - * @Version: V1.0 - */ -public interface IProcessEsInspectService extends IService { - - /** - * 分页查询 - * - * @param processEsInspect - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessEsInspect processEsInspect, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param processEsInspect - * @param req - * @return - */ - List queryList(ProcessEsInspect processEsInspect, HttpServletRequest req); - - /** - * 保存 - * - * @param processEsInspect - * @return - */ - void add(ProcessEsInspect processEsInspect); - - /** - * 更新 - * - * @param processEsInspect - * @return - */ - void editById(ProcessEsInspect processEsInspect); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsInspect queryById(String id); - - /** - * 企标稽查流程业务表-分页查询 - * @param processEsInspectVO - * @param pageNo - * @param pageSize - * @return - */ - IPage queryByPage(ProcessEsInspectVO processEsInspectVO, Integer pageNo, Integer pageSize); - - /** - * 企标稽查流程业务表-列表查询 - * @param processEsInspectVO - * @return - */ - List queryByList(ProcessEsInspectVO processEsInspectVO); - - /** - * 企标稽查流程业务表-企标文件查询 - * @param inspectId - * @return - */ - OSSFile queryFileByInspectId(String inspectId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java deleted file mode 100644 index dca5fa70..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.service.impl; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsInspectFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_es_inspect", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index 14cdedc4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ /dev/null @@ -1,543 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import com.jero.modules.activiti.process.esinspect.service.IEsInspectFlowService; -import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; -import com.jero.modules.activiti.process.esinspect.vo.EsInspectFlowVO; -import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; -import com.jero.modules.activiti.process.esinspectrectify.common.EsInspectRectifyCommon; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.activiti.process.esinspectrectify.service.IEsInspectRectifyFlowService; -import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; -import com.jero.modules.activiti.process.esinspectrectify.vo.EsInspectRectifyFlowVO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -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.entity.EnterpriseStandardInspect; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: EsInspectFlowServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-11-23 09:25 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsInspectFlowServiceImpl implements IEsInspectFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final ProcessNodeLinkService processNodeLinkService; - private final IProcessEsInspectService processEsInspectService; - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - private final EnterpriseStandardInspectService enterpriseStandardInspectService; - private final EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; - private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; - private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService; - private final IEsInspectRectifyFlowService esInspectReportFlowService; - private final IProcessEsInspectRectifyService processEsInspectRectifyService; - public EsInspectFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - ProcessNodeLinkService processNodeLinkService, - IProcessEsInspectService processEsInspectService, - ILawsEnterpriseStandardService lawsEnterpriseStandardService, - EnterpriseStandardInspectService enterpriseStandardInspectService, - EnterpriseStandardInspectContentService enterpriseStandardInspectContentService, - EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService, - EnterpriseStandardInspectReportService enterpriseStandardInspectReportService, - IEsInspectRectifyFlowService esInspectReportFlowService, - IProcessEsInspectRectifyService processEsInspectReportService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processNodeLinkService = processNodeLinkService; - this.processEsInspectService = processEsInspectService; - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - this.enterpriseStandardInspectService = enterpriseStandardInspectService; - this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService; - this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService; - this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService; - this.esInspectReportFlowService = esInspectReportFlowService; - this.processEsInspectRectifyService = processEsInspectReportService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - @Override - public void flowStart(EsInspectFlowVO esInspectFlowVO) { - // 流程信息 - ProcessAll processAll = esInspectFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsInspectCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT.getValue())); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息 - 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())); - - // 处理业务表数据 - handleBusinessData(esInspectFlowVO); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - - // 更新企标稽查状态 - updateLawsEnterpriseStandardStatus(processAll.getProjectId()); - } - - private void handleBusinessData(EsInspectFlowVO esInspectFlowVO) { - List processEsInspectList = esInspectFlowVO.getProcessEsInspectList(); - // 删除数据 - if (StringUtils.isNotBlank(esInspectFlowVO.getProcessAllDelIds())){ - List idList = Arrays.asList(esInspectFlowVO.getProcessAllDelIds().split(",")); - processEsInspectService.removeByIds(idList); - enterpriseStandardInspectContentService.removeByIds(idList); - enterpriseStandardInspectReportService.removeByIds(idList); - enterpriseStandardInspectRectifyPlanService.removeByIds(idList); - } - ProcessAll processAll = esInspectFlowVO.getProcessAll(); - String projectId = processAll.getProjectId(); - processEsInspectList.stream().map(v -> { - if (StringUtils.isBlank(v.getId())){ - v.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - v.setProjectId(projectId); - return v; - }).collect(Collectors.toList()).forEach(v -> log.info(v.toString())); - // 重复性校验 - duplicateCheck(processEsInspectList); - processEsInspectService.saveOrUpdateBatch(processEsInspectList); - - for (ProcessEsInspect processEsInspect : processEsInspectList) { - // 处理稽查内容 - if (StringUtils.isBlank(processAll.getNodeId())){ - // 添加新稽查内容 - List enterpriseStandardInspectContentList = processEsInspect.getEnterpriseStandardInspectContentList(); - for (EnterpriseStandardInspectContent enterpriseStandardInspectContent : enterpriseStandardInspectContentList) { - enterpriseStandardInspectContent.setProcessEsInspectId(processEsInspect.getId()); - } - enterpriseStandardInspectContentService.saveOrUpdateBatch(enterpriseStandardInspectContentList); - } - // 处理稽查报告 和 整改计划 - handleReportAndRectifyPlan(processAll, processEsInspect); - } - } - - private void duplicateCheck(List processEsInspectList) { - List inspectIdList = new ArrayList<>(); - for (ProcessEsInspect processEsInspect : processEsInspectList) { - ProcessEsInspect esInspect = processEsInspectService.getOne( - new LambdaQueryWrapper() - .eq(ProcessEsInspect::getInspectId, processEsInspect.getInspectId()) - .ne(ProcessEsInspect::getId, processEsInspect.getId())); - if (!Objects.isNull(esInspect)){ - int size = processDraftService.count(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, esInspect.getProjectId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (size == 0){ - inspectIdList.add(processEsInspect.getInspectId()); - } - } - } - if (!inspectIdList.isEmpty()){ - List enterpriseStandardInspectList = enterpriseStandardInspectService.listByIds(inspectIdList); - if (!enterpriseStandardInspectList.isEmpty()){ - String errorMsg = enterpriseStandardInspectList.stream().map(EnterpriseStandardInspect::getInspectNo).collect(Collectors.joining(",")); - throw new JeroBootException("稽查依据标准号为：" + errorMsg + "的稽查计划企标不可重复发起!"); - } - } - } - - private void handleReportAndRectifyPlan(ProcessAll processAll, ProcessEsInspect processEsInspect) { - if (EsInspectCommon.PROCESS_NODE_3.equals(processAll.getNodeId())){ - // 添加新稽查报告 - List enterpriseStandardInspectReportList = processEsInspect.getEnterpriseStandardInspectReportList(); - for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : enterpriseStandardInspectReportList) { - enterpriseStandardInspectReport.setProcessEsInspectId(processEsInspect.getId()); - } - enterpriseStandardInspectReportService.saveOrUpdateBatch(enterpriseStandardInspectReportList); - - // 添加新整改计划 - List enterpriseStandardInspectRectifyPlanList = processEsInspect.getEnterpriseStandardInspectRectifyPlanList(); - for (EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan : enterpriseStandardInspectRectifyPlanList) { - enterpriseStandardInspectRectifyPlan.setProcessEsInspectId(processEsInspect.getId()); - // 如果整改单位不为空，则同时更新相关稽查内容的整改单位 - if (StringUtils.isNotBlank(enterpriseStandardInspectRectifyPlan.getResponseDepart())){ - // 通过整改计划查询稽查报告 - EnterpriseStandardInspectReport enterpriseStandardInspectReport = - enterpriseStandardInspectReportService.getById( - enterpriseStandardInspectRectifyPlan.getInspectReportId()); - if (!Objects.isNull(enterpriseStandardInspectReport)){ - enterpriseStandardInspectContentService.update( - new LambdaUpdateWrapper() - .eq(EnterpriseStandardInspectContent::getId, - enterpriseStandardInspectReport.getInspectContentId()) - .set(EnterpriseStandardInspectContent::getRectificationDepartment, - enterpriseStandardInspectRectifyPlan.getResponseDepart())); - } - } - } - enterpriseStandardInspectRectifyPlanService.saveOrUpdateBatch(enterpriseStandardInspectRectifyPlanList); - } - } - - private void updateLawsEnterpriseStandardStatus(String projectId) { - List list = processEsInspectService.list( - new LambdaQueryWrapper() - .eq(ProcessEsInspect::getProjectId, projectId)); - List processIds = list.stream().map(ProcessEsInspect::getInspectId).collect(Collectors.toList()); - enterpriseStandardInspectService.update( - new LambdaUpdateWrapper() - .in(EnterpriseStandardInspect::getId, processIds) - .set(EnterpriseStandardInspect::getInspectStatus, EsInspectCommon.INSPECT_STATUS_2)); - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List)v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } - - - @Override - public void flowSave(EsInspectFlowVO esInspectFlowVO) { - // 处理业务表数据 - handleBusinessData(esInspectFlowVO); - // 流程信息 - ProcessAll processAll = esInspectFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - @Override - public EsInspectFlowVO queryDetailByProjectId(String projectId, String taskId) { - EsInspectFlowVO esInspectFlowVO = new EsInspectFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ - String id = ""; - if(Objects.isNull(processAll)){ - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - }else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())){ - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ - esInspectFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - }else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, taskId) - , false); - } - // 业务表数据 - ProcessEsInspectVO processEsInspectVO = new ProcessEsInspectVO(); - processEsInspectVO.setProjectId(projectId); - List processEsInspectVOList = processEsInspectService.queryByList(processEsInspectVO); - esInspectFlowVO.setProcessEsInspectVOList(processEsInspectVOList); - esInspectFlowVO.setProcessAll(processAll); - esInspectFlowVO.setProcessApprovalRecord(processApprovalRecord); - return esInspectFlowVO; - } - - @Override - public void flowApproval(EsInspectFlowVO esInspectFlowVO) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 流程信息 - ProcessAll processAll = esInspectFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectFlowVO.getMap(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - - // 更新流程审批信息 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .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::getEndTime, new Date())); - - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task!= null) { - // 完成任务 - taskService.complete(task.getId(), map); - // 处理业务表数据 - handleBusinessData(esInspectFlowVO); - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); - // 判断是否是最后一个节点 - if (isLastNode(processAll.getProcessInstanceId())){ - // 企标稽查计划 生成数据 保存企标库 - saveDataToInspect(processAll.getProjectId()); - } - } - } - - private void saveDataToInspect(String projectId) { - ProcessEsInspectVO processEsInspectVO = new ProcessEsInspectVO(); - processEsInspectVO.setProjectId(projectId); - // 通过项目id查询企标稽查流程业务表信息 - List processEsInspectVOList = processEsInspectService.queryByList(processEsInspectVO); - for (ProcessEsInspectVO esInspectVO : processEsInspectVOList) { - // 企标稽查id - String inspectId = esInspectVO.getInspectId(); - // 更新企标稽数据 - enterpriseStandardInspectService.update(new LambdaUpdateWrapper() - .eq(EnterpriseStandardInspect::getId, inspectId) - .set(EnterpriseStandardInspect::getActualInspectUser, esInspectVO.getActualInspectUser()) - .set(EnterpriseStandardInspect::getCompleteDate, esInspectVO.getCompleteDate()) - .set(EnterpriseStandardInspect::getInspectStatus, EsInspectCommon.INSPECT_STATUS_3)); - - // 查询企标信息 - LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne( - new LambdaQueryWrapper().eq(LawsEnterpriseStandard::getStandardNumber, esInspectVO.getInspectNo()), false); - - // 查询稽查内容 - List enterpriseStandardInspectContentList = enterpriseStandardInspectContentService.list( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, esInspectVO.getId())); - // 查询稽查报告 - List enterpriseStandardInspectReportList = enterpriseStandardInspectReportService.list( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectReport::getProcessEsInspectId, esInspectVO.getId())); - // 查询整改计划 - List enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanService.list( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, esInspectVO.getId())); - - if (!Objects.isNull(lawsEnterpriseStandard)){ - // 企标内容 - List idList = enterpriseStandardInspectContentList.stream() - .map(EnterpriseStandardInspectContent::getId) - .collect(Collectors.toList()); - if (!idList.isEmpty()){ - enterpriseStandardInspectContentService.update( - new LambdaUpdateWrapper() - .in(EnterpriseStandardInspectContent::getId, idList) - .set(EnterpriseStandardInspectContent::getStandardId, lawsEnterpriseStandard.getId())); - } - } - - if (!enterpriseStandardInspectReportList.isEmpty()){ - // 稽查报告 - List idList = enterpriseStandardInspectReportList.stream().map(EnterpriseStandardInspectReport::getId).collect(Collectors.toList()); - if (!idList.isEmpty()){ - enterpriseStandardInspectReportService.update( - new LambdaUpdateWrapper() - .in(EnterpriseStandardInspectReport::getId, idList) - .set(EnterpriseStandardInspectReport::getInspectId, inspectId)); - } - } - - if (!enterpriseStandardInspectRectifyPlanList.isEmpty()){ - enterpriseStandardInspectRectifyPlanList.forEach(enterpriseStandardInspectRectifyPlan -> - // 自动生成企标稽查整改 - autoEsInspectRectifyPlanFlow(esInspectVO, enterpriseStandardInspectRectifyPlan) - ); - - // 企标整改计划 - List idList = enterpriseStandardInspectRectifyPlanList.stream().map(EnterpriseStandardInspectRectifyPlan::getId).collect(Collectors.toList()); - enterpriseStandardInspectRectifyPlanService.update( - new LambdaUpdateWrapper() - .in(EnterpriseStandardInspectRectifyPlan::getId, idList) - .set(EnterpriseStandardInspectRectifyPlan::getInspectId, inspectId)); - } - } - } - - private void autoEsInspectRectifyPlanFlow(ProcessEsInspectVO esInspectVO, EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan) { - if (!EsInspectRectifyCommon.INSPECT_RECTIFY_STATUS_1.equals(enterpriseStandardInspectRectifyPlan.getRectifyStatus())){ - return; - } - // 自动生成企标稽查整改 - EsInspectRectifyFlowVO esInspectReportFlowVO = new EsInspectRectifyFlowVO(); - // 处理流程信息 - ProcessAll processAll = new ProcessAll(); - processAll.setProjectId(String.valueOf(SnowflakeUtils.snowflake())); - // 生成流程名称 - String prcName = esInspectVO.getInspectNo() + "-" + esInspectVO.getInspectName() + "-稽查整改"; - processAll.setPrcName(prcName); - processAll.setCreateUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); - esInspectReportFlowVO.setProcessAll(processAll); - - // 处理流程审批信息 - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - processApprovalRecord.setProjectId(processAll.getProjectId()); - processApprovalRecord.setUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); - esInspectReportFlowVO.setProcessApprovalRecord(processApprovalRecord); - - // 处理业务表数据 - ProcessEsInspectRectify processEsInspectRectify = new ProcessEsInspectRectify(); - processEsInspectRectify.setProjectId(processAll.getProjectId()); - processEsInspectRectify.setInspectRectifyPlanId(enterpriseStandardInspectRectifyPlan.getId()); - esInspectReportFlowVO.setProcessEsInspectRectify(processEsInspectRectify); - processEsInspectRectifyService.save(processEsInspectRectify); - - // 处理人员信息 - Map map = new HashMap<>(); - map.put("responsible", enterpriseStandardInspectRectifyPlan.getResponseUser()); - map.put("leader", "请选择"); - map.put("responsibleApproval", "请选择"); - esInspectReportFlowVO.setMap(map); - esInspectReportFlowService.createReportFlow(esInspectReportFlowVO); - } - - @Override - public void flowTransfer(String taskId, String userId) { - processHandleService.transfer(taskId, userId); - } - - public boolean isLastNode(String processInstanceId) { - // 查询流程实例状态 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - - // 如果流程实例为null，表示流程已结束 - return processInstance == null; - } -} 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 deleted file mode 100644 index 7a8e3a6c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ /dev/null @@ -1,258 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import com.jero.modules.activiti.process.esinspect.mapper.ProcessEsInspectMapper; -import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; -import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; -import com.jero.modules.laws.common.constant.FieldCommon; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.system.service.ISysUserService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - - -/** - * @Description: 企标稽查流程业务表 - * @Author: jero-boot - * @Date: 2023-11-22 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsInspectServiceImpl extends ServiceImpl implements IProcessEsInspectService { - - private final ProcessEsInspectMapper processEsInspectMapper; - private final EnterpriseStandardInspectContentService enterpriseStandardInspectContentService; - private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; - private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService; - private final ISysUserService sysUserService; - private final IOSSFileService ossFileService; - private final EnterpriseStandardInspectService enterpriseStandardInspectService; - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - - public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper, - EnterpriseStandardInspectContentService enterpriseStandardInspectContentService, - EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService, - EnterpriseStandardInspectReportService enterpriseStandardInspectReportService, - ISysUserService sysUserService, - IOSSFileService ossFileService, - EnterpriseStandardInspectService enterpriseStandardInspectService, - ILawsEnterpriseStandardService lawsEnterpriseStandardService) { - this.processEsInspectMapper = processEsInspectMapper; - this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService; - this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService; - this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService; - this.sysUserService = sysUserService; - this.ossFileService = ossFileService; - this.enterpriseStandardInspectService = enterpriseStandardInspectService; - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - } - - - /** - * 分页查询 - * - * @param processEsInspect - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(ProcessEsInspect processEsInspect, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processEsInspect, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processEsInspect - * @param req - * @return - */ - @Override - public List queryList(ProcessEsInspect processEsInspect, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(processEsInspect, req.getParameterMap())); - } - - /** - * 保存 - * - * @param processEsInspect - * @return - */ - @Override - public void add(ProcessEsInspect processEsInspect) { - String ids = processEsInspect.getIds(); - for (String s : ids.split(",")) { - int count = count( - new LambdaQueryWrapper() - .eq(ProcessEsInspect::getInspectId, s) - .eq(ProcessEsInspect::getProjectId, processEsInspect.getProjectId())); - if (count > 0) { - if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ - throw new JeroBootException("不能重复添加!"); - }else { - throw new JeroBootException("Cannot repeat add!"); - } - } - processEsInspect.setInspectId(s); - processEsInspect.setId(String.valueOf(SnowflakeUtils.snowflake())); - save(processEsInspect); - } - } - - /** - * 更新 - * - * @param processEsInspect - * @return - */ - @Override - public void editById(ProcessEsInspect processEsInspect) { - saveOrUpdate(processEsInspect); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsInspect queryById(String id) { - return getById(id); - } - - @Override - public IPage queryByPage(ProcessEsInspectVO processEsInspectVO, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = getProcessEsInspectVOQueryWrapper(processEsInspectVO); - IPage processEsInspectVOIPage = processEsInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); - setProperty(processEsInspectVOIPage.getRecords()); - return processEsInspectVOIPage; - } - - private void setProperty(List processEsInspectVOList) { - for (ProcessEsInspectVO processEsInspectVO : processEsInspectVOList) { - // 稽查内容 - List enterpriseStandardInspectContents = enterpriseStandardInspectContentService.queryClauseByEsInspectId(processEsInspectVO.getId()); - if (CollectionUtils.isNotEmpty(enterpriseStandardInspectContents)){ - processEsInspectVO.setEnterpriseStandardInspectContentList(enterpriseStandardInspectContents); - } - // 稽查报告 - List enterpriseStandardInspectReports = enterpriseStandardInspectReportService.queryByProcessEsInspectId(processEsInspectVO.getId()); - if (CollectionUtils.isNotEmpty(enterpriseStandardInspectReports)){ - processEsInspectVO.setEnterpriseStandardInspectReportList(enterpriseStandardInspectReports); - } - // 整改计划 - List enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanService.queryByProcessEsInspectId(processEsInspectVO.getId()); - if (CollectionUtils.isNotEmpty(enterpriseStandardInspectRectifyPlanList)){ - processEsInspectVO.setEnterpriseStandardInspectRectifyPlanList(enterpriseStandardInspectRectifyPlanList); - } - processEsInspectVO.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectVO.getInspectUser(), "")); - } - } - - @Override - public List queryByList(ProcessEsInspectVO processEsInspectVO) { - QueryWrapper queryWrapper = getProcessEsInspectVOQueryWrapper(processEsInspectVO); - List processEsInspectVOS = processEsInspectMapper.queryByList(queryWrapper); - setProperty(processEsInspectVOS); - return processEsInspectVOS; - } - - @Override - public OSSFile queryFileByInspectId(String inspectId) { - EnterpriseStandardInspect enterpriseStandardInspect = enterpriseStandardInspectService.getById(inspectId); - LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne( - new LambdaQueryWrapper() - .eq(LawsEnterpriseStandard::getStandardNumber, enterpriseStandardInspect.getInspectNo()), false); - if (!Objects.isNull(lawsEnterpriseStandard)){ - 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, - FieldCommon.FILE_DRAFT_FOR_REVIEW, FieldCommon.FILE_DRAFT_FOR_APPROVAL, - FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT}; - for (String fileType : fileTypeArr) { - Optional optional = list.stream() - .filter(v -> fileType.equals(v.getStandardFileType()) - && (v.getFileName().endsWith(".pdf") - || v.getFileName().endsWith(".docx") - || v.getFileName().endsWith(".doc"))).findFirst(); - if (optional.isPresent()){ - return optional.get(); - } - } - } - } - return new OSSFile(); - } - - @NotNull - private static QueryWrapper getProcessEsInspectVOQueryWrapper(ProcessEsInspectVO processEsInspectVO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getId()), "t.id", processEsInspectVO.getId()); - queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getProjectId()), "t.project_id", processEsInspectVO.getProjectId()); - queryWrapper.eq("t.del_flag", 0); - queryWrapper.orderByAsc("t.create_time"); - return queryWrapper; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java deleted file mode 100644 index 0c1d2e59..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: 企标稽查流程VO - * @Description: - * @Author: yjz - * @Date: 2023-11-09 11:51 - * @Version: 1.0 - **/ -@Data -public class EsInspectFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private List processEsInspectList; - /**业务基本信息 展示用*/ - @ApiModelProperty(value = "业务基本信息 展示用") - private List processEsInspectVOList; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - /** - * 流程全局删除ids - */ - @ApiModelProperty(value="流程全局删除ids") - private String processAllDelIds; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java deleted file mode 100644 index 8a04616c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.jero.modules.activiti.process.esinspect.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - * @ClassName: ProcessEsInspectVO - * @Description: - * @Author: yjz - * @Date: 2023-11-23 09:20 - * @Version: 1.0 - **/ -@Data -public class ProcessEsInspectVO extends EnterpriseStandardInspectVo { - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private java.lang.String projectId; - /**企标稽查id*/ - @Excel(name = "企标稽查id", width = 15) - @ApiModelProperty(value = "企标稽查id") - private java.lang.String inspectId; - /** 实际稽查完成日期 */ - @Excel(name = "实际稽查完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实际稽查完成日期") - private Date completeDate; - /** 实际稽查人 */ - @Excel(name = "实际稽查人", width = 15, orderNum = "1") - @ApiModelProperty(value = "实际稽查人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - private String actualInspectUser; - /**稽查内容数量*/ - @ApiModelProperty(value = "稽查内容数量") - private java.lang.String standardInspectContentCount; - - /** 稽查负责人 翻译*/ - @ApiModelProperty(value = "稽查负责人 翻译") - private String inspectUserDictText; - - /**稽查内容*/ - @ApiModelProperty(value = "稽查内容") - @TableField(exist = false) - private List enterpriseStandardInspectContentList; - /**稽查报告*/ - @ApiModelProperty(value = "稽查报告") - @TableField(exist = false) - private List enterpriseStandardInspectReportList; - /**整改计划*/ - @ApiModelProperty(value = "整改计划") - @TableField(exist = false) - private List enterpriseStandardInspectRectifyPlanList; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/common/EsInspectDelayApplyCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/common/EsInspectDelayApplyCommon.java deleted file mode 100644 index f71de984..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/common/EsInspectDelayApplyCommon.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.common; - -/** - * @ClassName: EsInspectDelayApplyCommon - * @Description: - * @Author: yjz - * @Date: 2023-11-28 10:13 - * @Version: 1.0 - **/ -public class EsInspectDelayApplyCommon { - private EsInspectDelayApplyCommon(){ - - } - /** - * 稽查延期申请流程key - */ - public static final String KEY = "inspect_delay_apply_process"; - - /** - * 稽查延期申请流程name - */ - public static final String NAME = "稽查延期申请流程"; - - /** - * 稽查延期申请流程节点: 1:稽查负责人申请延期,2:负责人主管级领导审批,3:稽查联络人评估,4:负责人主管级上一级领导审批 - */ - public static final String PROCESS_NODE_1 = "responsible_start"; - /** - * 稽查延期申请流程节点: 1:稽查负责人申请延期,2:负责人主管级领导审批,3:稽查联络人评估,4:负责人主管级上一级领导审批 - */ - public static final String PROCESS_NODE_2 = "leader_approval"; - /** - * 稽查延期申请流程节点: 1:稽查负责人申请延期,2:负责人主管级领导审批,3:稽查联络人评估,4:负责人主管级上一级领导审批 - */ - public static final String PROCESS_NODE_3 = "liaisons_assess"; - /** - * 稽查延期申请流程节点: 1:稽查负责人申请延期,2:负责人主管级领导审批,3:稽查联络人评估,4:负责人主管级上一级领导审批 - */ - public static final String PROCESS_NODE_4 = "leader_up_level"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/controller/EsInspectDelayApplyFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/controller/EsInspectDelayApplyFlowController.java deleted file mode 100644 index 164078e8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/controller/EsInspectDelayApplyFlowController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IEsInspectDelayApplyFlowService; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.EsInspectDelayApplyFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.*; - -/** - * @ClassName: 稽查延期申请流程 - * @Description: - * @Author: yjz - * @Date: 2023-11-09 11:45 - * @Version: 1.0 - **/ -@Api(tags="稽查延期申请流程") -@RestController -@RequestMapping("/process/esInspectDelayApplyFlow") -@Slf4j -public class EsInspectDelayApplyFlowController { - private final IEsInspectDelayApplyFlowService esInspectDelayApplyFlowService; - - - public EsInspectDelayApplyFlowController(@Lazy IEsInspectDelayApplyFlowService esInspectDelayApplyFlowService) { - this.esInspectDelayApplyFlowService = esInspectDelayApplyFlowService; - } - - /** - * 稽查延期申请流程-生成项目id - * @return 项目id - */ - @AutoLog(value = "稽查延期申请流程-生成项目id") - @ApiOperation(value="稽查延期申请流程-生成项目id", notes="稽查延期申请流程-生成项目id") - @GetMapping(value = "/getProjectId") - public String getProjectId() { - return String.valueOf(SnowflakeUtils.snowflake()); - } - - /** - * 稽查延期申请流程-流程发起 - * @param esInspectDelayApplyFlowVO 稽查延期申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "稽查延期申请流程-流程发起") - @ApiOperation(value="稽查延期申请流程-流程发起", notes="稽查延期申请流程-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - esInspectDelayApplyFlowService.flowStart(esInspectDelayApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 稽查延期申请流程-流程保存 - * @param esInspectDelayApplyFlowVO 稽查延期申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "稽查延期申请流程-流程保存") - @ApiOperation(value="稽查延期申请流程-流程保存", notes="稽查延期申请流程-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - esInspectDelayApplyFlowService.flowSave(esInspectDelayApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - - /** - * 稽查延期申请流程-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "稽查延期申请流程-办理详情") - @ApiOperation(value="稽查延期申请流程-办理详情", notes="稽查延期申请流程-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(esInspectDelayApplyFlowService.queryDetailByProjectId(projectId, taskId)); - } - - /** - * 稽查延期申请流程-流程审批 - * @param esInspectDelayApplyFlowVO 稽查延期申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "稽查延期申请流程-流程审批") - @ApiOperation(value="稽查延期申请流程-流程审批", notes="稽查延期申请流程-流程审批") - @PostMapping(value = "/flowApproval") - public Result flowApproval(@RequestBody EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - esInspectDelayApplyFlowService.flowApproval(esInspectDelayApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 稽查延期申请流程-驳回 - * @param esInspectDelayApplyFlowVO 稽查延期申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "稽查延期申请流程-驳回") - @ApiOperation(value="稽查延期申请流程-驳回", notes="稽查延期申请流程-驳回") - @PostMapping(value = "/flowReject") - public Result flowReject(@RequestBody EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - log.info(""); - esInspectDelayApplyFlowService.flowApproval(esInspectDelayApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 稽查延期申请流程-流程转办 - * @return 结果对象 - */ - @AutoLog(value = "稽查延期申请流程-流程转办") - @ApiOperation(value="稽查延期申请流程-流程转办", notes="稽查延期申请流程-流程转办") - @GetMapping(value = "/flowTransfer") - public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { - esInspectDelayApplyFlowService.flowTransfer(taskId, userId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/controller/ProcessEsInspectDelayApplyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/controller/ProcessEsInspectDelayApplyController.java deleted file mode 100644 index a2d0ddeb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/controller/ProcessEsInspectDelayApplyController.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.system.base.controller.JeroController; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.ProcessEsInspectDelayApplyVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 稽查延期申请流程业务表 - * @Author: jero-boot - * @Date: 2023-11-27 - * @Version: V1.0 - */ -@Api(tags="稽查延期申请流程业务表") -@RestController -@RequestMapping("/esinspectdelayapply/processEsInspectDelayApply") -@Slf4j -public class ProcessEsInspectDelayApplyController extends JeroController { - @Autowired - private IProcessEsInspectDelayApplyService processEsInspectDelayApplyService; - - /** - * 分页列表查询 - * - * @param processEsInspectDelayApplyVO - * @param pageNo - * @param pageSize - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-分页列表查询") - @ApiOperation(value="稽查延期申请流程业务表-分页列表查询", notes="稽查延期申请流程业务表-分页列表查询") - @GetMapping(value = "/queryByPage") - @Translation - public Result> queryByPage(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = processEsInspectDelayApplyService.queryByPage(processEsInspectDelayApplyVO, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processEsInspectDelayApplyVO - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-列表查询") - @ApiOperation(value="稽查延期申请流程业务表-列表查询", notes="稽查延期申请流程业务表-列表查询") - @GetMapping(value = "/queryByList") - @Translation - public Result> queryByList(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO) { - List list = processEsInspectDelayApplyService.queryByList(processEsInspectDelayApplyVO); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processEsInspectDelayApply - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-添加") - @ApiOperation(value="稽查延期申请流程业务表-添加", notes="稽查延期申请流程业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsInspectDelayApply processEsInspectDelayApply) { - String ids = processEsInspectDelayApply.getIds(); - for (String s : ids.split(",")) { - processEsInspectDelayApply.setInspectId(s); - processEsInspectDelayApply.setId(String.valueOf(SnowflakeUtils.snowflake())); - processEsInspectDelayApplyService.add(processEsInspectDelayApply); - } - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processEsInspectDelayApply - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-编辑") - @ApiOperation(value="稽查延期申请流程业务表-编辑", notes="稽查延期申请流程业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsInspectDelayApply processEsInspectDelayApply) { - processEsInspectDelayApplyService.editById(processEsInspectDelayApply); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-通过id删除") - @ApiOperation(value="稽查延期申请流程业务表-通过id删除", notes="稽查延期申请流程业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processEsInspectDelayApplyService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-批量删除") - @ApiOperation(value="稽查延期申请流程业务表-批量删除", notes="稽查延期申请流程业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processEsInspectDelayApplyService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "稽查延期申请流程业务表-通过id查询") - @ApiOperation(value="稽查延期申请流程业务表-通过id查询", notes="稽查延期申请流程业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessEsInspectDelayApply processEsInspectDelayApply = processEsInspectDelayApplyService.queryById(id); - if(processEsInspectDelayApply==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsInspectDelayApply); - } - - /** - * 导出excel - * - * @param request - * @param processEsInspectDelayApply - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspectDelayApply processEsInspectDelayApply) { - return super.exportXls(request, processEsInspectDelayApply, ProcessEsInspectDelayApply.class, "稽查延期申请流程业务表"); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/entity/ProcessEsInspectDelayApply.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/entity/ProcessEsInspectDelayApply.java deleted file mode 100644 index e7d5e286..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/entity/ProcessEsInspectDelayApply.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - - -/** - * @Description: 稽查延期申请流程 - * @Author: jero-boot - * @Date: 2023-11-27 - * @Version: V1.0 - */ -@Data -@TableName("process_es_inspect_delay_apply") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_inspect_delay_apply对象", description="稽查延期申请流程") -public class ProcessEsInspectDelayApply extends BaseEntity { - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private java.lang.String projectId; - /**企标稽查id*/ - @Excel(name = "企标稽查id", width = 15) - @ApiModelProperty(value = "企标稽查id") - private String inspectId; - /**申请延期日期*/ - @Excel(name = "申请延期日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "申请延期日期") - private Date requestDelayDate; - /**延期说明*/ - @Excel(name = "延期说明", width = 15) - @ApiModelProperty(value = "延期说明") - private String delayDescription; - /**稽查联络人*/ - @Excel(name = "稽查联络人", width = 15) - @ApiModelProperty(value = "稽查联络人") - private String liaisons; - /**ids 添加用*/ - @ApiModelProperty(value = "ids 添加用") - @TableField(exist = false) - private java.lang.String ids; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/mapper/ProcessEsInspectDelayApplyMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/mapper/ProcessEsInspectDelayApplyMapper.java deleted file mode 100644 index 327c01e1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/mapper/ProcessEsInspectDelayApplyMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.ProcessEsInspectDelayApplyVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 稽查延期申请流程 - * @Author: jero-boot - * @Date: 2023-11-27 - * @Version: V1.0 - */ -public interface ProcessEsInspectDelayApplyMapper extends BaseMapper { - - List queryByList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); - - IPage queryByPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/mapper/xml/ProcessEsInspectDelayApplyMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/mapper/xml/ProcessEsInspectDelayApplyMapper.xml deleted file mode 100644 index 44646840..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/mapper/xml/ProcessEsInspectDelayApplyMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - select * - from (SELECT pesida.id, - pesida.create_by, - pesida.create_time, - pesida.update_by, - pesida.update_time, - pesida.del_flag, - pesida.project_id, - pesida.inspect_id, - pesida.request_delay_date, - pesida.delay_description, - pesida.liaisons, - inspect_no, - (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, - standardization_work_group, - belong_dept, - plan_inspect_date, - inspect_user, - standardization_docking_user, - inspect_status, - group_concat(lesio.plan_inspect_object separator ',') plan_inspect_object - FROM process_es_inspect_delay_apply pesida - LEFT JOIN laws_enterprise_standard_inspect lesi ON pesida.inspect_id = lesi.id - LEFT JOIN laws_enterprise_standard les ON lesi.inspect_no = les.standard_number AND les.del_flag = '0' - LEFT JOIN laws_enterprise_standard_inspect_object lesio ON lesi.id = lesio.inspect_id - group by pesida.id) t - ${ew.customSqlSegment} - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/IEsInspectDelayApplyFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/IEsInspectDelayApplyFlowService.java deleted file mode 100644 index 577d5621..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/IEsInspectDelayApplyFlowService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.service; - -import com.jero.modules.activiti.process.esinspectdelayapply.vo.EsInspectDelayApplyFlowVO; - -/** - * @ClassName: IEsInspectDelayApplyFlowService - * @Description: - * @Author: yjz - * @Date: 2023-11-27 18:38 - * @Version: 1.0 - **/ -public interface IEsInspectDelayApplyFlowService { - /** - * 稽查延期申请流程-流程发起 - * @param esInspectDelayApplyFlowVO - */ - void flowStart(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO); - - /** - * 稽查延期申请流程-流程保存 - * @param esInspectDelayApplyFlowVO - */ - void flowSave(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO); - - /** - * 稽查延期申请流程-办理详情 - * @param projectId - * @param taskId - * @return - */ - EsInspectDelayApplyFlowVO queryDetailByProjectId(String projectId, String taskId); - - /** - * 稽查延期申请流程-流程审批 - * @param esInspectDelayApplyFlowVO - */ - void flowApproval(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO); - - /** - * 稽查延期申请流程-流程转办 - * @param taskId - * @param userId - */ - void flowTransfer(String taskId, String userId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/IProcessEsInspectDelayApplyService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/IProcessEsInspectDelayApplyService.java deleted file mode 100644 index 4dfd58f7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/IProcessEsInspectDelayApplyService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.ProcessEsInspectDelayApplyVO; - -import java.util.List; - -/** - * @Description: 稽查延期申请流程 - * @Author: jero-boot - * @Date: 2023-11-27 - * @Version: V1.0 - */ -public interface IProcessEsInspectDelayApplyService extends IService { - - /** - * 分页查询 - * - * @param processEsInspectDelayApplyVO - * @param pageNo - * @param pageSize - * @return - */ - IPage queryByPage(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO, Integer pageNo, Integer pageSize); - - /** - * 列表查询 - * - * @param processEsInspectDelayApplyVO - * @return - */ - List queryByList(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO); - - /** - * 保存 - * - * @param processEsInspectDelayApply - * @return - */ - void add(ProcessEsInspectDelayApply processEsInspectDelayApply); - - /** - * 更新 - * - * @param processEsInspectDelayApply - * @return - */ - void editById(ProcessEsInspectDelayApply processEsInspectDelayApply); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsInspectDelayApply queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java deleted file mode 100644 index 8f08a9b1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.service.impl; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsInspectDelayApplyFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_es_inspect_delay_apply", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index 314f5e91..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ /dev/null @@ -1,357 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon; -import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; -import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; -import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IEsInspectDelayApplyFlowService; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.EsInspectDelayApplyFlowVO; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.ProcessEsInspectDelayApplyVO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -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.entity.EnterpriseStandardInspect; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: EsInspectDelayApplyFlowServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-11-27 18:38 - * @Version: 1.0 - **/ -@Service -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final ProcessNodeLinkService processNodeLinkService; - private final IProcessEsInspectService processEsInspectService; - private final EnterpriseStandardInspectService enterpriseStandardInspectService; - private final IProcessEsInspectDelayApplyService processEsInspectDelayApplyService; - private final EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService; - - public EsInspectDelayApplyFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - ProcessNodeLinkService processNodeLinkService, - IProcessEsInspectService processEsInspectService, - EnterpriseStandardInspectService enterpriseStandardInspectService, - IProcessEsInspectDelayApplyService processEsInspectDelayApplyService, - EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processNodeLinkService = processNodeLinkService; - this.processEsInspectService = processEsInspectService; - this.enterpriseStandardInspectService = enterpriseStandardInspectService; - this.processEsInspectDelayApplyService = processEsInspectDelayApplyService; - this.enterpriseStandardInspectDelayService = enterpriseStandardInspectDelayService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - @Override - public void flowStart(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - // 流程信息 - ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectDelayApplyFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectDelayApplyFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsInspectDelayApplyCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_DELAY_APPLY.getValue())); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息 - 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())); - - // 处理业务表数据 - handleBusinessData(esInspectDelayApplyFlowVO); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - } - - private void handleBusinessData(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - List processEsInspectDelayApplyList = esInspectDelayApplyFlowVO.getProcessEsInspectDelayApplyList(); - // 删除数据 - if (StringUtils.isNotBlank(esInspectDelayApplyFlowVO.getProcessAllDelIds())){ - List idList = Arrays.asList(esInspectDelayApplyFlowVO.getProcessAllDelIds().split(",")); - processEsInspectDelayApplyService.removeByIds(idList); - } - ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll(); - String projectId = processAll.getProjectId(); - processEsInspectDelayApplyList.stream().map(v -> { - if (StringUtils.isBlank(v.getId())){ - v.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - v.setProjectId(projectId); - return v; - }).collect(Collectors.toList()).forEach(v -> log.info(v.toString())); - processEsInspectDelayApplyService.saveOrUpdateBatch(processEsInspectDelayApplyList); - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List)v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } - - @Override - public void flowSave(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - // 处理业务表数据 - handleBusinessData(esInspectDelayApplyFlowVO); - - // 流程信息 - ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectDelayApplyFlowVO.getProcessApprovalRecord(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - @Override - public EsInspectDelayApplyFlowVO queryDetailByProjectId(String projectId, String taskId) { - EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO = new EsInspectDelayApplyFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ - String id = ""; - if(Objects.isNull(processAll)){ - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - }else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())){ - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ - esInspectDelayApplyFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - }else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, taskId) - , false); - } - // 业务表数据 - ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO = new ProcessEsInspectDelayApplyVO(); - processEsInspectDelayApplyVO.setProjectId(projectId); - processEsInspectDelayApplyVO.setNodeId(processApprovalRecord.getNodeId()); - esInspectDelayApplyFlowVO.setProcessEsInspectDelayApplyVOList(processEsInspectDelayApplyService.queryByList(processEsInspectDelayApplyVO)); - esInspectDelayApplyFlowVO.setProcessAll(processAll); - esInspectDelayApplyFlowVO.setProcessApprovalRecord(processApprovalRecord); - return esInspectDelayApplyFlowVO; - } - - @Override - public void flowApproval(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 流程信息 - ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectDelayApplyFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectDelayApplyFlowVO.getMap(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - - // 更新流程审批信息 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .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::getEndTime, new Date())); - - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task!= null) { - // 完成任务 - taskService.complete(task.getId(), map); - // 处理业务表数据 - handleBusinessData(esInspectDelayApplyFlowVO); - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); - // 判断是否是最后一个节点 - if (isLastNode(processAll.getProcessInstanceId())){ - // 稽查延期申请流程 更新计划稽查日期 生成企业标准稽查延期数据 - saveDataToInspect(processAll.getProjectId()); - } - } - } - - private void saveDataToInspect(String projectId) { - List list = processEsInspectDelayApplyService.list( - new LambdaQueryWrapper() - .eq(ProcessEsInspectDelayApply::getProjectId, projectId)); - List enterpriseStandardInspectDelayList = new ArrayList<>(); - for (ProcessEsInspectDelayApply processEsInspectDelayApply : list) { - // 查询之前稽查状态 - String inspectStatus = EsInspectCommon.INSPECT_STATUS_1; - ProcessEsInspect processEsInspect = processEsInspectService.getOne( - new LambdaQueryWrapper() - .eq(ProcessEsInspect::getInspectId, processEsInspectDelayApply.getInspectId()), false); - if (!Objects.isNull(processEsInspect)){ - int size = processDraftService.count(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processEsInspect.getProjectId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (size == 0){ - inspectStatus = EsInspectCommon.INSPECT_STATUS_2; - } - } - enterpriseStandardInspectService.update( - new LambdaUpdateWrapper() - .eq(EnterpriseStandardInspect::getId, processEsInspectDelayApply.getInspectId()) - .set(EnterpriseStandardInspect::getPlanInspectDate, processEsInspectDelayApply.getRequestDelayDate()) - .set(EnterpriseStandardInspect::getInspectStatus, inspectStatus)); - - EnterpriseStandardInspectDelay enterpriseStandardInspectDelay = new EnterpriseStandardInspectDelay(); - enterpriseStandardInspectDelay.setInspectId(processEsInspectDelayApply.getInspectId()); - enterpriseStandardInspectDelay.setRequestDelayDate(processEsInspectDelayApply.getRequestDelayDate()); - enterpriseStandardInspectDelay.setDelayDescription(processEsInspectDelayApply.getDelayDescription()); - enterpriseStandardInspectDelayList.add(enterpriseStandardInspectDelay); - } - enterpriseStandardInspectDelayService.saveBatch(enterpriseStandardInspectDelayList); - } - - public boolean isLastNode(String processInstanceId) { - // 查询流程实例状态 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - - // 如果流程实例为null，表示流程已结束 - return processInstance == null; - } - - @Override - public void flowTransfer(String taskId, String userId) { - processHandleService.transfer(taskId, userId); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/ProcessEsInspectDelayApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/ProcessEsInspectDelayApplyServiceImpl.java deleted file mode 100644 index b78e5a87..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/ProcessEsInspectDelayApplyServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.mapper.ProcessEsInspectDelayApplyMapper; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; -import com.jero.modules.activiti.process.esinspectdelayapply.vo.ProcessEsInspectDelayApplyVO; -import com.jero.modules.system.service.ISysUserService; -import org.apache.shiro.SecurityUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - - -/** - * @Description: 稽查延期申请流程 - * @Author: jero-boot - * @Date: 2023-11-27 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsInspectDelayApplyServiceImpl extends ServiceImpl implements IProcessEsInspectDelayApplyService { - private final ProcessEsInspectDelayApplyMapper processEsInspectDelayApplyMapper; - private final ISysUserService sysUserService; - public ProcessEsInspectDelayApplyServiceImpl(ProcessEsInspectDelayApplyMapper processEsInspectDelayApplyMapper, - ISysUserService sysUserService) { - this.processEsInspectDelayApplyMapper = processEsInspectDelayApplyMapper; - this.sysUserService = sysUserService; - } - - /** - * 分页查询 - * - * @param processEsInspectDelayApplyVO - * @param pageNo - * @param pageSize - * @return - */ - @Override - public IPage queryByPage(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = getProcessEsInspectDelayApplyLambdaQueryWrapper(processEsInspectDelayApplyVO); - return processEsInspectDelayApplyMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); - } - - /** - * 列表查询 - * - * @param processEsInspectDelayApplyVO - * @return - */ - @Override - public List queryByList(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO) { - QueryWrapper queryWrapper = getProcessEsInspectDelayApplyLambdaQueryWrapper(processEsInspectDelayApplyVO); - List processEsInspectDelayApplyVOS = processEsInspectDelayApplyMapper.queryByList(queryWrapper); - setProperty(processEsInspectDelayApplyVOS); - return processEsInspectDelayApplyVOS; - } - - private void setProperty(List processEsInspectDelayApplyVOS) { - for (ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO : processEsInspectDelayApplyVOS) { - // 翻译 - processEsInspectDelayApplyVO.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectDelayApplyVO.getInspectUser(), "")); - processEsInspectDelayApplyVO.setLiaisonsDictText(sysUserService.dictByIdsOrUserNames(processEsInspectDelayApplyVO.getLiaisons(), "")); - } - } - - @NotNull - private static QueryWrapper getProcessEsInspectDelayApplyLambdaQueryWrapper(ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (StringUtils.isNotBlank(processEsInspectDelayApplyVO.getNodeId()) && EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processEsInspectDelayApplyVO.getNodeId())){ - queryWrapper.eq("t.liaisons", sysUser.getId()); - } - queryWrapper.eq(StringUtils.isNotBlank(processEsInspectDelayApplyVO.getProjectId()), "t.project_id", processEsInspectDelayApplyVO.getProjectId()); - queryWrapper.eq("t.del_flag", 0); - queryWrapper.orderByAsc("t.create_time"); - return queryWrapper; - } - - /** - * 保存 - * - * @param processEsInspectDelayApply - * @return - */ - @Override - public void add(ProcessEsInspectDelayApply processEsInspectDelayApply) { - Date now = new Date(); - processEsInspectDelayApply.setCreateTime(now); - processEsInspectDelayApply.setUpdateTime(now); - save(processEsInspectDelayApply); - } - - /** - * 更新 - * - * @param processEsInspectDelayApply - * @return - */ - @Override - public void editById(ProcessEsInspectDelayApply processEsInspectDelayApply) { - Date now = new Date(); - processEsInspectDelayApply.setUpdateTime(now); - saveOrUpdate(processEsInspectDelayApply); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsInspectDelayApply queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java deleted file mode 100644 index 01cd4fbd..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: EsinspectFlowVO - * @Description: - * @Author: yjz - * @Date: 2023-11-27 18:41 - * @Version: 1.0 - **/ -@Data -public class EsInspectDelayApplyFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private List processEsInspectDelayApplyList; - /**业务基本信息 展示用*/ - @ApiModelProperty(value = "业务基本信息 展示用") - private List processEsInspectDelayApplyVOList; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - /** - * 流程全局删除ids - */ - @ApiModelProperty(value="流程全局删除ids") - private String processAllDelIds; - /** - * 保存来源 - */ - @ApiModelProperty(value="保存来源(1：待办 2：草稿)") - private String saveSource; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/ProcessEsInspectDelayApplyVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/ProcessEsInspectDelayApplyVO.java deleted file mode 100644 index d5e5a6a7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/ProcessEsInspectDelayApplyVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jero.modules.activiti.process.esinspectdelayapply.vo; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * @ClassName: 稽查延期申请流程VO - * @Description: - * @Author: yjz - * @Date: 2023-11-27 18:41 - * @Version: 1.0 - **/ -@Data -public class ProcessEsInspectDelayApplyVO extends EnterpriseStandardInspectVo { - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private java.lang.String projectId; - /**企标稽查id*/ - @Excel(name = "企标稽查id", width = 15) - @ApiModelProperty(value = "企标稽查id") - private String inspectId; - /**申请延期日期*/ - @Excel(name = "申请延期日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "申请延期日期") - private Date requestDelayDate; - /**延期说明*/ - @Excel(name = "延期说明", width = 15) - @ApiModelProperty(value = "延期说明") - private String delayDescription; - /**稽查联络人*/ - @Excel(name = "稽查联络人", width = 15) - @ApiModelProperty(value = "稽查联络人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String liaisons; - - /** 稽查联络人 翻译*/ - @ApiModelProperty(value = "稽查联络人 翻译") - @TableField(exist = false) - private String liaisonsDictText; - /** 稽查负责人 翻译*/ - @ApiModelProperty(value = "稽查负责人 翻译") - @TableField(exist = false) - private String inspectUserDictText; - /**节点id*/ - @ApiModelProperty(value = "节点id") - @TableField(exist = false) - private String nodeId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java deleted file mode 100644 index 1754855c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.common; - -/** - * @ClassName: EsInspectPlanCommon - * @Description: - * @Author: yjz - * @Date: 2023-11-09 13:47 - * @Version: 1.0 - **/ -public class EsInspectPlanCommon { - private EsInspectPlanCommon(){ - - } - - /** - * 企业稽查计划key - */ - public static final String KEY = "inspect_plan"; - - /** - * 企业稽查计划流name - */ - public static final String NAME = "企业稽查计划"; - - /** - * 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 - */ - public static final String PROCESS_NODE_1 = "liaisons_start"; - /** - * 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 - */ - public static final String PROCESS_NODE_2 = "opinion_fill"; - /** - * 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 - */ - public static final String PROCESS_NODE_3 = "liaisons_collect"; - /** - * 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 - */ - public static final String PROCESS_NODE_4 = "involve_countersign"; - /** - * 企业稽查计划流程节点: 1:稽查联络人发起计划,2:稽查征求意见对象填写意见,3:稽查联络人汇总,4:相关人员会签,5:联络人主管级领导批准 - */ - public static final String PROCESS_NODE_5 = "leader_approval"; - - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_1 = "1"; - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_2 = "2"; - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_3 = "3"; - /** - * 稽查状态: 1:进行中，2：稽查中，3：已完成，4：拖期 - */ - public static final String INSPECT_STATUS_4 = "4"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/EsInspectPlanFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/EsInspectPlanFlowController.java deleted file mode 100644 index 07ea33b4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/EsInspectPlanFlowController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.esinspectplan.service.IEsInspectPlanFlowService; -import com.jero.modules.activiti.process.esinspectplan.vo.EsInspectPlanFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.*; - -/** - * @ClassName: 企标稽查计划流程 - * @Description: - * @Author: yjz - * @Date: 2023-11-09 11:45 - * @Version: 1.0 - **/ -@Api(tags="企标稽查计划流程") -@RestController -@RequestMapping("/process/esInspectPlanFlow") -@Slf4j -public class EsInspectPlanFlowController { - private final IEsInspectPlanFlowService esInspectPlanFlowService; - - public EsInspectPlanFlowController(@Lazy IEsInspectPlanFlowService esInspectPlanFlowService) { - this.esInspectPlanFlowService = esInspectPlanFlowService; - } - - /** - * 企标稽查计划流程-生成项目id - * @return 项目id - */ - @AutoLog(value = "企标稽查计划流程-生成项目id") - @ApiOperation(value="企标稽查计划流程-生成项目id", notes="企标稽查计划流程-生成项目id") - @GetMapping(value = "/getProjectId") - public String getProjectId() { - return String.valueOf(SnowflakeUtils.snowflake()); - } - - /** - * 企标稽查计划流程-流程发起 - * @param esInspectPlanFlowVO 企标稽查计划流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查计划流程-流程发起") - @ApiOperation(value="企标稽查计划流程-流程发起", notes="企标稽查计划流程-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody EsInspectPlanFlowVO esInspectPlanFlowVO) { - esInspectPlanFlowService.flowStart(esInspectPlanFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查计划流程-流程保存 - * @param esInspectPlanFlowVO 企标稽查计划流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查计划流程-流程保存") - @ApiOperation(value="企标稽查计划流程-流程保存", notes="企标稽查计划流程-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody EsInspectPlanFlowVO esInspectPlanFlowVO) { - esInspectPlanFlowService.flowSave(esInspectPlanFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - - /** - * 企标稽查计划流程-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "企标稽查计划流程-办理详情") - @ApiOperation(value="企标稽查计划流程-办理详情", notes="企标稽查计划流程-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(esInspectPlanFlowService.queryDetailByProjectId(projectId, taskId)); - } - - /** - * 企标稽查计划流程-流程审批 - * @param esInspectPlanFlowVO 企标稽查计划流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查计划流程-流程审批") - @ApiOperation(value="企标稽查计划流程-流程审批", notes="企标稽查计划流程-流程审批") - @PostMapping(value = "/flowApproval") - public Result flowApproval(@RequestBody EsInspectPlanFlowVO esInspectPlanFlowVO) { - esInspectPlanFlowService.flowApproval(esInspectPlanFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查计划流程-驳回 - * @param esInspectPlanFlowVO 企标稽查计划流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查计划流程-驳回") - @ApiOperation(value="企标稽查计划流程-驳回", notes="企标稽查计划流程-驳回") - @PostMapping(value = "/flowReject") - public Result flowReject(@RequestBody EsInspectPlanFlowVO esInspectPlanFlowVO) { - log.info(""); - esInspectPlanFlowService.flowApproval(esInspectPlanFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查计划流程-流程转办 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查计划流程-流程转办") - @ApiOperation(value="企标稽查计划流程-流程转办", notes="企标稽查计划流程-流程转办") - @GetMapping(value = "/flowTransfer") - public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { - esInspectPlanFlowService.flowTransfer(taskId, userId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java deleted file mode 100644 index 6952b35a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java +++ /dev/null @@ -1,223 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.system.base.controller.JeroController; -import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - - - /** - * @Description: 企标稽查计划业务表 - * @Author: jero-boot - * @Date: 2023-11-09 - * @Version: V1.0 - */ -@Api(tags="企标稽查计划业务表") -@RestController -@RequestMapping("/process/processEsInspectPlan") -@Slf4j -public class ProcessEsInspectPlanController extends JeroController { - @Autowired - private IProcessEsInspectPlanService processEsInspectPlanService; - - /** - * 分页列表查询 - * - * @param processEsInspectPlan - * @param pageNo - * @param pageSize - * @return - */ - @AutoLog(value = "企标稽查计划业务表-分页列表查询") - @ApiOperation(value="企标稽查计划业务表-分页列表查询", notes="企标稽查计划业务表-分页列表查询") - @GetMapping(value = "/page") - @Translation - public Result> queryPageList(ProcessEsInspectPlan processEsInspectPlan, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = processEsInspectPlanService.queryPage(processEsInspectPlan, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processEsInspectPlan - * @return - */ - @AutoLog(value = "企标稽查计划业务表-列表查询") - @ApiOperation(value="企标稽查计划业务表-列表查询", notes="企标稽查计划业务表-列表查询") - @GetMapping(value = "/list") - @Translation - public Result> queryList(ProcessEsInspectPlan processEsInspectPlan) { - List list = processEsInspectPlanService.queryList(processEsInspectPlan); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processEsInspectPlan - * @return - */ - @AutoLog(value = "企标稽查计划业务表-添加") - @ApiOperation(value="企标稽查计划业务表-添加", notes="企标稽查计划业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsInspectPlan processEsInspectPlan) { - processEsInspectPlanService.add(processEsInspectPlan); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 编辑 - * - * @param processEsInspectPlan - * @return - */ - @AutoLog(value = "企标稽查计划业务表-编辑") - @ApiOperation(value="企标稽查计划业务表-编辑", notes="企标稽查计划业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsInspectPlan processEsInspectPlan) { - processEsInspectPlanService.editById(processEsInspectPlan); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查计划业务表-通过id删除") - @ApiOperation(value="企标稽查计划业务表-通过id删除", notes="企标稽查计划业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - processEsInspectPlanService.deleteById(map.getId()); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查计划业务表-批量删除") - @ApiOperation(value="企标稽查计划业务表-批量删除", notes="企标稽查计划业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - if (StringUtils.isBlank(map.getIds())){ - return Result.error("请选择数据!"); - } - this.processEsInspectPlanService.deleteByIds(Arrays.asList(map.getIds().split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查计划业务表-通过id查询") - @ApiOperation(value="企标稽查计划业务表-通过id查询", notes="企标稽查计划业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - ProcessEsInspectPlan processEsInspectPlan = processEsInspectPlanService.queryById(id); - if(processEsInspectPlan==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsInspectPlan); - } - - /** - * 导出excel - * - * @param request - * @param processEsInspectPlan - */ - @AutoLog(value = "企标稽查计划业务表-导出excel") - @ApiOperation(value="企标稽查计划业务表-导出excel", notes="企标稽查计划业务表-导出excel") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspectPlan processEsInspectPlan) { - return super.exportXls(request, processEsInspectPlan, ProcessEsInspectPlan.class, "企标稽查计划业务表"); - } - - /** - * 下载导入模板(稽查联络人发起计划) - * - */ - @AutoLog(value = "企标稽查计划业务表-下载导入模板(稽查联络人发起计划)") - @ApiOperation(value="企标稽查计划业务表-下载导入模板(稽查联络人发起计划)", notes="企标稽查计划业务表-下载导入模板(稽查联络人发起计划)") - @GetMapping(value = "/templateDownloadByStart") - public void templateDownloadByStart(HttpServletResponse response) throws IOException { - processEsInspectPlanService.templateDownloadByStart(response); - } - - /** - * 下载导入模板 - * - */ - @AutoLog(value = "企标稽查计划业务表-下载导入模板(稽查征求意见对象填写意见)") - @ApiOperation(value="企标稽查计划业务表-下载导入模板(稽查征求意见对象填写意见)", notes="企标稽查计划业务表-下载导入模板(稽查征求意见对象填写意见)") - @GetMapping(value = "/templateDownloadByStartByOpinionFill") - public void templateDownloadByStartByOpinionFill(HttpServletResponse response) throws IOException { - processEsInspectPlanService.templateDownloadByStartByOpinionFill(response); - } - - /** - * 通过excel导入数据(稽查联络人发起计划) - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "企标稽查计划业务表-通过excel导入数据(稽查联络人发起计划)") - @ApiOperation(value="企标稽查计划业务表-通过excel导入数据(稽查联络人发起计划)", notes="企标稽查计划业务表-通过excel导入数据(稽查联络人发起计划)") - @PostMapping(value = "/importExcelByStart") - @Translation - public Result> importExcelByStart(HttpServletRequest request, HttpServletResponse response) throws Exception { - return processEsInspectPlanService.importExcelByStart(request, response); - } - - /** - * 通过excel导入数据(稽查征求意见对象填写意见) - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "企标稽查计划业务表-通过excel导入数据(稽查征求意见对象填写意见)") - @ApiOperation(value="企标稽查计划业务表-通过excel导入数据(稽查征求意见对象填写意见)", notes="企标稽查计划业务表-通过excel导入数据(稽查征求意见对象填写意见)") - @PostMapping(value = "/importExcelByOpinionFill") - @Translation - public Result> importExcelByOpinionFill(HttpServletRequest request, HttpServletResponse response) throws Exception { - return processEsInspectPlanService.importExcelByOpinionFill(request, response); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java deleted file mode 100644 index 277eb4e6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; - - - /** - * @Description: 企标稽查计划业务_意见表 - * @Author: jero-boot - * @Date: 2023-11-13 - * @Version: V1.0 - */ -@Api(tags="企标稽查计划业务_意见表") -@RestController -@RequestMapping("/process/processEsInspectPlanOpinion") -@Slf4j -public class ProcessEsInspectPlanOpinionController extends JeroController { - @Autowired - private IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService; - - /** - * 分页列表查询 - * - * @param processEsInspectPlanOpinion - * @param pageNo - * @param pageSize - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-分页列表查询") - @ApiOperation(value="企标稽查计划业务_意见表-分页列表查询", notes="企标稽查计划业务_意见表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = processEsInspectPlanOpinionService.queryPage(processEsInspectPlanOpinion, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processEsInspectPlanOpinion - * @param req - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-列表查询") - @ApiOperation(value="企标稽查计划业务_意见表-列表查询", notes="企标稽查计划业务_意见表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - List list = processEsInspectPlanOpinionService.queryList(processEsInspectPlanOpinion); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processEsInspectPlanOpinion - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-添加") - @ApiOperation(value="企标稽查计划业务_意见表-添加", notes="企标稽查计划业务_意见表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - processEsInspectPlanOpinionService.add(processEsInspectPlanOpinion); - return Result.OK("操作成功!"); - } - - /** - * 企标稽查计划业务_意见表-填写意见 - * - * @param processEsInspectPlanOpinion - * @return - */ - @AutoLog(value = "企标稽查计划业务表-填写意见") - @ApiOperation(value="企标稽查计划业务表-填写意见", notes="企标稽查计划业务表-填写意见") - @PostMapping(value = "/fillInOpinion") - public Result fillInOpinion(@Validated @RequestBody ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - processEsInspectPlanOpinionService.saveOrUpdate(processEsInspectPlanOpinion); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查计划业务_意见表-获取最新的填写意见 - * - * @param inspectPlanId - * @return - */ - @AutoLog(value = "企标稽查计划业务表-获取当前登陆人最新的填写意见") - @ApiOperation(value="企标稽查计划业务表-获取当前登陆人最新的填写意见", notes="企标稽查计划业务表-获取当前登陆人最新的填写意见") - @GetMapping(value = "/queryLastOpinionByInspectPlanId") - public Result queryLastOpinion(String inspectPlanId) { - return Result.OK(processEsInspectPlanOpinionService.queryLastOpinion(inspectPlanId)); - } - - /** - * 编辑 - * - * @param processEsInspectPlanOpinion - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-编辑") - @ApiOperation(value="企标稽查计划业务_意见表-编辑", notes="企标稽查计划业务_意见表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - processEsInspectPlanOpinionService.editById(processEsInspectPlanOpinion); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-通过id删除") - @ApiOperation(value="企标稽查计划业务_意见表-通过id删除", notes="企标稽查计划业务_意见表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - processEsInspectPlanOpinionService.deleteById(map.getId()); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-批量删除") - @ApiOperation(value="企标稽查计划业务_意见表-批量删除", notes="企标稽查计划业务_意见表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - if (StringUtils.isBlank(map.getIds())){ - return Result.error("请选择数据!"); - } - this.processEsInspectPlanOpinionService.deleteByIds(Arrays.asList(map.getIds().split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查计划业务_意见表-通过id查询") - @ApiOperation(value="企标稽查计划业务_意见表-通过id查询", notes="企标稽查计划业务_意见表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - ProcessEsInspectPlanOpinion processEsInspectPlanOpinion = processEsInspectPlanOpinionService.queryById(id); - if(processEsInspectPlanOpinion==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsInspectPlanOpinion); - } - - /** - * 导出excel - * - * @param request - * @param processEsInspectPlanOpinion - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - return super.exportXls(request, processEsInspectPlanOpinion, ProcessEsInspectPlanOpinion.class, "企标稽查计划业务_意见表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java deleted file mode 100644 index 0d6a7750..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - - -/** - * @Description: 企标稽查计划业务表 - * @Author: jero-boot - * @Date: 2023-11-09 - * @Version: V1.0 - */ -@Data -@TableName("process_es_inspect_plan") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_inspect_plan对象", description="企标稽查计划业务表") -public class ProcessEsInspectPlan extends BaseEntity { - /**项目id*/ - @ApiModelProperty(value = "项目id") - private String projectId; - /**稽查依据标准号*/ - @Excel(name = "*稽查依据标准号", width = 15) - @ApiModelProperty(value = "稽查依据标准号") - private String inspectNo; - /**稽查依据标准名称*/ - @Excel(name = "*稽查依据标准名称", width = 16) - @ApiModelProperty(value = "稽查依据标准名称") - private String inspectName; - /**计划稽查对象*/ - @Excel(name = "*计划稽查对象", width = 15) - @ApiModelProperty(value = "计划稽查对象") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private String inspectObject; - /**主责标准化工作组*/ - @Excel(name = "*主责标准化工作组", width = 16) - @ApiModelProperty(value = "主责标准化工作组") - private String standardizationWorkGroup; - /**所属部门*/ - @Excel(name = "*所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private String belongDept; - /**计划稽查日期*/ -// @Excel(name = "计划稽查日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "计划稽查日期") - private Date planInspectDate; - /**计划稽查日期 导入用*/ - @Excel(name = "*计划稽查日期", width = 15, format = "yyyy-MM-dd") - @ApiModelProperty(value = "计划稽查日期 导入用") - @TableField(exist = false) - private String planInspectDates; - /**稽查负责人*/ - @Excel(name = "*稽查负责人", width = 15) - @ApiModelProperty(value = "稽查负责人") - private String inspectUser; - /**稽查负责人 翻译*/ - @ApiModelProperty(value = "稽查负责人 翻译") - @TableField(exist = false) - private String inspectUserDictText; - /**标准化组对接人*/ - @Excel(name = "*标准化组对接人", width = 15) - @ApiModelProperty(value = "标准化组对接人") - private String standardizationDockingUser; - /**标准化组对接人 翻译*/ - @ApiModelProperty(value = "标准化组对接人 翻译") - @TableField(exist = false) - private String standardizationDockingUserDictText; - /**征求意见对象*/ - @Excel(name = "*征求意见对象", width = 15) - @ApiModelProperty(value = "征求意见对象") - private String objectOfConsultation; - /**征求意见对象 翻译*/ - @ApiModelProperty(value = "征求意见对象 翻译") - @TableField(exist = false) - private String objectOfConsultationDictText; - /**备注*/ - @ApiModelProperty(value = "备注") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String remarks; - - /**意见*/ - @ApiModelProperty(value = "意见") - @TableField(exist = false) - private List processEsInspectPlanOpinionList; - /**意见*/ - @ApiModelProperty(value = "意见") - @TableField(exist = false) - private ProcessEsInspectPlanOpinion processEsInspectPlanOpinion; - /**节点id*/ - @ApiModelProperty(value = "节点id") - @TableField(exist = false) - private String nodeId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlanOpinion.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlanOpinion.java deleted file mode 100644 index a4ac8495..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlanOpinion.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - - -/** - * @Description: 企标稽查计划业务_意见表 - * @Author: jero-boot - * @Date: 2023-11-13 - * @Version: V1.0 - */ -@Data -@TableName("process_es_inspect_plan_opinion") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_inspect_plan_opinion对象", description="企标稽查计划业务_意见表") -public class ProcessEsInspectPlanOpinion extends BaseEntity { - private static final long serialVersionUID = 1L; - /**企标稽查计划业务表Id*/ - @Excel(name = "企标稽查计划业务表Id", width = 15) - @ApiModelProperty(value = "企标稽查计划业务表Id") - private java.lang.String inspectPlanId; - /**意见*/ - @Excel(name = "意见", width = 15) - @ApiModelProperty(value = "意见") - private java.lang.String opinion; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanMapper.java deleted file mode 100644 index e5397614..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; -import org.apache.ibatis.annotations.Param; - -import java.util.Map; - -/** - * @Description: 企标稽查计划业务表 - * @Author: jero-boot - * @Date: 2023-11-09 - * @Version: V1.0 - */ -public interface ProcessEsInspectPlanMapper extends BaseMapper { - - /** - * 根据流程实例id查询流程变量 - * @param instanceId - * @return - */ - Map findActRuVariableByInstanceId(@Param("instanceId") String instanceId, @Param("key") String key); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java deleted file mode 100644 index cd5c906c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/ProcessEsInspectPlanOpinionMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 企标稽查计划业务_意见表 - * @Author: jero-boot - * @Date: 2023-11-13 - * @Version: V1.0 - */ -public interface ProcessEsInspectPlanOpinionMapper extends BaseMapper { - - /** - * 标准化组-根据账号分组查最新 - * @param id - * @return - */ - List findLastByGroup(@Param("inspectPlanId") String inspectPlanId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanMapper.xml deleted file mode 100644 index 3c8a6340..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml deleted file mode 100644 index e357c654..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/mapper/xml/ProcessEsInspectPlanOpinionMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IEsInspectPlanFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IEsInspectPlanFlowService.java deleted file mode 100644 index 73ebff5e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IEsInspectPlanFlowService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service; - -import com.jero.modules.activiti.entity.ProcessNode; -import com.jero.modules.activiti.process.esinspectplan.vo.EsInspectPlanFlowVO; - -import java.util.List; - -/** - * @InterfaceName: 企标稽查计划流程 - * @Description: - * @Author: yjz - * @Date: 2023-11-09 11:47 - * @Version: 1.0 - **/ -public interface IEsInspectPlanFlowService { - /** - * 企标稽查计划流程-流程发起 - * @param esInspectPlanFlowVO - */ - void flowStart(EsInspectPlanFlowVO esInspectPlanFlowVO); - - /** - * 企标稽查计划流程-流程保存 - * @param esInspectPlanFlowVO - */ - void flowSave(EsInspectPlanFlowVO esInspectPlanFlowVO); - - /** - * 企标稽查计划流程-办理详情 - * - * @param projectId - * @param taskId - * @return - */ - EsInspectPlanFlowVO queryDetailByProjectId(String projectId, String taskId); - - /** - * 企标稽查计划流程-人员信息 - * @return - */ - List queryPersonInfo(String processDefinitionName, String processInstanceId); - - /** - * 企标稽查计划流程-流程审批 - * @param esInspectPlanFlowVO - */ - void flowApproval(EsInspectPlanFlowVO esInspectPlanFlowVO); - - /** - * 企标稽查计划流程-流程转办 - * - * @param taskId - * @param userId - */ - void flowTransfer(String taskId, String userId); - - /** - * 企标稽查计划流程-是否是最后一个节点 - * - * @param processInstanceId - * @return - */ - boolean isLastNode(String processInstanceId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java deleted file mode 100644 index 0c5db056..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; - -import java.util.List; - -/** - * @Description: 企标稽查计划业务_意见表 - * @Author: jero-boot - * @Date: 2023-11-13 - * @Version: V1.0 - */ -public interface IProcessEsInspectPlanOpinionService extends IService { - - /** - * 分页查询 - * - * @param processEsInspectPlanOpinion - * @param pageNo - * @param pageSize - * @return - */ - IPage queryPage(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion, Integer pageNo, Integer pageSize); - - /** - * 列表查询 - * - * @param processEsInspectPlanOpinion - * @return - */ - List queryList(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion); - - /** - * 保存 - * - * @param processEsInspectPlanOpinion - * @return - */ - void add(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion); - - /** - * 更新 - * - * @param processEsInspectPlanOpinion - * @return - */ - void editById(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsInspectPlanOpinion queryById(String id); - - /** - * 企标稽查计划业务表-获取当前登陆人最新的填写意见 - * @param inspectPlanId - * @return - */ - ProcessEsInspectPlanOpinion queryLastOpinion(String inspectPlanId); - - /** - * 标准化组-根据账号分组查最新 - * @param inspectPlanId - * @return - */ - List findLastByGroup(String inspectPlanId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java deleted file mode 100644 index b44427ab..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.common.api.vo.Result; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -/** - * @Description: 企标稽查计划业务表 - * @Author: jero-boot - * @Date: 2023-11-09 - * @Version: V1.0 - */ -public interface IProcessEsInspectPlanService extends IService { - - /** - * 分页查询 - * - * @param processEsInspectPlan - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessEsInspectPlan processEsInspectPlan, Integer pageNo, Integer pageSize); - - /** - * 列表查询 - * - * @param processEsInspectPlan - * @return - */ - List queryList(ProcessEsInspectPlan processEsInspectPlan); - - /** - * 保存 - * - * @param processEsInspectPlan - * @return - */ - void add(ProcessEsInspectPlan processEsInspectPlan); - - /** - * 更新 - * - * @param processEsInspectPlan - * @return - */ - void editById(ProcessEsInspectPlan processEsInspectPlan); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsInspectPlan queryById(String id); - - /** - * 通过流程实例id和参数名查询流程变量 - * - * @param instanceId - * @param key - * @return - */ - Map findActRuVariableByInstanceId(String instanceId, String key); - - /** - * 企标稽查计划业务表-通过excel导入数据(稽查联络人发起计划) - * @param request - * @param response - * @return - */ - Result> importExcelByStart(HttpServletRequest request, HttpServletResponse response) throws Exception; - - /** - * 下载导入模板 - * @return - */ - void templateDownloadByStart(HttpServletResponse response) throws IOException; - - /** - * 通过excel导入数据(稽查征求意见对象填写意见) - * @param request - * @param response - * @return - */ - Result> importExcelByOpinionFill(HttpServletRequest request, HttpServletResponse response) throws Exception; - - /** - * 企标稽查计划业务表-下载导入模板(稽查征求意见对象填写意见) - * @param response - */ - void templateDownloadByStartByOpinionFill(HttpServletResponse response) throws IOException; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java deleted file mode 100644 index 37d650e7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service.impl; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsInspectPlanFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_es_inspect_plan", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index d34c4a22..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ /dev/null @@ -1,576 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.entity.ProcessNode; -import com.jero.modules.activiti.entity.ProcessNodeLink; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish; -import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; -import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; -import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService; -import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import com.jero.modules.activiti.process.esinspectplan.service.IEsInspectPlanFlowService; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; -import com.jero.modules.activiti.process.esinspectplan.vo.EsInspectPlanFlowVO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -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.activiti.service.ProcessNodeService; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectObject; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectObjectService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -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.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: 企标稽查计划流程 - * @Description: - * @Author: yjz - * @Date: 2023-11-09 11:47 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final IProcessEsInspectPlanService processEsInspectPlanService; - private final RepositoryService repositoryService; - private final ISysUserService sysUserService; - private final ProcessNodeService processNodeService; - private final ProcessNodeLinkService processNodeLinkService; - private final SendMessageAPI sendMessageAPI; - private final EnterpriseStandardInspectService enterpriseStandardInspectService; - private final EnterpriseStandardInspectObjectService enterpriseStandardInspectObjectService; - private final IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService; - private final ProcessEsAbolishService processEsAbolishService; - private final ProcessEsArchiveService processEsArchiveService; - public EsInspectPlanFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - IProcessEsInspectPlanService processEsInspectPlanService, - RepositoryService repositoryService, - ISysUserService sysUserService, - ProcessNodeService processNodeService, - ProcessNodeLinkService processNodeLinkService, - SendMessageAPI sendMessageAPI, - EnterpriseStandardInspectService enterpriseStandardInspectService, - EnterpriseStandardInspectObjectService enterpriseStandardInspectObjectService, - IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService, - ProcessEsAbolishService processEsAbolishService, - ProcessEsArchiveService processEsArchiveService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processEsInspectPlanService = processEsInspectPlanService; - this.repositoryService = repositoryService; - this.sysUserService = sysUserService; - this.processNodeService = processNodeService; - this.processNodeLinkService = processNodeLinkService; - this.sendMessageAPI = sendMessageAPI; - this.enterpriseStandardInspectService = enterpriseStandardInspectService; - this.enterpriseStandardInspectObjectService = enterpriseStandardInspectObjectService; - this.processEsInspectPlanOpinionService = processEsInspectPlanOpinionService; - this.processEsAbolishService = processEsAbolishService; - this.processEsArchiveService = processEsArchiveService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - private static final String COUNTERSIGN = "countersign"; - private static final String COUNTERSIGN_TAG = "countersignTag"; - - @Override - public void flowStart(EsInspectPlanFlowVO esInspectPlanFlowVO) { - // 流程信息 - ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectPlanFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsInspectPlanCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue())); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息、 - 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())); - - // 处理业务表数据 - handleBusinessData(esInspectPlanFlowVO); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - } - - private void handleBusinessData(EsInspectPlanFlowVO esInspectPlanFlowVO) { - List processEsInspectPlanList = esInspectPlanFlowVO.getProcessEsInspectPlanList(); - // 删除数据 - if (StringUtils.isNotBlank(esInspectPlanFlowVO.getProcessAllDelIds())) { - List idList = Arrays.asList(esInspectPlanFlowVO.getProcessAllDelIds().split(",")); - processEsInspectPlanService.removeByIds(idList); - processEsInspectPlanOpinionService.removeByIds(idList); - } - ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); - String projectId = processAll.getProjectId(); - - // 废止/封存判断 - checkout(processEsInspectPlanList); - List updateProcessEsInspectPlanList = processEsInspectPlanList.stream() - .filter(v -> StringUtils.isNotBlank(v.getId())) - .map(v -> { - v.setProjectId(projectId); - return v; - }) - .collect(Collectors.toList()); - processEsInspectPlanService.updateBatchById(updateProcessEsInspectPlanList); - - List saveProcessEsInspectPlanList = processEsInspectPlanList.stream() - .filter(v -> StringUtils.isBlank(v.getId())) - .map(v -> { - v.setId(String.valueOf(SnowflakeUtils.snowflake())); - v.setProjectId(projectId); - return v; - }) - .collect(Collectors.toList()); - processEsInspectPlanService.saveBatch(saveProcessEsInspectPlanList); - - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - // 处理意见 - if (EsInspectPlanCommon.PROCESS_NODE_2.equals(processAll.getNodeId())) { - ArrayList processEsInspectPlanOpinions = new ArrayList<>(); - for (ProcessEsInspectPlan processEsInspectPlan : processEsInspectPlanList) { - if (!Objects.isNull(processEsInspectPlan.getProcessEsInspectPlanOpinion())) { - ProcessEsInspectPlanOpinion processEsInspectPlanOpinion = processEsInspectPlan.getProcessEsInspectPlanOpinion(); - processEsInspectPlanOpinion.setInspectPlanId(processEsInspectPlan.getId()); - processEsInspectPlanOpinion.setCreateBy(sysUser.getUsername()); - processEsInspectPlanOpinions.add(processEsInspectPlanOpinion); - } - } - // 保存意见 - processEsInspectPlanOpinionService.saveOrUpdateBatch(processEsInspectPlanOpinions); - } - } - - private void checkout(List processEsInspectPlanList){ - List errorList = new ArrayList<>(); - for (ProcessEsInspectPlan processEsInspectPlan : processEsInspectPlanList) { - String inspectNo = processEsInspectPlan.getInspectNo(); - // 企标废止 - ProcessEsAbolish processEsAbolish = processEsAbolishService.getOne( - new LambdaQueryWrapper() - .eq(ProcessEsAbolish::getStandardNumber, inspectNo) - .orderByDesc(ProcessEsAbolish::getCreateTime) - .last("limit 1"), false); - if (!Objects.isNull(processEsAbolish)){ - ProcessAll processAll = processAllService.getOne( - new LambdaQueryWrapper() - .eq(ProcessAll::getProcessInstanceId, processEsAbolish.getProcessInstanceId())); - if (!Objects.isNull(processEsAbolish) - && ProcessStatusEnum.INCOMPLETE.getValue().equals(processAll.getPrcStatus())){ - errorList.add(inspectNo); - } - } - - // 企标封存 - ProcessEsArchive processEsArchive = processEsArchiveService.getOne( - new LambdaQueryWrapper() - .eq(ProcessEsArchive::getStandardNumber, inspectNo) - .orderByDesc(ProcessEsArchive::getCreateTime) - .last("limit 1"), false); - if (!Objects.isNull(processEsArchive)){ - ProcessAll processAll = processAllService.getOne( - new LambdaQueryWrapper() - .eq(ProcessAll::getProcessInstanceId, processEsArchive.getProcessInstanceId())); - if (!Objects.isNull(processAll) - && ProcessStatusEnum.INCOMPLETE.getValue().equals(processAll.getPrcStatus())){ - errorList.add(inspectNo); - } - } - } - if (!errorList.isEmpty()){ - throw new JeroBootException("企标编号为" + String.join(",", errorList) + "的数据已在企标废止/封存流程进行中，不可发起！"); - } - } - - @Override - public void flowSave(EsInspectPlanFlowVO esInspectPlanFlowVO) { - // 流程信息 - ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord(); - - // 处理业务表数据 - handleBusinessData(esInspectPlanFlowVO); - - // 稽查联络人汇总节点保存会签信息 - if (StringUtils.isNotBlank(processAll.getTaskId())){ - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (EsInspectPlanCommon.PROCESS_NODE_3.equals(task.getTaskDefinitionKey())){ - taskService.setVariable(processAll.getTaskId(), COUNTERSIGN, esInspectPlanFlowVO.getCountersign()); - taskService.setVariable(processAll.getTaskId(), COUNTERSIGN_TAG, esInspectPlanFlowVO.getCountersignTag()); - } - } - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List)v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } - - @Override - public EsInspectPlanFlowVO queryDetailByProjectId(String projectId, String taskId) { - EsInspectPlanFlowVO esInspectPlanFlowVO = new EsInspectPlanFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ - String id = ""; - if(Objects.isNull(processAll)){ - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - }else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())){ - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ - esInspectPlanFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - }else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, taskId) - , false); - } - // 会签信息 - countersign(taskId, esInspectPlanFlowVO); - // 业务表信息 - ProcessEsInspectPlan processEsInspectPlan = new ProcessEsInspectPlan(); - processEsInspectPlan.setProjectId(projectId); - processEsInspectPlan.setNodeId(processApprovalRecord.getNodeId()); - esInspectPlanFlowVO.setProcessEsInspectPlanList(processEsInspectPlanService.queryList(processEsInspectPlan)); - esInspectPlanFlowVO.setProcessAll(processAll); - esInspectPlanFlowVO.setProcessApprovalRecord(processApprovalRecord); - return esInspectPlanFlowVO; - } - - private void countersign(String taskId, EsInspectPlanFlowVO esInspectPlanFlowVO) { - if (StringUtils.isNotBlank(taskId)){ - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - if (EsInspectPlanCommon.PROCESS_NODE_3.equals(task.getTaskDefinitionKey())){ - String countersign = (String) taskService.getVariable(taskId, COUNTERSIGN); - String countersignTag = (String) taskService.getVariable(taskId, COUNTERSIGN_TAG); - if (StringUtils.isNotBlank(countersign)){ - esInspectPlanFlowVO.setCountersign(countersign); - esInspectPlanFlowVO.setCountersignDictText(sysUserService.dictByIdsOrUserNames(countersign, "")); - } - if (StringUtils.isNotBlank(countersignTag)){ - esInspectPlanFlowVO.setCountersignTag(countersignTag); - } - } - } - } - - @Override - public List queryPersonInfo(String processDefinitionName, String processInstanceId) { - List nodeList = new ArrayList<>(); - // 查询流程定义 - ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionName(processDefinitionName) - .latestVersion() - .singleResult(); - if (!Objects.isNull(processDefinition)) { - // 获取流程节点信息 - List processNodeList = processNodeService.list( - new LambdaQueryWrapper() - .eq(ProcessNode::getProcessDefinitionId, processDefinition.getId()) - .orderByAsc(ProcessNode::getSort)); - - // 查询流程实例关联用户 - for (ProcessNode processNode : processNodeList) { - String userIds = ""; - if (StringUtils.isNotBlank(processInstanceId)) { - ListprocessNodeLinkList = processNodeLinkService.list( - new LambdaQueryWrapper() - .eq(ProcessNodeLink::getProcessDefinitionId, processDefinition.getId()) - .eq(ProcessNodeLink::getProcessNodeId, processNode.getId())); - if (!processNodeLinkList.isEmpty()){ - List userIdList = processNodeLinkList.stream().map(ProcessNodeLink::getUserId).collect(Collectors.toList()); - List sysUserList = sysUserService.listByIds(userIdList); - userIds = sysUserList.stream().map(SysUser::getId).collect(Collectors.joining(",")); - } - } - processNode.setLinkUserIds(userIds); - nodeList.add(processNode); - } - } - return nodeList; - } - - @Override - public void flowApproval(EsInspectPlanFlowVO esInspectPlanFlowVO) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 流程信息 - ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectPlanFlowVO.getMap(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - - // 更新流程审批信息 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .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::getEndTime, new Date())); - - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task != null) { - // 稽查联络人汇总节点保存会签信息 - saveCountersign(esInspectPlanFlowVO, map); - // 处理业务表数据 - handleBusinessData(esInspectPlanFlowVO); - // 获取稽查联络人 - String liaisons = taskService.getVariable(task.getId(), "liaisons", String.class); - // 完成任务 - taskService.complete(task.getId(), map); - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); - // 可跳过节点处理 - if (map.containsKey("pass") && (boolean) map.get("pass")){ - // 更新流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processAll.getProcessDefinitionId(), processAll.getProcessInstanceId(), listToString(map)); - }else if (map.containsKey("pass") && !(boolean) map.get("pass")){ - // 驳回删除可跳过节点人员信息 - ProcessNode processNode = processNodeService.getOne(new LambdaQueryWrapper() - .eq(ProcessNode::getProcessDefinitionId, processAll.getProcessDefinitionId()) - .eq(ProcessNode::getVariableName, "involveList") - .orderByDesc(ProcessNode::getCreateTime)); - processNodeLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessNodeLink::getProcessDefinitionId, processAll.getProcessDefinitionId()) - .eq(ProcessNodeLink::getProcessInstanceId, processAll.getProcessInstanceId()) - .eq(ProcessNodeLink::getProcessNodeId, processNode.getId()) - .set(ProcessNodeLink::getUserId, null)); - } - // 判断是否是最后一个节点 - if (isLastNode(processAll.getProcessInstanceId()) - && map.containsKey("pass") && (boolean) map.get("pass")){ - - // 企标稽查计划业务表数据 - List processEsInspectPlanList = processEsInspectPlanService.list( - new LambdaQueryWrapper() - .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId())); - - // 企标稽查计划 生成数据 保存企标库 - saveDataToInspect(processEsInspectPlanList); - try { - // 抄送消息 通过hiwork 给稽查联络人抄送消息 - sendMessage(processAll, liaisons); - }catch (Exception e){ - log.error("邮件发送失败:{}", e.getMessage()); - } - } - } - } - - private void sendMessage(ProcessAll processAll, String liaisons) { - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.ES_INSPECT_PLAN); - sendMessageDTO.setToUserId(liaisons); - Map sendMap = new HashMap<>(); - ProcessAll process = processAllService.getByProcessInstanceId(processAll.getProcessInstanceId()); - sendMap.put("prcNum", process.getPrcNum()); - sendMap.put("prcName", process.getPrcName()); - sendMessageDTO.setMap(sendMap); - sendMessageAPI.sendMessage(sendMessageDTO); - } - - private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map map) { - if (map.containsKey("pass") && (boolean) map.get("pass")){ - if (StringUtils.isNotBlank(esInspectPlanFlowVO.getCountersign())){ - map.put(COUNTERSIGN, esInspectPlanFlowVO.getCountersign()); - } - if (StringUtils.isNotBlank(esInspectPlanFlowVO.getCountersignTag())){ - map.put(COUNTERSIGN_TAG, esInspectPlanFlowVO.getCountersignTag()); - } - } - } - - private void saveDataToInspect(List processEsInspectPlanList) { - List list = new ArrayList<>(); - List objectList = new ArrayList<>(); - for (ProcessEsInspectPlan processEsInspectPlan : processEsInspectPlanList) { - EnterpriseStandardInspect enterpriseStandardInspect = new EnterpriseStandardInspect(); - // 属性拷贝 - BeanUtils.copyProperties(processEsInspectPlan, enterpriseStandardInspect); - enterpriseStandardInspect.setCreateTime(null); - enterpriseStandardInspect.setUpdateTime(null); - enterpriseStandardInspect.setCreateBy(null); - enterpriseStandardInspect.setUpdateBy(null); - enterpriseStandardInspect.setProcessEsInspectPlanId(processEsInspectPlan.getId()); - // 稽查状态 - enterpriseStandardInspect.setInspectStatus(EsInspectPlanCommon.INSPECT_STATUS_1); - // 计划稽查对象 - String inspectObject = processEsInspectPlan.getInspectObject(); - String[] inspectObjectList = inspectObject.split(","); - for (String object : inspectObjectList) { - EnterpriseStandardInspectObject enterpriseStandardInspectObject = new EnterpriseStandardInspectObject(); - enterpriseStandardInspectObject.setInspectId(processEsInspectPlan.getId()); - enterpriseStandardInspectObject.setPlanInspectObject(object); - objectList.add(enterpriseStandardInspectObject); - } - list.add(enterpriseStandardInspect); - } - // 保存稽查 - enterpriseStandardInspectService.saveBatch(list); - // 保存稽查对象 - enterpriseStandardInspectObjectService.saveBatch(objectList); - } - - @Override - public void flowTransfer(String taskId, String userId) { - processHandleService.transfer(taskId, userId); - } - - @Override - public boolean isLastNode(String processInstanceId) { - // 查询流程实例状态 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - - // 如果流程实例为null，表示流程已结束 - return processInstance == null; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java deleted file mode 100644 index 9b1e5994..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import com.jero.modules.activiti.process.esinspectplan.mapper.ProcessEsInspectPlanOpinionMapper; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; -import com.jero.modules.system.service.ISysUserService; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - - -/** - * @Description: 企标稽查计划业务_意见表 - * @Author: jero-boot - * @Date: 2023-11-13 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl implements IProcessEsInspectPlanOpinionService { - - private final ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper; - private final ISysUserService sysUserService; - - public ProcessEsInspectPlanOpinionServiceImpl(ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper, - ISysUserService sysUserService) { - this.processEsInspectPlanOpinionMapper = processEsInspectPlanOpinionMapper; - this.sysUserService = sysUserService; - } - - /** - * 分页查询 - * - * @param processEsInspectPlanOpinion - * @param pageNo - * @param pageSize - * @return - */ - @Override - public IPage queryPage(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = getProcessEsInspectPlanOpinionQueryWrapper(processEsInspectPlanOpinion); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processEsInspectPlanOpinion - * @return - */ - @Override - public List queryList(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - QueryWrapper queryWrapper = getProcessEsInspectPlanOpinionQueryWrapper(processEsInspectPlanOpinion); - return list(queryWrapper); - } - - @NotNull - private static QueryWrapper getProcessEsInspectPlanOpinionQueryWrapper(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(processEsInspectPlanOpinion.getInspectPlanId()), "opinion", processEsInspectPlanOpinion.getInspectPlanId()); - queryWrapper.orderByDesc("create_time"); - return queryWrapper; - } - - /** - * 保存 - * - * @param processEsInspectPlanOpinion - * @return - */ - @Override - public void add(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - Date now = new Date(); - processEsInspectPlanOpinion.setCreateTime(now); - processEsInspectPlanOpinion.setUpdateTime(now); - save(processEsInspectPlanOpinion); - } - - /** - * 更新 - * - * @param processEsInspectPlanOpinion - * @return - */ - @Override - public void editById(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) { - Date now = new Date(); - processEsInspectPlanOpinion.setUpdateTime(now); - saveOrUpdate(processEsInspectPlanOpinion); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsInspectPlanOpinion queryById(String id) { - return getById(id); - } - - @Override - public ProcessEsInspectPlanOpinion queryLastOpinion(String inspectPlanId) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessEsInspectPlanOpinion::getInspectPlanId, inspectPlanId); - queryWrapper.eq(ProcessEsInspectPlanOpinion::getCreateBy, sysUser.getUsername()); - queryWrapper.orderByDesc(ProcessEsInspectPlanOpinion::getCreateTime); - queryWrapper.last("limit 1"); - return getOne(queryWrapper,false); - } - - @Override - public List findLastByGroup(String inspectPlanId) { - List lastByGroup = processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId); - for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : lastByGroup) { - processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy())); - } - return lastByGroup; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java deleted file mode 100644 index 372afbf8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ /dev/null @@ -1,533 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.BeanCopyUtils; -import com.jero.common.util.ImportExcelUtil; -import com.jero.common.util.IntekeyUtils; -import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import com.jero.modules.activiti.process.esinspectplan.mapper.ProcessEsInspectPlanMapper; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; -import com.jero.modules.activiti.process.esinspectplan.vo.ProcessEsInspectPlanExcel; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysUserService; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jetbrains.annotations.NotNull; -import org.springframework.core.io.ClassPathResource; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.*; - - -/** - * @Description: 企标稽查计划业务表 - * @Author: jero-boot - * @Date: 2023-11-09 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsInspectPlanServiceImpl extends ServiceImpl implements IProcessEsInspectPlanService { - - private final ProcessEsInspectPlanMapper processEsInspectPlanMapper; - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - private final IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService; - private final ISysUserService sysUserService; - private final ISysDepartService sysDepartService; - - public ProcessEsInspectPlanServiceImpl(ProcessEsInspectPlanMapper processEsInspectPlanMapper, - ILawsEnterpriseStandardService lawsEnterpriseStandardService, - IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService, - ISysUserService sysUserService, - ISysDepartService sysDepartService) { - this.processEsInspectPlanMapper = processEsInspectPlanMapper; - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - this.processEsInspectPlanOpinionService = processEsInspectPlanOpinionService; - this.sysUserService = sysUserService; - this.sysDepartService = sysDepartService; - } - - private static final String ERROR_MESSAGE = "模板错误，按照系统模板导入!"; - private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - - /** - * 分页查询 - * - * @param processEsInspectPlan - * @param pageNo - * @param pageSize - * @return - */ - @Override - public IPage queryPage(ProcessEsInspectPlan processEsInspectPlan, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = getProcessEsInspectPlanQueryWrapper(processEsInspectPlan); - Page page = new Page<>(pageNo, pageSize); - Page pages = page(page, queryWrapper); - fillProperty(pages.getRecords()); - return pages; - } - - /** - * 列表查询 - * - * @param processEsInspectPlan - * @return - */ - @Override - public List queryList(ProcessEsInspectPlan processEsInspectPlan) { - QueryWrapper queryWrapper = getProcessEsInspectPlanQueryWrapper(processEsInspectPlan); - List list = list(queryWrapper); - fillProperty(list); - return list; - } - - private void fillProperty(List list) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - for (ProcessEsInspectPlan processEsInspectPlan : list) { - // 意见 - List opinionList = processEsInspectPlanOpinionService.findLastByGroup(processEsInspectPlan.getId()); - for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) { - if (loginUser.getUsername().equals(processEsInspectPlanOpinion.getCreateBy())){ - processEsInspectPlan.setProcessEsInspectPlanOpinion(processEsInspectPlanOpinion); - } - // 用户翻译 - processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy())); - processEsInspectPlanOpinion.setUpdateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getUpdateBy())); - } - processEsInspectPlan.setProcessEsInspectPlanOpinionList(opinionList); - // 用户翻译 - processEsInspectPlan.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getInspectUser(), "")); - processEsInspectPlan.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getStandardizationDockingUser(), "")); - processEsInspectPlan.setObjectOfConsultationDictText(sysUserService.dictByIdsOrUserNames(processEsInspectPlan.getObjectOfConsultation(), "")); - processEsInspectPlan.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlan.getCreateBy())); - processEsInspectPlan.setUpdateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlan.getUpdateBy())); - } - } - - @NotNull - private static QueryWrapper getProcessEsInspectPlanQueryWrapper(ProcessEsInspectPlan processEsInspectPlan) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(processEsInspectPlan.getProjectId()), "project_id", processEsInspectPlan.getProjectId()); - if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && EsInspectPlanCommon.PROCESS_NODE_2.equals(processEsInspectPlan.getNodeId())){ - queryWrapper.and(qw -> - qw.like("object_of_consultation", loginUser.getId()) - .or().eq("create_by", loginUser.getUsername())); - } - queryWrapper.orderByAsc("create_time"); - return queryWrapper; - } - - /** - * 保存 - * - * @param processEsInspectPlan - * @return - */ - @Override - public void add(ProcessEsInspectPlan processEsInspectPlan) { - Date now = new Date(); - processEsInspectPlan.setCreateTime(now); - processEsInspectPlan.setUpdateTime(now); - save(processEsInspectPlan); - } - - /** - * 更新 - * - * @param processEsInspectPlan - * @return - */ - @Override - public void editById(ProcessEsInspectPlan processEsInspectPlan) { - Date now = new Date(); - processEsInspectPlan.setUpdateTime(now); - saveOrUpdate(processEsInspectPlan); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsInspectPlan queryById(String id) { - return getById(id); - } - - @Override - public Map findActRuVariableByInstanceId(String instanceId, String key) { - return processEsInspectPlanMapper.findActRuVariableByInstanceId(instanceId, key); - } - - @Override - public Result> importExcelByStart(HttpServletRequest request, HttpServletResponse response) throws Exception { - String projectId = request.getParameter("projectId"); - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - // 获取上传文件对象 - // 解密excel - MultipartFile file = IntekeyUtils.autoDecryptFile(entity.getValue()); - ImportParams params = new ImportParams(); - params.setNeedSave(true); - params.setHeadRows(1); - // excel表格头部校验 - excelHeadVerify(file, ProcessEsInspectPlan.class, 0, 0); - List lists = ExcelImportUtil.importExcel(file.getInputStream(), ProcessEsInspectPlan.class, params); - if (CollectionUtils.isEmpty(lists) || lists.size() <= 2) { - return Result.error("没有数据可导入!"); - } - lists.remove(0); - lists.remove(0); - List list = BeanCopyUtils.copyBeanList(lists, ProcessEsInspectPlan.class); - StringBuilder errorMSG = new StringBuilder(); - // 字段校验 - for (int i = 0; i < list.size(); i++) { - list.get(i).setProjectId(projectId); - String head = "第" + (i + 4) + "行："; - List firstVerify = firstVerify(list.get(i)); - List secondVerify = secondVerify(list.get(i)); - List thirdVerify = thirdVerify(list.get(i)); - List fifthVerify = fifthVerify(list.get(i)); - List sixthVerify = sixthVerify(list.get(i)); - List seventhVerify = seventhVerify(list.get(i)); - firstVerify.addAll(secondVerify); - firstVerify.addAll(thirdVerify); - firstVerify.addAll(fifthVerify); - firstVerify.addAll(sixthVerify); - firstVerify.addAll(seventhVerify); - - if (!firstVerify.isEmpty()){ - errorMSG.append(head).append(String.join("", firstVerify)).append("
"); - } - } - //update-begin-author:taoyan date:20190528 for:批量插入数据 - //update-end-author:taoyan date:20190528 for:批量插入数据 - if (errorMSG.length() > 0){ - throw new JeroBootException("文件导入失败:
" + errorMSG); - }else { - fillProperty(list); - return Result.OK("文件导入成功！数据行数：" + list.size(), list); - } - } - return Result.error("文件导入失败！"); - } - - @Override - public void templateDownloadByStart(HttpServletResponse response) throws IOException { - ClassPathResource resource = new ClassPathResource("excelTemplate/企标稽查计划导入模板(稽查联络人发起计划).xls"); - // 设置HTTP响应头，包括文件大小和内容类型 - response.setContentType("application/vnd.ms-excel"); // 根据实际文件类型设置内容类型 - response.setHeader("Content-Disposition", "attachment; filename=企标稽查计划导入模板.xls"); - - // 将文件内容写入HTTP响应输出流中 - try (InputStream in = resource.getInputStream(); - ServletOutputStream out = response.getOutputStream()) { - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = in.read(buffer)) != -1) { - out.write(buffer, 0, bytesRead); - } - } - } - - @Override - public Result> importExcelByOpinionFill(HttpServletRequest request, HttpServletResponse response) throws Exception { - String projectId = request.getParameter("projectId"); - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - // 获取上传文件对象 - MultipartFile file = IntekeyUtils.autoDecryptFile(entity.getValue()); - ImportParams params = new ImportParams(); - params.setNeedSave(true); - params.setHeadRows(1); - // excel表格头部校验 - excelHeadVerify2(file, ProcessEsInspectPlanExcel.class, 0, 0); - List lists = ExcelImportUtil.importExcel(file.getInputStream(), ProcessEsInspectPlanExcel.class, params); - if (CollectionUtils.isEmpty(lists) || lists.size() <= 2) { - throw new JeroBootException("没有数据可导入!"); - } - lists.remove(0); - lists.remove(0); - List list = BeanCopyUtils.copyBeanList(lists, ProcessEsInspectPlan.class); - StringBuilder errorMSG = new StringBuilder(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 字段校验 - for (int i = 0; i < list.size(); i++) { - list.get(i).setProjectId(projectId); - String head = "第" + (i + 4) + "行："; - List firstVerify = firstVerify(list.get(i)); - List secondVerify = secondVerify(list.get(i)); - List thirdVerify = thirdVerify(list.get(i)); - List fifthVerify = fifthVerify(list.get(i)); - List sixthVerify = sixthVerify(list.get(i)); - list.get(i).setObjectOfConsultation(loginUser.getId()); - firstVerify.addAll(secondVerify); - firstVerify.addAll(thirdVerify); - firstVerify.addAll(fifthVerify); - firstVerify.addAll(sixthVerify); - - if (!firstVerify.isEmpty()){ - errorMSG.append(head).append(String.join("", firstVerify)).append("
"); - } - } - //update-begin-author:taoyan date:20190528 for:批量插入数据 - //update-end-author:taoyan date:20190528 for:批量插入数据 - if (errorMSG.length() > 0){ - throw new JeroBootException("文件导入失败:
" + errorMSG); - }else { - fillProperty(list); - return Result.OK("文件导入成功！数据行数：" + list.size(), list); - } - } - return Result.error("文件导入失败！"); - } - - @Override - public void templateDownloadByStartByOpinionFill(HttpServletResponse response) throws IOException { - ClassPathResource resource = new ClassPathResource("excelTemplate/企标稽查计划导入模板(稽查征求意见对象填写意见).xls"); - // 设置HTTP响应头，包括文件大小和内容类型 - response.setContentType("application/vnd.ms-excel"); // 根据实际文件类型设置内容类型 - response.setHeader("Content-Disposition", "attachment; filename=企标稽查计划导入模板.xls"); - - // 将文件内容写入HTTP响应输出流中 - try (InputStream in = resource.getInputStream(); - ServletOutputStream out = response.getOutputStream()) { - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = in.read(buffer)) != -1) { - out.write(buffer, 0, bytesRead); - } - } - } - - private List seventhVerify(ProcessEsInspectPlan processEsInspectPlan) { - List errorList = new ArrayList<>(); - if (StringUtils.isNotBlank(processEsInspectPlan.getObjectOfConsultation())){ - String[] objectOfConsultationArr = processEsInspectPlan.getObjectOfConsultation().split(","); - List userList = new ArrayList<>(); - for (String objectOfConsultation : objectOfConsultationArr) { - SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(objectOfConsultation); - if (Objects.isNull(sysUser)){ - errorList.add("征求意见对象不存在!"); - }else { - userList.add(sysUser.getId()); - } - } - if (!userList.isEmpty()){ - processEsInspectPlan.setObjectOfConsultation(String.join(",", userList)); - } - }else { - errorList.add("征求意见对象不能为空!"); - } - return errorList; - } - - private List sixthVerify(ProcessEsInspectPlan processEsInspectPlan) { - List errorList = new ArrayList<>(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationDockingUser())){ - SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getStandardizationDockingUser()); - if (Objects.isNull(sysUser)){ - errorList.add("标准化组对接人不存在!"); - }else { - processEsInspectPlan.setStandardizationDockingUser(sysUser.getId()); - } - }else { - errorList.add("标准化组对接人不能为空!"); - } - // 填充创建人 - processEsInspectPlan.setCreateBy(loginUser.getUsername()); - processEsInspectPlan.setCreateByDictText(loginUser.calcNameWorkNo()); - return errorList; - } - - private List fifthVerify(ProcessEsInspectPlan processEsInspectPlan) { - List errorList = new ArrayList<>(); - if (StringUtils.isNotBlank(processEsInspectPlan.getPlanInspectDates())){ - try{ - Date parse = dateFormat.parse(processEsInspectPlan.getPlanInspectDates()); - Calendar instance = Calendar.getInstance(); - instance.setTime(parse); - int weekYear = instance.getWeekYear(); - if (String.valueOf(weekYear).length() > 4){ - throw new JeroBootException(""); - } - processEsInspectPlan.setPlanInspectDate(parse); - }catch (Exception e){ - errorList.add("计划稽查日期格式不正确!（正确格式：yyyy-MM-dd）"); - } - }else { - errorList.add("计划稽查日期不能为空!"); - } - if (StringUtils.isNotBlank(processEsInspectPlan.getInspectUser())){ - SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getInspectUser()); - if (Objects.isNull(sysUser)){ - errorList.add("稽查负责人不存在!"); - }else { - processEsInspectPlan.setInspectUser(sysUser.getId()); - } - }else { - errorList.add("稽查负责人不能为空!"); - } - return errorList; - } - - private List thirdVerify(ProcessEsInspectPlan processEsInspectPlan) { - List errorList = new ArrayList<>(); - if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationWorkGroup())){ - processEsInspectPlan.setStandardizationWorkGroup(processEsInspectPlan.getStandardizationWorkGroup()); - }else { - errorList.add("主责标准化工作组不能为空!"); - } - if (StringUtils.isNotBlank(processEsInspectPlan.getBelongDept())){ - List sysDepart = sysDepartService.list( - new LambdaQueryWrapper() - .eq(SysDepart::getDepartName, processEsInspectPlan.getBelongDept())); - if (sysDepart.isEmpty()) { - errorList.add("所属部门不存在!"); - }else { - processEsInspectPlan.setBelongDept(sysDepart.get(0).getId()); - } - }else { - errorList.add("所属部门不能为空!"); - } - return errorList; - } - - private List secondVerify(ProcessEsInspectPlan processEsInspectPlan) { - List errorList = new ArrayList<>(); - List departList = new ArrayList<>(); - if (StringUtils.isNotBlank(processEsInspectPlan.getInspectObject())){ - String[] list = processEsInspectPlan.getInspectObject().split(","); - for (String s : list) { - List sysDepart = sysDepartService.list( - new LambdaQueryWrapper() - .eq(SysDepart::getDepartName, s)); - if (sysDepart.isEmpty()) { - errorList.add("计划稽查对象不存在!"); - }else { - departList.add(sysDepart.get(0).getId()); - } - } - }else { - errorList.add("计划稽查对象不能为空!"); - } - if (errorList.isEmpty()){ - processEsInspectPlan.setInspectObject(String.join(",", departList)); - } - return errorList; - } - - private List firstVerify(ProcessEsInspectPlan processEsInspectPlan) { - List errorList = new ArrayList<>(); - boolean flag = false; - if (StringUtils.isBlank(processEsInspectPlan.getInspectNo())){ - errorList.add("稽查依据标准号不能为空!"); - flag = true; - } - if (StringUtils.isNotBlank(processEsInspectPlan.getInspectName())){ - List list = lawsEnterpriseStandardService.list(new LambdaQueryWrapper() - .eq(LawsEnterpriseStandard::getStandardName, processEsInspectPlan.getInspectName())); - if (list.isEmpty()) { - errorList.add("稽查依据标准名称不存在!"); - }else if (flag){ - long count = list.stream().filter(v -> v.getStandardNumber().equals(processEsInspectPlan.getInspectNo()) - && v.getStandardName().equals(processEsInspectPlan.getInspectName())).count(); - if (count == 0){ - errorList.add("稽查依据标准号和稽查依据标准名称不匹配!"); - } - } - }else { - errorList.add("稽查依据标准名称不能为空!"); - } - return errorList; - } - - /** - * excel表头校验 - * @param file - * @param carTypeClass - * @param titleRows - * @param i - */ - private void excelHeadVerify(MultipartFile file, Class carTypeClass, int titleRows, int i) { - try { - if (!(boolean) ImportExcelUtil.checkTemplateTitle(file, carTypeClass, titleRows, i)){ - throw new JeroBootException(ERROR_MESSAGE); - } - }catch (Exception e) { - e.printStackTrace(); - throw new JeroBootException(ERROR_MESSAGE); - } - } - - /** - * excel表头校验 - * @param file - * @param carTypeClass - * @param titleRows - * @param i - */ - private void excelHeadVerify2(MultipartFile file, Class carTypeClass, int titleRows, int i) { - try { - if (!(boolean) ImportExcelUtil.checkTemplateTitle(file, carTypeClass, titleRows, i)){ - throw new JeroBootException(ERROR_MESSAGE); - } - }catch (Exception e) { - e.printStackTrace(); - throw new JeroBootException(ERROR_MESSAGE); - } - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowPersonVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowPersonVO.java deleted file mode 100644 index 5497e183..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowPersonVO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.vo; - -import lombok.Data; - -/** - * @ClassName: EsInspectPlanFlowPersonVO - * @Description: - * @Author: yjz - * @Date: 2023-11-13 14:41 - * @Version: 1.0 - **/ -@Data -public class EsInspectPlanFlowPersonVO { - private String key; - private String value; - private String description; -} 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 deleted file mode 100644 index 0a26abd5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: 企标稽查计划流程VO - * @Description: - * @Author: yjz - * @Date: 2023-11-09 11:51 - * @Version: 1.0 - **/ -@Data -public class EsInspectPlanFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private List processEsInspectPlanList; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - - /** - * 是否会签 - */ - @ApiModelProperty(value="是否会签") - private String countersignTag; - - /** - * 会签人员 - */ - @ApiModelProperty(value="会签人员") - private String countersign; - - /** - * 会签人员 翻译 - */ - @ApiModelProperty(value="会签人员 翻译") - private String countersignDictText; - - /** - * 流程全局删除ids - */ - @ApiModelProperty(value="流程全局删除ids") - private String processAllDelIds; - /** - * 保存来源 - */ - @ApiModelProperty(value="保存来源(1：待办 2：草稿)") - private String saveSource; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/FlowRefusalVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/FlowRefusalVO.java deleted file mode 100644 index 63f0bd94..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/FlowRefusalVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName: FlowRefusalVO - * @Description: - * @Author: yjz - * @Date: 2023-11-13 18:28 - * @Version: 1.0 - **/ -@Data -public class FlowRefusalVO { - /**任务id*/ - @ApiModelProperty(value = "任务id") - private String taskId; - /**备注*/ - @ApiModelProperty(value = "备注") - private String commitText; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/ProcessEsInspectPlanExcel.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/ProcessEsInspectPlanExcel.java deleted file mode 100644 index e40ce053..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/ProcessEsInspectPlanExcel.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.jero.modules.activiti.process.esinspectplan.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** -* @ClassName: ProcessEsInspectPlanExcel -* @Description: -* @Author: yjz -* @Date: 2023-12-29 17:27 -* @Version: 1.0 -**/ -@Data -public class ProcessEsInspectPlanExcel implements Serializable { - /**项目id*/ - @ApiModelProperty(value = "项目id") - private String projectId; - /**稽查依据标准号*/ - @Excel(name = "*稽查依据标准号", width = 15) - @ApiModelProperty(value = "稽查依据标准号") - private String inspectNo; - /**稽查依据标准名称*/ - @Excel(name = "*稽查依据标准名称", width = 16) - @ApiModelProperty(value = "稽查依据标准名称") - private String inspectName; - /**计划稽查对象*/ - @Excel(name = "*计划稽查对象", width = 15) - @ApiModelProperty(value = "计划稽查对象") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private String inspectObject; - /**主责标准化工作组*/ - @Excel(name = "*主责标准化工作组", width = 16) - @ApiModelProperty(value = "主责标准化工作组") - private String standardizationWorkGroup; - /**所属部门*/ - @Excel(name = "*所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private String belongDept; - /**计划稽查日期*/ -// @Excel(name = "计划稽查日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "计划稽查日期") - private Date planInspectDate; - /**计划稽查日期 导入用*/ - @Excel(name = "*计划稽查日期", width = 15, format = "yyyy-MM-dd") - @ApiModelProperty(value = "计划稽查日期 导入用") - @TableField(exist = false) - private String planInspectDates; - /**稽查负责人*/ - @Excel(name = "*稽查负责人", width = 15) - @ApiModelProperty(value = "稽查负责人") - private String inspectUser; - /**稽查负责人 翻译*/ - @ApiModelProperty(value = "稽查负责人 翻译") - @TableField(exist = false) - private String inspectUserDictText; - /**标准化组对接人*/ - @Excel(name = "*标准化组对接人", width = 15) - @ApiModelProperty(value = "标准化组对接人") - private String standardizationDockingUser; - /**标准化组对接人 翻译*/ - @ApiModelProperty(value = "标准化组对接人 翻译") - @TableField(exist = false) - private String standardizationDockingUserDictText; - /**征求意见对象*/ - @ApiModelProperty(value = "征求意见对象") - private String objectOfConsultation; - /**征求意见对象 翻译*/ - @ApiModelProperty(value = "征求意见对象 翻译") - @TableField(exist = false) - private String objectOfConsultationDictText; - /**备注*/ - @ApiModelProperty(value = "备注") - private String remarks; - - /**意见*/ - @ApiModelProperty(value = "意见") - @TableField(exist = false) - private List processEsInspectPlanOpinionList; - /**节点id*/ - @ApiModelProperty(value = "节点id") - @TableField(exist = false) - private String nodeId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/common/EsInspectRectifyCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/common/EsInspectRectifyCommon.java deleted file mode 100644 index db182cc0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/common/EsInspectRectifyCommon.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.common; - -/** - * @ClassName: EsInspectReportCommon - * @Description: - * @Author: yjz - * @Date: 2023-11-28 19:12 - * @Version: 1.0 - **/ -public class EsInspectRectifyCommon { - private EsInspectRectifyCommon(){ - - } - - /** - * 企标稽查整改key - */ - public static final String KEY = "inspect_rectify"; - - /** - * 企标稽查整改流name - */ - public static final String NAME = "企标稽查整改"; - - /** - * 企标稽查整改节点: 1:整改负责人上传整改结果,2:负责人主管级领导审批,3:稽查负责人审核 - */ - public static final String PROCESS_NODE_1 = "responsible_start"; - /** - * 企标稽查整改节点: 1:整改负责人上传整改结果,2:负责人主管级领导审批,3:稽查负责人审核 - */ - public static final String PROCESS_NODE_2 = "leader_approval"; - /** - * 企标稽查整改节点: 1:整改负责人上传整改结果,2:负责人主管级领导审批,3:稽查负责人审核 - */ - public static final String PROCESS_NODE_3 = "responsible_approval"; - - /** - * 整改状态 1：整改中 2：审核中 3：整改已完成 4：无需整改 - */ - public static final String INSPECT_RECTIFY_STATUS_1 = "1"; - /** - * 整改状态 1：整改中 2：审核中 3：整改已完成 4：无需整改 - */ - public static final String INSPECT_RECTIFY_STATUS_2 = "2"; - /** - * 整改状态 1：整改中 2：审核中 3：整改已完成 4：无需整改 - */ - public static final String INSPECT_RECTIFY_STATUS_3 = "3"; - /** - * 整改状态 1：整改中 2：审核中 3：整改已完成 4：无需整改 - */ - public static final String INSPECT_RECTIFY_STATUS_4 = "4"; - - /** - * 操作类型 1：提交整改结果 2：申请延期 - */ - public static final String OPERATION_TYPE_1 = "1"; - /** - * 操作类型 1：提交整改结果 2：申请延期 - */ - public static final String OPERATION_TYPE_2 = "2"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/controller/EsInspectRectifyFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/controller/EsInspectRectifyFlowController.java deleted file mode 100644 index 4939e993..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/controller/EsInspectRectifyFlowController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.esinspectrectify.service.IEsInspectRectifyFlowService; -import com.jero.modules.activiti.process.esinspectrectify.vo.EsInspectRectifyFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.web.bind.annotation.*; - -import java.text.ParseException; - -/** - * @ClassName: 企标稽查整改 - * @Description: - * @Author: yjz - * @Date: 2023-11-28 19:15 - * @Version: 1.0 - **/ -@Api(tags="企标稽查整改") -@RestController -@RequestMapping("/process/esInspectRectifyFlow") -@Slf4j -public class EsInspectRectifyFlowController { - - private final IEsInspectRectifyFlowService esInspectReportFlowService; - - public EsInspectRectifyFlowController(IEsInspectRectifyFlowService esInspectReportFlowService) { - this.esInspectReportFlowService = esInspectReportFlowService; - } - - /** - * 企标稽查整改-流程发起 - * @param esInspectReportFlowVO 企标稽查整改VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查整改-流程发起") - @ApiOperation(value="企标稽查整改-流程发起", notes="企标稽查整改-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody EsInspectRectifyFlowVO esInspectReportFlowVO) { - esInspectReportFlowService.flowStart(esInspectReportFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查整改-流程保存 - * @param esInspectReportFlowVO 企标稽查整改VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查整改-流程保存") - @ApiOperation(value="企标稽查整改-流程保存", notes="企标稽查整改-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody EsInspectRectifyFlowVO esInspectReportFlowVO) { - esInspectReportFlowService.flowSave(esInspectReportFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - - /** - * 企标稽查整改-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "企标稽查整改-办理详情") - @ApiOperation(value="企标稽查整改-办理详情", notes="企标稽查整改-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(esInspectReportFlowService.queryDetailByProjectId(projectId, taskId)); - } - - /** - * 企标稽查整改-流程审批 - * @param esInspectReportFlowVO 企标稽查整改VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查整改-流程审批") - @ApiOperation(value="企标稽查整改-流程审批", notes="企标稽查整改-流程审批") - @PostMapping(value = "/flowApproval") - public Result flowApproval(@RequestBody EsInspectRectifyFlowVO esInspectReportFlowVO) throws ParseException { - esInspectReportFlowService.flowApproval(esInspectReportFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查整改-驳回 - * @param esInspectReportFlowVO 企标稽查计划流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查整改-驳回") - @ApiOperation(value="企标稽查整改-驳回", notes="企标稽查整改-驳回") - @PostMapping(value = "/flowReject") - public Result flowReject(@RequestBody EsInspectRectifyFlowVO esInspectReportFlowVO) throws ParseException { - log.info(""); - esInspectReportFlowService.flowApproval(esInspectReportFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 企标稽查整改-流程转办 - * @return 结果对象 - */ - @AutoLog(value = "企标稽查整改-流程转办") - @ApiOperation(value="企标稽查整改-流程转办", notes="企标稽查整改-流程转办") - @GetMapping(value = "/flowTransfer") - public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { - esInspectReportFlowService.flowTransfer(taskId, userId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/controller/ProcessEsInspectRectifyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/controller/ProcessEsInspectRectifyController.java deleted file mode 100644 index d8c4aa15..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/controller/ProcessEsInspectRectifyController.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; -import com.jero.modules.activiti.process.esinspectrectify.vo.ProcessEsInspectRectifyVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 企标稽查整改业务表 - * @Author: jero-boot - * @Date: 2023-11-28 - * @Version: V1.0 - */ -@Api(tags="企标稽查整改业务表") -@RestController -@RequestMapping("/esinspectreport/processEsInspectRectify") -@Slf4j -public class ProcessEsInspectRectifyController extends JeroController { - @Autowired - private IProcessEsInspectRectifyService processEsInspectReportService; - - /** - * 分页列表查询 - * - * @param processEsInspectReport - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "企标稽查整改业务表-分页列表查询") - @ApiOperation(value="企标稽查整改业务表-分页列表查询", notes="企标稽查整改业务表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessEsInspectRectify processEsInspectReport, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = processEsInspectReportService.queryPage(processEsInspectReport, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processEsInspectReport - * @param req - * @return - */ - @AutoLog(value = "企标稽查整改业务表-列表查询") - @ApiOperation(value="企标稽查整改业务表-列表查询", notes="企标稽查整改业务表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessEsInspectRectify processEsInspectReport, HttpServletRequest req) { - List list = processEsInspectReportService.queryList(processEsInspectReport, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processEsInspectReport - * @return - */ - @AutoLog(value = "企标稽查整改业务表-添加") - @ApiOperation(value="企标稽查整改业务表-添加", notes="企标稽查整改业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsInspectRectify processEsInspectReport) { - processEsInspectReportService.add(processEsInspectReport); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processEsInspectReport - * @return - */ - @AutoLog(value = "企标稽查整改业务表-编辑") - @ApiOperation(value="企标稽查整改业务表-编辑", notes="企标稽查整改业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsInspectRectify processEsInspectReport) { - processEsInspectReportService.editById(processEsInspectReport); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查整改业务表-通过id删除") - @ApiOperation(value="企标稽查整改业务表-通过id删除", notes="企标稽查整改业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processEsInspectReportService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "企标稽查整改业务表-批量删除") - @ApiOperation(value="企标稽查整改业务表-批量删除", notes="企标稽查整改业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processEsInspectReportService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "企标稽查整改业务表-通过id查询") - @ApiOperation(value="企标稽查整改业务表-通过id查询", notes="企标稽查整改业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessEsInspectRectify esInspectReport = processEsInspectReportService.queryById(id); - if(esInspectReport==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(esInspectReport); - } - - /** - * 通过项目id查询 - * - * @param projectId - * @return - */ - @AutoLog(value = "企标稽查整改业务表-通过项目id查询") - @ApiOperation(value="企标稽查整改业务表-通过项目id查询", notes="企标稽查整改业务表-通过项目id查询") - @GetMapping(value = "/queryByProjectId") - @Translation - public Result queryByProjectId(String projectId) { - ProcessEsInspectRectifyVO esInspectReportVO = processEsInspectReportService.queryByProjectId(projectId); - if(esInspectReportVO==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(esInspectReportVO); - } - - /** - * 导出excel - * - * @param request - * @param processEsInspectReport - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspectRectify processEsInspectReport) { - return super.exportXls(request, processEsInspectReport, ProcessEsInspectRectify.class, "企标稽查整改业务表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/entity/ProcessEsInspectRectify.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/entity/ProcessEsInspectRectify.java deleted file mode 100644 index 069b4dba..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/entity/ProcessEsInspectRectify.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - - -/** - * @Description: 企标稽查整改业务表 - * @Author: jero-boot - * @Date: 2023-11-28 - * @Version: V1.0 - */ -@Data -@TableName("process_es_inspect_rectify") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_inspect_rectify对象", description="企标稽查整改业务表") -public class ProcessEsInspectRectify extends BaseEntity { - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private String projectId; - /**企标稽查整改计划id*/ - @Excel(name = "企标稽查整改计划id", width = 15) - @ApiModelProperty(value = "企标稽查整改计划id") - private String inspectRectifyPlanId; - /**操作类型（1：提交整改结果 2：申请延期）*/ - @Excel(name = "操作类型（1：提交整改结果 2：申请延期）", width = 15) - @ApiModelProperty(value = "操作类型（1：提交整改结果 2：申请延期）") - @Dict(dicCode = "report_operation_type") - private String operationType; - /**整改结果*/ - @Excel(name = "整改结果", width = 15) - @ApiModelProperty(value = "整改结果") - private String rectifyResult; - /**附件*/ - @Excel(name = "附件", width = 15) - @ApiModelProperty(value = "附件") - private String attachment; - /**申请延期日期*/ - @Excel(name = "申请延期日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "申请延期日期") - private Date applyDelayDate; - /**延期说明*/ - @Excel(name = "延期说明", width = 15) - @ApiModelProperty(value = "延期说明") - private String delayDetail; - /**是否生成过新的流程(1:是 0:否)*/ - @Excel(name = "是否生成过新的流程(1:是 0:否)", width = 15) - @ApiModelProperty(value = "是否生成过新的流程(1:是 0:否)") - private String isDelayCreate; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java deleted file mode 100644 index 1d1c12e3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.job; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.esinspectrectify.common.EsInspectRectifyCommon; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.activiti.process.esinspectrectify.service.IEsInspectRectifyFlowService; -import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; -import com.jero.modules.activiti.process.esinspectrectify.vo.EsInspectRectifyFlowVO; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import lombok.extern.slf4j.Slf4j; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * @ClassName: DelayApplyJob - * @Description: 企标稽查整改-申请延期生成稽查整改定时任务 - * @Author: yjz - * @Date: 2023-12-26 09:59 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -public class DelayApplyJob implements Job { - @Resource - private IEsInspectRectifyFlowService esInspectRectifyFlowService; - @Resource - private IProcessEsInspectRectifyService processEsInspectRectifyService; - @Resource - private ProcessAllService processAllService; - @Resource - private EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; - - - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JeroBootException { - log.info("企标稽查整改-申请延期生成稽查整改定时任务开始"); - long num = 0L; - // 需要生成的企标稽查整改 - Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Date parse; - try { - parse = dateFormat.parse(dateFormat.format(date)); - } catch (ParseException e) { - throw new JeroBootException(e); - } - List list = processEsInspectRectifyService.list( - new LambdaQueryWrapper() - .eq(ProcessEsInspectRectify::getIsDelayCreate, YesOrNoEnum.NO.getValue()) - .eq(ProcessEsInspectRectify::getApplyDelayDate, parse)); - - List idList = new ArrayList<>(); - // 生成新整改流程 - for (ProcessEsInspectRectify processEsInspectRectify : list) { - idList.add(processEsInspectRectify.getId()); - EsInspectRectifyFlowVO esInspectReportFlowVO = new EsInspectRectifyFlowVO(); - - // 更新整改计划完成日期为申请延期日期，整改实际完成时间置空，整改状态为整改中 - enterpriseStandardInspectRectifyPlanService.update( - new LambdaUpdateWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getId, processEsInspectRectify.getInspectRectifyPlanId()) - .set(EnterpriseStandardInspectRectifyPlan::getPlanCompleteDate, processEsInspectRectify.getApplyDelayDate()) - .set(EnterpriseStandardInspectRectifyPlan::getActualCompleteDate, null) - .set(EnterpriseStandardInspectRectifyPlan::getRectifyStatus, EsInspectRectifyCommon.INSPECT_RECTIFY_STATUS_1)); - - // 整改计划 - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = - enterpriseStandardInspectRectifyPlanService.getById(processEsInspectRectify.getInspectRectifyPlanId()); - - // 处理流程信息 - ProcessAll oldProcessAll = processAllService.getOne( - new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, processEsInspectRectify.getProjectId())); - ProcessAll processAll = new ProcessAll(); - processAll.setProjectId(String.valueOf(SnowflakeUtils.snowflake())); - processAll.setPrcName(oldProcessAll.getPrcName()); - processAll.setCreateUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); - esInspectReportFlowVO.setProcessAll(processAll); - - // 处理流程审批信息 - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - processApprovalRecord.setProjectId(processAll.getProjectId()); - processApprovalRecord.setUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); - esInspectReportFlowVO.setProcessApprovalRecord(processApprovalRecord); - - // 处理业务表数据 - ProcessEsInspectRectify newProcessEsInspectRectify = new ProcessEsInspectRectify(); - newProcessEsInspectRectify.setId(String.valueOf(SnowflakeUtils.snowflake())); - newProcessEsInspectRectify.setProjectId(processAll.getProjectId()); - newProcessEsInspectRectify.setIsDelayCreate(YesOrNoEnum.NO.getValue()); - newProcessEsInspectRectify.setInspectRectifyPlanId(processEsInspectRectify.getInspectRectifyPlanId()); - esInspectReportFlowVO.setProcessEsInspectRectify(newProcessEsInspectRectify); - processEsInspectRectifyService.save(newProcessEsInspectRectify); - - // 处理人员信息 - Map map = new HashMap<>(); - map.put("responsible", enterpriseStandardInspectRectifyPlan.getResponseUser()); - map.put("leader", "请选择"); - map.put("responsibleApproval", "请选择"); - esInspectReportFlowVO.setMap(map); - esInspectRectifyFlowService.createReportFlow(esInspectReportFlowVO); - num += 1; - } - - if (!idList.isEmpty()){ - // 修改状态 - processEsInspectRectifyService.update( - new LambdaUpdateWrapper() - .in(ProcessEsInspectRectify::getId, idList) - .set(ProcessEsInspectRectify::getIsDelayCreate, YesOrNoEnum.YES.getValue())); - } - log.info("企标稽查整改-申请延期生成稽查整改定时任务结束"); - log.info("企标稽查整改-申请延期生成稽查整改{}条", num); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/mapper/ProcessEsInspectRectifyMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/mapper/ProcessEsInspectRectifyMapper.java deleted file mode 100644 index a63cfbbc..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/mapper/ProcessEsInspectRectifyMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; - -/** - * @Description: 企标稽查整改业务表 - * @Author: jero-boot - * @Date: 2023-11-28 - * @Version: V1.0 - */ -public interface ProcessEsInspectRectifyMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/mapper/xml/ProcessEsInspectRectifyMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/mapper/xml/ProcessEsInspectRectifyMapper.xml deleted file mode 100644 index 24a1dfc1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/mapper/xml/ProcessEsInspectRectifyMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/IEsInspectRectifyFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/IEsInspectRectifyFlowService.java deleted file mode 100644 index cb238924..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/IEsInspectRectifyFlowService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.service; - -import com.jero.modules.activiti.process.esinspectrectify.vo.EsInspectRectifyFlowVO; - -import java.text.ParseException; - -/** - * @ClassName: IEsInspectReportFlowService - * @Description: - * @Author: yjz - * @Date: 2023-11-28 19:50 - * @Version: 1.0 - **/ -public interface IEsInspectRectifyFlowService { - - /** - * 企标稽查流程-流程发起 - * @param esInspectReportFlowVO - */ - void flowStart(EsInspectRectifyFlowVO esInspectReportFlowVO); - - /** - * 生成企标稽查整改 - * @param esInspectReportFlowVO - */ - void createReportFlow(EsInspectRectifyFlowVO esInspectReportFlowVO); - - /** - * 企标稽查流程-流程保存 - * @param esInspectReportFlowVO - */ - void flowSave(EsInspectRectifyFlowVO esInspectReportFlowVO); - - /** - * 企标稽查流程-办理详情 - * @param projectId - * @param taskId - * @return - */ - EsInspectRectifyFlowVO queryDetailByProjectId(String projectId, String taskId); - - /** - * 企标稽查流程-流程审批 - * @param esInspectReportFlowVO - */ - void flowApproval(EsInspectRectifyFlowVO esInspectReportFlowVO) throws ParseException; - - /** - * 企标稽查流程-流程转办 - * @param taskId - * @param userId - */ - void flowTransfer(String taskId, String userId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/IProcessEsInspectRectifyService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/IProcessEsInspectRectifyService.java deleted file mode 100644 index 135bf702..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/IProcessEsInspectRectifyService.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.activiti.process.esinspectrectify.vo.ProcessEsInspectRectifyVO; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 企标稽查整改业务表 - * @Author: jero-boot - * @Date: 2023-11-28 - * @Version: V1.0 - */ -public interface IProcessEsInspectRectifyService extends IService { - - /** - * 分页查询 - * - * @param processEsInspectReport - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessEsInspectRectify processEsInspectReport, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param processEsInspectReport - * @param req - * @return - */ - List queryList(ProcessEsInspectRectify processEsInspectReport, HttpServletRequest req); - - /** - * 保存 - * - * @param processEsInspectReport - * @return - */ - void add(ProcessEsInspectRectify processEsInspectReport); - - /** - * 更新 - * - * @param processEsInspectReport - * @return - */ - void editById(ProcessEsInspectRectify processEsInspectReport); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsInspectRectify queryById(String id); - - /** - * 企标稽查整改业务表-通过项目id查询 - * - * @param projectId - * @return - */ - ProcessEsInspectRectifyVO queryByProjectId(String projectId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java deleted file mode 100644 index b76468c9..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.service.impl; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsInspectRectifyFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_es_inspect_rectify", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index c31a42b0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ /dev/null @@ -1,477 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.entity.ProcessNodeLink; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esinspectrectify.common.EsInspectRectifyCommon; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.activiti.process.esinspectrectify.service.IEsInspectRectifyFlowService; -import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; -import com.jero.modules.activiti.process.esinspectrectify.vo.EsInspectRectifyFlowVO; -import com.jero.modules.activiti.process.esinspectrectify.vo.ProcessEsInspectRectifyVO; -import com.jero.modules.activiti.process.esinspectrectify.vo.UserInfo; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -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.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import com.jero.modules.system.service.ISysUserService; -import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: EsInspectReportFlowServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-11-28 19:51 - * @Version: 1.0 - **/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final ProcessNodeLinkService processNodeLinkService; - private final IProcessEsInspectRectifyService processEsInspectRectifyService; - private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; - private final ISysUserService sysUserService; - - public EsInspectRectifyFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - ProcessNodeLinkService processNodeLinkService, - IProcessEsInspectRectifyService processEsInspectReportService, - EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService, - ISysUserService sysUserService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processNodeLinkService = processNodeLinkService; - this.processEsInspectRectifyService = processEsInspectReportService; - this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService; - this.sysUserService = sysUserService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - - private static final String RESPONSIBLE = "responsible"; - - @Override - public void flowStart(EsInspectRectifyFlowVO esInspectReportFlowVO) { - // 流程信息 - ProcessAll processAll = esInspectReportFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectReportFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsInspectRectifyCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_REPORT.getValue())); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息、 - 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())); - - // 处理业务表数据 - handleBusinessData(esInspectReportFlowVO); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - } - - @Override - public void createReportFlow(EsInspectRectifyFlowVO esInspectReportFlowVO) { - // 流程信息 - ProcessAll processAll = esInspectReportFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectReportFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(EsInspectRectifyCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 更新流程总表信息 - processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_REPORT.getValue())); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息 - processApprovalRecord.setUserId((String) map.get(RESPONSIBLE)); - processApprovalRecord.setProjectId(processAll.getProjectId()); - processApprovalRecord.setFinishFlag(FinishFlagEnum.INCOMPLETE.getValue()); - processApprovalRecordService.update(processApprovalRecord, - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, task.getId())); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 保存新草稿(强制撤回用) - saveDraft(esInspectReportFlowVO, processAll, processApprovalRecord); - } - - private void saveDraft(EsInspectRectifyFlowVO esInspectReportFlowVO, ProcessAll processAll, ProcessApprovalRecord processApprovalRecord) { - ProcessDraft processDraft = new ProcessDraft(); - // 属性拷贝 - BeanUtils.copyProperties(processAll, processDraft); - processDraft.setCreateBy(""); - processDraft.setId(""); - processDraft.setUpdateBy(""); - Date dateNow = new Date(); - processDraft.setCreateTime(dateNow); - processDraft.setUpdateBy(""); - processDraft.setUpdateTime(dateNow); - // 保存草稿表 - if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){ - processDraft.setHandleFile(processApprovalRecord.getCommitFile()); - } - if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ - processDraft.setHandleText(processApprovalRecord.getCommitText()); - } - if (!Objects.isNull(processAll.getDueTime())){ - processDraft.setProcessDueDate(processAll.getDueTime()); - } - if (StringUtils.isNotBlank(processAll.getPrcMes())){ - processDraft.setProcessDescription(processAll.getPrcMes()); - } - if (StringUtils.isNotBlank(esInspectReportFlowVO.getInfoJsonStr())){ - processDraft.setInfoJsonStr(esInspectReportFlowVO.getInfoJsonStr()); - } - processDraft.setUserId(processApprovalRecord.getUserId()); - processDraft.setId(String.valueOf(SnowflakeUtils.snowflake())); - processDraft.setSaveSource("3"); - - // 保存infoJsonStr信息 - Map map = esInspectReportFlowVO.getMap(); - map.put("responsible_dictText", sysUserService.dictByIdsOrUserNames(String.valueOf(map.get(RESPONSIBLE)), "")); - ProcessEsInspectRectify processEsInspectRectify = esInspectReportFlowVO.getProcessEsInspectRectify(); - ProcessEsInspectRectifyVO processEsInspectRectifyVO = processEsInspectRectifyService.queryByProjectId(processEsInspectRectify.getProjectId()); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("revocation", true); - jsonObject.put("personInfo", map); - jsonObject.put("draftData", processEsInspectRectifyVO); - processDraft.setInfoJsonStr(jsonObject.toJSONString()); - processDraftService.save(processDraft); - } - - private void handleBusinessData(EsInspectRectifyFlowVO esInspectReportFlowVO) { - ProcessEsInspectRectify processEsInspectRectify = esInspectReportFlowVO.getProcessEsInspectRectify(); - processEsInspectRectifyService.saveOrUpdate(processEsInspectRectify); - } - - @Override - public void flowSave(EsInspectRectifyFlowVO esInspectReportFlowVO) { - // 处理业务表数据 - handleBusinessData(esInspectReportFlowVO); - // 流程信息 - ProcessAll processAll = esInspectReportFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - @Override - public EsInspectRectifyFlowVO queryDetailByProjectId(String projectId, String taskId) { - EsInspectRectifyFlowVO esInspectReportFlowVO = new EsInspectRectifyFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ - String id = ""; - if(Objects.isNull(processAll)){ - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - }else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())){ - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ - esInspectReportFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - }else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, taskId) - , false); - } - esInspectReportFlowVO.setProcessAll(processAll); - esInspectReportFlowVO.setProcessApprovalRecord(processApprovalRecord); - return esInspectReportFlowVO; - } - - @Override - public void flowApproval(EsInspectRectifyFlowVO esInspectReportFlowVO) throws ParseException { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 流程信息 - ProcessAll processAll = esInspectReportFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esInspectReportFlowVO.getMap(); - - // 更新流程总表信息 - processAllService.updateById(processAll); - - //更新人员信息 - List userInfoList = esInspectReportFlowVO.getUserInfo(); - for (UserInfo userInfo : userInfoList) { - processNodeLinkService.update(new LambdaUpdateWrapper() - .eq(ProcessNodeLink::getProcessNodeId, userInfo.getId()) - .eq(ProcessNodeLink::getProcessInstanceId, processAll.getProcessInstanceId()) - .set(ProcessNodeLink::getUserId, userInfo.getLinkUserIds())); - } - - // 处理业务表数据 - handleBusinessData(esInspectReportFlowVO); - - // 更新流程审批信息 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .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::getEndTime, new Date())); - - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task!= null) { - // 如果是第一节点，说明是强制撤回后的，需要更新报错第一个节点人填写的业务信息 - updateInfoJsonStr(esInspectReportFlowVO); - // 完成任务 - taskService.complete(task.getId(), map); - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); - // 判断是否是最后一个节点 - if (isLastNode(processAll.getProcessInstanceId())){ - ProcessEsInspectRectifyVO processEsInspectReportVO = processEsInspectRectifyService.queryByProjectId(processAll.getProjectId()); - Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Date parse = dateFormat.parse(dateFormat.format(date)); - // 是否申请延期 - if (EsInspectRectifyCommon.OPERATION_TYPE_2.equals(processEsInspectReportVO.getOperationType())){ - // 更新整改计划完成日期为申请延期日期，整改实际完成时间置空，整改状态为整改中 - enterpriseStandardInspectRectifyPlanService.update( - new LambdaUpdateWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getId, processEsInspectReportVO.getInspectRectifyPlanId()) - .set(EnterpriseStandardInspectRectifyPlan::getPlanCompleteDate, processEsInspectReportVO.getApplyDelayDate()) - .set(EnterpriseStandardInspectRectifyPlan::getActualCompleteDate, null) - .set(EnterpriseStandardInspectRectifyPlan::getRectifyStatus, EsInspectRectifyCommon.INSPECT_RECTIFY_STATUS_1)); - - // 申请延期日期 <= 当前日期 立即生成新流程 - if (processEsInspectReportVO.getApplyDelayDate().before(parse) - || processEsInspectReportVO.getApplyDelayDate().equals(parse)){ - // 整改计划 - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = - enterpriseStandardInspectRectifyPlanService.getById(processEsInspectReportVO.getInspectRectifyPlanId()); - // 生成新整改流程 - EsInspectRectifyFlowVO newEsInspectReportFlowVO = new EsInspectRectifyFlowVO(); - // 处理流程信息 - ProcessAll newProcessAll = new ProcessAll(); - newProcessAll.setProjectId(String.valueOf(SnowflakeUtils.snowflake())); - newProcessAll.setPrcName(processAll.getPrcName()); - newProcessAll.setCreateUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); - newEsInspectReportFlowVO.setProcessAll(newProcessAll); - - // 处理流程审批信息 - ProcessApprovalRecord newProcessApprovalRecord = new ProcessApprovalRecord(); - newProcessApprovalRecord.setId(String.valueOf(SnowflakeUtils.snowflake())); - newProcessApprovalRecord.setProjectId(newProcessAll.getProjectId()); - newProcessApprovalRecord.setUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); - newEsInspectReportFlowVO.setProcessApprovalRecord(newProcessApprovalRecord); - - // 处理业务表数据 - ProcessEsInspectRectify processEsInspectRectify = new ProcessEsInspectRectify(); - processEsInspectRectify.setId(String.valueOf(SnowflakeUtils.snowflake())); - processEsInspectRectify.setProjectId(newProcessAll.getProjectId()); - processEsInspectRectify.setIsDelayCreate(YesOrNoEnum.NO.getValue()); - processEsInspectRectify.setInspectRectifyPlanId(processEsInspectReportVO.getInspectRectifyPlanId()); - newEsInspectReportFlowVO.setProcessEsInspectRectify(processEsInspectRectify); - processEsInspectRectifyService.save(processEsInspectRectify); - - // 处理人员信息 - Map newMap = new HashMap<>(); - newMap.put(RESPONSIBLE, enterpriseStandardInspectRectifyPlan.getResponseUser()); - newMap.put("leader", "请选择"); - newMap.put("responsibleApproval", "请选择"); - newEsInspectReportFlowVO.setMap(newMap); - createReportFlow(newEsInspectReportFlowVO); - - // 修改状态 - processEsInspectRectifyService.update( - new LambdaUpdateWrapper() - .in(ProcessEsInspectRectify::getId, processEsInspectReportVO.getId()) - .set(ProcessEsInspectRectify::getIsDelayCreate, YesOrNoEnum.YES.getValue())); - } - }else { - // 更新整改状态 - enterpriseStandardInspectRectifyPlanService.update(new LambdaUpdateWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getId, processEsInspectReportVO.getInspectRectifyPlanId()) - .set(EnterpriseStandardInspectRectifyPlan::getRectifyStatus, EsInspectRectifyCommon.INSPECT_RECTIFY_STATUS_3) - .set(EnterpriseStandardInspectRectifyPlan::getActualCompleteDate, parse)); - } - } - } - } - - private void updateInfoJsonStr(EsInspectRectifyFlowVO esInspectReportFlowVO) { - ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord(); - if (StringUtils.isNotBlank(processApprovalRecord.getNodeId()) - && EsInspectRectifyCommon.PROCESS_NODE_1.equals(processApprovalRecord.getNodeId())){ - processDraftService.update( - new LambdaUpdateWrapper() - .eq(ProcessDraft::getProjectId, esInspectReportFlowVO.getProcessAll().getProjectId()) - .eq(ProcessDraft::getSaveSource, "3") - .set(ProcessDraft::getInfoJsonStr, esInspectReportFlowVO.getInfoJsonStr() - .replaceFirst("\\{", "{\"revocation\": true,"))); - } - } - - @Override - public void flowTransfer(String taskId, String userId) { - processHandleService.transfer(taskId, userId); - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List)v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } - - public boolean isLastNode(String processInstanceId) { - // 查询流程实例状态 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - - // 如果流程实例为null，表示流程已结束 - return processInstance == null; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/ProcessEsInspectRectifyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/ProcessEsInspectRectifyServiceImpl.java deleted file mode 100644 index a6c689b1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/ProcessEsInspectRectifyServiceImpl.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; -import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.activiti.process.esinspectrectify.mapper.ProcessEsInspectRectifyMapper; -import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; -import com.jero.modules.activiti.process.esinspectrectify.vo.ProcessEsInspectRectifyVO; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - - -/** - * @Description: 企标稽查整改业务表 - * @Author: jero-boot - * @Date: 2023-11-28 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsInspectRectifyServiceImpl extends ServiceImpl implements IProcessEsInspectRectifyService { - - private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService; - private final IProcessEsInspectService processEsInspectService; - - public ProcessEsInspectRectifyServiceImpl(EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService, - IProcessEsInspectService processEsInspectService) { - this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService; - this.processEsInspectService = processEsInspectService; - } - - /** - * 分页查询 - * - * @param processEsInspectReport - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(ProcessEsInspectRectify processEsInspectReport, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processEsInspectReport, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processEsInspectReport - * @param req - * @return - */ - @Override - public List queryList(ProcessEsInspectRectify processEsInspectReport, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(processEsInspectReport, req.getParameterMap())); - } - - /** - * 保存 - * - * @param processEsInspectReport - * @return - */ - @Override - public void add(ProcessEsInspectRectify processEsInspectReport) { - Date now = new Date(); - processEsInspectReport.setCreateTime(now); - processEsInspectReport.setUpdateTime(now); - save(processEsInspectReport); - } - - /** - * 更新 - * - * @param processEsInspectReport - * @return - */ - @Override - public void editById(ProcessEsInspectRectify processEsInspectReport) { - Date now = new Date(); - processEsInspectReport.setUpdateTime(now); - saveOrUpdate(processEsInspectReport); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsInspectRectify queryById(String id) { - return getById(id); - } - - @Override - public ProcessEsInspectRectifyVO queryByProjectId(String projectId) { - ProcessEsInspectRectifyVO esInspectReportVO = new ProcessEsInspectRectifyVO(); - ProcessEsInspectRectify processEsInspectRectify = getOne( - new LambdaQueryWrapper() - .eq(ProcessEsInspectRectify::getProjectId, projectId)); - BeanUtils.copyProperties(processEsInspectRectify, esInspectReportVO); - // 查询企业标准稽查整改计划 - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = enterpriseStandardInspectRectifyPlanService.queryById(processEsInspectRectify.getInspectRectifyPlanId()); - esInspectReportVO.setEnterpriseStandardInspectRectifyPlan(enterpriseStandardInspectRectifyPlan); - // 稽查依据 - String processEsInspectId = enterpriseStandardInspectRectifyPlan.getProcessEsInspectId(); - ProcessEsInspectVO processEsInspectVO = new ProcessEsInspectVO(); - processEsInspectVO.setId(processEsInspectId); - List processEsInspectVOList = processEsInspectService.queryByList(processEsInspectVO); - if (!processEsInspectVOList.isEmpty()){ - esInspectReportVO.setStandardName(processEsInspectVOList.get(0).getInspectName()); - } - return esInspectReportVO; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java deleted file mode 100644 index ab7725b2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: EsInspectReportFlowVO - * @Description: - * @Author: yjz - * @Date: 2023-11-28 19:55 - * @Version: 1.0 - **/ -@Data -public class EsInspectRectifyFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessEsInspectRectify processEsInspectRectify; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**人员信息*/ - @ApiModelProperty(value = "人员信息") - private List userInfo; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - /** - * 保存来源 - */ - @ApiModelProperty(value="保存来源(1：待办 2：草稿)") - private String saveSource; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/ProcessEsInspectRectifyVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/ProcessEsInspectRectifyVO.java deleted file mode 100644 index 6dfff70c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/ProcessEsInspectRectifyVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.vo; - -import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @ClassName: EsInspectReportVO - * @Description: - * @Author: yjz - * @Date: 2023-11-28 19:32 - * @Version: 1.0 - **/ -@Data -public class ProcessEsInspectRectifyVO extends ProcessEsInspectRectify { - /**稽查依据*/ - @ApiModelProperty(value = "稽查依据") - private String standardName; - /**企业标准稽查整改计划*/ - @ApiModelProperty(value = "企业标准稽查整改计划") - private EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/UserInfo.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/UserInfo.java deleted file mode 100644 index e2697e36..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/UserInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jero.modules.activiti.process.esinspectrectify.vo; - -import lombok.Data; - -/** - * @ClassName: UserInfo - * @Description: - * @Author: yjz - * @Date: 2023-11-30 15:41 - * @Version: 1.0 - **/ -@Data -public class UserInfo { - private String id; - private String linkUserIds; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java deleted file mode 100644 index d30fd229..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.common; - -/** - * @ClassName: ProcessEsPermissionApplyCommon - * @Description: - * @Author: yjz - * @Date: 2023-11-29 18:41 - * @Version: 1.0 - **/ -public class ProcessEsPermissionApplyCommon { - private ProcessEsPermissionApplyCommon(){ - } - /** - * 权限申请流程key - */ - public static final String KEY = "permission_apply_process"; - - /** - * 权限申请流程name - */ - public static final String NAME = "权限申请流程"; - - /** - * 权限申请流程节点: 1:发起人申请,2:发起人领导审批,3:标准化审批 - */ - public static final String PROCESS_NODE_1 = "initiator_start"; - /** - * 权限申请流程节点: 1:发起人申请,2:发起人领导审批,3:标准化审批 - */ - public static final String PROCESS_NODE_2 = "leader_approval"; - /** - * 权限申请流程节点: 1:发起人申请,2:发起人领导审批,3:标准化审批 - */ - public static final String PROCESS_NODE_3 = "standard_approval"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/EsPermissionApplyFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/EsPermissionApplyFlowController.java deleted file mode 100644 index 1d4ba6cc..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/EsPermissionApplyFlowController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService; -import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.*; - -/** - * @ClassName: EsPermissionApplyFlowController - * @Description: - * @Author: yjz - * @Date: 2023-11-29 18:42 - * @Version: 1.0 - **/ -@Api(tags="权限申请流程") -@RestController -@RequestMapping("/process/esPermissionApplyFlow") -@Slf4j -public class EsPermissionApplyFlowController { - private final EsPermissionApplyFlowService esPermissionApplyFlowService; - - public EsPermissionApplyFlowController(@Lazy EsPermissionApplyFlowService esPermissionApplyFlowService) { - this.esPermissionApplyFlowService = esPermissionApplyFlowService; - } - - /** - * 权限申请流程-生成项目id - * @return 项目id - */ - @AutoLog(value = "权限申请流程-生成项目id") - @ApiOperation(value="权限申请流程-生成项目id", notes="权限申请流程-生成项目id") - @GetMapping(value = "/getProjectId") - public String getProjectId() { - return String.valueOf(SnowflakeUtils.snowflake()); - } - - /** - * 权限申请流程-流程发起 - * @param esPermissionApplyFlowVO 权限申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "权限申请流程-流程发起") - @ApiOperation(value="权限申请流程-流程发起", notes="权限申请流程-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - esPermissionApplyFlowService.flowStart(esPermissionApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 权限申请流程-流程保存 - * @param esPermissionApplyFlowVO 权限申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "权限申请流程-流程保存") - @ApiOperation(value="权限申请流程-流程保存", notes="权限申请流程-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - esPermissionApplyFlowService.flowSave(esPermissionApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - - /** - * 权限申请流程-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "权限申请流程-办理详情") - @ApiOperation(value="权限申请流程-办理详情", notes="权限申请流程-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(esPermissionApplyFlowService.queryDetailByProjectId(projectId, taskId)); - } - - /** - * 权限申请流程-流程审批 - * @param esPermissionApplyFlowVO 权限申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "权限申请流程-流程审批") - @ApiOperation(value="权限申请流程-流程审批", notes="权限申请流程-流程审批") - @PostMapping(value = "/flowApproval") - public Result flowApproval(@RequestBody EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - esPermissionApplyFlowService.flowApproval(esPermissionApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 权限申请流程-驳回 - * @param esPermissionApplyFlowVO 权限申请流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "权限申请流程-驳回") - @ApiOperation(value="权限申请流程-驳回", notes="权限申请流程-驳回") - @PostMapping(value = "/flowReject") - public Result flowReject(@RequestBody EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - log.info(""); - esPermissionApplyFlowService.flowApproval(esPermissionApplyFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 权限申请流程-流程转办 - * @return 结果对象 - */ - @AutoLog(value = "权限申请流程-流程转办") - @ApiOperation(value="权限申请流程-流程转办", notes="权限申请流程-流程转办") - @GetMapping(value = "/flowTransfer") - public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { - esPermissionApplyFlowService.flowTransfer(taskId, userId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java deleted file mode 100644 index 113cbada..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java +++ /dev/null @@ -1,220 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.controller; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; -import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; -import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - -/** - * @Description: 权限申请流程业务表 - * @Author: jero-boot - * @Date: 2023-11-29 - * @Version: V1.0 - */ -@Api(tags="权限申请流程业务表") -@RestController -@RequestMapping("/espermissionapply/processEsPermissionApply") -@Slf4j -public class ProcessEsPermissionApplyController extends JeroController { - @Autowired - private IProcessEsPermissionApplyService processEsPermissionApplyService; - @Autowired - private EnterpriseStandardAuthUserService enterpriseStandardAuthUserService; - @Autowired - private ILawsEnterpriseStandardService lawsEnterpriseStandardService; - - /** - * 分页列表查询 - * - * @param processEsPermissionApply - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "权限申请流程业务表-分页列表查询") - @ApiOperation(value="权限申请流程业务表-分页列表查询", notes="权限申请流程业务表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessEsPermissionApply processEsPermissionApply, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = processEsPermissionApplyService.queryPage(processEsPermissionApply, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 企标分页列表查询 - * @param manyStandardSelectionBoxVO - * @param pageNo - * @param pageSize - * @return - */ - @AutoLog(value = "权限申请流程业务表-企标分页列表查询") - @ApiOperation(value="权限申请流程业务表-企标分页列表查询", notes="权限申请流程业务表-企标分页列表查询") - @GetMapping(value = "/queryEnterpriseByPage") - public Result> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList = processEsPermissionApplyService.queryEnterpriseByPage(manyStandardSelectionBoxVO, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processEsPermissionApply - * @param req - * @return - */ - @AutoLog(value = "权限申请流程业务表-列表查询") - @ApiOperation(value="权限申请流程业务表-列表查询", notes="权限申请流程业务表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessEsPermissionApply processEsPermissionApply, HttpServletRequest req) { - List list = processEsPermissionApplyService.queryList(processEsPermissionApply, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param jsonObject - * @return - */ - @AutoLog(value = "权限申请流程业务表-权限校验") - @ApiOperation(value="权限申请流程业务表-权限校验", notes="权限申请流程业务表-权限校验") - @PostMapping(value = "/permissionCheck") - public Result permissionCheck(@Validated @RequestBody JSONObject jsonObject) { - return processEsPermissionApplyService.permissionCheck(jsonObject); - } - - /** - * 添加 - * - * @param processEsPermissionApply - * @return - */ - @AutoLog(value = "权限申请流程业务表-添加") - @ApiOperation(value="权限申请流程业务表-添加", notes="权限申请流程业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) { - processEsPermissionApplyService.add(processEsPermissionApply); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processEsPermissionApply - * @return - */ - @AutoLog(value = "权限申请流程业务表-编辑") - @ApiOperation(value="权限申请流程业务表-编辑", notes="权限申请流程业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) { - processEsPermissionApplyService.editById(processEsPermissionApply); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "权限申请流程业务表-通过id删除") - @ApiOperation(value="权限申请流程业务表-通过id删除", notes="权限申请流程业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processEsPermissionApplyService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "权限申请流程业务表-批量删除") - @ApiOperation(value="权限申请流程业务表-批量删除", notes="权限申请流程业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processEsPermissionApplyService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "权限申请流程业务表-通过id查询") - @ApiOperation(value="权限申请流程业务表-通过id查询", notes="权限申请流程业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessEsPermissionApply processEsPermissionApply = processEsPermissionApplyService.queryById(id); - if(processEsPermissionApply==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsPermissionApply); - } - - /** - * 通过项目id查询 - * - * @param projectId - * @return - */ - @AutoLog(value = "权限申请流程业务表-通过项目id查询") - @ApiOperation(value="权限申请流程业务表-通过项目id查询", notes="权限申请流程业务表-通过项目id查询") - @GetMapping(value = "/queryByProjectId") - public Result queryByProjectId(String projectId) { - ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(projectId); - if(processEsPermissionApplyVO==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processEsPermissionApplyVO); - } - - /** - * 导出excel - * - * @param request - * @param processEsPermissionApply - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessEsPermissionApply processEsPermissionApply) { - return super.exportXls(request, processEsPermissionApply, ProcessEsPermissionApply.class, "权限申请流程业务表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/entity/ProcessEsPermissionApply.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/entity/ProcessEsPermissionApply.java deleted file mode 100644 index 110dfa50..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/entity/ProcessEsPermissionApply.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - - -/** - * @Description: 权限申请流程 - * @Author: jero-boot - * @Date: 2023-11-29 - * @Version: V1.0 - */ -@Data -@TableName("process_es_permission_apply") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_es_permission_apply对象", description="权限申请流程") -public class ProcessEsPermissionApply extends BaseEntity { - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private String projectId; - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private String standardNumbers; - /**授权到期日期*/ - @Excel(name = "授权到期日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "授权到期日期") - private Date expirationDate; - /**申请说明*/ - @Excel(name = "申请说明", width = 15) - @ApiModelProperty(value = "申请说明") - private String applyDetail; - /**用户id*/ - @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") - @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") - private String userId; - /**用户 翻译*/ - @ApiModelProperty(value = "用户 翻译") - @TableField(exist = false) - private String userDictText; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/mapper/ProcessEsPermissionApplyMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/mapper/ProcessEsPermissionApplyMapper.java deleted file mode 100644 index 40b7ee16..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/mapper/ProcessEsPermissionApplyMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; - -/** - * @Description: 权限申请流程 - * @Author: jero-boot - * @Date: 2023-11-29 - * @Version: V1.0 - */ -public interface ProcessEsPermissionApplyMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/mapper/xml/ProcessEsPermissionApplyMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/mapper/xml/ProcessEsPermissionApplyMapper.xml deleted file mode 100644 index 2d44f086..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/mapper/xml/ProcessEsPermissionApplyMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/EsPermissionApplyFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/EsPermissionApplyFlowService.java deleted file mode 100644 index 372e113a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/EsPermissionApplyFlowService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.service; - -import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO; - -/** - * @InterfaceName: EsPermissionApplyFlowService - * @Description: - * @Author: yjz - * @Date: 2023-11-29 18:42 - * @Version: 1.0 - **/ -public interface EsPermissionApplyFlowService { - /** - * 权限申请流程-流程发起 - * @param esPermissionApplyFlowVO - */ - void flowStart(EsPermissionApplyFlowVO esPermissionApplyFlowVO); - - /** - * 权限申请流程-流程保存 - * @param esPermissionApplyFlowVO - */ - void flowSave(EsPermissionApplyFlowVO esPermissionApplyFlowVO); - - /** - * 权限申请流程-办理详情 - * @param projectId - * @param taskId - * @return - */ - EsPermissionApplyFlowVO queryDetailByProjectId(String projectId, String taskId); - - /** - * 权限申请流程-审批 - * @param esPermissionApplyFlowVO - */ - void flowApproval(EsPermissionApplyFlowVO esPermissionApplyFlowVO); - - /** - * 权限申请流程-流程转办 - * @param taskId - * @param userId - */ - void flowTransfer(String taskId, String userId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java deleted file mode 100644 index d96f9c5e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.service; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.common.api.vo.Result; -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; -import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import org.apache.poi.ss.formula.functions.T; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 权限申请流程 - * @Author: jero-boot - * @Date: 2023-11-29 - * @Version: V1.0 - */ -public interface IProcessEsPermissionApplyService extends IService { - - /** - * 分页查询 - * - * @param processEsPermissionApply - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessEsPermissionApply processEsPermissionApply, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param processEsPermissionApply - * @param req - * @return - */ - List queryList(ProcessEsPermissionApply processEsPermissionApply, HttpServletRequest req); - - /** - * 保存 - * - * @param processEsPermissionApply - * @return - */ - void add(ProcessEsPermissionApply processEsPermissionApply); - - /** - * 更新 - * - * @param processEsPermissionApply - * @return - */ - void editById(ProcessEsPermissionApply processEsPermissionApply); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessEsPermissionApply queryById(String id); - - /** - * 权限申请流程业务表-通过项目id查询 - * @param projectId - * @return - */ - ProcessEsPermissionApplyVO queryByProjectId(String projectId); - - /** - * 权限申请流程业务表-企标分页列表查询 - * @param manyStandardSelectionBoxVO - * @param pageNo - * @param pageSize - * @return - */ - IPage queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize); - - /** - * 权限申请流程业务表-权限校验 - * @param jsonObject - * @return - */ - Result permissionCheck(JSONObject jsonObject); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java deleted file mode 100644 index 5aeb413b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.service.impl; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class EsPermissionApplyFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_es_permission_apply", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index 654c430f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ /dev/null @@ -1,306 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.espermissionapply.common.ProcessEsPermissionApplyCommon; -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; -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.process.fb.service.IProcessHandleService; -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; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @ClassName: EsPermissionApplyFlowServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-11-29 18:42 - * @Version: 1.0 - **/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final ProcessNodeLinkService processNodeLinkService; - private final IProcessEsPermissionApplyService processEsPermissionApplyService; - public EsPermissionApplyFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - ProcessNodeLinkService processNodeLinkService, - IProcessEsPermissionApplyService processEsPermissionApplyService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processNodeLinkService = processNodeLinkService; - this.processEsPermissionApplyService = processEsPermissionApplyService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - - @Resource - private EnterpriseStandardAuthUserService enterpriseStandardAuthUserService; - - @Override - public void flowStart(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - // 流程信息 - ProcessAll processAll = esPermissionApplyFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esPermissionApplyFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esPermissionApplyFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(ProcessEsPermissionApplyCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 处理业务表数据 - handleBusinessData(esPermissionApplyFlowVO); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.PERMISSION_APPLY_PROCESS.getValue())); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息 - 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())); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - } - - private void handleBusinessData(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply(); - if (StringUtils.isNotBlank(processEsPermissionApply.getId())) { - processEsPermissionApplyService.updateById(processEsPermissionApply); - } else { - processEsPermissionApplyService.save(processEsPermissionApply); - } - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List) v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } - - @Override - public void flowSave(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - // 处理业务表数据 - handleBusinessData(esPermissionApplyFlowVO); - // 流程信息 - ProcessAll processAll = esPermissionApplyFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esPermissionApplyFlowVO.getProcessApprovalRecord(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - @Override - public EsPermissionApplyFlowVO queryDetailByProjectId(String projectId, String taskId) { - EsPermissionApplyFlowVO esPermissionApplyFlowVO = new EsPermissionApplyFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()) { - String id = ""; - if (Objects.isNull(processAll)) { - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - } else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())) { - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())) { - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())) { - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())) { - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())) { - esPermissionApplyFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - } else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, taskId) - , false); - } - esPermissionApplyFlowVO.setProcessAll(processAll); - esPermissionApplyFlowVO.setProcessApprovalRecord(processApprovalRecord); - return esPermissionApplyFlowVO; - } - - @Override - public void flowApproval(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 流程信息 - ProcessAll processAll = esPermissionApplyFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = esPermissionApplyFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = esPermissionApplyFlowVO.getMap(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - - // 更新流程审批信息 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .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::getEndTime, new Date())); - - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task != null) { - // 完成任务 - taskService.complete(task.getId(), map); - // 处理业务表数据 - handleBusinessData(esPermissionApplyFlowVO); - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); - // 判断是否是最后一个节点 - if (isLastNode(processAll.getProcessInstanceId()) - && 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); - } - } - } - - @Override - public void flowTransfer(String taskId, String userId) { - processHandleService.transfer(taskId, userId); - } - - public boolean isLastNode(String processInstanceId) { - // 查询流程实例状态 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - - // 如果流程实例为null，表示流程已结束 - return processInstance == null; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java deleted file mode 100644 index f657e50c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; -import com.jero.modules.activiti.process.espermissionapply.mapper.ProcessEsPermissionApplyMapper; -import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; -import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.system.service.ISysUserService; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.*; -import java.util.stream.Collectors; - - -/** - * @Description: 权限申请流程 - * @Author: jero-boot - * @Date: 2023-11-29 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl implements IProcessEsPermissionApplyService { - - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - private final EnterpriseStandardAuthUserService enterpriseStandardAuthUserService; - private final ISysUserService sysUserService; - - public ProcessEsPermissionApplyServiceImpl(ILawsEnterpriseStandardService lawsEnterpriseStandardService, - EnterpriseStandardAuthUserService enterpriseStandardAuthUserService, - ISysUserService sysUserService) { - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - this.enterpriseStandardAuthUserService = enterpriseStandardAuthUserService; - this.sysUserService = sysUserService; - } - - /** - * 分页查询 - * - * @param processEsPermissionApply - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(ProcessEsPermissionApply processEsPermissionApply, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processEsPermissionApply, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processEsPermissionApply - * @param req - * @return - */ - @Override - public List queryList(ProcessEsPermissionApply processEsPermissionApply, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(processEsPermissionApply, req.getParameterMap())); - } - - /** - * 保存 - * - * @param processEsPermissionApply - * @return - */ - @Override - public void add(ProcessEsPermissionApply processEsPermissionApply) { - Date now = new Date(); - processEsPermissionApply.setCreateTime(now); - processEsPermissionApply.setUpdateTime(now); - save(processEsPermissionApply); - } - - /** - * 更新 - * - * @param processEsPermissionApply - * @return - */ - @Override - public void editById(ProcessEsPermissionApply processEsPermissionApply) { - Date now = new Date(); - processEsPermissionApply.setUpdateTime(now); - saveOrUpdate(processEsPermissionApply); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessEsPermissionApply queryById(String id) { - return getById(id); - } - - @Override - public ProcessEsPermissionApplyVO queryByProjectId(String projectId) { - ProcessEsPermissionApplyVO processEsPermissionApplyVO = new ProcessEsPermissionApplyVO(); - // 通过项目id查询 - ProcessEsPermissionApply processEsPermissionApply = getOne( - new LambdaQueryWrapper() - .eq(ProcessEsPermissionApply::getProjectId, projectId)); - BeanUtils.copyProperties(processEsPermissionApply, processEsPermissionApplyVO); - - if (StringUtils.isNotBlank(processEsPermissionApply.getStandardNumbers())){ - List standardNumberList = Arrays.asList(processEsPermissionApply.getStandardNumbers().split(",")); - List list = lawsEnterpriseStandardService.list( - new LambdaQueryWrapper() - .in(LawsEnterpriseStandard::getStandardNumber, standardNumberList)); - // 排序 - List newList = new ArrayList<>(); - for (String standardNumber : standardNumberList) { - Optional optionalLawsEnterpriseStandard = list.stream().filter(lawsEnterpriseStandard -> standardNumber.equals(lawsEnterpriseStandard.getStandardNumber())).findFirst(); - optionalLawsEnterpriseStandard.ifPresent(newList::add); - } - processEsPermissionApplyVO.setLawsEnterpriseStandardList(newList); - } - // 翻译 - if (StringUtils.isNotBlank(processEsPermissionApplyVO.getUserId())){ - processEsPermissionApplyVO.setUserDictText(sysUserService.dictByIdsOrUserNames(processEsPermissionApplyVO.getUserId(), "")); - } - return processEsPermissionApplyVO; - } - - @Override - public IPage queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(manyStandardSelectionBoxVO.getStandardNumberOrName())){ - queryWrapper.and(qw -> - qw.like(LawsEnterpriseStandard::getStandardNumber, manyStandardSelectionBoxVO.getStandardNumberOrName()) - .or().like(LawsEnterpriseStandard::getStandardName, manyStandardSelectionBoxVO.getStandardNumberOrName())); - } - queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime); - // 查询企标数据 - List list = lawsEnterpriseStandardService.list(queryWrapper); - List result = new ArrayList<>(); - - // 权限校验 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - for (LawsEnterpriseStandard lawsEnterpriseStandard : list) { - boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId())); - if (!b){ - ManyStandardSelectionBox manyStandardSelectionBox = new ManyStandardSelectionBox(); - BeanUtils.copyProperties(lawsEnterpriseStandard, manyStandardSelectionBox); - result.add(manyStandardSelectionBox); - } - } - - // 手动分页 - IPage page = new Page<>(pageNo ,pageSize); - page.setTotal(result.size()); - page.setRecords( - result.stream() - .skip((long) (Math.max(1, pageNo) - 1) * pageSize) - .limit(pageSize) - .collect(Collectors.toList())); - return page; - } - - @Override - public Result permissionCheck(JSONObject jsonObject) { - String ids = String.valueOf(jsonObject.get("ids")); - List list = Arrays.asList(ids.split(",")); - List lawsEnterpriseStandardList = lawsEnterpriseStandardService.listByIds(list); - List standardNameList = new ArrayList<>(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - for (LawsEnterpriseStandard lawsEnterpriseStandard : lawsEnterpriseStandardList) { - boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId())); - if (b){ - standardNameList.add(lawsEnterpriseStandard.getStandardName()); - } - } - if (!standardNameList.isEmpty()){ - return Result.error("企标编号为：" + String.join(",", standardNameList) + "已拥有权限，请重新选择没有权限的企标!"); - } - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java deleted file mode 100644 index 28665a5e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -/** - * @ClassName: EsPermissionApplyFlowVO - * @Description: - * @Author: yjz - * @Date: 2023-11-29 18:47 - * @Version: 1.0 - **/ -@Data -public class EsPermissionApplyFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessEsPermissionApply processEsPermissionApply; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - /** - * 保存来源 - */ - @ApiModelProperty(value="保存来源(1：待办 2：草稿)") - private String saveSource; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/ProcessEsPermissionApplyVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/ProcessEsPermissionApplyVO.java deleted file mode 100644 index d02bd588..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/ProcessEsPermissionApplyVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jero.modules.activiti.process.espermissionapply.vo; - -import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @ClassName: ProcessEsPermissionApplyVO - * @Description: - * @Author: yjz - * @Date: 2023-11-29 18:49 - * @Version: 1.0 - **/ -@Data -public class ProcessEsPermissionApplyVO extends ProcessEsPermissionApply { - /**企业标准*/ - @ApiModelProperty(value = "企业标准") - private List lawsEnterpriseStandardList; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java deleted file mode 100644 index 775eca0b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.jero.modules.activiti.process.fb.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.modules.activiti.process.common.entity.TransferVO; -import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; -import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; - - - /** - * @Description: 标准法规入库/变更流程 - * @Author: jero-boot - * @Date: 2023-11-01 - * @Version: V1.0 - */ -@Api(tags="fb标准法规入库_变更流程") -@RestController -@RequestMapping("/process/fb/processFbEntryChange") -@Slf4j -public class ProcessFbEntryChangeController extends JeroController { - @Autowired - private IProcessFbEntryChangeService processFbEntryChangeService; - - @DictPoint - @GetMapping("/queryProcessInfoVO") - @AutoLog(value = "标准法规入库_变更流程-查询流程信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "draftId", value = "草稿id"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id"), - @ApiImplicitParam(name = "taskId", value = "任务id") - }) - @ApiOperation("标准法规入库_变更流程-查询流程信息") - public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId){ - ProcessInfoVO processInfoVO = processFbEntryChangeService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); - return Result.OK(processInfoVO); - } - - @AutoLog(value = "标准法规入库_变更流程-发起流程") - @ApiOperation(value = "标准法规入库_变更流程-发起流程", notes = "流程处理-发起流程") - @PostMapping(value = "/startProcess") - public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbEntryChangeService.startProcess(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "标准法规入库_变更流程-同意") - @ApiOperation(value="标准法规入库_变更流程-同意", notes="标准法规入库_变更流程-同意") - @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbEntryChangeService.approveTask(processInfoVO, true); - return Result.OK(); - } - - @AutoLog(value = "标准法规入库_变更流程-驳回") - @ApiOperation(value="标准法规入库_变更流程-驳回", notes="标准法规入库_变更流程-驳回") - @PostMapping("/reject") - public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbEntryChangeService.approveTask(processInfoVO, false); - return Result.OK(); - } - - @AutoLog(value = "标准法规入库_变更流程-转办") - @ApiOperation(value="标准法规入库_变更流程-转办", notes="标准法规入库_变更流程-转办") - @PostMapping(value = "/transfer") - public Result transfer(@RequestBody TransferVO transferVO) { - processFbEntryChangeService.transfer(transferVO.getTaskId(), transferVO.getUserId()); - return Result.OK(); - } - - @AutoLog(value = "标准法规入库_变更流程-保存为草稿") - @ApiOperation(value = "标准法规入库_变更流程-保存为草稿", notes = "标准法规入库_变更流程-保存为草稿") - @PostMapping(value = "/saveToDraft") - public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbEntryChangeService.saveToDraft(processInfoVO); - return Result.OK(); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java deleted file mode 100644 index 1197ac07..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.jero.modules.activiti.process.fb.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.entity.ProcessNode; -import com.jero.modules.activiti.mapper.ProcessNodeMapper; -import com.jero.modules.activiti.process.common.common.DraftCommon; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.service.ActFlowCommonService; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.spire.ms.System.Collections.ArrayList; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.HistoryService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.history.HistoricProcessInstance; -import org.activiti.engine.runtime.Execution; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.apache.shiro.SecurityUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.*; - -/** - * @Author: liao - * @Date: 2023/11/7 17:20 - * @Description: 流程信息 - */ -@Api(tags="fb流程信息") -@RestController -@RequestMapping("/process/fb/processFbInfo") -@Slf4j -public class ProcessFbInfoController { - - @Resource - private ProcessNodeMapper processNodeMapper; - @Resource - private IProcessHandleService processHandleService; - @Resource - private ProcessDraftService processDraftService; - @Resource - private RuntimeService runtimeService; - @Resource - private TaskService taskService; - @Resource - private HistoryService historyService; - - @Resource - private ActFlowCommonService actFlowCommonService; - - @DictPoint - @GetMapping("/getNodeList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义key"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id(这个参数会去查绑定好的用户)") - }) - @ApiOperation("获得节点列表") - public Result> getNodeList(String processDefinitionKey, String processInstanceId) { - String processDefinitionId = processHandleService.getDefinitionIdByKey(processDefinitionKey); - //查询节点信息 - List processNodeList = processNodeMapper.selectByIdPdIdAndPiId(processDefinitionId,processInstanceId); - return Result.OK(processNodeList); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java deleted file mode 100644 index bffcb16a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.jero.modules.activiti.process.fb.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.common.entity.TransferVO; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - - - /** - * @Description: 标准征求意见流程表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Api(tags="fb标准征求意见流程表") -@RestController -@RequestMapping("/process/fb/processFbStandardConsultation") -@Slf4j -public class ProcessFbStandardConsultationController extends JeroController { - @Autowired - private IProcessFbStandardConsultationService processFbStandardConsultationService; - - @DictPoint - @GetMapping("/queryProcessInfoVO") - @AutoLog(value = "标准征求意见流程-查询流程信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "draftId", value = "草稿id"), - @ApiImplicitParam(name = "taskId", value = "任务id"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id") - }) - @ApiOperation("标准征求意见流程-查询流程信息") - public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId){ - ProcessInfoVO processInfoVO = processFbStandardConsultationService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); - return Result.OK(processInfoVO); - } - - @AutoLog(value = "标准征求意见流程-发起流程") - @ApiOperation(value = "标准征求意见流程-发起流程", notes = "标准征求意见流程-发起流程") - @PostMapping(value = "/startProcess") - public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbStandardConsultationService.startProcess(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "标准征求意见流程-同意") - @ApiOperation(value="标准征求意见流程-同意", notes="标准征求意见流程-同意") - @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbStandardConsultationService.approveTask(processInfoVO, true); - return Result.OK(); - } - - @AutoLog(value = "标准征求意见流程-驳回") - @ApiOperation(value="标准征求意见流程-驳回", notes="标准征求意见流程-驳回") - @PostMapping("/reject") - public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbStandardConsultationService.approveTask(processInfoVO, false); - return Result.OK(); - } - - @AutoLog(value = "标准征求意见流程-提交") - @ApiOperation(value="标准征求意见流程-提交", notes="标准征求意见流程-提交") - @PostMapping("/submit") - public Result submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbStandardConsultationService.submit(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "标准征求意见流程-保存为草稿") - @ApiOperation(value = "标准征求意见流程-保存为草稿", notes = "标准征求意见流程-保存为草稿") - @PostMapping(value = "/saveToDraft") - public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processFbStandardConsultationService.saveToDraft(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "标准征求意见流程-转办") - @ApiOperation(value="标准征求意见流程-转办", notes="标准征求意见流程-转办") - @PostMapping(value = "/transfer") - public Result transfer(@RequestBody TransferVO transferVO) { - processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId(), transferVO.getProjectId()); - return Result.OK(); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java deleted file mode 100644 index 96121794..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jero.modules.activiti.process.fb.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.modules.activiti.enums.ProcessTypeEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.entity.TransferVO; -import com.jero.modules.activiti.process.common.service.ActFlowCommonService; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardPurchaseService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; -import java.util.List; - - -/** - * @Description: 法规采购流程表 - * @Author: jero-boot - * @Date: 2023-11-14 - * @Version: V1.0 - */ -@Api(tags = "法规采购流程表") -@RestController -@RequestMapping("/process/fb/processFbStandardPurchase") -@Slf4j -public class ProcessFbStandardPurchaseController extends JeroController { - - @Resource - private IProcessFbStandardPurchaseService processFbStandardPurchaseService; - - @Resource - private ActFlowCommonService actFlowCommonService; - - @GetMapping("/queryProcessInfoVO") - @AutoLog(value = "法规采购流程表-查询流程信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "draftId", value = "草稿id"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id"), - @ApiImplicitParam(name = "taskId", value = "任务id") - }) - @ApiOperation("法规采购流程表-查询流程信息") - public Result queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { - ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.FB_STANDARD_PURCHASE); - if (draft != null) { - return Result.OK(draft); - } - ProcessInfoVO> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); - return Result.OK(processInfoVO); - } - - @AutoLog(value = "法规采购流程表-发起流程") - @ApiOperation(value = "法规采购流程表-发起流程", notes = "流程处理-发起流程") - @PostMapping(value = "/startProcess") - public Result startProcess(@Validated @RequestBody ProcessInfoVO> processInfoVO) { - processFbStandardPurchaseService.startProcess(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "法规采购流程表-同意") - @ApiOperation(value = "法规采购流程表-同意", notes = "法规采购流程表-同意") - @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO> processInfoVO) { - processFbStandardPurchaseService.approveTask(processInfoVO, true); - return Result.OK(); - } - - @AutoLog(value = "法规采购流程表-驳回") - @ApiOperation(value = "法规采购流程表-驳回", notes = "法规采购流程表-驳回") - @PostMapping("/reject") - public Result reject(@Validated @RequestBody ProcessInfoVO> processInfoVO) { - processFbStandardPurchaseService.approveTask(processInfoVO, false); - return Result.OK(); - } - - @AutoLog(value = "法规采购流程表-转办") - @ApiOperation(value = "法规采购流程表-转办", notes = "法规采购流程表-转办") - @PostMapping(value = "/transfer") - public Result transfer(@RequestBody TransferVO transferVO) { - processFbStandardPurchaseService.transfer(transferVO.getTaskId(), transferVO.getUserId()); - return Result.OK(); - } - - @AutoLog(value = "法规采购流程表-保存为草稿") - @ApiOperation(value = "法规采购流程表-保存为草稿", notes = "法规采购流程表-保存为草稿") - @PostMapping(value = "/saveToDraft") - public Result saveToDraft(@Validated @RequestBody ProcessInfoVO> processInfoVO) { - processFbStandardPurchaseService.saveToDraft(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "法规采购流程表-导出") - @ApiOperation(value = "法规采购流程表-导出", notes = "法规采购流程表-导出") - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(@RequestParam(name = "businessId") String businessId) { - return processFbStandardPurchaseService.exportXls(businessId); - } - - @AutoLog(value = "法规采购流程表-抄送") - @ApiOperation(value = "法规采购流程表-抄送", notes = "法规采购流程表-抄送") - @GetMapping(value = "/carbonCopy") - public Result carbonCopy(@RequestParam(name = "taskId") String taskId, - @RequestParam(name = "userId") String userIds) { - processFbStandardPurchaseService.carbonCopy(taskId, userIds); - return Result.OK(); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java deleted file mode 100644 index 9d6d5ca5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.jero.modules.activiti.process.fb.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Data -@TableName("process_fb_consultation_list") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_fb_consultation_list对象", description="标准征求意见流程-征求意见列表表") -public class ProcessFbConsultationList implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**业务id*/ - @Excel(name = "业务id", width = 15) - @ApiModelProperty(value = "业务id") - private java.lang.String businessId; - /**用户关联表id*/ - @Excel(name = "用户关联表id", width = 15) - @ApiModelProperty(value = "用户关联表id") - private java.lang.String userLinkId; - /**序号*/ - @Excel(name = "序号", width = 15) - @ApiModelProperty(value = "序号") - private java.lang.String serialNumber; - /**章节id*/ - @Excel(name = "章节id", width = 15) - @ApiModelProperty(value = "章节id") - private java.lang.String chapterId; - /**章节编号*/ - @Excel(name = "章节编号", width = 15) - @ApiModelProperty(value = "章节编号") - private java.lang.String chapterNumber; - /**章节名称*/ - @Excel(name = "章节名称", width = 15) - @ApiModelProperty(value = "章节名称") - private java.lang.String chapterName; - /**修改前*/ - @Excel(name = "修改前", width = 15) - @ApiModelProperty(value = "修改前") - private java.lang.String modificationBefore; - /**修改后*/ - @Excel(name = "修改后", width = 15) - @ApiModelProperty(value = "修改后") - private java.lang.String modificationAfter; - /**修改理由*/ - @Excel(name = "修改理由", width = 15) - @ApiModelProperty(value = "修改理由") - private java.lang.String modificationReason; - /**模块负责人意见（1采纳，2部分采纳，3不采纳）*/ - @Excel(name = "模块负责人意见（1采纳，2部分采纳，3不采纳）", width = 15) - @ApiModelProperty(value = "模块负责人意见（1采纳，2部分采纳，3不采纳）") - @Dict(dicCode = "consultation_opinion") - private java.lang.String isAdopt; - @TableField(exist = false) - private java.lang.String isAdopt_dictText; - /**依据描述*/ - @Excel(name = "依据描述", width = 15) - @ApiModelProperty(value = "依据描述") - private java.lang.String basisDescription; - /**依据材料*/ - @Excel(name = "依据材料", width = 15) - @ApiModelProperty(value = "依据材料") - private java.lang.String basisFile; - /**依据材料名称*/ - @Excel(name = "依据材料名称", width = 15) - @ApiModelProperty(value = "依据材料名称") - @TableField(exist = false) - private java.lang.String basisFileName; - /**设计工程师名称*/ - @Excel(name = "设计工程师名称", width = 15) - @ApiModelProperty(value = "设计工程师名称") - private java.lang.String designEngineerName; - /**设计工程师id*/ - @Excel(name = "设计工程师id", width = 15) - @ApiModelProperty(value = "设计工程师id") - private java.lang.String designEngineerId; - /**提出部门*/ - @Excel(name = "提出部门", width = 15) - @ApiModelProperty(value = "提出部门") - @TableField(exist = false) - private java.lang.String depart; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java deleted file mode 100644 index a932f23d..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jero.modules.activiti.process.fb.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - - -/** - * @Description: 标准征求意见流程-用户关联表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Data -@TableName("process_fb_consultation_user_link") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_fb_consultation_user_link对象", description="标准征求意见流程-用户关联表") -public class ProcessFbConsultationUserLink implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**业务id*/ - @Excel(name = "业务id", width = 15) - @ApiModelProperty(value = "业务id") - private java.lang.String businessId; - /**部门主管级领导*/ - @Excel(name = "部门主管级领导", width = 15) - @ApiModelProperty(value = "部门主管级领导") - private java.lang.String departLeaderId; - /**模块负责人*/ - @Excel(name = "模块负责人", width = 15) - @ApiModelProperty(value = "模块负责人") - private java.lang.String moduleOwnerId; - @TableField(exist = false) - private java.lang.String moduleOwnerId_dictText; - /**设计工程师*/ - @Excel(name = "设计工程师", width = 15) - @ApiModelProperty(value = "设计工程师") - private java.lang.String designEngineerId; - @TableField(exist = false) - private java.lang.String designEngineerId_dictText; - /**下发人员类型（1模块负责人、2设计工程师）*/ - @Excel(name = "下发人员类型（1模块负责人、2设计工程师）", width = 15) - @ApiModelProperty(value = "下发人员类型（1模块负责人、2设计工程师）") - private java.lang.String userType; - /**父执行实例流id*/ - @Excel(name = "父执行实例流id", width = 15) - @ApiModelProperty(value = "父执行实例流id") - private java.lang.String parentExecutionId; - /**部门主管级领导原始办理人*/ - @Excel(name = "部门主管级领导原始办理人", width = 15) - @ApiModelProperty(value = "部门主管级领导原始办理人") - private java.lang.String originDepartLeaderId; - /**模块负责人原始办理人*/ - @Excel(name = "模块负责人原始办理人", width = 15) - @ApiModelProperty(value = "模块负责人原始办理人") - private java.lang.String originModuleOwnerId; - /**设计工程师原始办理人*/ - @Excel(name = "设计工程师原始办理人", width = 15) - @ApiModelProperty(value = "设计工程师原始办理人") - private java.lang.String originDesignEngineerId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java deleted file mode 100644 index f31a2a87..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.jero.modules.activiti.process.fb.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Map; - - -/** - * @Description: 标准法规入库/变更流程 - * @Author: jero-boot - * @Date: 2023-11-01 - * @Version: V1.0 - */ -@Data -@TableName("process_fb_entry_change") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_fb_entry_change对象", description="标准法规入库_变更流程") -public class ProcessFbEntryChange implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - private java.lang.String orgCode; - /**0表示未删除,1表示删除*/ - @Excel(name = "0表示未删除,1表示删除", width = 15) - @ApiModelProperty(value = "0表示未删除,1表示删除") - private java.lang.Integer delFlag; - - /**来源（1国内、2海外）*/ - @Excel(name = "来源（1国内、2海外）", width = 15) - @ApiModelProperty(value = "来源（1国内、2海外）") - private java.lang.String source; - /**来源（1国内、2海外） 翻译*/ - @ApiModelProperty(value = "来源（1国内、2海外） 翻译") - @TableField(exist = false) - private java.lang.String source_dictText; - /**操作类型（1标准法规入库、2标准法规变更）*/ - @Excel(name = "操作类型（1标准法规入库、2标准法规变更）", width = 15) - @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更）") - private java.lang.String operateType; - /**操作类型（1标准法规入库、2标准法规变更）*/ - @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更） 翻译") - @TableField(exist = false) - private java.lang.String operateType_dictText; - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; - /**用户id*/ - @Excel(name = "用户id", width = 15) - @ApiModelProperty(value = "用户id") - private java.lang.String userId; - /**JSON字符串*/ - @Excel(name = "JSON字符串", width = 15) - @ApiModelProperty(value = "JSON字符串") - private java.lang.String businessJson; - - @ApiModelProperty(value = "法规数据") - @TableField(exist = false) - private Map businessMap; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java deleted file mode 100644 index b95c3566..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.jero.modules.activiti.process.fb.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - - -/** - * @Description: 标准征求意见流程表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Data -@TableName("process_fb_standard_consultation") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_fb_standard_consultation对象", description="标准征求意见流程表") -public class ProcessFbStandardConsultation implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - private java.lang.String orgCode; - /**0表示未删除,1表示删除*/ - @Excel(name = "0表示未删除,1表示删除", width = 15) - @ApiModelProperty(value = "0表示未删除,1表示删除") - private java.lang.Integer delFlag; - - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; - /**标准名称*/ - @Excel(name = "标准名称", width = 15) - @ApiModelProperty(value = "标准名称") - private java.lang.String standardName; - /**标准文本*/ - @Excel(name = "标准文本", width = 15) - @ApiModelProperty(value = "标准文本") - private java.lang.String standardText; - /**标准文本文件*/ - @Excel(name = "标准文本文件", width = 15) - @ApiModelProperty(value = "标准文本文件") - private java.lang.String standardTextFileId; - /**相关文件*/ - @Excel(name = "相关文件", width = 15) - @ApiModelProperty(value = "相关文件") - private java.lang.String relatedFile; - /**征求意见结束日期*/ - @Excel(name = "征求意见结束日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "征求意见结束日期") - private java.util.Date consultationDueDate; - - /**征求意见开始日期(征求意见周期)*/ - @Excel(name = "征求意见开始日期(征求意见周期)", width = 15) - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "征求意见开始日期(征求意见周期)") - private java.util.Date consultationBeginDate; - - /**征求意见结束日期(征求意见周期)*/ - @Excel(name = "征求意见结束日期(征求意见周期)", width = 15) - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "征求意见结束日期(征求意见周期)") - private java.util.Date consultationEndDate; - - /**征求意见周期*/ - @Excel(name = "征求意见周期", width = 15) - @ApiModelProperty(value = "征求意见周期") - @TableField(exist = false) - private java.lang.String consultationPeriod; - - /**标准名称/编号*/ - @Excel(name = "标准名称/编号", width = 15) - @ApiModelProperty(value = "标准名称/编号") - @TableField(exist = false) - private java.lang.String standardNameNumber; - - /**收准来源(1国内、2海外、3企标)*/ - @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)") - @TableField(exist = false) - private String source; - - /**标准id*/ - @Excel(name = "标准id", width = 15) - @ApiModelProperty(value = "标准id") - private java.lang.String standardId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardPurchase.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardPurchase.java deleted file mode 100644 index d187633e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardPurchase.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.jero.modules.activiti.process.fb.entity; - -import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - - -/** - * @Description: 法规采购流程表 - * @Author: jero-boot - * @Date: 2023-11-14 - * @Version: V1.0 - */ -@Data -@TableName("process_fb_standard_purchase") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_fb_standard_purchase对象", description="法规采购流程表") -public class ProcessFbStandardPurchase implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private java.lang.String orgCode; - /**0表示未删除,1表示删除*/ - @ApiModelProperty(value = "0表示未删除,1表示删除") - private java.lang.Integer delFlag; - /**业务id*/ - @ApiModelProperty(value = "业务id") - private java.lang.String businessId; - /**排序*/ - @ApiModelProperty(value = "排序") - private java.lang.Integer sort; - /**标准编号*/ - @Excel(name = "标准号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; - /**标准名称*/ - @Excel(name = "标准名称", width = 15) - @ApiModelProperty(value = "标准名称") - private java.lang.String standardName; - /**采购理由*/ - @ApiModelProperty(value = "采购理由") - private java.lang.String purchaseReason; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/DepartLeaderStartOverDueJob.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/DepartLeaderStartOverDueJob.java deleted file mode 100644 index 3566b571..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/DepartLeaderStartOverDueJob.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jero.modules.activiti.process.fb.job; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; -import com.jero.modules.activiti.process.fb.common.FbCommon; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.activiti.process.fb.vo.NodeDispose; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.*; -import org.apache.commons.collections4.CollectionUtils; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @ClassName: DesignEngineerOverDueJob3 - * @Description: - * @Author: yjz - * @Date: 2024-01-31 10:59 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -public class DepartLeaderStartOverDueJob implements Job { - @Resource - private IProcessFbStandardConsultationService processFbStandardConsultationService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private TaskService taskService; - @Resource - private RuntimeService runtimeService; - - /** - * 征求意见流程-超过征求意见结束日期，各部所主管级领导未分发时 - * @param jobExecutionContext - * @throws JobExecutionException - */ - @Override - public void execute(JobExecutionContext jobExecutionContext) { - log.info("征求意见流程-超过征求意见结束日期，各部所主管级领导 部分/全部 未分发时任务开始"); - long num = 0L; - // 查询超过征求意见结束日期的各部所主管级领导未分发节点情况 - List nodeDisposeCount = - processFbStandardConsultationService.findNodeDisposeCount(ConsultationTaskKey.DEPART_LEADER_START_1); - if (CollectionUtils.isNotEmpty(nodeDisposeCount)){ - List processInstanceIdList = nodeDisposeCount.stream() - .map(NodeDispose::getProcessInstanceId) - .collect(Collectors.toList()); - - // 未完成审批数据 - List processApprovalRecordList = processApprovalRecordService.list( - new LambdaQueryWrapper() - .in(ProcessApprovalRecord::getProcessInstanceId, processInstanceIdList) - .eq(ProcessApprovalRecord::getNodeId, ConsultationTaskKey.DEPART_LEADER_START_1) - .eq(ProcessApprovalRecord::getOverDue, YesOrNoEnum.NO.getValue()) - .eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue())); - - // 更新超期标识 - if (!processApprovalRecordList.isEmpty()){ - List idList = processApprovalRecordList.stream() - .map(ProcessApprovalRecord::getId).collect(Collectors.toList()); - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .in(ProcessApprovalRecord::getId, idList) - .eq(ProcessApprovalRecord::getOverDue, YesOrNoEnum.NO.getValue()) - .set(ProcessApprovalRecord::getOverDue, YesOrNoEnum.YES.getValue())); - } - - for (ProcessApprovalRecord processApprovalRecord : processApprovalRecordList) { - num += 1; - // 设置网关条件 - runtimeService.setVariableLocal(processApprovalRecord.getProcessInstanceId(), - FbCommon.VARIABLE_PASS_FIRST, 3); - - // 完成任务 - taskService.complete(processApprovalRecord.getTaskId()); - } - } - log.info("征求意见流程-超过征求意见结束日期，各部所主管级领导 部分/全部 未分发时任务结束"); - log.info("征求意见流程-超过征求意见结束日期，任务数量{}", num); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/DesignEngineerOverDueJob.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/DesignEngineerOverDueJob.java deleted file mode 100644 index 9ce0142a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/DesignEngineerOverDueJob.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.jero.modules.activiti.process.fb.job; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationListService; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationUserLinkService; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.activiti.process.fb.vo.NodeDispose; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.Execution; -import org.activiti.engine.task.Task; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @ClassName: OverDueJob - * @Description: - * @Author: yjz - * @Date: 2024-01-30 09:22 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -public class DesignEngineerOverDueJob implements Job { - @Resource - private IProcessFbStandardConsultationService processFbStandardConsultationService; - @Resource - private IProcessFbConsultationUserLinkService processFbConsultationUserLinkService; - @Resource - private IProcessFbConsultationListService processFbConsultationListService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private ProcessAllService processAllService; - @Resource - private TaskService taskService; - @Resource - private RuntimeService runtimeService; - @Resource - private ISysUserService sysUserService; - - /** - * 征求意见流程-超过征求意见结束日期，存在设计师未提交意见时，直接流转到下一节点任务 - * @param jobExecutionContext - * @throws JobExecutionException - */ - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - log.info("征求意见流程-超过征求意见结束日期，存在设计师未提交意见时，直接流转到下一节点任务开始"); - long num = 0L; - // 查询超过征求意见结束日期的设计工程师填写征求意见节点情况 - List designEngineerNodeList = Arrays.asList(ConsultationTaskKey.DESIGN_ENGINEER_1, - ConsultationTaskKey.DESIGN_ENGINEER_2); - List nodeDisposeCount = - processFbStandardConsultationService.findNodeDisposeCount( - String.join(",", designEngineerNodeList)); - if (!nodeDisposeCount.isEmpty()){ - // 获取实例id - List processInstanceIdList = nodeDisposeCount.stream() - .map(NodeDispose::getProcessInstanceId) - .collect(Collectors.toList()); - // 获取流程信息 - List processAllList = processAllService.list(new LambdaQueryWrapper() - .in(ProcessAll::getProcessInstanceId, processInstanceIdList) - .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.INCOMPLETE.getValue())); - - for (ProcessAll processAll : processAllList) { - // 查询节点待办信息 - List processApprovalRecordList = processApprovalRecordService.list( - new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProcessInstanceId, processAll.getProcessInstanceId()) - .in(ProcessApprovalRecord::getNodeId, designEngineerNodeList) - .eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue())); - - for (ProcessApprovalRecord processApprovalRecord : processApprovalRecordList) { - // 获取任务信息 - Task task = taskService.createTaskQuery().taskId(processApprovalRecord.getTaskId()).singleResult(); - String executionId = task.getExecutionId(); - Execution execution = runtimeService.createExecutionQuery().executionId(executionId).singleResult(); - String executionParentId = execution.getParentId(); - // 查询用户关联表 - ProcessFbConsultationUserLink userLink = processFbConsultationUserLinkService.getOne( - new LambdaQueryWrapper() - .eq(ProcessFbConsultationUserLink::getParentExecutionId, executionParentId) - .eq(ProcessFbConsultationUserLink::getDesignEngineerId, - processApprovalRecord.getUserId()) - .eq(ProcessFbConsultationUserLink::getBusinessId, - processAll.getProjectId())); - if (!Objects.isNull(userLink)){ - // 修改流程相关业务数据 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessFbConsultationList::getBusinessId, processAll.getProjectId()); - updateWrapper.eq(ProcessFbConsultationList::getDesignEngineerId, - processApprovalRecord.getUserId()); - updateWrapper.eq(ProcessFbConsultationList::getUserLinkId, userLink.getId()); - updateWrapper.set(ProcessFbConsultationList::getModificationBefore, null); - updateWrapper.set(ProcessFbConsultationList::getModificationAfter, null); - updateWrapper.set(ProcessFbConsultationList::getModificationReason, "无意见"); - boolean update = processFbConsultationListService.update(updateWrapper); - if (!update){ - // 生成一条无意见数据 - ProcessFbConsultationList consultationList = new ProcessFbConsultationList(); - consultationList.setBusinessId(processAll.getProjectId()); - consultationList.setDesignEngineerId(processApprovalRecord.getUserId()); - consultationList.setDesignEngineerName(sysUserService.dictByIdsOrUserNames( - processApprovalRecord.getUserId(), "")); - consultationList.setUserLinkId(userLink.getId()); - consultationList.setModificationReason("无意见"); - processFbConsultationListService.save(consultationList); - } - } - num += 1; - // 完成任务 - taskService.complete(processApprovalRecord.getTaskId()); - } - } - } - log.info("征求意见流程-超过征求意见结束日期，存在设计师未提交意见时，直接流转到下一节点任务开始"); - log.info("征求意见流程-超过征求意见结束日期，存在设计师未提交意见时，任务数量{}", num); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/ModuleOwnerStartOverDueJob.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/ModuleOwnerStartOverDueJob.java deleted file mode 100644 index e925b73c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/job/ModuleOwnerStartOverDueJob.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.jero.modules.activiti.process.fb.job; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; -import com.jero.modules.activiti.process.fb.common.FbCommon; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.activiti.process.fb.vo.NodeDispose; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.apache.commons.collections4.CollectionUtils; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @ClassName: DesignEngineerOverDueJob2 - * @Description: - * @Author: yjz - * @Date: 2024-01-31 10:59 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -public class ModuleOwnerStartOverDueJob implements Job { - @Resource - private IProcessFbStandardConsultationService processFbStandardConsultationService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private TaskService taskService; - @Resource - private RuntimeService runtimeService; - - /** - * 征求意见流程-超过征求意见结束日期，模块负责人未分发时 - * @param jobExecutionContext - * @throws JobExecutionException - */ - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - log.info("征求意见流程-超过征求意见结束日期，模块负责人 部分/全部 未分发时任务开始"); - long num = 0L; - // 查询超过征求意见结束日期的模块负责人分发节点情况 - List nodeDisposeCount = - processFbStandardConsultationService.findNodeDisposeCount(ConsultationTaskKey.MODULE_OWNER_START); - if (CollectionUtils.isNotEmpty(nodeDisposeCount)){ - /** - * // 部分未完成 - * List sectorUnFinishedList = nodeDisposeCount.stream() - * .filter(v -> !v.getUnFinished().equals(v.getCount())) - * .collect(Collectors.toList()); - * - * // 全部未完成 - * List allUnFinishedList = nodeDisposeCount.stream() - * .filter(v -> v.getUnFinished().equals(v.getCount())) - * .collect(Collectors.toList()); - */ - List processInstanceIdList = nodeDisposeCount.stream() - .map(NodeDispose::getProcessInstanceId) - .collect(Collectors.toList()); - - // 未完成审批数据 - List processApprovalRecordList = processApprovalRecordService.list( - new LambdaQueryWrapper() - .in(ProcessApprovalRecord::getProcessInstanceId, processInstanceIdList) - .eq(ProcessApprovalRecord::getNodeId, ConsultationTaskKey.MODULE_OWNER_START) - .eq(ProcessApprovalRecord::getOverDue, YesOrNoEnum.NO.getValue()) - .eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue())); - - // 更新超期标识 - if (!processApprovalRecordList.isEmpty()){ - List idList = processApprovalRecordList.stream() - .map(ProcessApprovalRecord::getId).collect(Collectors.toList()); - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .in(ProcessApprovalRecord::getId, idList) - .eq(ProcessApprovalRecord::getOverDue, YesOrNoEnum.NO.getValue()) - .set(ProcessApprovalRecord::getOverDue, YesOrNoEnum.YES.getValue())); - } - - for (ProcessApprovalRecord processApprovalRecord : processApprovalRecordList) { - num += 1; - // 设置网关条件 - runtimeService.setVariableLocal(processApprovalRecord.getProcessInstanceId(), - FbCommon.OVER_DUE, true); - // 完成任务 - try { - taskService.complete(processApprovalRecord.getTaskId()); - }catch (Exception e){ - log.error("{}处理失败！" + e.getMessage(), processApprovalRecord.getTaskId()); - } - } - } - log.info("征求意见流程-超过征求意见结束日期，模块负责人 部分/全部 未分发时任务结束"); - log.info("征求意见流程-超过征求意见结束日期，任务数量{}", num); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/BusinessKeyListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/BusinessKeyListener.java deleted file mode 100644 index 4320d4a4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/BusinessKeyListener.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.activiti.process.fb.listener; - -import com.jero.common.util.SpringContextUtils; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; - -/** - * @Author: liao - * @Date: 2023/11/13 17:01 - * @Description: 设置任务的业务key - */ -public class BusinessKeyListener implements TaskListener { - @Override - public void notify(DelegateTask delegateTask) { - TaskListenerService taskListenerService = SpringContextUtils.getBean(TaskListenerService.class); - taskListenerService.setBusinessKey(delegateTask); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java deleted file mode 100644 index 3e8a84fd..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/listener/TaskListenerService.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.jero.modules.activiti.process.fb.listener; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.exception.JeroBootException; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationUserLinkService; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.HistoryService; -import org.activiti.engine.delegate.DelegateExecution; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.history.HistoricTaskInstance; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * @Author: liao - * @Date: 2023/11/20 11:41 - * @Description: 任务监听器服务 - */ -@Service -@Slf4j -public class TaskListenerService { - - @Resource - private IProcessFbConsultationUserLinkService processFbConsultationUserLinkService; - @Resource - private ProcessAllService processAllService; - @Resource - private HistoryService historyService; - - public void setBusinessKey(DelegateTask delegateTask) { - // 在任务创建时，设置业务key - String taskDefinitionKey = delegateTask.getTaskDefinitionKey(); - String assignee = delegateTask.getAssignee(); - String processInstanceId = delegateTask.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - - DelegateExecution execution = delegateTask.getExecution(); - String executionId = execution.getId(); - String parentExecutionId = execution.getParentId(); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processAll.getProjectId()); - String userId = ""; - try { - userId = CurrentUserUtil.getId(); - }catch (Exception e){ - return; - } - - ProcessFbConsultationUserLink userLink; - switch (taskDefinitionKey) { - case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 - queryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, userId); - queryWrapper.eq(ProcessFbConsultationUserLink::getModuleOwnerId, assignee); - userLink = processFbConsultationUserLinkService.getOne(queryWrapper); - delegateTask.setFormKey(userLink.getId()); - // 给人员关系表绑定执行流父id - userLink.setParentExecutionId(executionId); - processFbConsultationUserLinkService.updateById(userLink); - break; - case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人） - queryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, userId); - queryWrapper.eq(ProcessFbConsultationUserLink::getDesignEngineerId, assignee); - userLink = processFbConsultationUserLinkService.getOne(queryWrapper); - delegateTask.setFormKey(userLink.getId()); - // 给人员关系表绑定执行流父id - userLink.setParentExecutionId(parentExecutionId); - processFbConsultationUserLinkService.updateById(userLink); - break; - case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人） - userLink = processFbConsultationUserLinkService.getById(assignee); - assignee = userLink.getDesignEngineerId(); - delegateTask.setAssignee(userLink.getDesignEngineerId()); - delegateTask.setFormKey(userLink.getId()); - // 给人员关系表绑定执行流父id - userLink.setParentExecutionId(parentExecutionId); - processFbConsultationUserLinkService.updateById(userLink); - break; - case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后） - delegateTask.setFormKey(userId); // 绑定主管级领导的id - break; - case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 - HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery().executionId(parentExecutionId).singleResult(); - String historicTaskAssignee = historicTask.getAssignee(); - if (StringUtils.isBlank(historicTaskAssignee)) { - throw new JeroBootException("系统错误，请联系开发管理员"); - } - log.info("法规工程师驳回后的模块负责人为: {}", historicTaskAssignee); - delegateTask.setFormKey(historicTaskAssignee); - break; - default: - log.info("{}没有监听任务", taskDefinitionKey); - } - - log.info("================================任务监听器================================="); - log.info("任务id: {}", delegateTask.getId()); - log.info("TaskDefinitionKey: {}", delegateTask.getTaskDefinitionKey()); - log.info("任务Name: {}", delegateTask.getName()); - log.info("taskDefinitionKey: {}", taskDefinitionKey); - log.info("assignee: {}", assignee); - log.info("FormKey: {}", delegateTask.getFormKey()); - log.info("任务ExecutionId: {}", executionId); - log.info("任务父ExecutionId: {}", parentExecutionId); - log.info("======================================================================="); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationListMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationListMapper.java deleted file mode 100644 index 9ee07bbb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationListMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.fb.mapper; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface ProcessFbConsultationListMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationUserLinkMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationUserLinkMapper.java deleted file mode 100644 index 31fc3770..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationUserLinkMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.fb.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 标准征求意见流程-用户关联表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface ProcessFbConsultationUserLinkMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbEntryChangeMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbEntryChangeMapper.java deleted file mode 100644 index c463fdf2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbEntryChangeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.fb.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 标准法规入库/变更流程 - * @Author: jero-boot - * @Date: 2023-11-01 - * @Version: V1.0 - */ -public interface ProcessFbEntryChangeMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java deleted file mode 100644 index 23ab340f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jero.modules.activiti.process.fb.mapper; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.fb.vo.NodeDispose; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 标准征求意见流程表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface ProcessFbStandardConsultationMapper extends BaseMapper { - - /** - * 已超期节点任务处理数量查询 - * @param nodeIds - * @return - */ - List findNodeDisposeCount(@Param("nodeIds") String nodeIds); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardPurchaseMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardPurchaseMapper.java deleted file mode 100644 index f2965675..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardPurchaseMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.fb.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 法规采购流程表 - * @Author: jero-boot - * @Date: 2023-11-14 - * @Version: V1.0 - */ -public interface ProcessFbStandardPurchaseMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationListMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationListMapper.xml deleted file mode 100644 index 065f3829..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationListMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml deleted file mode 100644 index 6e1451b8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbEntryChangeMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbEntryChangeMapper.xml deleted file mode 100644 index b812941b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbEntryChangeMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardConsultationMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardConsultationMapper.xml deleted file mode 100644 index 64c34f91..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardConsultationMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardPurchaseMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardPurchaseMapper.xml deleted file mode 100644 index e787fd5f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardPurchaseMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationListService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationListService.java deleted file mode 100644 index 29d1eb2f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationListService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.fb.service; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface IProcessFbConsultationListService extends IService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationUserLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationUserLinkService.java deleted file mode 100644 index 29e457d3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationUserLinkService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.fb.service; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; - -/** - * @Description: 标准征求意见流程-用户关联表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface IProcessFbConsultationUserLinkService extends IService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java deleted file mode 100644 index b2346fd1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.jero.modules.activiti.process.fb.service; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; - -/** - * @Description: 标准法规入库/变更流程 - * @Author: jero-boot - * @Date: 2023-11-01 - * @Version: V1.0 - */ -public interface IProcessFbEntryChangeService extends IService { - /** - * @Author: liao - * @Date: 2023/11/2 15:43 - * @Description: 添加业务信息 - **/ - void addBusinessInfo(ProcessFbEntryChange processFbEntryChange); - - /** - * @Author: liao - * @Date: 2023/11/2 15:48 - * @Description: 编辑业务信息 - **/ - void editBusinessInfo(ProcessFbEntryChange processFbEntryChange); - - /** - * @Author: liao - * @Date: 2023/11/3 10:57 - * @Description: 启动流程 - **/ - void startProcess(ProcessInfoVO processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/6 14:52 - * @Description: 审批 - **/ - void approveTask(ProcessInfoVO processInfoVO, boolean pass); - - /** - * @Author: liao - * @Date: 2023/11/6 15:22 - * @Description: 转办 - **/ - void transfer(String taskId, String toUserId); - - /** - * @Author: liao - * @Date: 2023/11/3 10:58 - * @Description: 保存为草稿 - **/ - void saveToDraft(ProcessInfoVO processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/8 11:12 - * @Description: 查询流程信息 - **/ - ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId); - - /** - * 删除校验 - * @param ids - */ - void delCheck(String ids); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java deleted file mode 100644 index e8aba8eb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jero.modules.activiti.process.fb.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.activiti.process.fb.vo.NodeDispose; -import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; - -import java.util.List; - -/** - * @Description: 标准征求意见流程表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface IProcessFbStandardConsultationService extends IService { - - /** - * @Author: liao - * @Date: 2023/11/8 14:35 - * @Description: 发起流程 - **/ - void startProcess(ProcessInfoVO processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/10 11:41 - * @Description: 审批 - **/ - void approveTask(ProcessInfoVO processInfoVO, boolean pass); - - /** - * @Author: liao - * @Date: 2023/11/13 16:00 - * @Description: 提交 - **/ - void submit(ProcessInfoVO processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/16 15:09 - * @Description: 保存为草稿 - **/ - void saveToDraft(ProcessInfoVO processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/16 15:11 - * @Description: 转办 - **/ - void transfer(String taskId, String toUserId, String projectId); - - /** - * @Author: liao - * @Date: 2023/11/16 15:13 - * @Description: 查询流程信息 - **/ - ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId); - - /** - * @Author: liao - * @Date: 2023/11/27 16:50 - * @Description: 根据任务id和业务id查询关联表集合 - **/ - List listByTaskIdAndBusinessId(String taskId, String businessId); - - /** - * 已超期节点任务处理数量查询 - * @param nodeId - * @return - */ - List findNodeDisposeCount(String nodeId); - - /** - * 超期判断 - * @param taskId - */ - void isOverDue(String taskId); - - /** - * 修改标准状态为发布或报批后，征求意见流程的超期待办，流程结束，不进入已办中 - * @param id - */ - void endOverDueBackLog(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java deleted file mode 100644 index 98ea5ba3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.jero.modules.activiti.process.fb.service; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import org.springframework.web.servlet.ModelAndView; - -import java.util.List; - -/** - * @Description: 法规采购流程表 - * @Author: jero-boot - * @Date: 2023-11-14 - * @Version: V1.0 - */ -public interface IProcessFbStandardPurchaseService extends IService { - - /** - * @Author: liao - * @Date: 2023/11/14 14:07 - * @Description: 查询流程信息 - **/ - ProcessInfoVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId); - - /** - * @Author: liao - * @Date: 2023/11/14 14:07 - * @Description: 发起流程 - **/ - void startProcess(ProcessInfoVO> processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/14 14:07 - * @Description: 审批 - **/ - void approveTask(ProcessInfoVO> processInfoVO, boolean pass); - - /** - * @Author: liao - * @Date: 2023/11/14 14:08 - * @Description: 转办 - **/ - void transfer(String taskId, String toUserId); - - /** - * @Author: liao - * @Date: 2023/11/14 14:08 - * @Description: 保存为草稿 - **/ - void saveToDraft(ProcessInfoVO> processInfoVO); - - /** - * @Author: liao - * @Date: 2023/11/14 14:55 - * @Description: 导出 - **/ - ModelAndView exportXls(String businessId); - - /** - * @Author: liao - * @Date: 2023/11/14 15:07 - * @Description: 抄送 - **/ - void carbonCopy(String taskId, String userIds); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationListServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationListServiceImpl.java deleted file mode 100644 index dad85cc2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationListServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jero.modules.activiti.process.fb.service.impl; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.mapper.ProcessFbConsultationListMapper; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationListService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessFbConsultationListServiceImpl extends ServiceImpl implements IProcessFbConsultationListService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationUserLinkServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationUserLinkServiceImpl.java deleted file mode 100644 index 59f2f57c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationUserLinkServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.modules.activiti.process.fb.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.mapper.ProcessFbConsultationUserLinkMapper; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationUserLinkService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - -/** - * @Description: 标准征求意见流程-用户关联表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessFbConsultationUserLinkServiceImpl extends ServiceImpl implements IProcessFbConsultationUserLinkService { - -} 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 deleted file mode 100644 index a20551cb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ /dev/null @@ -1,664 +0,0 @@ -package com.jero.modules.activiti.process.fb.service.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPath; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -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.ProcessStatusEnum; -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.ProcessFbEntryChange; -import com.jero.modules.activiti.process.fb.mapper.ProcessFbEntryChangeMapper; -import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.service.ProcessAllService; -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.constant.FieldCommon; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.mapper.LawsCommonMapper; -import com.jero.modules.laws.common.service.ILawsCommonService; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.standard.entity.*; -import com.jero.modules.laws.standard.service.*; -import com.jero.modules.laws.standardization.entity.LawsStandardization; -import com.jero.modules.laws.standardization.service.ILawsStandardizationService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.service.ISysUserService; -import com.jero.modules.tag.entity.LawsTag; -import com.jero.modules.tag.enums.TableNameEnum; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - - -/** - * @Description: 标准法规入库/变更流程 - * @Author: jero-boot - * @Date: 2023-11-01 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class ProcessFbEntryChangeServiceImpl extends ServiceImpl - implements IProcessFbEntryChangeService, WorkCenterService { - - @Resource - private IProcessHandleService processHandleService; - @Resource - private ILawsCommonService lawsCommonService; - @Resource - private LawsCommonMapper lawsCommonMapper; - @Resource - private SendMessageAPI sendMessageAPI; - @Resource - private ILawsEnterpriseStandardService lawsEnterpriseStandardService; - - @Resource - private ProcessDraftService processDraftService; - - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - - @Resource - private ISysUserService sysUserService; - - @Resource - private ISysDepartService sysDepartService; - - @Resource - private ISysDictService dictService; - - @Resource - private ILawsStandardizationService lawsStandardizationService; - @Resource - private ILawsDomesticStandardService lawsDomesticStandardService; - @Resource - private ILawsOverseasStandardService lawsOverseasStandardService; - @Resource - private ProcessAllService processAllService; - - @Resource - private ILawsTreeNodeService lawsTreeNodeService; - @Resource - private ILawsReplacedStandardService lawsReplacedStandardService; - - @Resource - private ILawsDomesticStandardService gbService; - - @Resource - private ILawsOverseasStandardService fbService; - - /** - * @Author: liao - * @Date: 2023/11/2 15:43 - * @Description: 添加业务信息 - **/ - @Override - public void addBusinessInfo(ProcessFbEntryChange processFbEntryChange) { - // 设置标准编号 - setStandardNumber(processFbEntryChange); - Map businessMap = processFbEntryChange.getBusinessMap(); - processFbEntryChange.setBusinessJson(JSON.toJSONString(businessMap)); - processFbEntryChange.setSource((String) businessMap.get("source")); - processFbEntryChange.setOperateType((String) businessMap.get("operateType")); - processFbEntryChange.setStandardNumber((String) businessMap.get(FieldCommon.STANDARD_NUMBER)); - saveOrUpdate(processFbEntryChange); - } - - /** - * @Author: liao - * @Date: 2023/11/2 15:48 - * @Description: 编辑业务信息 - **/ - @Override - public void editBusinessInfo(ProcessFbEntryChange processFbEntryChange) { - // 设置标准编号 - Map businessMap = processFbEntryChange.getBusinessMap(); - processFbEntryChange.setBusinessJson(JSON.toJSONString(businessMap)); - processFbEntryChange.setSource((String) businessMap.get("source")); - processFbEntryChange.setOperateType((String) businessMap.get("operateType")); - processFbEntryChange.setStandardNumber((String) businessMap.get(FieldCommon.STANDARD_NUMBER)); - updateById(processFbEntryChange); - } - - /** - * @Author: liao - * @Date: 2023/11/6 11:35 - * @Description: 设置标准编号 - **/ - private void setStandardNumber(ProcessFbEntryChange processFbEntryChange) { - Map parameterMap = new HashMap<>(); - Map businessMap = processFbEntryChange.getBusinessMap(); - parameterMap.put(FieldCommon.STANDARD_CLASS, businessMap.get(FieldCommon.STANDARD_CLASS)); - parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, businessMap.get(FieldCommon.STANDARD_NUMBER_TEMP)); - parameterMap.put(FieldCommon.YEAR_NUMBER, businessMap.get(FieldCommon.YEAR_NUMBER)); - lawsCommonService.setStandardNumber(parameterMap); - businessMap.put(FieldCommon.STANDARD_NUMBER, parameterMap.get(FieldCommon.STANDARD_NUMBER)); - } - - /** - * @Author: liao - * @Date: 2023/11/3 10:58 - * @Description: 启动流程 - **/ - @Override - public void startProcess(ProcessInfoVO processInfoVO) { - ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - if (StringUtils.isBlank(businessInfoDTO.getId())) { - businessInfoDTO.setId(UUIDUtils.randomUUID20()); - } - businessInfoDTO.setUserId(CurrentUserUtil.getId()); - processInfoVO.setBusinessId(businessInfoDTO.getId()); - addBusinessInfo(businessInfoDTO); // 保存业务信息 - - Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map - userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id -// basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称 - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型 - // 重复性校验 - duplicateCheck(processInfoVO.getBusinessId()); - // 删除自己的草稿 - String draftId = processInfoVO.getDraftId(); - if (StringUtils.isNotBlank(draftId)) { - processDraftService.removeById(draftId); - } - // 同一个标准编号不能同时有多个进行中的标准变更流程 - verify(processInfoVO.getBusinessId()); - processHandleService.startProcess(processInfoVO); - - // 保存草稿用于强制撤销 - processInfoVO.setSaveSource("3"); - processInfoVO.getBasicTaskInfoDTO().setTaskId(null); - processInfoVO.getBasicProcessInfoDTO().setProcessInstanceId(null); - saveToDraft(processInfoVO); - } - - private void verify(String businessId) { - ProcessFbEntryChange businessData = getById(businessId); - String businessJson = businessData.getBusinessJson(); - Map map = JSON.parseObject(businessJson, Map.class); - if ("2".equals(businessData.getOperateType())) { - List list = list( - new LambdaQueryWrapper() - .ne(ProcessFbEntryChange::getId, businessId) - .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) - .eq(ProcessFbEntryChange::getOperateType, "2")); - if (!list.isEmpty()){ - int count = processAllService.count( - new LambdaQueryWrapper() - .in(ProcessAll::getProjectId, list.stream().map(ProcessFbEntryChange::getId).collect(Collectors.toList())) - .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.INCOMPLETE.getValue())); - if (count > 0){ - throw new JeroBootException("标准编号为：" + map.get(FieldCommon.STANDARD_NUMBER) +"已在标准变更流程进行中，不可重复发起！"); - } - } - } - } - - private void duplicateCheck(String businessId) { - ProcessFbEntryChange businessData = getById(businessId); - String businessJson = businessData.getBusinessJson(); - Map map = JSON.parseObject(businessJson, Map.class); - if ("1".equals(businessData.getOperateType())) { - int documentCount = lawsDomesticStandardService.count( - new LambdaQueryWrapper() - .eq(LawsDomesticStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))); - int overseasCount = lawsOverseasStandardService.count( - new LambdaQueryWrapper() - .eq(LawsOverseasStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))); - if (documentCount > 0 || overseasCount > 0){ - throw new JeroBootException("标准编号为：" + map.get(FieldCommon.STANDARD_NUMBER) + "已入库或已发起入库流程，不可重复发起！"); - } - - List list = list( - new LambdaQueryWrapper() - .ne(ProcessFbEntryChange::getId, businessId) - .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) - .eq(ProcessFbEntryChange::getOperateType, "1")); - for (ProcessFbEntryChange processFbEntryChange : list) { - int count = processDraftService.count( - new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (count == 0){ - throw new JeroBootException("标准编号为：" + map.get(FieldCommon.STANDARD_NUMBER) + "已入库或已发起入库流程，不可重复发起！"); - } - } - } - } - - /** - * @Author: liao - * @Date: 2023/11/6 14:52 - * @Description: 审批 - **/ - @Override - public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { - ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - processInfoVO.setBusinessId(businessInfoDTO.getId()); - editBusinessInfo(businessInfoDTO); - processHandleService.approveTask(processInfoVO, pass); - - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - String processInstanceId = basicProcessInfoDTO.getProcessInstanceId(); - // 如果流程结束 - if (pass && processHandleService.isProcessFinish(processInstanceId)) { - Map objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class); - objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource()); - if ("1".equals(businessInfoDTO.getOperateType())) { - // 重复性校验 -// duplicateCheck(processInfoVO.getBusinessId()); - // 如果是标准法规入库流程 - lawsCommonService.commonAdd(objectMap); - } else { - // 如果是标准法规变更流程 - // 发送消息 - sendMsg(objectMap); - lawsCommonService.commonEdit(objectMap); - } - log.info("《标准法规入库/变更流程》结束，流程名称：{}", basicProcessInfoDTO.getProcessName()); - } - } - - /** - * @Author: liao - * @Date: 2023/11/29 16:55 - * @Description: 发消息 - **/ - private void sendMsg(Map objectMap) { - String module = (String) objectMap.get(FieldCommon.MODULE); - String id = (String) objectMap.get("id"); - String standardNumber = (String) objectMap.get(FieldCommon.STANDARD_NUMBER); - String standardName = (String) objectMap.get(FieldCommon.STANDARD_NAME); - Map oldMap = lawsCommonService.getByIdAndModule(id, module, "2", null); - - String replaced = (String) objectMap.get(FieldCommon.REPLACED_STANDARD); // 代替标准 - String replacedBy = (String) objectMap.get(FieldCommon.REPLACED_BY_STANDARD); // 被代替标准 - String reference = (String) objectMap.get(FieldCommon.REFERENCE_STANDARD); // 引用标准 - String referenceBy = (String) objectMap.get(FieldCommon.REFERENCED_STANDARD); // 被引用标准 - String replacedOld = (String) oldMap.get(FieldCommon.REPLACED_STANDARD); // 代替标准 - String replacedByOld = (String) oldMap.get(FieldCommon.REPLACED_BY_STANDARD); // 被代替标准 - String referenceOld = (String) oldMap.get(FieldCommon.REFERENCE_STANDARD); // 引用标准 - - // 代替标准发消息 - if (StringUtils.isNotBlank(replaced)) { - String userId = ""; - String templateCode = ""; - List replacedList = Arrays.asList(replaced.split(",")); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedList); - queryWrapper.eq(ProcessFbEntryChange::getOperateType, "1"); - List processFbEntryChangeList = list(queryWrapper); - userId = processFbEntryChangeList.stream().map(ProcessFbEntryChange::getUserId).collect(Collectors.joining(",")); - templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REPLACE; - sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode); - } - // 被代替标准发消息 - if (StringUtils.isNotBlank(replacedBy)) { - String userId = ""; - String templateCode = ""; - List replacedByList = Arrays.asList(replacedBy.split(",")); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedByList); - queryWrapper.eq(ProcessFbEntryChange::getOperateType, "1"); - List processFbEntryChangeList = list(queryWrapper); - userId = processFbEntryChangeList.stream().map(ProcessFbEntryChange::getUserId).collect(Collectors.joining(",")); - templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REPLACE_BY; - sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode); - } - // 引用标准 - if (StringUtils.isNotBlank(referenceBy)) { - String userId = ""; - String templateCode = ""; - List referenceByList = Arrays.asList(referenceBy.split(",")); - List lawsEnterpriseStandardList = lawsEnterpriseStandardService.list( - new LambdaQueryWrapper() - .in(LawsEnterpriseStandard::getStandardNumber, referenceByList)); - if (!lawsEnterpriseStandardList.isEmpty()){ - List mainDraftingUserList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getMainDraftingUser).collect(Collectors.toList()); - userId = String.join(",", mainDraftingUserList); - templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REFERENCE; - sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode); - } - } - } - - private void sendMsg(Map objectMap, String module, String standardNumber, String standardName, Map oldMap, String userId, String templateCode) { - if (StringUtils.isNotBlank(userId)) { - String content = getContent(objectMap, oldMap, module); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(templateCode); - sendMessageDTO.setToUserId(userId); - Map map = new HashMap<>(); - map.put("standardNumber", standardNumber); - map.put("standardName", standardName); - map.put("content", content); - map.put("openType", "page"); - if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue())) { - String standardId = gbService.getOne(new LambdaQueryWrapper() - .eq(LawsDomesticStandard::getStandardNumber, standardNumber)).getId(); - map.put("openPage", "/standardRegulationLibrary/DomesticStandardDetail?id=" + standardId); - } - if (module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) { - String standardId = fbService.getOne(new LambdaQueryWrapper() - .eq(LawsOverseasStandard::getStandardNumber, standardNumber)).getId(); - map.put("openPage", "/standardRegulationLibrary/OverseasStandardDetail?id=" + standardId); - } - sendMessageDTO.setMap(map); - sendMessageAPI.sendMessage(sendMessageDTO); - } - } - - /** - * @Author: liao - * @Date: 2023/11/29 17:48 - * @Description: 得到变更内容 - **/ - private String getContent(Map objectMap, Map oldMap, String module) { - // 获取要操作的表名 - String tableName = TableNameEnum.getTableName(module); - // 获取全部字段 - List fieldList = lawsCommonMapper.getFieldList(tableName); - // 筛选出表单显示的 - fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getInteger() - .equals(lawsTag.getIsShowFormCreate())).collect(Collectors.toList()); - - // 组装更新内容 - StringBuilder recordBuffer = new StringBuilder(); - recordBuffer.append("变更前："); - StringBuilder recordBuffer2 = new StringBuilder(); - recordBuffer2.append("变更后："); - - for (Map.Entry entryMap : objectMap.entrySet()) { - String key = entryMap.getKey(); - String value = ""; - if (!Objects.isNull(entryMap.getValue())) { - value = (String) entryMap.getValue(); - } - // 添加更新记录 - lawsCommonService.addUpdateRecord(fieldList, oldMap, recordBuffer, recordBuffer2, key, value); - } - recordBuffer.deleteCharAt(recordBuffer.length()-1); - recordBuffer2.deleteCharAt(recordBuffer2.length()-1); - recordBuffer.append("。"); - recordBuffer.append(recordBuffer2); - return recordBuffer.toString(); - } - - /** - * @Author: liao - * @Date: 2023/11/6 15:23 - * @Description: 转办 - **/ - @Override - public void transfer(String taskId, String toUserId) { - processHandleService.transfer(taskId, toUserId); - } - - /** - * @Author: liao - * @Date: 2023/11/3 11:28 - * @Description: 根据业务id获取流程名称 - **/ - private String getProcessNameByBusinessId(String businessId) { - if (StringUtils.isBlank(businessId)) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "businessId"); - } - ProcessFbEntryChange businessData = getById(businessId); - if (Objects.isNull(businessData)) { - throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - String businessJson = businessData.getBusinessJson(); - Map map = JSON.parseObject(businessJson, Map.class); - String processName = map.get(FieldCommon.STANDARD_NUMBER) + "-" + map.get(FieldCommon.STANDARD_NAME); - if ("1".equals(businessData.getOperateType())) { // 入库 - processName = processName + "-" + "入库"; - } else { // 变更 - processName = processName + "-" + "变更"; - } - return processName; - } - - /** - * @Author: liao - * @Date: 2023/11/3 10:58 - * @Description: 保存为草稿 - **/ - @Override - public void saveToDraft(ProcessInfoVO processInfoVO) { - // 业务信息 - ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - Map businessMap = businessInfoDTO.getBusinessMap(); - businessInfoDTO.setBusinessJson(JSON.toJSONString(businessMap)); - businessInfoDTO.setSource((String) businessMap.get("source")); - businessInfoDTO.setOperateType((String) businessMap.get("operateType")); - businessInfoDTO.setStandardNumber((String) businessMap.get(FieldCommon.STANDARD_NUMBER)); - if (StringUtils.isBlank(businessInfoDTO.getId())) { // 如果是发起时保存 - businessInfoDTO.setId(UUIDUtils.randomUUID20()); - save(businessInfoDTO); - } else { // 如果是审批时保存 - businessInfoDTO.setBusinessJson(JSON.toJSONString(businessInfoDTO.getBusinessMap())); - updateById(businessInfoDTO); - } - processInfoVO.setBusinessId(businessInfoDTO.getId()); - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型 - - processHandleService.saveToDraft2(processInfoVO); - } - - /** - * @Author: liao - * @Date: 2023/11/8 11:12 - * @Description: 查询流程信息 - **/ - @Override - public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); - ProcessFbEntryChange processFbEntryChange = getById(projectId); - - - // 处理字典翻译 - //List fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource())); - // 新增编辑显示 - //fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() - //.equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList()); - //Map stringObjectMap = lawsCommonService.processResultMap(map, fieldList); - - //processFbEntryChange.setBusinessMap(stringObjectMap); - if (!Objects.isNull(processFbEntryChange)){ - // 翻译 - toDict(processFbEntryChange); - Map map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class); - processFbEntryChange.setBusinessMap(map); - processInfoVO.setBusinessInfoDTO(processFbEntryChange); - }else { - processInfoVO.setBusinessInfoDTO(new ProcessFbEntryChange()); - } - return processInfoVO; - } - - @Override - public void delCheck(String ids) { - List idsList = Arrays.asList(ids.split(",")); - List standardNumberList = new ArrayList<>(); - List lawsStandardizations = lawsDomesticStandardService.listByIds(idsList); - List lawsOverseasStandards = lawsOverseasStandardService.listByIds(idsList); - standardNumberList.addAll(lawsStandardizations.stream().map(LawsDomesticStandard::getStandardNumber).collect(Collectors.toList())); - standardNumberList.addAll(lawsOverseasStandards.stream().map(LawsOverseasStandard::getStandardNumber).collect(Collectors.toList())); - - List list = list(new LambdaQueryWrapper() - .in(ProcessFbEntryChange::getStandardNumber, standardNumberList) - .eq(ProcessFbEntryChange::getOperateType, "2")); - if (list.isEmpty()){ - return; - } - List idList = list.stream().map(ProcessFbEntryChange::getId).collect(Collectors.toList()); - List processAllList = processAllService.list( - new LambdaQueryWrapper() - .in(ProcessAll::getProjectId, idList) - .eq(ProcessAll::getPrcStatus, "1")); - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .in(ProcessDraft::getProjectId, idList) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processAllList.isEmpty() || !processDraftList.isEmpty()) { - List processAllProjectIds = processAllList.stream().map(ProcessAll::getProjectId).collect(Collectors.toList()); - List processDraftProjectIds = processDraftList.stream().map(ProcessDraft::getProjectId).collect(Collectors.toList()); - processAllProjectIds.addAll(processDraftProjectIds); - processAllProjectIds = processAllProjectIds.stream().distinct().collect(Collectors.toList()); - List finalProcessAllProjectIds = processAllProjectIds; - String standardNumbers = list.stream().filter(v -> finalProcessAllProjectIds.contains(v.getId())) - .map(ProcessFbEntryChange::getStandardNumber).distinct().collect(Collectors.joining(",")); - throw new JeroBootException("标准编号为：" + standardNumbers +"已在标准法规变更流程进行中，不可删除！"); - } - } - - private void toDict(ProcessFbEntryChange processFbEntryChange) { - String businessJson = processFbEntryChange.getBusinessJson(); - String source = processFbEntryChange.getSource(); - JSONObject jsonObject = JSON.parseObject(businessJson); - if ("1".equals(source)){ - processFbEntryChange.setSource_dictText("国内"); - // 国内动力类型 - if (businessJson.contains("dynamic_type")){ - Object read = JSONPath.read(businessJson, "$.dynamic_type"); - String text = dictService.queryDictText("POWER_TYPE_DOMESTIC", read.toString()); - jsonObject.put("dynamic_type_dictText", text); - } - // 国内标准类别 - if (businessJson.contains("standard_class")){ - Object read = JSONPath.read(businessJson, "$.standard_class"); - String text = dictService.queryDictText("standard_type", read.toString()); - jsonObject.put("standard_class_dictText", text); - } - // 国内适用车型 - if (businessJson.contains("applicable_vehicle")){ - Object read = JSONPath.read(businessJson, "$.applicable_vehicle"); - String text = dictService.queryDictText("APPLICATIONS_DOMESTIC", read.toString()); - jsonObject.put("applicable_vehicle_dictText", text); - } - }else { - processFbEntryChange.setSource_dictText("海外"); - // 海外动力类型 - if (businessJson.contains("dynamic_type")){ - Object read = JSONPath.read(businessJson, "$.dynamic_type"); - String text = dictService.queryDictText("POWER_TYPE_DOMESTIC_OVERSEAS", read.toString()); - jsonObject.put("dynamic_type_dictText", text); - } - // 海外标准类别 - if (businessJson.contains("standard_class")){ - Object read = JSONPath.read(businessJson, "$.standard_class"); - String text = dictService.queryDictText("standard_type_overseas", read.toString()); - jsonObject.put("standard_class_dictText", text); - } - // 海外适用车型 - if (businessJson.contains("applicable_vehicle")){ - Object read = JSONPath.read(businessJson, "$.applicable_vehicle"); - String text = dictService.queryDictText("APPLICATIONS_OVERSEAS", read.toString()); - jsonObject.put("applicable_vehicle_dictText", text); - } - } - if ("1".equals(processFbEntryChange.getOperateType())){ - processFbEntryChange.setOperateType_dictText("标准法规入库"); - }else { - processFbEntryChange.setOperateType_dictText("标准法规变更"); - } - // 采标程度 - if (businessJson.contains("degree_of_bid_acquisition")){ - Object read = JSONPath.read(businessJson, "$.degree_of_bid_acquisition"); - String text = dictService.queryDictText("degree_bid_acquisition", read.toString()); - jsonObject.put("degree_of_bid_acquisition_dictText", text); - } - // 分标委 - if (businessJson.contains("bidding_committee")){ - Object read = JSONPath.read(businessJson, "$.bidding_committee"); - LawsStandardization lawsStandardization = lawsStandardizationService.getById(String.valueOf(read)); - jsonObject.put("bidding_committee_dictText", !Objects.isNull(lawsStandardization) ? lawsStandardization.getName() : ""); - } - // 标准状态 - if (businessJson.contains("standard_state")){ - Object read = JSONPath.read(businessJson, "$.standard_state"); - String text = dictService.queryDictText("standard_state", read.toString()); - jsonObject.put("standard_state_dictText", text); - } - // 标准性质 - if (businessJson.contains("standard_property")){ - Object read = JSONPath.read(businessJson, "$.standard_property"); - String text = dictService.queryDictText("standard_property", read.toString()); - jsonObject.put("standard_property_dictText", text); - } - // 标准体系 - if (businessJson.contains("standard_system")){ - List dicTextList = new ArrayList<>(); - Object read = JSONPath.read(businessJson, "$.standard_system"); - List list = Arrays.asList(read.toString().split(",")); - List lawsTreeNodeList = lawsTreeNodeService.listByIds(list); - for (String item : list) { - Optional optional = lawsTreeNodeList.stream().filter(v -> v.getId().equals(item)).findFirst(); - optional.ifPresent(v -> dicTextList.add(v.getNodeName())); - } - jsonObject.put("standard_system_dictText", String.join(",", dicTextList)); - } - // 责任部门 - if (businessJson.contains("responsible_department")){ - Object read = JSONPath.read(businessJson, "$.responsible_department"); - List sysDepartList = sysDepartService.listByIds(Arrays.asList(String.valueOf(read.toString()).split(","))); - jsonObject.put("responsible_department_dictText", CollectionUtils.isNotEmpty(sysDepartList) ? - sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")) : ""); - } - // 企业参与情况 - if (businessJson.contains("enterprise_participation")){ - Object read = JSONPath.read(businessJson, "$.enterprise_participation"); - String text = dictService.queryDictText("yn", read.toString()); - jsonObject.put("enterprise_participation_dictText", text); - } - // 适用认证 - if (businessJson.contains("applicable_certification")){ - Object read = JSONPath.read(businessJson, "$.applicable_certification"); - String text = dictService.queryDictText("applicable_certification", read.toString()); - jsonObject.put("applicable_certification_dictText", text); - } - processFbEntryChange.setBusinessJson(jsonObject.toJSONString()); - } - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteById("process_fb_entry_change", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java deleted file mode 100644 index 523bf7d7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ /dev/null @@ -1,1272 +0,0 @@ -package com.jero.modules.activiti.process.fb.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.util.SnowflakeUtils; -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.entity.ProcessNode; -import com.jero.modules.activiti.entity.ProcessNodeLink; -import com.jero.modules.activiti.enums.CommitFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.enums.ProcessTypeEnum; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.fb.common.ConsultationNodeSort; -import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; -import com.jero.modules.activiti.process.fb.common.FbCommon; -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.dto.BasicTaskInfoDTO; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; -import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardConsultationMapper; -import com.jero.modules.activiti.process.fb.service.*; -import com.jero.modules.activiti.process.fb.vo.NodeDispose; -import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.service.*; -import com.jero.modules.activiti.util.SpringContextUtil; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.consultation.common.DirectoryComparator; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.Execution; -import org.activiti.engine.task.Task; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - - -/** - * @Description: 标准征求意见流程表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Service -@Slf4j -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl - implements IProcessFbStandardConsultationService, WorkCenterService { - - @Resource - private IProcessHandleService processHandleService; - @Resource - private IProcessFbConsultationUserLinkService processFbConsultationUserLinkService; - @Resource - private IProcessFbConsultationListService processFbConsultationListService; - @Resource - private TaskService taskService; - @Resource - private RuntimeService runtimeService; - @Resource - private ProcessNodeService processNodeService; - @Resource - private ProcessNodeLinkService processNodeLinkService; - @Resource - private ISysUserService sysUserService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private SendMessageAPI sendMessageAPI; - - @Resource - private ProcessDraftService processDraftService; - - @Resource - private ProcessFbStandardConsultationMapper processFbStandardConsultationMapper; - @Resource - private ProcessAllService processAllService; - @Resource - private ISysDictService sysDictService; - - public static final String EXCEPTION = "目前还未开发，请联系管理员"; - - /** - * @Author: liao - * @Date: 2023/11/8 14:36 - * @Description: 发起流程 - **/ - @Override - public void startProcess(ProcessInfoVO processInfoVO) { - // 业务基本信息 - ProcessFbStandardConsultation businessInfoDTO = processInfoVO.getBusinessInfoDTO().getProcessFbStandardConsultation(); - businessInfoDTO.setId(UUIDUtils.randomUUID20()); - businessInfoDTO.setConsultationBeginDate(new Date()); - save(businessInfoDTO); // 保存业务信息 - processInfoVO.setBusinessId(businessInfoDTO.getId()); - - Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map - String departLeaders = (String) userInfoMap.get(FbCommon.VARIABLE_DEPART_LEADER_LIST); - if (StringUtils.isBlank(departLeaders)) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, FbCommon.VARIABLE_DEPART_LEADER_LIST); - } - userInfoMap.put(FbCommon.VARIABLE_ENGINEER, CurrentUserUtil.getId()); // 第一个任务节点设置成自己 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_STANDARD_CONSULTATION)); // 流程定义id -// basicProcessInfoDTO.setProcessName(businessInfoDTO.getStandardNumber() + "-" + businessInfoDTO.getStandardName() + "-" + "征求意见"); // 流程名称 - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue()); // 流程类型 - - // 删除自己的草稿 - String draftId = processInfoVO.getDraftId(); - if (StringUtils.isNotBlank(draftId)) { - processDraftService.removeById(draftId); - } - processHandleService.startProcess(processInfoVO); - - // 把各部所主管级领导数据存入关联人员表 - List departLeaderList = Arrays.asList(departLeaders.split(",")); - List linkList = new ArrayList<>(); - departLeaderList.forEach(departLeader -> { - ProcessFbConsultationUserLink link = new ProcessFbConsultationUserLink(); - link.setBusinessId(processInfoVO.getBusinessId()); - link.setDepartLeaderId(departLeader); - linkList.add(link); - }); - processFbConsultationUserLinkService.saveBatch(linkList, linkList.size()); - - // 保存草稿用于强制撤销 - processInfoVO.setSaveSource("3"); - processInfoVO.getBasicTaskInfoDTO().setTaskId(null); - processInfoVO.getBasicProcessInfoDTO().setProcessInstanceId(null); - saveToDraft(processInfoVO); - } - - /** - * @Author: liao - * @Date: 2023/11/10 11:42 - * @Description: 审批 - **/ - @Override - public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - ProcessFbStandardConsultation businessBasicInfo = businessInfoDTO.getProcessFbStandardConsultation(); // 业务基本信息 - String businessId = businessBasicInfo.getId(); - processInfoVO.setBusinessId(businessId); - - BasicTaskInfoDTO taskInfo = processInfoVO.getBasicTaskInfoDTO(); // 任务信息 - String taskId = taskInfo.getTaskId(); - isOverDue(taskId); - - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - processHandleService.isMyTask(taskId); // 判断是否拥有任务处理权 - String taskDefinitionKey = task.getTaskDefinitionKey(); // 任务定义id - String processInstanceId = task.getProcessInstanceId(); - - Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult(); - - log.info("================================审批节点================================="); - log.info("任务Id: {}", task.getId()); - log.info("TaskDefinitionKey: {}", task.getTaskDefinitionKey()); - log.info("任务Name: {}", task.getName()); - log.info("任务FormKey: {}", task.getFormKey()); - log.info("任务ProcessInstanceId: {}", processInstanceId); - log.info("任务ExecutionId: {}", task.getExecutionId()); - log.info("任务父ExecutionId: {}", execution.getParentId()); - log.info("======================================================================="); - - String userId = CurrentUserUtil.getId(); - if (pass) { // 同意 - taskInfo.setCommitFlag(CommitFlagEnum.PASS.getValue()); - switch (taskDefinitionKey) { - case ConsultationTaskKey.DEPART_LEADER_END_1: // 主管级领导审批 - case ConsultationTaskKey.DEPART_LEADER_END_4: // 驳回流程中的主管级领导审批 - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_SECOND, true); - break; - case ConsultationTaskKey.ENGINEER_START_END: // 法规工程师审批 - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_THIRD, true); - break; - default: - throw new JeroBootException(EXCEPTION); - } - } else { // 驳回 - taskInfo.setCommitFlag(CommitFlagEnum.REJECT.getValue()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, businessId); - - List userLinkList; - switch (taskDefinitionKey) { - case ConsultationTaskKey.DEPART_LEADER_END_1: // 主管级领导审批 - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_SECOND, false); - // 分发给退回的模块负责人 - queryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, userId); - userLinkList = processFbConsultationUserLinkService.list(queryWrapper); - List moduleOwnerIdList = userLinkList.stream() - .map(ProcessFbConsultationUserLink::getModuleOwnerId) - .distinct() - .collect(Collectors.toList()); - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_MODULE_OWNER_LIST, moduleOwnerIdList); - break; - case ConsultationTaskKey.ENGINEER_START_END: // 法规工程师审批 - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_THIRD, false); - // 退回到子流程 - userLinkList = processFbConsultationUserLinkService.list(queryWrapper); - List departLeaderIdList = userLinkList.stream() - .map(ProcessFbConsultationUserLink::getDepartLeaderId) - .distinct() - .collect(Collectors.toList()); - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_DEPART_LEADER_LIST, departLeaderIdList); - processHandleService.updateApprovalRecord(processInfoVO); - // 完成当前任务任务 - taskService.complete(taskId); - - // 法规工程师驳回 任务列表 - List chooseTaskList = taskService.createTaskQuery() - .processInstanceId(processInstanceId) - .list(); - - // 自动完成任务选择 - for (Task chooseTask : chooseTaskList) { - String chooseTaskAssignee = chooseTask.getAssignee(); - String chooseTaskId = chooseTask.getId(); - List userLinks = userLinkList.stream() - .filter(userLink -> chooseTaskAssignee.equals(userLink.getDepartLeaderId())) - .collect(Collectors.toList()); - if ("1".equals(userLinks.get(0).getUserType())) { // 驳回给模块负责人 - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_FOURTH, true); - List moduleOwnerList = userLinks.stream() - .map(ProcessFbConsultationUserLink::getModuleOwnerId) - .distinct() - .collect(Collectors.toList()); - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_MODULE_OWNER_LIST, moduleOwnerList); - } else { // 驳回给各部所主管级领导 - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_FOURTH, false); - } - // 完成驳回任务 - taskService.complete(chooseTaskId); - - // 删除驳回的审批记录 - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(ProcessApprovalRecord::getTaskId, chooseTaskId); - removeWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, processInstanceId); - processApprovalRecordService.remove(removeWrapper); - } - return; - case ConsultationTaskKey.DEPART_LEADER_END_4: - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_PASS_SECOND, false); - break; - default: - throw new JeroBootException(EXCEPTION); - } - } - processHandleService.updateApprovalRecord(processInfoVO); - // 完成任务 - taskService.complete(taskId); - - // 判断法规工程师审批节点是否经过转办 - if (pass && taskDefinitionKey.equals(ConsultationTaskKey.DEPART_LEADER_END_4)) { - isTransition(processInfoVO); - } - - // 如果流程已经结束 - endProcess(processInstanceId, businessId); - } - - /** - * @Author: liao - * @Date: 2023/11/16 15:09 - * @Description: 保存为草稿 - **/ - @Override - public void saveToDraft(ProcessInfoVO processInfoVO) { - // 保存业务信息 - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - - BasicTaskInfoDTO taskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = taskInfoDTO.getTaskId(); - isOverDue(taskId); - - ProcessFbStandardConsultation processFbStandardConsultation = businessInfoDTO.getProcessFbStandardConsultation(); - - if (StringUtils.isBlank(taskId)) { // 法规工程师发起 - saveOrUpdate(processFbStandardConsultation); - } else { // 流程发起后保存 - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - processInfoVO.setBusinessId(businessInfoDTO.getProcessFbStandardConsultation().getId()); - switch (taskDefinitionKey) { - case ConsultationTaskKey.DEPART_LEADER_START_1: - processDepartLeaderStart_1_draft(processInfoVO); // 各部所主管级领导分发 - break; - case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人） - case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人） - designEngineer_draft(processInfoVO); - break; - case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过） - case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后） - case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人） - collect_draft(processInfoVO); - break; - case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 - moduleOwnerStart_draft(processInfoVO); - break; - default: - log.info("taskDefinitionKey:{}，没有业务数据保存", taskDefinitionKey); - } - } - processInfoVO.setBusinessId(processFbStandardConsultation.getId()); - - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue()); // 流程类型 - - processHandleService.saveToDraft(processInfoVO); - } - - /** - * @Author: liao - * @Date: 2023/11/16 15:11 - * @Description: 转办 - **/ - @Override - public void transfer(String taskId, String toUserId, String projectId) { - isOverDue(taskId); - processHandleService.transfer(taskId, toUserId); - } - - /** - * @Author: liao - * @Date: 2023/11/16 15:13 - * @Description: 查询流程信息 - **/ - @Override - public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); - ProcessFbStandardConsultationVO processFbStandardConsultationVO = new ProcessFbStandardConsultationVO(); - processInfoVO.setBusinessInfoDTO(processFbStandardConsultationVO); - - String businessId = processInfoVO.getBusinessId(); - ProcessFbStandardConsultation processFbStandardConsultation = getById(businessId); - processFbStandardConsultationVO.setProcessFbStandardConsultation(processFbStandardConsultation); // 业务基本信息 - - if (StringUtils.isBlank(taskId)) return processInfoVO; - - // 人员选择 - LambdaQueryWrapper linkQueryWrapper = new LambdaQueryWrapper<>(); - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, businessId); - // 征求意见列表 - LambdaQueryWrapper listQueryWrapper = new LambdaQueryWrapper<>(); - listQueryWrapper.eq(ProcessFbConsultationList::getBusinessId, businessId); - - String userId = CurrentUserUtil.getId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String executionId = task.getExecutionId(); - Execution execution = runtimeService.createExecutionQuery().executionId(executionId).singleResult(); - String executionParentId = execution.getParentId(); - String taskDefinitionKey = task.getTaskDefinitionKey(); // 任务定义id - List userLinks; - ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); - List linkIds; - List consultationLists = new ArrayList<>(); - switch (taskDefinitionKey) { - case ConsultationTaskKey.DEPART_LEADER_START_1: // 各部所主管级领导分发 - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, userId); - // 查询当前节点审批记录 - ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getOne( - new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getTaskId, taskId) - .isNotNull(ProcessApprovalRecord::getTransferBy)); - // 如果转办过 - if (!Objects.isNull(processApprovalRecord)){ - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getOriginDepartLeaderId, - processApprovalRecord.getOriginUserId()); - } - userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper); - if (CollectionUtils.isNotEmpty(userLinks)) { - userLink = userLinks.get(0); - String userType = userLink.getUserType(); - if (FbCommon.USER_TYPE_MODULE_OWNER.equals(userType)) { // 模块负责人 - List collect = userLinks.stream() - .map(ProcessFbConsultationUserLink::getModuleOwnerId) - .distinct().collect(Collectors.toList()); - userLink.setModuleOwnerId(StringUtils.join(collect, ",")); - } else { // 设计工程师 - List collect = userLinks.stream() - .map(ProcessFbConsultationUserLink::getDesignEngineerId) - .distinct().collect(Collectors.toList()); - userLink.setDesignEngineerId(StringUtils.join(collect, ",")); - } - processFbStandardConsultationVO.setProcessFbConsultationUserLink(userLink); - } - break; - case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人） - case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人） - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getParentExecutionId, executionParentId); - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getDesignEngineerId, userId); - userLink = processFbConsultationUserLinkService.getOne(linkQueryWrapper); - listQueryWrapper.eq(ProcessFbConsultationList::getDesignEngineerId, userId); - listQueryWrapper.eq(ProcessFbConsultationList::getUserLinkId, userLink.getId()); - consultationLists = processFbConsultationListService.list(listQueryWrapper); - processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); - break; - case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过） - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getParentExecutionId, executionId); - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getModuleOwnerId, userId); - userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper); - linkIds = userLinks.stream().map(ProcessFbConsultationUserLink::getId).collect(Collectors.toList()); - listQueryWrapper.in(ProcessFbConsultationList::getUserLinkId, linkIds); - consultationLists = processFbConsultationListService.list(listQueryWrapper); - processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); - break; - case ConsultationTaskKey.DEPART_LEADER_END_1: // 各部所主管级领导审批 - case ConsultationTaskKey.DEPART_LEADER_END_4: // 各部所主管级领导审批 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人） - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, userId); - userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper); - if(userLinks.isEmpty()){ - break; - } - linkIds = userLinks.stream().map(ProcessFbConsultationUserLink::getId).collect(Collectors.toList()); - listQueryWrapper.in(ProcessFbConsultationList::getUserLinkId, linkIds); - consultationLists = processFbConsultationListService.list(listQueryWrapper); - processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); - break; - case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后） - case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, task.getFormKey()); - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getModuleOwnerId, userId); - userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper); - linkIds = userLinks.stream().map(ProcessFbConsultationUserLink::getId).collect(Collectors.toList()); - listQueryWrapper.in(ProcessFbConsultationList::getUserLinkId, linkIds); - consultationLists = processFbConsultationListService.list(listQueryWrapper); - processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); - break; - case ConsultationTaskKey.ENGINEER_START_END: // 法规工程师审批 - consultationLists = processFbConsultationListService.list(listQueryWrapper); - processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); - break; - case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 - linkQueryWrapper.eq(ProcessFbConsultationUserLink::getParentExecutionId, executionId); - //linkQueryWrapper.eq(ProcessFbConsultationUserLink::getModuleOwnerId, userId); - userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper); - if (CollectionUtils.isNotEmpty(userLinks)) { - List collect = userLinks.stream() - .map(ProcessFbConsultationUserLink::getDesignEngineerId) - .distinct().collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(collect)) { - userLink = userLinks.get(0); - userLink.setDesignEngineerId(StringUtils.join(collect, ",")); - } - } - break; - default: - log.info("taskDefinitionKey:{}，没有业务数据保存", taskDefinitionKey); - } - consultationLists.sort(new DirectoryComparator()); - consultationLists.forEach(consultation -> { - if (StringUtils.isNotBlank(consultation.getIsAdopt())) { - switch (consultation.getIsAdopt()) { - case "1": - consultation.setIsAdopt_dictText("采纳"); - break; - case "2": - consultation.setIsAdopt_dictText("部分采纳"); - break; - case "3": - consultation.setIsAdopt_dictText("不采纳"); - break; - } - } - }); - - setUserName(userLink); - processFbStandardConsultationVO.setProcessFbConsultationUserLink(userLink); - return processInfoVO; - } - - /** - * @Author: liao - * @Date: 2023/11/28 16:26 - * @Description: 设置模块负责人和设计工程师的翻译 - **/ - private void setUserName(ProcessFbConsultationUserLink userLink) { - if (userLink == null) return; - String moduleOwnerId = userLink.getModuleOwnerId(); - String designEngineerId = userLink.getDesignEngineerId(); - if (StringUtils.isNotBlank(moduleOwnerId)) { - List names = new ArrayList<>(); - List userIds = Arrays.asList(moduleOwnerId.split(",")); - List users = sysUserService.listByIds(userIds); - users.forEach(user -> names.add(user.getUsername() + "(" + user.getRealname() + ")")); - userLink.setModuleOwnerId_dictText(StringUtils.join(names, ",")); - } - if (StringUtils.isNotBlank(designEngineerId)) { - List names = new ArrayList<>(); - List userIds = Arrays.asList(designEngineerId.split(",")); - List users = sysUserService.listByIds(userIds); - users.forEach(user -> names.add(user.getUsername() + "(" + user.getRealname() + ")")); - userLink.setDesignEngineerId_dictText(StringUtils.join(names, ",")); - } - } - - /** - * @Author: liao - * @Date: 2023/11/27 16:50 - * @Description: 根据任务id和业务id查询关联表集合 - **/ - @Override - public List listByTaskIdAndBusinessId(String taskId, String businessId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, businessId); - - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - String executionId = task.getExecutionId(); - switch (taskDefinitionKey) { - case ConsultationTaskKey.DEPART_LEADER_START_1: // 各部所主管级领导分发 - case ConsultationTaskKey.DEPART_LEADER_END_1: // 各部所主管级领导审批 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总 - case ConsultationTaskKey.DEPART_LEADER_END_4: // 各部所主管级领导审批（驳回流程） - case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 各部所主管级领导汇总（驳回流程） - queryWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, task.getAssignee()); - break; - case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 - case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总 - queryWrapper.eq(ProcessFbConsultationUserLink::getParentExecutionId, executionId); - default: - return new ArrayList<>(); - } - return processFbConsultationUserLinkService.list(queryWrapper); - } - - @Override - public List findNodeDisposeCount(String nodeIds) { - return processFbStandardConsultationMapper.findNodeDisposeCount(nodeIds); - } - - @Override - public void isOverDue(String taskId) { - // 判断是否超期数据 - ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getOne( - new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getTaskId, taskId), false); - if (!Objects.isNull(processApprovalRecord) - && YesOrNoEnum.YES.getValue().equals(processApprovalRecord.getOverDue())){ - throw new JeroBootException(ResultCommon.OVER_DUE); - } - } - - @Override - public void endOverDueBackLog(String id) { - // 通过标准id查询未结束的业务数据 - List list = list(new LambdaQueryWrapper() - .eq(ProcessFbStandardConsultation::getStandardId, id) - .isNull(ProcessFbStandardConsultation::getConsultationEndDate)); - if (!list.isEmpty()){ - // 通过业务id查询未完成的相关流程信息 - List idList = list.stream().map(ProcessFbStandardConsultation::getId).collect(Collectors.toList()); - List processAllList = processAllService.list( - new LambdaQueryWrapper() - .in(ProcessAll::getProjectId, idList) - .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.INCOMPLETE.getValue())); - if (!processAllList.isEmpty()){ - // 获取流程实例id - List processInstanceIdList = processAllList.stream() - .map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); - - // 处理各部所主管级领导分发 - manageOverDue(processAllList, processInstanceIdList, ConsultationTaskKey.DEPART_LEADER_START_1); - // 处理模块负责人分发 - manageOverDue(processAllList, processInstanceIdList, ConsultationTaskKey.MODULE_OWNER_START); - } - } - } - - private void manageOverDue(List processAllList, List processInstanceIdList, String nodeIds) { - List nodeDisposeCount = findNodeDisposeCount(nodeIds); - // 过滤每个流程这两个节点全部未完成的流程实例 - List allUnFinishedList = nodeDisposeCount.stream() - .filter(v -> v.getUnFinished().equals(v.getCount())).collect(Collectors.toList()); - List processInstanceIds = allUnFinishedList.stream() - .map(NodeDispose::getProcessInstanceId).collect(Collectors.toList()); - - // 取交集 - List intersectionProcessInstanceIdList = - (List) CollectionUtils.intersection(processInstanceIdList, processInstanceIds); - - Date date = new Date(); - for (String processInstanceId: intersectionProcessInstanceIdList) { - // 结束流程 - runtimeService.deleteProcessInstance(processInstanceId,"结束流程"); - //更新流程总表状态 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstanceId) - .set(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue())); - - Optional optionalProcessAll = processAllList.stream() - .filter(v -> v.getProcessInstanceId().equals(processInstanceId)).findFirst(); - - optionalProcessAll.ifPresent(v -> - // 更新业务状态 - update(new LambdaUpdateWrapper() - .eq(ProcessFbStandardConsultation::getId, optionalProcessAll.get().getProjectId()) - .set(ProcessFbStandardConsultation::getConsultationEndDate, date) - .set(ProcessFbStandardConsultation::getUpdateTime, date)) - ); - } - } - - /** - * @Author: liao - * @Date: 2023/11/13 16:00 - * @Description: 提交 - **/ - @Override - public void submit(ProcessInfoVO processInfoVO) { - BasicTaskInfoDTO taskInfo = processInfoVO.getBasicTaskInfoDTO(); // 任务信息 - - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - ProcessFbStandardConsultation businessBasicInfo = businessInfoDTO.getProcessFbStandardConsultation(); // 业务基本信息 - processInfoVO.setBusinessId(businessBasicInfo.getId()); - - String taskId = taskInfo.getTaskId(); - isOverDue(taskId); - processHandleService.isMyTask(taskId); - - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String taskDefinitionKey = task.getTaskDefinitionKey(); // 任务定义id - processHandleService.isMyTask(taskId); // 判断是否拥有任务处理权 - - Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult(); - processHandleService.updateApprovalRecord(processInfoVO); - - log.info("================================流程节点================================="); - log.info("任务Id: {}", task.getId()); - log.info("TaskDefinitionKey: {}", task.getTaskDefinitionKey()); - log.info("任务Name: {}", task.getName()); - log.info("任务FormKey: {}", task.getFormKey()); - String processInstanceId = task.getProcessInstanceId(); - log.info("任务ProcessInstanceId: {}", processInstanceId); - log.info("任务ExecutionId: {}", task.getExecutionId()); - log.info("任务父ExecutionId: {}", execution.getParentId()); - log.info("======================================================================="); - - String realName = CurrentUserUtil.getRealName(); - switch (taskDefinitionKey) { - case ConsultationTaskKey.DEPART_LEADER_START_1: - log.info("各部所主管级领导 {} 分发", realName); - processDepartLeaderStart_1(processInfoVO, taskDefinitionKey); // 各部所主管级领导分发 - break; - case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人） - case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人） - log.info("设计工程师 {} 填写征求意见", realName); - designEngineer(processInfoVO); - break; - case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过） - case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后） - case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总 - case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人） - log.info("{} 汇总", realName); - collect(processInfoVO, taskDefinitionKey); - break; - case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 - log.info("模块负责人 {} 分发", realName); - moduleOwnerStart(processInfoVO, taskDefinitionKey); - break; - default: - throw new JeroBootException(EXCEPTION); - } - - // 如果流程已经结束 - endProcess(processInstanceId, businessBasicInfo.getId()); - - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, taskId) - .set(ProcessApprovalRecord::getCommitFlag, null)); - } - - /** - * @Author: liao - * @Date: 2023/11/23 13:43 - * @Description: 流程结束 - **/ - private void endProcess(String processInstanceId, String businessId) { - if (processHandleService.isProcessFinish(processInstanceId)) { - log.info("流程 {} 已经结束", processInstanceId); - Date date = new Date(); - update(new LambdaUpdateWrapper() - .eq(ProcessFbStandardConsultation::getId, businessId) - .set(ProcessFbStandardConsultation::getConsultationEndDate, date) - .set(ProcessFbStandardConsultation::getUpdateTime, date)); - // 删除超期待办 - processApprovalRecordService.remove( - new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProcessInstanceId, processInstanceId) - .eq(ProcessApprovalRecord::getOverDue, YesOrNoEnum.YES.getValue())); - // 发送邮件 - try { - sendMessage(businessId); - } catch (Exception e) { - log.error("邮件发送失败！" + e.getMessage()); - } - } else { - List taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); - log.info("还剩 {} 个任务待完成", taskList.size()); - taskList.forEach(lastTask -> { - log.info("======================================================================="); - log.info("任务id: {}", lastTask.getId()); - log.info("任务name: {}", lastTask.getName()); - SysUser user = sysUserService.getById(lastTask.getAssignee()); - log.info("处理人: {}", user.getUsername() + "(" + user.getRealname() + ")"); - log.info("======================================================================="); - }); - } - } - - private void sendMessage(String businessId) { - ProcessFbStandardConsultation processFbStandardConsultation = getById(businessId); - // 部分采纳，不采纳 - List processFbConsultationListList = processFbConsultationListService.list( - new LambdaQueryWrapper() - .eq(ProcessFbConsultationList::getBusinessId, businessId) - .in(ProcessFbConsultationList::getIsAdopt, Arrays.asList("2", "3"))); - for (ProcessFbConsultationList processFbConsultationList : processFbConsultationListList) { - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.STANDARD_CONSULTATION); - sendMessageDTO.setToUserId(processFbConsultationList.getDesignEngineerId()); - Map sendMap = new HashMap<>(); - sendMap.put("standardNumber", processFbStandardConsultation.getStandardNumber()); - sendMap.put("standardName", processFbStandardConsultation.getStandardName()); - sendMap.put("chapterNumber", processFbConsultationList.getChapterNumber()); - sendMap.put("chapterName", StringUtils.isNotBlank(processFbConsultationList.getChapterName()) ? processFbConsultationList.getChapterName() : ""); - sendMap.put("modificationBefore", StringUtils.isNotBlank(processFbConsultationList.getModificationBefore()) ? processFbConsultationList.getModificationBefore() : ""); - sendMap.put("modificationAfter", processFbConsultationList.getModificationAfter()); - sendMap.put("modificationReason", processFbConsultationList.getModificationReason()); - sendMap.put("adopt", sysDictService.queryDictText("consultation_opinion", processFbConsultationList.getIsAdopt())); - sendMap.put("openType", "url"); - sendMap.put("openPage", "/businessSupport/AskForAdviceDetail?id=" + processFbStandardConsultation.getId()); - sendMessageDTO.setMap(sendMap); - sendMessageAPI.sendMessage(sendMessageDTO); - } - } - - /** - * @Author: liao - * @Date: 2023/11/21 15:07 - * @Description: 模块负责人分发 - **/ - private void moduleOwnerStart(ProcessInfoVO processInfoVO, String taskDefinitionKey) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - String designEngineerId = businessInfoDTO.getProcessFbConsultationUserLink().getDesignEngineerId(); - - if (StringUtils.isBlank(designEngineerId)) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, FbCommon.VARIABLE_DESIGN_ENGINEER_ID); - } - - String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - - String userLinkId = task.getFormKey(); - log.info("userLinkId: {}", userLinkId); -// processFbConsultationUserLinkService.update( -// new LambdaUpdateWrapper() -// .eq(ProcessFbConsultationUserLink::getId, userLinkId) -// .set(ProcessFbConsultationUserLink::getDesignEngineerId, designEngineerId)); - ProcessFbConsultationUserLink processFbConsultationUserLink = - processFbConsultationUserLinkService.listByIds(Arrays.asList(userLinkId.split(","))).get(0); -// - List designEngineerIdList = Arrays.asList(designEngineerId.split(",")); - List userLinkList = new ArrayList<>(); - List idList =new ArrayList<>(); - - designEngineerIdList.forEach(designEngineer -> { - ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); - userLink.setId(String.valueOf(SnowflakeUtils.snowflake())); - userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); - userLink.setBusinessId(processFbConsultationUserLink.getBusinessId()); - userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId()); - userLink.setOriginDepartLeaderId(processFbConsultationUserLink.getOriginDepartLeaderId()); - userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId()); - userLink.setOriginModuleOwnerId(processFbConsultationUserLink.getOriginModuleOwnerId()); - userLink.setDesignEngineerId(designEngineer); - userLink.setOriginDesignEngineerId(designEngineer); - userLinkList.add(userLink); - idList.add(userLink.getId()); - }); - - task.setFormKey(String.join(",", idList)); - processFbConsultationUserLinkService.removeByIds(Arrays.asList(userLinkId.split(","))); // 先删除 - processFbConsultationUserLinkService.saveBatch(userLinkList, userLinkList.size()); // 后新增 - - List ids = userLinkList.stream().map(ProcessFbConsultationUserLink::getId).collect(Collectors.toList()); - String processInstanceId = task.getProcessInstanceId(); - runtimeService.setVariableLocal(processInstanceId, FbCommon.OVER_DUE, false); - runtimeService.setVariableLocal(processInstanceId, FbCommon.VARIABLE_DESIGN_ENGINEER_LIST, ids); - saveNodeUserLink(processInstanceId, ConsultationNodeSort.DESIGN_ENGINEER_LIST, designEngineerIdList, taskDefinitionKey); - - // 完成任务 - taskService.complete(taskId); - } - - /** - * @Author: liao - * @Date: 2023/11/28 10:43 - * @Description: 模块负责人分发-草稿 - **/ - private void moduleOwnerStart_draft(ProcessInfoVO processInfoVO) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - String designEngineerId = businessInfoDTO.getProcessFbConsultationUserLink().getDesignEngineerId(); - - if (StringUtils.isBlank(designEngineerId)) return; - - String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - - String userLinkId = task.getFormKey(); -// processFbConsultationUserLinkService.update( -// new LambdaUpdateWrapper() -// .eq(ProcessFbConsultationUserLink::getId, userLinkId) -// .set(ProcessFbConsultationUserLink::getDesignEngineerId, designEngineerId)); - ProcessFbConsultationUserLink processFbConsultationUserLink = - processFbConsultationUserLinkService.listByIds(Arrays.asList(userLinkId.split(","))).get(0); - List designEngineerIdList = Arrays.asList(designEngineerId.split(",")); - List userLinkList = new ArrayList<>(); - - List idList =new ArrayList<>(); - designEngineerIdList.forEach(designEngineer -> { - ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink(); - userLink.setId(String.valueOf(SnowflakeUtils.snowflake())); - userLink.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); - userLink.setBusinessId(processFbConsultationUserLink.getBusinessId()); - userLink.setBusinessId(processInfoVO.getBusinessId()); - userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId()); - userLink.setOriginDepartLeaderId(processFbConsultationUserLink.getOriginDepartLeaderId()); - userLink.setModuleOwnerId(processFbConsultationUserLink.getModuleOwnerId()); - userLink.setOriginModuleOwnerId(processFbConsultationUserLink.getOriginModuleOwnerId()); - userLink.setDesignEngineerId(designEngineer); - userLink.setOriginDesignEngineerId(designEngineer); - userLink.setParentExecutionId(processFbConsultationUserLink.getParentExecutionId()); - userLinkList.add(userLink); - idList.add(userLink.getId()); - }); - - int size = userLinkList.size(); - if (size > 0) { - task.setFormKey(String.join(",", idList)); - taskService.saveTask(task); - processFbConsultationUserLinkService.removeByIds(Arrays.asList(userLinkId.split(","))); // 先删除 - processFbConsultationUserLinkService.saveBatch(userLinkList, size); // 后新增 - } - } - - - /** - * @Author: liao - * @Date: 2023/11/21 9:39 - * @Description: 汇总 - **/ - private void collect(ProcessInfoVO processInfoVO, String taskDefinitionKey) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - List processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists(); - - String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - - if (CollectionUtils.isNotEmpty(processFbConsultationLists)) { - processFbConsultationListService.updateBatchById(processFbConsultationLists); // 更新业务信息 - } - - runtimeService.setVariableLocal(task.getProcessInstanceId(), FbCommon.VARIABLE_PASS_SECOND, true); - // 完成任务 - taskService.complete(taskId); - - // 判断法规工程师审批节点是否经过转办 - if (ConsultationTaskKey.DEPART_LEADER_COLLECT_3.equals(taskDefinitionKey)){ - isTransition(processInfoVO); - } - } - - private void isTransition(ProcessInfoVO processInfoVO) { - // 判断法规工程师审批节点是否经过转办 - List processApprovalRecordList = processApprovalRecordService.list( - new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProcessInstanceId, processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId()) - .orderByDesc(ProcessApprovalRecord::getCreateTime)); - if (!processApprovalRecordList.isEmpty()){ - ProcessApprovalRecord processApprovalRecord = processApprovalRecordList.get(0); - processApprovalRecordList.remove(0); - Optional optional = processApprovalRecordList.stream().filter(v -> - v.getTaskName().equals(processApprovalRecord.getTaskName()) - && v.getNodeId().equals(processApprovalRecord.getNodeId())).findFirst(); - optional.ifPresent(v -> { - // 是否转办过 - if (StringUtils.isNotBlank(v.getTransferBy())){ - // 转办给转办人 - taskService.setAssignee(processApprovalRecord.getTaskId(), v.getUserId()); - // 更新流程审批记录表 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processApprovalRecord.getTaskId()) - .set(ProcessApprovalRecord::getUserId, v.getUserId()) - .set(ProcessApprovalRecord::getOriginUserId, v.getUserId())); - } - }); - } - } - - /** - * @Author: liao - * @Date: 2023/11/28 10:34 - * @Description: 汇总-草稿 - **/ - private void collect_draft(ProcessInfoVO processInfoVO) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - List processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists(); - if (CollectionUtils.isNotEmpty(processFbConsultationLists)) { - processFbConsultationListService.updateBatchById(processFbConsultationLists); // 更新业务信息 - } - } - - /** - * @Author: liao - * @Date: 2023/11/16 15:46 - * @Description: 设计工程师填写征求意见 - **/ - private void designEngineer(ProcessInfoVO processInfoVO) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - List processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists(); - String businessId = processInfoVO.getBusinessId(); - - String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - - String userLinkId = task.getFormKey(); - log.info("userLinkId: {}", userLinkId); - - // 先删除存储的数据 - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(ProcessFbConsultationList::getUserLinkId, userLinkId); - processFbConsultationListService.remove(removeWrapper); - - String designEngineerName = CurrentUserUtil.getRealName() + "(" + CurrentUserUtil.getUsername() + ")"; - // 保存业务信息 - if (CollectionUtils.isNotEmpty(processFbConsultationLists)) { - processFbConsultationLists.forEach(consultation -> { - consultation.setUserLinkId(userLinkId); - consultation.setBusinessId(businessId); - consultation.setDesignEngineerName(designEngineerName); - consultation.setDesignEngineerId(CurrentUserUtil.getId()); - }); - processFbConsultationListService.saveBatch(processFbConsultationLists, processFbConsultationLists.size()); - } - - // 完成任务 - taskService.complete(taskId); - } - - /** - * @Author: liao - * @Date: 2023/11/28 10:30 - * @Description: 设计工程师填写征求意见-草稿 - **/ - private void designEngineer_draft(ProcessInfoVO processInfoVO) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - List processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists(); - String businessId = processInfoVO.getBusinessId(); - - String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - - String userLinkId = task.getFormKey(); - - // 先删除存储的数据 - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(ProcessFbConsultationList::getUserLinkId, userLinkId); - processFbConsultationListService.remove(removeWrapper); - - String designEngineerName = CurrentUserUtil.getRealName() + "(" + CurrentUserUtil.getUsername() + ")"; - // 保存业务信息 - if (CollectionUtils.isNotEmpty(processFbConsultationLists)) { - processFbConsultationLists.forEach(consultation -> { - consultation.setUserLinkId(userLinkId); - consultation.setBusinessId(businessId); - consultation.setDesignEngineerName(designEngineerName); - consultation.setDesignEngineerId(CurrentUserUtil.getId()); - }); - processFbConsultationListService.saveBatch(processFbConsultationLists, processFbConsultationLists.size()); - } - } - - /** - * @Author: liao - * @Date: 2023/11/14 9:35 - * @Description: 各部所主管级领导分发 - **/ - private void processDepartLeaderStart_1(ProcessInfoVO processInfoVO, String taskDefinitionKey) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - ProcessFbConsultationUserLink userLink = businessInfoDTO.getProcessFbConsultationUserLink(); // 业务分派信息 - - String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId(); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String processInstanceId = task.getProcessInstanceId(); - - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(userLink.getId())){ - removeWrapper.eq(ProcessFbConsultationUserLink::getId, userLink.getId()); - } - removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId()); - removeWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, CurrentUserUtil.getId()); - processFbConsultationUserLinkService.remove(removeWrapper); // 删除原先存储的关联 - - Map variables = new HashMap<>(); - List linkList = new ArrayList<>(); - if (FbCommon.USER_TYPE_MODULE_OWNER.equals(userLink.getUserType())) { // 模块负责人 - if (StringUtils.isBlank(userLink.getModuleOwnerId())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, FbCommon.VARIABLE_MODULE_OWNER_ID); - } - List moduleOwnerIds = Arrays.asList(userLink.getModuleOwnerId().split(",")); - moduleOwnerIds.forEach(moduleOwnerId -> { - ProcessFbConsultationUserLink link = new ProcessFbConsultationUserLink(); - link.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); - link.setBusinessId(processInfoVO.getBusinessId()); - link.setDepartLeaderId(CurrentUserUtil.getId()); - link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId()); - link.setModuleOwnerId(moduleOwnerId); - linkList.add(link); - }); - processFbConsultationUserLinkService.saveBatch(linkList, linkList.size()); - variables.put(FbCommon.VARIABLE_PASS_FIRST, 1); - variables.put(FbCommon.VARIABLE_MODULE_OWNER_LIST, moduleOwnerIds); - saveNodeUserLink(processInstanceId, ConsultationNodeSort.MODULE_OWNER_LIST, moduleOwnerIds, taskDefinitionKey); - } else { // 设计工程师 - if (StringUtils.isBlank(userLink.getDesignEngineerId())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, FbCommon.VARIABLE_DESIGN_ENGINEER_ID); - } - List designEngineerIds = Arrays.asList(userLink.getDesignEngineerId().split(",")); - designEngineerIds.forEach(designEngineerId -> { - ProcessFbConsultationUserLink link = new ProcessFbConsultationUserLink(); - link.setUserType(FbCommon.USER_TYPE_DESIGN_ENGINEER); - link.setBusinessId(processInfoVO.getBusinessId()); - link.setDepartLeaderId(CurrentUserUtil.getId()); - link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId()); - link.setDesignEngineerId(designEngineerId); - link.setOriginDesignEngineerId(userLink.getOriginDesignEngineerId()); - linkList.add(link); - }); - processFbConsultationUserLinkService.saveBatch(linkList, linkList.size()); - variables.put(FbCommon.VARIABLE_PASS_FIRST, 2); - variables.put(FbCommon.VARIABLE_DESIGN_ENGINEER_LIST, designEngineerIds); - saveNodeUserLink(processInstanceId, ConsultationNodeSort.DESIGN_ENGINEER_LIST, designEngineerIds, taskDefinitionKey); - } - - runtimeService.setVariablesLocal(processInstanceId, variables); - // 完成任务 - taskService.complete(taskId); - } - - /** - * @Author: liao - * @Date: 2023/11/28 10:25 - * @Description: 各部所主管级领导分发-保存草稿 - **/ - private void processDepartLeaderStart_1_draft(ProcessInfoVO processInfoVO) { - ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 - ProcessFbConsultationUserLink userLink = businessInfoDTO.getProcessFbConsultationUserLink(); // 业务分派信息 - - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(userLink.getId())){ - removeWrapper.eq(ProcessFbConsultationUserLink::getId, userLink.getId()); - } - removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId()); - removeWrapper.eq(ProcessFbConsultationUserLink::getDepartLeaderId, CurrentUserUtil.getId()); - processFbConsultationUserLinkService.remove(removeWrapper); // 删除原先存储的关联 - - List linkList = new ArrayList<>(); - if (FbCommon.USER_TYPE_MODULE_OWNER.equals(userLink.getUserType())) { // 模块负责人 - if (StringUtils.isBlank(userLink.getModuleOwnerId())) return; - List moduleOwnerIds = Arrays.asList(userLink.getModuleOwnerId().split(",")); - moduleOwnerIds.forEach(moduleOwnerId -> { - ProcessFbConsultationUserLink link = new ProcessFbConsultationUserLink(); - link.setUserType(FbCommon.USER_TYPE_MODULE_OWNER); - link.setBusinessId(processInfoVO.getBusinessId()); - link.setDepartLeaderId(CurrentUserUtil.getId()); - link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId()); - link.setModuleOwnerId(moduleOwnerId); - linkList.add(link); - }); - processFbConsultationUserLinkService.saveBatch(linkList, linkList.size()); - } else { // 设计工程师 - if (StringUtils.isBlank(userLink.getDesignEngineerId())) return; - List designEngineerIds = Arrays.asList(userLink.getDesignEngineerId().split(",")); - designEngineerIds.forEach(designEngineerId -> { - ProcessFbConsultationUserLink link = new ProcessFbConsultationUserLink(); - link.setUserType(FbCommon.USER_TYPE_DESIGN_ENGINEER); - link.setBusinessId(processInfoVO.getBusinessId()); - link.setDepartLeaderId(CurrentUserUtil.getId()); - link.setOriginDepartLeaderId(userLink.getOriginDepartLeaderId()); - link.setDesignEngineerId(designEngineerId); - link.setOriginDesignEngineerId(userLink.getOriginDesignEngineerId()); - linkList.add(link); - }); - processFbConsultationUserLinkService.saveBatch(linkList, linkList.size()); - } - } - - /** - * @Author: liao - * @Date: 2023/11/17 15:09 - * @Description: 保存流程定义节点用户 - **/ - private void saveNodeUserLink(String processInstanceId, Integer sort, List userIdList, String taskDefinitionKey) { - String processDefinitionId = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId).singleResult().getProcessDefinitionId(); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); - queryWrapper.eq(ProcessNode::getIsView, 1); - queryWrapper.eq(ProcessNode::getSort, sort); - ProcessNode processNode = processNodeService.getOne(queryWrapper, false); - - ProcessNode processNode2 = new ProcessNode(); - if (Objects.equals(sort, ConsultationNodeSort.MODULE_OWNER_LIST)){ - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); - qw.eq(ProcessNode::getIsView, 1); - qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.MODULE_OWNER_END_3); - processNode2 = processNodeService.getOne(qw, false); - - // 各部所主管级领导审批 - LambdaQueryWrapper qw2 = new LambdaQueryWrapper<>(); - qw2.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); - qw2.eq(ProcessNode::getIsView, 1); - qw2.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_END_4); - ProcessNode processNode3 = processNodeService.getOne(qw2, false); - ProcessNodeLink link = new ProcessNodeLink(); - link.setProcessDefinitionId(processDefinitionId); - link.setProcessNodeId(processNode3.getId()); - link.setProcessInstanceId(processInstanceId); - link.setUserId(CurrentUserUtil.getId()); - processNodeLinkService.save(link); - } - - if (Objects.equals(sort, ConsultationNodeSort.DESIGN_ENGINEER_LIST) && Objects.equals(taskDefinitionKey, ConsultationTaskKey.DEPART_LEADER_START_1)){ - // 各部所主管级领导汇总 - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); - qw.eq(ProcessNode::getIsView, 1); - qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3); - ProcessNode processNode3 = processNodeService.getOne(qw, false); - ProcessNodeLink link = new ProcessNodeLink(); - link.setProcessDefinitionId(processDefinitionId); - link.setProcessNodeId(processNode3.getId()); - link.setProcessInstanceId(processInstanceId); - link.setUserId(CurrentUserUtil.getId()); - processNodeLinkService.save(link); - } - - List linkList = new ArrayList<>(); - ProcessNode finalProcessNode = processNode2; - userIdList.forEach(userId -> { - ProcessNodeLink link = new ProcessNodeLink(); - link.setProcessDefinitionId(processDefinitionId); - link.setProcessNodeId(processNode.getId()); - link.setProcessInstanceId(processInstanceId); - link.setUserId(userId); - linkList.add(link); - - if (Objects.equals(sort, ConsultationNodeSort.MODULE_OWNER_LIST)){ - ProcessNodeLink link2 = new ProcessNodeLink(); - link2.setProcessDefinitionId(processDefinitionId); - link2.setProcessNodeId(finalProcessNode.getId()); - link2.setProcessInstanceId(processInstanceId); - link2.setUserId(userId); - linkList.add(link2); - } - }); - processNodeLinkService.saveBatch(linkList, linkList.size()); - } - - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - IProcessFbStandardPurchaseService processFbStandardPurchaseService = SpringContextUtil.getBean(IProcessFbStandardPurchaseService.class); - processFbStandardPurchaseService.remove( - new LambdaQueryWrapper() - .eq(ProcessFbStandardPurchase::getId, processAll.getProjectId())); - - IProcessFbConsultationListService processFbConsultationListService = SpringContextUtil.getBean(IProcessFbConsultationListService.class); - processFbConsultationListService.remove( - new LambdaQueryWrapper() - .eq(ProcessFbConsultationList::getBusinessId, processAll.getProjectId())); - - IProcessFbConsultationUserLinkService processFbConsultationUserLinkService = SpringContextUtil.getBean(IProcessFbConsultationUserLinkService.class); - processFbConsultationUserLinkService.remove( - new LambdaQueryWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, processAll.getProjectId())); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - String taskId = processApprovalRecord.getTaskId(); - String projectId = processAll.getProjectId(); - TaskService taskService = SpringContextUtil.getBean(TaskService.class); - IProcessFbConsultationUserLinkService processFbConsultationUserLinkService = - SpringContextUtil.getBean(IProcessFbConsultationUserLinkService.class); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - String executionId = task.getExecutionId(); - // 设计工程师填写征求意见 - if (ConsultationTaskKey.DESIGN_ENGINEER_1.equals(taskDefinitionKey) - || ConsultationTaskKey.DESIGN_ENGINEER_2.equals(taskDefinitionKey)){ - processFbConsultationUserLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) - .eq(ProcessFbConsultationUserLink::getDesignEngineerId, CurrentUserUtil.getId()) - .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId) - .set(ProcessFbConsultationUserLink::getOriginDesignEngineerId, CurrentUserUtil.getId())); - } - // 模块负责人分发/模块负责人汇总填写意见 - if (ConsultationTaskKey.MODULE_OWNER_START.equals(taskDefinitionKey) - || ConsultationTaskKey.MODULE_OWNER_END_1.equals(taskDefinitionKey) - || ConsultationTaskKey.MODULE_OWNER_END_2.equals(taskDefinitionKey) - || ConsultationTaskKey.MODULE_OWNER_END_3.equals(taskDefinitionKey)){ - processFbConsultationUserLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) - .eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId()) - .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId) - .set(ProcessFbConsultationUserLink::getOriginModuleOwnerId, CurrentUserUtil.getId())); - - runtimeService.setVariable(executionId, "moduleOwner", toUserId); - } - // 各部所主管级领导分发/各部所主管级领导审批/各部所主管级领导汇总 - if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_END_1.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_END_4.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_COLLECT_2.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_COLLECT_3.equals(taskDefinitionKey)){ - processFbConsultationUserLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) - .eq(ProcessFbConsultationUserLink::getDepartLeaderId, CurrentUserUtil.getId()) - .set(ProcessFbConsultationUserLink::getDepartLeaderId, toUserId) - .set(ProcessFbConsultationUserLink::getOriginDepartLeaderId, CurrentUserUtil.getId())); - - runtimeService.setVariable(executionId, "departLeader", toUserId); - } - } -} 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 deleted file mode 100644 index e665561a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java +++ /dev/null @@ -1,341 +0,0 @@ -package com.jero.modules.activiti.process.fb.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; -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.CommonVO; -import com.jero.modules.activiti.process.common.service.ActFlowCommonService; -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.dto.BasicTaskInfoDTO; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; -import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardPurchaseMapper; -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.ProcessAllService; -import com.jero.modules.activiti.service.ProcessNodeLinkService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.sys.utils.UserUtils; -import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * @Description: 法规采购流程表 - * @Author: jero-boot - * @Date: 2023-11-14 - * @Version: V1.0 - */ -@Service -@Slf4j -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl - implements IProcessFbStandardPurchaseService, WorkCenterService { - - @Resource - private IProcessHandleService processHandleService; - - @Resource - private ProcessDraftService processDraftService; - - @Resource - private ActFlowCommonService actFlowCommonService; - - @Resource - private RuntimeService runtimeService; - - @Resource - private ProcessNodeLinkService processNodeLinkService; - - @Resource - private TaskService taskService; - - @Resource - private ProcessAllService processAllService; - - @Resource - private SendMessageAPI sendMessageAPI; - - /** - * @Author: liao - * @Date: 2023/11/14 14:08 - * @Description: 查询流程信息 - **/ - @Override - public ProcessInfoVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, projectId); - queryWrapper.orderByAsc(ProcessFbStandardPurchase::getSort); - List purchaseList = list(queryWrapper); - processInfoVO.setBusinessInfoDTO(purchaseList); - - return processInfoVO; - } - - /** - * @Author: liao - * @Date: 2023/11/14 14:09 - * @Description: 发起流程 - **/ - @Override - public void startProcess(ProcessInfoVO> processInfoVO) { - addBusinessInfo(processInfoVO);// 保存业务信息 - - Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map - userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_STANDARD_PURCHASE)); // 流程定义id - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_PURCHASE.getValue()); // 流程类型 - // 删除自己的草稿 - String draftId = processInfoVO.getDraftId(); - if (StringUtils.isNotBlank(draftId)) { - processDraftService.removeById(draftId); - } - processHandleService.startProcess(processInfoVO); - - // 保存草稿用于强制撤销 - processInfoVO.setSaveSource("3"); - processInfoVO.getBasicTaskInfoDTO().setTaskId(null); - processInfoVO.getBasicProcessInfoDTO().setProcessInstanceId(null); - saveToDraft(processInfoVO); - } - - /** - * @Author: liao - * @Date: 2023/11/14 14:18 - * @Description: 添加业务信息 - **/ - private void addBusinessInfo(ProcessInfoVO> processInfoVO) { - List businessInfoList = processInfoVO.getBusinessInfoDTO(); - if (CollectionUtils.isEmpty(businessInfoList)) return; - String businessId = businessInfoList.get(0).getBusinessId(); - if (StringUtils.isBlank(businessId)) { - businessId = UUIDUtils.randomUUID20(); - } - processInfoVO.setBusinessId(businessId); - - for (int i = 0; i < businessInfoList.size(); i++) { - if (StringUtils.isBlank(businessInfoList.get(i).getStandardNumber())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "standardNumber"); - } - if (StringUtils.isBlank(businessInfoList.get(i).getStandardName())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "standardName"); - } - businessInfoList.get(i).setBusinessId(businessId); - businessInfoList.get(i).setSort(i + 1); - } - - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(ProcessFbStandardPurchase::getBusinessId, businessId); - remove(removeWrapper); // 先删除历史数据 - - saveOrUpdateBatch(businessInfoList, businessInfoList.size()); // 保存到数据库 - } - - /** - * @Author: liao - * @Date: 2023/11/14 14:09 - * @Description: 审批 - **/ - @Override - public void approveTask(ProcessInfoVO> processInfoVO, boolean pass) { - String userId = UserUtils.getUserId(); - CommonVO commonVO = this.transferCommonVo(processInfoVO); - Map flowUser = processInfoVO.getUserInfoMap(); - String taskId = commonVO.getTaskId(); - if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { - throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS); - } - // 获取流程实例ID - String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - // 获取流程实例对象 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId).singleResult(); - // 获取流程定义ID - String processDefinitionId = processInstance.getProcessDefinitionId(); - List data = processInfoVO.getBusinessInfoDTO(); - if (data != null) { - addBusinessInfo(processInfoVO); // 保存业务信息 - // 根据流程实例id更新流程总表 - String prcName = commonVO.getPrcName(); - String prcMes = commonVO.getPrcMes(); - Date dueTime = commonVO.getDueTime(); - Integer prcType = ProcessTypeEnum.FB_STANDARD_PURCHASE.getValue(); - actFlowCommonService.updateProcessAllWithProjectId(processInstanceId, - prcName, prcMes, prcType, dueTime, data.get(0).getBusinessId()); - } - if (flowUser != null) { - Map variables = setVariables(flowUser); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - // 获取执行id - String executionId = task.getExecutionId(); - // 设置流程变量 - runtimeService.setVariables(executionId, variables); - processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, flowUser); - } - // 设置流程变量 - runtimeService.setVariable(processInstanceId, "pass", pass); - // 更新审批表为完成，填充数据 - actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass); - // 审批节点 - actFlowCommonService.completeTask(taskId, userId); - // 删除草稿 - actFlowCommonService.removeDraft(commonVO); - } - - private CommonVO transferCommonVo(ProcessInfoVO processInfoVO) { - CommonVO commonVO = new CommonVO(); - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - commonVO.setTaskId(basicTaskInfoDTO.getTaskId()); - commonVO.setPrcName(basicProcessInfoDTO.getProcessName()); - commonVO.setPrcMes(basicProcessInfoDTO.getProcessDescription()); - commonVO.setDueTime(basicProcessInfoDTO.getProcessDueDate()); - commonVO.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); - commonVO.setCommitFile(basicTaskInfoDTO.getHandleFile()); - commonVO.setCommitText(basicTaskInfoDTO.getHandleText()); - return commonVO; - } - - private Map setVariables(Map flowUser) { - // 删除所有后缀是“_dictText”的变量 - flowUser.entrySet().removeIf(entry -> entry.getKey().endsWith("_dictText")); - return flowUser; - } - - /** - * @Author: liao - * @Date: 2023/11/14 14:09 - * @Description: 转办 - **/ - @Override - public void transfer(String taskId, String toUserId) { - processHandleService.transfer(taskId, toUserId); - } - - /** - * @Author: liao - * @Date: 2023/11/14 14:09 - * @Description: 保存为草稿 - **/ - @Override - public void saveToDraft(ProcessInfoVO> processInfoVO) { - addBusinessInfo(processInfoVO); // 保存业务信息 - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_PURCHASE.getValue()); // 流程类型 - - processHandleService.saveToDraft(processInfoVO); - } - - /** - * @Author: liao - * @Date: 2023/11/14 14:55 - * @Description: 导出 - **/ - @Override - public ModelAndView exportXls(String businessId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, businessId); - queryWrapper.orderByAsc(ProcessFbStandardPurchase::getSort); - List exportList = list(queryWrapper); // 准备数据 - - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(JeroController.CLASS, ProcessFbStandardPurchase.class); - ExportParams exportParams = new ExportParams(); - mv.addObject(JeroController.PARAMS, exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } - - /** - * @Author: liao - * @Date: 2023/11/14 15:07 - * @Description: 抄送 - **/ - @Override - public void carbonCopy(String taskId, String userIds) { - // 获取流程实例ID - String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessAll::getProcessInstanceId, processInstanceId); - ProcessAll processAll = processAllService.getOne(queryWrapper); - String projectId = processAll.getProjectId(); - LambdaQueryWrapper purchaseLambdaQueryWrapper = new LambdaQueryWrapper<>(); - purchaseLambdaQueryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, projectId); - List dataList = list(purchaseLambdaQueryWrapper); - String prcName = processAll.getPrcName(); - String prcNum = processAll.getPrcNum(); - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.FB_STANDARD_PURCHASE); - sendMessageDTO.setToUserId(userIds); - Map sendMap = new HashMap<>(); - sendMap.put("prcNum", prcNum); - sendMap.put("prcName", prcName); - sendMap.put("content", this.generateMsg(dataList)); - sendMessageDTO.setMap(sendMap); - sendMessageAPI.sendMessage(sendMessageDTO); - } - - /** - * 构造消息内容 - */ - private String generateMsg(List dataList) { - StringBuilder builder = new StringBuilder(); - for (ProcessFbStandardPurchase processFbStandardPurchase : dataList) { - builder.append(processFbStandardPurchase.getStandardNumber()) - .append(" ") - .append(processFbStandardPurchase.getStandardName()).append("、"); - } - return builder.substring(0, builder.length() - 1); - } - - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务表数据 - IProcessFbStandardPurchaseService processFbStandardPurchaseService = SpringContextUtil.getBean(IProcessFbStandardPurchaseService.class); - processFbStandardPurchaseService.remove( - new LambdaQueryWrapper() - .eq(ProcessFbStandardPurchase::getBusinessId, processAll.getProjectId())); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java deleted file mode 100644 index cf25f86f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.jero.modules.activiti.process.fb.util; - -import com.jero.common.exception.JeroBootException; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * @Author: liao - * @Date: 2023/11/2 15:26 - * @Description: 实体类转Map集合 - */ -public class ObjectToMapUtil { - private static final String COMPILE = "[A-Z]"; - private ObjectToMapUtil(){} - - /** - * Bean -> Map - * 驼峰规范属性转下划线 - * 支持递归转换，如属性为JavaBean时 - */ - public static Map transform(T object){ - if(object == null){ - return null; - } - - Map map = new HashMap<>(); - // 获取实体类所有属性，返回Field数组 - Field[] fields = object.getClass().getDeclaredFields(); - - try { - for (int i = 0 ; i < fields.length; i++){ - // 属性名称 - String fieldName = fields[i].getName(); - - if ("serialVersionUID".equalsIgnoreCase(fieldName)) { - continue; - } - - // 转换驼峰形式属性名称成下划线风格，获取map的key 例：fieldName 》 field_name - String transformFieldName = ObjectToMapUtil.getTransformFieldName(fieldName); - // map 的 value ，属性的值 - Object fieldValue; - - // 将属性的首字符大写，方便构造get，set方法 - String name = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1); - - // 获取属性的类型 - String type = fields[i].getGenericType().toString(); - Method m = object.getClass().getMethod("get" + name); - - switch (type){ - // 如果有需要,可以仿照下面继续进行扩充,再增加对其它类型的判断 - case "class java.lang.String": - case "class java.lang.Boolean": - case "class java.util.Date": - case "class java.lang.Integer": - case "class java.lang.Long": - // 调用getter方法获取属性值 - fieldValue = m.invoke(object); - break; - default: - // 属性类型为bean,则递归 - Object obj = m.invoke(object); - fieldValue = ObjectToMapUtil.transform(obj); - } - map.put(transformFieldName,fieldValue); - } - }catch (Exception e){ - // 系统异常 - e.printStackTrace(); - throw new JeroBootException("系统异常"); - } - return map; - } - - /** - * 转换风格 驼峰转下划线 - * @param fieldName 属性名称 - * @return - */ - private static String getTransformFieldName(String fieldName) { - Pattern humpPattern = Pattern.compile(COMPILE); - Matcher matcher = humpPattern.matcher(fieldName); - StringBuffer sb = new StringBuffer(); - while(matcher.find()){ - matcher.appendReplacement(sb, "_"+matcher.group(0).toLowerCase()); - } - matcher.appendTail(sb); - return sb.toString(); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/NodeDispose.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/NodeDispose.java deleted file mode 100644 index dead11db..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/NodeDispose.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.modules.activiti.process.fb.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @ClassName: NodeDispose - * @Description: - * @Author: yjz - * @Date: 2024-01-31 11:06 - * @Version: 1.0 - **/ -@Data -public class NodeDispose implements Serializable { - /**总数*/ - @ApiModelProperty(value = "总数") - private Long count; - /**未完成数量*/ - @ApiModelProperty(value = "未完成数量") - private Long unFinished; - /**已完成数量*/ - @ApiModelProperty(value = "已完成数量") - private Long finished; - /**流程实例id*/ - @ApiModelProperty(value = "流程实例id") - private String processInstanceId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java deleted file mode 100644 index d3e658ce..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.jero.modules.activiti.process.fb.vo; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @Author: liao - * @Date: 2023/11/8 15:00 - * @Description: 标准征求意见流程表VO类 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="标准征求意见流程表VO类", description="标准征求意见流程表VO类") -public class ProcessFbStandardConsultationVO { - - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessFbStandardConsultation processFbStandardConsultation; - - /**业务分派信息*/ - @ApiModelProperty(value = "业务分派信息") - private ProcessFbConsultationUserLink processFbConsultationUserLink; - - /**征求意见列表*/ - @ApiModelProperty(value = "征求意见列表") - private List processFbConsultationLists; - - /**用户类型*/ - @ApiModelProperty(value = "用户类型（engineer法规工程师、departLeader部所主管级领导、moduleOwner模块负责人、designEngineer设计工程师、other其他）") - private String userType; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java deleted file mode 100644 index b3bed621..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.common; - -/** - * @ClassName: processMeetingManageCommon - * @Description: - * @Author: yjz - * @Date: 2023-11-30 17:06 - * @Version: 1.0 - **/ -public class ProcessMeetingManageCommon { - private ProcessMeetingManageCommon(){ - } - /** - * 会后管理流程key - */ - public static final String KEY = "meeting_manage"; - - /** - * 会后管理流程name - */ - public static final String NAME = "会后管理流程"; - - /** - * 会后管理流程节点: 1:法规工程师发起,2:参会人员上传材料 - */ - public static final String PROCESS_NODE_1 = "engineer_start"; - /** - * 会后管理流程节点: 1:法规工程师发起,2:参会人员上传材料 - */ - public static final String PROCESS_NODE_2 = "meeting_upload"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/MeetingManageFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/MeetingManageFlowController.java deleted file mode 100644 index 18b7ea0c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/MeetingManageFlowController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.process.meetingmanage.service.IMeetingManageFlowService; -import com.jero.modules.activiti.process.meetingmanage.vo.MeetingManageFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.web.bind.annotation.*; - -/** - * @ClassName: MeetingManageFlowController - * @Description: - * @Author: yjz - * @Date: 2023-11-30 17:09 - * @Version: 1.0 - **/ -@Api(tags="会后管理流程") -@RestController -@RequestMapping("/process/meetingManageFlow") -@Slf4j -public class MeetingManageFlowController { - private final IMeetingManageFlowService meetingManageFlowService; - - public MeetingManageFlowController(IMeetingManageFlowService meetingManageFlowService) { - this.meetingManageFlowService = meetingManageFlowService; - } - - /** - * 会后管理流程-生成项目id - * @return 项目id - */ - @AutoLog(value = "会后管理流程-生成项目id") - @ApiOperation(value="会后管理流程-生成项目id", notes="会后管理流程-生成项目id") - @GetMapping(value = "/getProjectId") - public String getProjectId() { - return String.valueOf(SnowflakeUtils.snowflake()); - } - - /** - * 会后管理流程-流程发起 - * @param meetingManageFlowVO 会后管理流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "会后管理流程-流程发起") - @ApiOperation(value="会后管理流程-流程发起", notes="会后管理流程-流程发起") - @PostMapping(value = "/flowStart") - public Result flowStart(@RequestBody MeetingManageFlowVO meetingManageFlowVO) { - meetingManageFlowService.flowStart(meetingManageFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 会后管理流程-流程保存 - * @param meetingManageFlowVO 会后管理流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "会后管理流程-流程保存") - @ApiOperation(value="会后管理流程-流程保存", notes="会后管理流程-流程保存") - @PostMapping(value = "/flowSave") - public Result flowSave(@RequestBody MeetingManageFlowVO meetingManageFlowVO) { - meetingManageFlowService.flowSave(meetingManageFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - - /** - * 会后管理流程-办理详情 - * @param projectId 项目id - * @return 结果对象 - */ - @AutoLog(value = "会后管理流程-办理详情") - @ApiOperation(value="会后管理流程-办理详情", notes="会后管理流程-办理详情") - @GetMapping(value = "/queryDetailByProjectId") - @Translation - public Result queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) { - return Result.OK(meetingManageFlowService.queryDetailByProjectId(projectId, taskId)); - } - - /** - * 会后管理流程-流程审批 - * @param meetingManageFlowVO 会后管理流程VO对象 - * @return 结果对象 - */ - @AutoLog(value = "会后管理流程-流程审批") - @ApiOperation(value="会后管理流程-流程审批", notes="会后管理流程-流程审批") - @PostMapping(value = "/flowApproval") - public Result flowApproval(@RequestBody MeetingManageFlowVO meetingManageFlowVO) { - meetingManageFlowService.flowApproval(meetingManageFlowVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 会后管理流程-流程转办 - * @return 结果对象 - */ - @AutoLog(value = "会后管理流程-流程转办") - @ApiOperation(value="会后管理流程-流程转办", notes="会后管理流程-流程转办") - @GetMapping(value = "/flowTransfer") - public Result flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) { - meetingManageFlowService.flowTransfer(taskId, userId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java deleted file mode 100644 index 45daeea9..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 会后管理流程业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Api(tags="会后管理流程业务表") -@RestController -@RequestMapping("/meetingmanage/processMeetingManage") -@Slf4j -public class ProcessMeetingManageController extends JeroController { - @Autowired - private IProcessMeetingManageService processMeetingManageService; - - /** - * 分页列表查询 - * - * @param processMeetingManage - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "会后管理流程业务表-分页列表查询") - @ApiOperation(value="会后管理流程业务表-分页列表查询", notes="会后管理流程业务表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessMeetingManage processMeetingManage, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = processMeetingManageService.queryPage(processMeetingManage, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processMeetingManage - * @param req - * @return - */ - @AutoLog(value = "会后管理流程业务表-列表查询") - @ApiOperation(value="会后管理流程业务表-列表查询", notes="会后管理流程业务表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessMeetingManage processMeetingManage, HttpServletRequest req) { - List list = processMeetingManageService.queryList(processMeetingManage, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processMeetingManage - * @return - */ - @AutoLog(value = "会后管理流程业务表-添加") - @ApiOperation(value="会后管理流程业务表-添加", notes="会后管理流程业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessMeetingManage processMeetingManage) { - processMeetingManageService.add(processMeetingManage); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processMeetingManage - * @return - */ - @AutoLog(value = "会后管理流程业务表-编辑") - @ApiOperation(value="会后管理流程业务表-编辑", notes="会后管理流程业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessMeetingManage processMeetingManage) { - processMeetingManageService.editById(processMeetingManage); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "会后管理流程业务表-通过id删除") - @ApiOperation(value="会后管理流程业务表-通过id删除", notes="会后管理流程业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processMeetingManageService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "会后管理流程业务表-批量删除") - @ApiOperation(value="会后管理流程业务表-批量删除", notes="会后管理流程业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processMeetingManageService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "会后管理流程业务表-通过id查询") - @ApiOperation(value="会后管理流程业务表-通过id查询", notes="会后管理流程业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessMeetingManage processMeetingManage = processMeetingManageService.queryById(id); - if(processMeetingManage==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processMeetingManage); - } - - /** - * 通过项目id查询 - * - * @param id - * @return - */ - @AutoLog(value = "会后管理流程业务表-通过项目id查询") - @ApiOperation(value="会后管理流程业务表-通过项目id查询", notes="会后管理流程业务表-通过项目id查询") - @GetMapping(value = "/queryByProjectId") - public Result queryByProjectId(String projectId) { - ProcessMeetingManage processMeetingManage = processMeetingManageService.queryByProjectId(projectId); - if(processMeetingManage==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processMeetingManage); - } - - /** - * 导出excel - * - * @param request - * @param processMeetingManage - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessMeetingManage processMeetingManage) { - return super.exportXls(request, processMeetingManage, ProcessMeetingManage.class, "会后管理流程业务表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManagePersonnelController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManagePersonnelController.java deleted file mode 100644 index 7fc674ab..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManagePersonnelController.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - - /** - * @Description: 会后管理流程_参会人员业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Api(tags="会后管理流程_参会人员业务表") -@RestController -@RequestMapping("/meetingmanage/processMeetingManagePersonnel") -@Slf4j -public class ProcessMeetingManagePersonnelController extends JeroController { - @Autowired - private IProcessMeetingManagePersonnelService processMeetingManagePersonnelService; - - /** - * 分页列表查询 - * - * @param processMeetingManagePersonnel - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-分页列表查询") - @ApiOperation(value="会后管理流程_参会人员业务表-分页列表查询", notes="会后管理流程_参会人员业务表-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(ProcessMeetingManagePersonnel processMeetingManagePersonnel, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = processMeetingManagePersonnelService.queryPage(processMeetingManagePersonnel, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param processMeetingManagePersonnel - * @param req - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-列表查询") - @ApiOperation(value="会后管理流程_参会人员业务表-列表查询", notes="会后管理流程_参会人员业务表-列表查询") - @GetMapping(value = "/list") - public Result> queryList(ProcessMeetingManagePersonnel processMeetingManagePersonnel, HttpServletRequest req) { - List list = processMeetingManagePersonnelService.queryList(processMeetingManagePersonnel, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param processMeetingManagePersonnel - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-添加") - @ApiOperation(value="会后管理流程_参会人员业务表-添加", notes="会后管理流程_参会人员业务表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ProcessMeetingManagePersonnel processMeetingManagePersonnel) { - processMeetingManagePersonnelService.add(processMeetingManagePersonnel); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param processMeetingManagePersonnel - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-编辑") - @ApiOperation(value="会后管理流程_参会人员业务表-编辑", notes="会后管理流程_参会人员业务表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody ProcessMeetingManagePersonnel processMeetingManagePersonnel) { - processMeetingManagePersonnelService.editById(processMeetingManagePersonnel); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-通过id删除") - @ApiOperation(value="会后管理流程_参会人员业务表-通过id删除", notes="会后管理流程_参会人员业务表-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Result.error("请选择数据!"); - } - processMeetingManagePersonnelService.deleteById(map.get("id")); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-批量删除") - @ApiOperation(value="会后管理流程_参会人员业务表-批量删除", notes="会后管理流程_参会人员业务表-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Result.error("请选择数据!"); - } - this.processMeetingManagePersonnelService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "会后管理流程_参会人员业务表-通过id查询") - @ApiOperation(value="会后管理流程_参会人员业务表-通过id查询", notes="会后管理流程_参会人员业务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ProcessMeetingManagePersonnel processMeetingManagePersonnel = processMeetingManagePersonnelService.queryById(id); - if(processMeetingManagePersonnel==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(processMeetingManagePersonnel); - } - - /** - * 导出excel - * - * @param request - * @param processMeetingManagePersonnel - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ProcessMeetingManagePersonnel processMeetingManagePersonnel) { - return super.exportXls(request, processMeetingManagePersonnel, ProcessMeetingManagePersonnel.class, "会后管理流程_参会人员业务表"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java deleted file mode 100644 index 5ec09594..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - - -/** - * @Description: 会后管理流程业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Data -@TableName("process_meeting_manage") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_meeting_manage对象", description="会后管理流程业务表") -public class ProcessMeetingManage extends BaseEntity { - /**参会日期*/ - @Excel(name = "参会日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "参会日期") - private java.util.Date participationTime; - /**会议名称*/ - @Excel(name = "会议名称", width = 15) - @ApiModelProperty(value = "会议名称") - private java.lang.String name; - /**来源（1：新增 2：会后管理流程）*/ - @Excel(name = "来源（1：新增 2：会后管理流程）", width = 15) - @ApiModelProperty(value = "来源（1：新增 2：会后管理流程）") - private java.lang.String source; - /**分标委id(标准化活动树结构一级id)*/ - @Excel(name = "分标委id(标准化活动树结构一级id)", width = 15) - @ApiModelProperty(value = "分标委id(标准化活动树结构一级id)") - private java.lang.String standardizationFirstId; - /**分标委名称*/ - @ApiModelProperty(value = "分标委名称") - @TableField(exist = false) - private java.lang.String standardizationFirstName; - /**工作组id(标准化活动树结构二级id)*/ - @Excel(name = "工作组id(标准化活动树结构二级id)", width = 15) - @ApiModelProperty(value = "工作组id(标准化活动树结构二级id)") - private java.lang.String standardizationSecondId; - /**工作组名称*/ - @ApiModelProperty(value = "工作组名称") - @TableField(exist = false) - private java.lang.String standardizationSecondName; - /**相关资料*/ - @ApiModelProperty(value = "相关资料") - @TableField(exist = false) - private java.lang.String fileIds; - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNo; - /**标准名称*/ - @Excel(name = "标准名称", width = 15) - @ApiModelProperty(value = "标准名称") - private java.lang.String standardName; - /**项目id*/ - @Excel(name = "项目id", width = 15) - @ApiModelProperty(value = "项目id") - private java.lang.String projectId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManagePersonnel.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManagePersonnel.java deleted file mode 100644 index 574448fa..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManagePersonnel.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - - -/** - * @Description: 会后管理流程_参会人员业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Data -@TableName("process_meeting_manage_personnel") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="process_meeting_manage_personnel对象", description="会后管理流程_参会人员业务表") -public class ProcessMeetingManagePersonnel implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**会后管理流程id*/ - @ApiModelProperty(value = "会后管理流程id") - private java.lang.String processMeetingManageId; - /**参会人员id*/ - @Excel(name = "参会人员id", width = 15) - @ApiModelProperty(value = "参会人员id") - private java.lang.String personnelId; - /**相关资料*/ - @Excel(name = "相关资料", width = 15) - @ApiModelProperty(value = "相关资料") - private java.lang.String fileId; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/ProcessMeetingManageMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/ProcessMeetingManageMapper.java deleted file mode 100644 index c0375740..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/ProcessMeetingManageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.mapper; - -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 会后管理流程业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -public interface ProcessMeetingManageMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/ProcessMeetingManagePersonnelMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/ProcessMeetingManagePersonnelMapper.java deleted file mode 100644 index b8377f4d..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/ProcessMeetingManagePersonnelMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.mapper; - -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 会后管理流程_参会人员业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -public interface ProcessMeetingManagePersonnelMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/xml/ProcessMeetingManageMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/xml/ProcessMeetingManageMapper.xml deleted file mode 100644 index e0b30139..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/xml/ProcessMeetingManageMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/xml/ProcessMeetingManagePersonnelMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/xml/ProcessMeetingManagePersonnelMapper.xml deleted file mode 100644 index 5426c4d1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/mapper/xml/ProcessMeetingManagePersonnelMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IMeetingManageFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IMeetingManageFlowService.java deleted file mode 100644 index e1209ef6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IMeetingManageFlowService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service; - -import com.jero.modules.activiti.process.meetingmanage.vo.MeetingManageFlowVO; - -/** - * @ClassName: MeetingManageFlowService - * @Description: - * @Author: yjz - * @Date: 2023-11-30 17:10 - * @Version: 1.0 - **/ -public interface IMeetingManageFlowService { - /** - * 会后管理流程-流程发起 - * @param meetingManageFlowVO - */ - void flowStart(MeetingManageFlowVO meetingManageFlowVO); - - /** - * 会后管理流程-流程保存 - * @param meetingManageFlowVO - */ - void flowSave(MeetingManageFlowVO meetingManageFlowVO); - - /** - * 会后管理流程-办理详情 - * @param projectId - * @param taskId - * @return - */ - MeetingManageFlowVO queryDetailByProjectId(String projectId, String taskId); - - /** - * 会后管理流程-流程审批 - * @param meetingManageFlowVO - */ - void flowApproval(MeetingManageFlowVO meetingManageFlowVO); - - /** - * 会后管理流程-流程转办 - * @param taskId - * @param userId - */ - void flowTransfer(String taskId, String userId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManagePersonnelService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManagePersonnelService.java deleted file mode 100644 index bfb484aa..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManagePersonnelService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 会后管理流程_参会人员业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -public interface IProcessMeetingManagePersonnelService extends IService { - - /** - * 分页查询 - * - * @param processMeetingManagePersonnel - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessMeetingManagePersonnel processMeetingManagePersonnel, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param processMeetingManagePersonnel - * @param req - * @return - */ - List queryList(ProcessMeetingManagePersonnel processMeetingManagePersonnel, HttpServletRequest req); - - /** - * 保存 - * - * @param processMeetingManagePersonnel - * @return - */ - void add(ProcessMeetingManagePersonnel processMeetingManagePersonnel); - - /** - * 更新 - * - * @param processMeetingManagePersonnel - * @return - */ - void editById(ProcessMeetingManagePersonnel processMeetingManagePersonnel); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessMeetingManagePersonnel queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java deleted file mode 100644 index 4ea661b5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 会后管理流程业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -public interface IProcessMeetingManageService extends IService { - - /** - * 分页查询 - * - * @param processMeetingManage - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(ProcessMeetingManage processMeetingManage, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param processMeetingManage - * @param req - * @return - */ - List queryList(ProcessMeetingManage processMeetingManage, HttpServletRequest req); - - /** - * 保存 - * - * @param processMeetingManage - * @return - */ - void add(ProcessMeetingManage processMeetingManage); - - /** - * 更新 - * - * @param processMeetingManage - * @return - */ - void editById(ProcessMeetingManage processMeetingManage); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - ProcessMeetingManage queryById(String id); - - /** - * 会后管理流程业务表-通过项目id查询 - * @param projectId - * @return - */ - ProcessMeetingManage queryByProjectId(String projectId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java deleted file mode 100644 index edadb422..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.WorkCenterService; -import com.jero.modules.activiti.util.SpringContextUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * @ClassName: EsInspectPlanFlowService - * @Description: - * @Author: yjz - * @Date: 2024-01-11 21:19 - * @Version: 1.0 - **/ -@Slf4j -@Transactional(rollbackFor = RuntimeException.class) -@Service -public class MeetingManageFlow implements WorkCenterService { - /** - * 强制撤回 - * @param processAll 流程总表 - */ - @Override - public void changeToDraft(ProcessAll processAll) { - // 删除业务关联表数据 - IProcessMeetingManageService processMeetingManageService = SpringContextUtil.getBean(IProcessMeetingManageService.class); - List list = processMeetingManageService.list(new LambdaQueryWrapper() - .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId())); - IProcessMeetingManagePersonnelService processMeetingManagePersonnelService = SpringContextUtil.getBean(IProcessMeetingManagePersonnelService.class); - List idList = list.stream().map(ProcessMeetingManage::getId).collect(Collectors.toList()); - processMeetingManagePersonnelService.remove( - new LambdaQueryWrapper() - .in(ProcessMeetingManagePersonnel::getProcessMeetingManageId, idList)); - // 删除业务表数据 - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.physicalDeleteByProjectId("process_meeting_manage", processAll.getProjectId()); - } - - @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); - } -} 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 deleted file mode 100644 index 9f40a4cf..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ /dev/null @@ -1,369 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service.impl; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.process.common.entity.ProcessDraft; -import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.process.meetingmanage.common.ProcessMeetingManageCommon; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; -import com.jero.modules.activiti.process.meetingmanage.service.IMeetingManageFlowService; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService; -import com.jero.modules.activiti.process.meetingmanage.vo.MeetingManageFlowVO; -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.standardization.common.LawsStandardizationCommon; -import com.jero.modules.laws.standardization.entity.LawsStandardization; -import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; -import com.jero.modules.laws.standardization.service.ILawsStandardizationService; -import com.jero.modules.laws.standardization.vo.StandardizationVO; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysUserService; -import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: MeetingManageFlowServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-11-30 17:11 - * @Version: 1.0 - **/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { - private final ProcessAllService processAllService; - private final ProcessApprovalRecordService processApprovalRecordService; - private final ProcessDraftService processDraftService; - private final ProcessNodeLinkService processNodeLinkService; - private final IProcessMeetingManageService processMeetingManageService; - private final IProcessMeetingManagePersonnelService processMeetingManagePersonnelService; - private final ILawsStandardizationService lawsStandardizationService; - private final ISysUserService sysUserService; - - public MeetingManageFlowServiceImpl(ProcessAllService processAllService, - ProcessApprovalRecordService processApprovalRecordService, - ProcessDraftService processDraftService, - ProcessNodeLinkService processNodeLinkService, - IProcessMeetingManageService processMeetingManageService, - IProcessMeetingManagePersonnelService processMeetingManagePersonnelService, - ILawsStandardizationService lawsStandardizationService, - ISysUserService sysUserService) { - this.processAllService = processAllService; - this.processApprovalRecordService = processApprovalRecordService; - this.processDraftService = processDraftService; - this.processNodeLinkService = processNodeLinkService; - this.processMeetingManageService = processMeetingManageService; - this.processMeetingManagePersonnelService = processMeetingManagePersonnelService; - this.lawsStandardizationService = lawsStandardizationService; - this.sysUserService = sysUserService; - } - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RuntimeService runtimeService = processEngine.getRuntimeService(); - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - - @Override - public void flowStart(MeetingManageFlowVO meetingManageFlowVO) { - // 流程信息 - ProcessAll processAll = meetingManageFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = meetingManageFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = meetingManageFlowVO.getMap(); - - // 根据流程key启动流程 同时 设置审批人员参数 - ProcessInstance processInstance = runtimeService - .startProcessInstanceByKey(ProcessMeetingManageCommon.KEY, map); - - // 再次设置map - runtimeService.setVariables(processInstance.getId(), map); - - // 保存业务表 - ProcessMeetingManage processMeetingManage = meetingManageFlowVO.getProcessMeetingManage(); - processMeetingManageService.saveOrUpdate(processMeetingManage); - - // 更新流程总表信息 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - processAll.setPrcType(Integer.valueOf(ProcessType.MEETING_MANAGE.getValue())); - processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); - DateTime date = DateUtil.date(); - processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setCreateUserId(loginUser.getId()); - processAllService.update(processAll, - new LambdaUpdateWrapper() - .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); - - // 根据流程实例id查询 - Task task = taskService.createTaskQuery() - .processInstanceId(processInstance.getId()) - .singleResult(); - - // 更新流程审批信息 - 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())); - - // 新增流程实例节点关联用户表 - processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); - - // 自动完成第一个节点 - taskService.complete(task.getId()); - } - - @Override - public void flowSave(MeetingManageFlowVO meetingManageFlowVO) { - // 保存业务表 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessMeetingManage processMeetingManage = meetingManageFlowVO.getProcessMeetingManage(); - if(StringUtils.isBlank(processMeetingManage.getId())){ - processMeetingManage.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - processMeetingManageService.saveOrUpdate(processMeetingManage); - - // 更新参会人 - processMeetingManagePersonnelService.remove( - new LambdaQueryWrapper() - .eq(ProcessMeetingManagePersonnel::getProcessMeetingManageId, processMeetingManage.getId())); - if (StringUtils.isNotBlank(meetingManageFlowVO.getFileIds())){ - String[] idArr = meetingManageFlowVO.getFileIds().split(","); - for (String id : idArr) { - ProcessMeetingManagePersonnel processMeetingManagePersonnel = new ProcessMeetingManagePersonnel(); - processMeetingManagePersonnel.setProcessMeetingManageId(processMeetingManage.getId()); - processMeetingManagePersonnel.setPersonnelId(loginUser.getId()); - processMeetingManagePersonnel.setFileId(id); - processMeetingManagePersonnelService.save(processMeetingManagePersonnel); - } - } - - // 流程信息 - ProcessAll processAll = meetingManageFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = meetingManageFlowVO.getProcessApprovalRecord(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - // 更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); - } - - @Override - public MeetingManageFlowVO queryDetailByProjectId(String projectId, String taskId) { - MeetingManageFlowVO meetingManageFlowVO = new MeetingManageFlowVO(); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, projectId) - .orderByDesc(ProcessAll::getCreateTime), false); - ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); - - // 是否存在草稿 - List processDraftList = processDraftService.list(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, projectId) - .eq(ProcessDraft::getUserId, loginUser.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (!processDraftList.isEmpty()){ - String id = ""; - if(Objects.isNull(processAll)){ - processAll = new ProcessAll(); - id = String.valueOf(SnowflakeUtils.snowflake()); - }else { - id = processAll.getId(); - } - // 存在草稿 - ProcessDraft processDraft = processDraftList.get(0); - // 属性拷贝 - BeanUtils.copyProperties(processDraft, processAll); - processAll.setId(id); - if (StringUtils.isNotBlank(processDraft.getHandleFile())){ - processApprovalRecord.setCommitFile(processDraft.getHandleFile()); - } - if (StringUtils.isNotBlank(processDraft.getHandleText())){ - processApprovalRecord.setCommitText(processDraft.getHandleText()); - } - if (!Objects.isNull(processDraft.getProcessDueDate())){ - processAll.setDueTime(processDraft.getProcessDueDate()); - } - if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ - processAll.setPrcMes(processDraft.getProcessDescription()); - } - if (StringUtils.isNotBlank(processDraft.getInfoJsonStr())){ - meetingManageFlowVO.setInfoJsonStr(processDraft.getInfoJsonStr()); - } - }else { - // 不存在草稿 - processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, taskId) - , false); - } - meetingManageFlowVO.setProcessAll(processAll); - meetingManageFlowVO.setProcessApprovalRecord(processApprovalRecord); - return meetingManageFlowVO; - } - - @Override - public void flowApproval(MeetingManageFlowVO meetingManageFlowVO) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // 流程信息 - ProcessAll processAll = meetingManageFlowVO.getProcessAll(); - // 流程审批信息 - ProcessApprovalRecord processApprovalRecord = meetingManageFlowVO.getProcessApprovalRecord(); - // map（参数） - Map map = meetingManageFlowVO.getMap(); - - // 更新流程信息 - processAllService.update(new LambdaUpdateWrapper() - .eq(ProcessAll::getId, processAll.getId()) - .set(ProcessAll::getPrcName, processAll.getPrcName()) - .set(ProcessAll::getPrcMes, processAll.getPrcMes()) - .set(ProcessAll::getDueTime, processAll.getDueTime())); - - // 更新流程审批信息 - processApprovalRecordService.update( - new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .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::getEndTime, new Date())); - - Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); - if (task!= null) { - // 完成任务 - taskService.complete(task.getId(), map); - // 再次更新流程审批信息 - processApprovalRecordService.update(new LambdaUpdateWrapper() - .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) - .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); - // 查询业务表数据 - ProcessMeetingManage processMeetingManage = processMeetingManageService.getOne( - new LambdaQueryWrapper() - .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()), false); - - // 保存参会人员 - if (!meetingManageFlowVO.isNotAttend()){ - ProcessMeetingManagePersonnel processMeetingManagePersonnel = new ProcessMeetingManagePersonnel(); - processMeetingManagePersonnel.setProcessMeetingManageId(processMeetingManage.getId()); - processMeetingManagePersonnel.setPersonnelId(loginUser.getId()); - processMeetingManagePersonnel.setFileId(meetingManageFlowVO.getFileIds()); - processMeetingManagePersonnelService.save(processMeetingManagePersonnel); - } - - // 流程结束 - if (isLastNode(processAll.getProcessInstanceId())){ - // 查询参会人员信息 - List processMeetingManagePersonnelList = processMeetingManagePersonnelService.list( - new LambdaQueryWrapper() - .eq(ProcessMeetingManagePersonnel::getProcessMeetingManageId, processMeetingManage.getId())); - - // 处理数据 - StandardizationVO standardizationVO = new StandardizationVO(); - - // 标准化活动 - LawsStandardization lawsStandardization = new LawsStandardization(); - LawsStandardization standardization = lawsStandardizationService.getById( - StringUtils.isNotBlank(processMeetingManage.getStandardizationSecondId()) ? - processMeetingManage.getStandardizationSecondId() : processMeetingManage.getStandardizationFirstId()); - lawsStandardization.setStandardizationType(standardization.getStandardizationType()); - lawsStandardization.setName(standardization.getName()); - lawsStandardization.setId(standardization.getId()); - lawsStandardization.setPid(standardization.getPid()); - - // 参会记录 - ArrayList lawsStandardizationMeetingList = new ArrayList<>(); - for (ProcessMeetingManagePersonnel meetingManagePersonnel : processMeetingManagePersonnelList) { - LawsStandardizationMeeting lawsStandardizationMeeting = new LawsStandardizationMeeting(); - lawsStandardizationMeeting.setParticipationTime(processMeetingManage.getParticipationTime()); - lawsStandardizationMeeting.setName(processMeetingManage.getName()); - lawsStandardizationMeeting.setPersonnelId(meetingManagePersonnel.getPersonnelId()); - lawsStandardizationMeeting.setMeetingData(meetingManagePersonnel.getFileId()); - lawsStandardizationMeeting.setSource(LawsStandardizationCommon.SOURCE_2); - SysUser sysUser = sysUserService.getById(meetingManagePersonnel.getPersonnelId()); - lawsStandardizationMeeting.setCreateBy(sysUser.getUsername()); - lawsStandardizationMeetingList.add(lawsStandardizationMeeting); - } - - // 保存到标准化活动 - standardizationVO.setLawsStandardization(lawsStandardization); - standardizationVO.setStandardizationMeetings(lawsStandardizationMeetingList); - standardizationVO.setStandardizationPayments(Collections.emptyList()); - standardizationVO.setStandardizationGroupList(Collections.emptyList()); - standardizationVO.setStandardizationLiaisonList(Collections.emptyList()); - lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_2); - } - } - } - - @Override - public void flowTransfer(String taskId, String userId) { - processHandleService.transfer(taskId, userId); - } - - private Map listToString(Map map) { - Map stringObjectHashMap; - stringObjectHashMap = map.entrySet().stream().map(v -> { - if (v.getValue() instanceof List) { - List list = (List)v.getValue(); - v.setValue(String.join(",", list)); - } - return v; - }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - return stringObjectHashMap; - } - - public boolean isLastNode(String processInstanceId) { - // 查询流程实例状态 - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - - // 如果流程实例为null，表示流程已结束 - return processInstance == null; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManagePersonnelServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManagePersonnelServiceImpl.java deleted file mode 100644 index ef5c4bfc..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManagePersonnelServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; -import com.jero.modules.activiti.process.meetingmanage.mapper.ProcessMeetingManagePersonnelMapper; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - - -/** - * @Description: 会后管理流程_参会人员业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessMeetingManagePersonnelServiceImpl extends ServiceImpl implements IProcessMeetingManagePersonnelService { - - - /** - * 分页查询 - * - * @param processMeetingManagePersonnel - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(ProcessMeetingManagePersonnel processMeetingManagePersonnel, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processMeetingManagePersonnel, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processMeetingManagePersonnel - * @param req - * @return - */ - @Override - public List queryList(ProcessMeetingManagePersonnel processMeetingManagePersonnel, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(processMeetingManagePersonnel, req.getParameterMap())); - } - - /** - * 保存 - * - * @param processMeetingManagePersonnel - * @return - */ - @Override - public void add(ProcessMeetingManagePersonnel processMeetingManagePersonnel) { - save(processMeetingManagePersonnel); - } - - /** - * 更新 - * - * @param processMeetingManagePersonnel - * @return - */ - @Override - public void editById(ProcessMeetingManagePersonnel processMeetingManagePersonnel) { - saveOrUpdate(processMeetingManagePersonnel); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessMeetingManagePersonnel queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java deleted file mode 100644 index 11e8076b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; -import com.jero.modules.activiti.process.meetingmanage.mapper.ProcessMeetingManageMapper; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; -import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService; -import com.jero.modules.laws.standardization.entity.LawsStandardization; -import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService; -import com.jero.modules.laws.standardization.service.ILawsStandardizationService; -import org.apache.logging.log4j.util.Strings; -import org.apache.shiro.SecurityUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - - -/** - * @Description: 会后管理流程业务表 - * @Author: jero-boot - * @Date: 2023-11-30 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessMeetingManageServiceImpl extends ServiceImpl implements IProcessMeetingManageService { - - private final IProcessMeetingManagePersonnelService processMeetingManagePersonnelService; - private final ILawsStandardizationService lawsStandardizationService; - private final ILawsStandardizationLiaisonService lawsStandardizationLiaisonService; - - public ProcessMeetingManageServiceImpl(IProcessMeetingManagePersonnelService processMeetingManagePersonnelService, - ILawsStandardizationService lawsStandardizationService, - ILawsStandardizationLiaisonService lawsStandardizationLiaisonService) { - this.processMeetingManagePersonnelService = processMeetingManagePersonnelService; - this.lawsStandardizationService = lawsStandardizationService; - this.lawsStandardizationLiaisonService = lawsStandardizationLiaisonService; - } - - /** - * 分页查询 - * - * @param processMeetingManage - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(ProcessMeetingManage processMeetingManage, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processMeetingManage, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param processMeetingManage - * @param req - * @return - */ - @Override - public List queryList(ProcessMeetingManage processMeetingManage, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(processMeetingManage, req.getParameterMap())); - } - - /** - * 保存 - * - * @param processMeetingManage - * @return - */ - @Override - public void add(ProcessMeetingManage processMeetingManage) { - Date now = new Date(); - processMeetingManage.setCreateTime(now); - processMeetingManage.setUpdateTime(now); - save(processMeetingManage); - } - - /** - * 更新 - * - * @param processMeetingManage - * @return - */ - @Override - public void editById(ProcessMeetingManage processMeetingManage) { - Date now = new Date(); - processMeetingManage.setUpdateTime(now); - saveOrUpdate(processMeetingManage); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public ProcessMeetingManage queryById(String id) { - return getById(id); - } - - @Override - public ProcessMeetingManage queryByProjectId(String projectId) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProcessMeetingManage processMeetingManage = getOne( - new LambdaQueryWrapper() - .eq(ProcessMeetingManage::getProjectId, projectId)); - // 翻译 - if (Strings.isNotBlank(processMeetingManage.getStandardizationFirstId())){ - LawsStandardization lawsStandardization = lawsStandardizationService.getById(processMeetingManage.getStandardizationFirstId()); - if (!Objects.isNull(processMeetingManage)){ - processMeetingManage.setStandardizationFirstName(lawsStandardization.getNum() + " " +lawsStandardization.getName()); - } - } - if (Strings.isNotBlank(processMeetingManage.getStandardizationSecondId())){ - LawsStandardization lawsStandardization = lawsStandardizationService.getById(processMeetingManage.getStandardizationSecondId()); - if (!Objects.isNull(processMeetingManage)){ - processMeetingManage.setStandardizationSecondName(lawsStandardization.getNum() + " " +lawsStandardization.getName()); - } - } - // 相关资料 - List processMeetingManagePersonnelList = processMeetingManagePersonnelService.list( - new LambdaQueryWrapper() - .eq(ProcessMeetingManagePersonnel::getProcessMeetingManageId, processMeetingManage.getId()) - .eq(ProcessMeetingManagePersonnel::getPersonnelId, sysUser.getId())); - - if (!processMeetingManagePersonnelList.isEmpty()){ - String fileIds = processMeetingManagePersonnelList.stream().map(ProcessMeetingManagePersonnel::getFileId).collect(Collectors.joining(",")); - processMeetingManage.setFileIds(fileIds); - } - return processMeetingManage; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java deleted file mode 100644 index 40dc2180..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.jero.modules.activiti.process.meetingmanage.vo; - -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -/** - * @ClassName: MeetingManageFlowVO - * @Description: - * @Author: yjz - * @Date: 2023-11-30 17:07 - * @Version: 1.0 - **/ -@Data -public class MeetingManageFlowVO { - /**流程信息*/ - @ApiModelProperty(value = "流程信息") - private ProcessAll processAll; - /**流程审批信息*/ - @ApiModelProperty(value = "流程审批信息") - private ProcessApprovalRecord processApprovalRecord; - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessMeetingManage processMeetingManage; - /**map*/ - @ApiModelProperty(value = "map") - private Map map; - /**文件id*/ - @ApiModelProperty(value = "文件id") - private String fileIds; - /**未参加*/ - @ApiModelProperty(value = "未参加") - private boolean notAttend; - /**草稿信息json字符串*/ - @ApiModelProperty(value = "草稿信息json字符串") - private String infoJsonStr; - /** - * 保存来源 - */ - @ApiModelProperty(value="保存来源(1：待办 2：草稿)") - private String saveSource; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java deleted file mode 100644 index e003a0a0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.common; - -/** - * @author liJiaRao - * @date 2023-12-13 17:28 - */ -public class ProcessProjectAssessCommon { - public static final String STANDARDS_ENGINEER = "standardsEngineer"; - public static final String MANAGER_LEADER = "managerLeader"; - public static final String MANAGER_LEADER_LIST = "managerLeaderList"; - public static final String MODULE_OWNER = "moduleOwner"; - public static final String MODULE_OWNER_LIST = "moduleOwnerList"; - public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize"; - public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; - public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize"; - public static final String PASS = "pass"; - public static final String SKIP = "skip"; - public static final String EXECUTION_ID = "executionId"; - //法规工程师发起 - public static final String FGGCSFQ = "fggcsfq"; - //各部门主管级领导下发 - public static final String GBMZGJLDXF = "gbmzgjldxf"; - //模块负责人分发 - public static final String MKFZRFF = "mkfzrff"; - //设计工程师评估 - public static final String SJGCSPG = "sjgcspg"; - //模块负责人审批 - public static final String MKFZRSP = "mkfzrsp"; - //各部门主管级领导（汇总）审批 - public static final String GBMZGJLDSP = "gbmzgjldsp"; - //模块负责人修改 - public static final String MKFZRXG = "mkfzrxg"; - //设计工程师评估2 - public static final String SJGCSPG2 = "sjgcspg2"; - //法规工程师归档 - public static final String FGGCSGD = "fggcsgd"; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java deleted file mode 100644 index 92aa9e48..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.controller; - -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessService; -import com.jero.common.api.vo.ResultCommon; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO; -import com.jero.modules.laws.documenttool.service.IDocumentSplitService; -import com.jero.modules.projectLibrary.entity.LawsAssess; -import com.jero.modules.projectLibrary.service.ILawsAssessService; -import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.web.bind.annotation.*; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import org.apache.commons.lang3.StringUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.springframework.web.servlet.ModelAndView; - -import javax.annotation.Resource; - -/** - * 项目合规评估流程表(process_project_assess)表控制层 - * - * @author xxxxx - */ -@Slf4j -@Api(tags = "项目合规评估流程表") -@RestController -@RequestMapping("process/projectAssess") -public class ProcessProjectAssessController extends JeroController { - /** - * 服务对象 - */ - @Resource - private ProcessProjectAssessService processProjectAssessService; - @Resource - private IDocumentSplitService documentSplitService; - @Resource - private ILawsAssessService lawsAssessService; - @DictPoint - @GetMapping("/queryProcessInfoVO") - @AutoLog(value = "项目合规评估流程-查询流程信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "draftId", value = "草稿id"), - @ApiImplicitParam(name = "taskId", value = "任务id"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id") - }) - @ApiOperation("项目合规评估流程-查询流程信息") - public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){ - ProcessInfoVO processInfoVO = processProjectAssessService.queryProcessInfoVO(draftId, processInstanceId, taskId); - return Result.OK(processInfoVO); - } - - @AutoLog(value = "项目合规评估流程-发起流程") - @ApiOperation(value = "项目合规评估流程-发起流程", notes = "项目合规评估流程-发起流程") - @PostMapping(value = "/startProcess") - public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectAssessService.startProcess(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "项目合规评估流程-同意") - @ApiOperation(value="项目合规评估流程-同意", notes="项目合规评估流程-同意") - @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectAssessService.approveTask(processInfoVO, true); - return Result.OK(); - } - - @AutoLog(value = "项目合规评估流程-驳回") - @ApiOperation(value="项目合规评估流程-驳回", notes="项目合规评估流程-驳回") - @PostMapping("/reject") - public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectAssessService.approveTask(processInfoVO, false); - return Result.OK(); - } - - @AutoLog(value = "项目合规评估流程-提交") - @ApiOperation(value="项目合规评估流程-提交", notes="项目合规评估流程-提交") - @PostMapping("/submit") - public Result submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectAssessService.submit(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "项目合规评估流程-保存为草稿") - @ApiOperation(value = "项目合规评估流程-保存为草稿", notes = "项目合规评估流程-保存为草稿") - @PostMapping(value = "/saveToDraft") - public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectAssessService.saveToDraft(processInfoVO); - return Result.OK(); - } - - /** - * 分页列表查询 - */ - @AutoLog(value = "项目合规评估流程-法规清单-分页列表查询") - @ApiOperation(value="项目合规评估流程-法规清单-分页列表查询") - @GetMapping(value = "/processQueryPage") - public Result> processQueryPage(LawsAssess lawsAssess, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - String projectId = lawsAssess.getProjectId(); - if (StringUtils.isBlank(projectId)){ - throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); - } - lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - IPage pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); - lawsAssessService.assignment(pageList.getRecords()); - return Result.OK(pageList); - } - - /** - * 项目合规评估流程-查询条款列表 - * @return - */ - @ApiOperation(value = "项目合规评估流程-查询条款列表") - @PostMapping("/processProjectAssessGetList") - @ApiOperationSupport(order = 21) - public Result> processProjectAssessGetList(@RequestBody List lawsAssessList) { - List allList = new ArrayList<>(); - for (LawsAssess lawsAssess : lawsAssessList) { - String sarFileSplitInfoId = lawsAssess.getSarFileSplitInfoId(); - if (StringUtils.isNotBlank(sarFileSplitInfoId)) { - List processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId); - processProjectAssessTermList.forEach(item -> item.setStandardId(lawsAssess.getStandardId())); - allList.addAll(processProjectAssessTermList); - continue; - } - ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm(); - processProjectAssessTerm.setStandardId(lawsAssess.getStandardId()); - processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber()); - processProjectAssessTerm.setTermName(lawsAssess.getStandardName()); - processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.YES.getInteger()); - allList.add(processProjectAssessTerm); - } - return Result.OK(allList); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssess.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssess.java deleted file mode 100644 index cc074b41..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssess.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - *项目合规评估流程表 - *@author liJiaRao - *@date 2023-12-05 16:29 - */ -@ApiModel(description = "项目合规评估流程表") -@Data -@TableName(value = "process_project_assess") -public class ProcessProjectAssess { - /** - * 主键ID - */ - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date createTime; - - /** - * 更新人 - */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date updateTime; - - /** - * 所属部门 - */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @ApiModelProperty(value = "0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 项目id - */ - @ApiModelProperty(value = "项目id") - private String projectId; - - /** - * 项目名称 - */ - @TableField(exist = false) - @ApiModelProperty(value = "项目名称") - private String projectName; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java deleted file mode 100644 index 012a6e07..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -/** - *项目合规评估流程关联标准 - *@author liJiaRao - *@date 2023-12-06 10:37 - */ -@ApiModel(description = "项目合规评估流程关联标准") -@Data -@TableName(value = "process_project_assess_link") -public class ProcessProjectAssessLink { - /** - * 主键ID - */ - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date createTime; - - /** - * 更新人 - */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date updateTime; - - /** - * 所属部门 - */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @ApiModelProperty(value = "0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 评估流程id - */ - @ApiModelProperty(value = "评估流程id") - private String assessmentId; - - /** - * 标准id - */ - @TableField(exist = false) - @ApiModelProperty(value = "标准id") - private String standardId; - - /**标准来源*/ - @TableField(exist = false) - @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)") - private String source; - - /** - * 标准编号 - */ - @ApiModelProperty(value = "标准编号") - private String standardNumber; - - /**标准名称*/ - @TableField(exist = false) - @ApiModelProperty(value = "标准名称") - private String standardName; - - /** - * 分解单来源 - */ - @ApiModelProperty(value = "分解单来源") - @Dict(dicCode = "decomposition_order_source") - private String decompositionOrderSource; - - - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java deleted file mode 100644 index d615fa34..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java +++ /dev/null @@ -1,262 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.Date; -import java.util.List; - -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -/** - *项目合规评估流程关联条款 - *@author liJiaRao - *@date 2023-12-06 10:37 - */ -@ApiModel(description = "项目合规评估流程关联条款") -@Data -@TableName(value = "process_project_assess_term") -public class ProcessProjectAssessTerm { - /** - * 主键ID - */ - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date createTime; - - /** - * 更新人 - */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date updateTime; - - /** - * 所属部门 - */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @ApiModelProperty(value = "0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 评估流程id - */ - @ApiModelProperty(value = "评估流程id") - private String assessmentId; - - /**标准id*/ - @ApiModelProperty(value = "标准id") - private String standardId; - - /** - * 条款号 - */ - @ApiModelProperty(value = "条款号") - private String termNumber; - - /** - * 条款名称 - */ - @ApiModelProperty(value = "条款名称") - private String termName; - - /** - * 条款内容 - */ - @ApiModelProperty(value = "条款内容") - private String termText; - - @ApiModelProperty(value = "拆分单id") - private String splitInfoId; - - @ApiModelProperty(value = "可以分派标识") - private Integer canAssignFlag; - - /** - * 发起人 - */ - @TableField(exist = false) - @ApiModelProperty(value = "发起人") - private String promoter; - - /** - * 条款关联用户表ID - */ - @TableField(exist = false) - @ApiModelProperty(value = "条款关联用户表ID") - private String termUserId; - - /** - * 责任单位id - */ - @TableField(exist = false) - @ApiModelProperty(value = "责任单位id") - private String responsibleUnits; - - /** - * 责任单位负责人id - */ - @TableField(exist = false) - @ApiModelProperty(value = "责任单位负责人ids") - private String responsibleUnitLeader; - - /** - * 责任单位负责人id - */ - @TableField(exist = false) - @ApiModelProperty(value = "责任单位负责人ids") - private String responsibleUnitLeaders; - - /** - * 模块负责人id - */ - @TableField(exist = false) - @ApiModelProperty(value = "模块负责人ids") - private String moduleOwner; - /** - * 模块负责人id - */ - @TableField(exist = false) - @ApiModelProperty(value = "模块负责人ids") - private String moduleOwners; - - /** - * 设计工程师 - */ - @TableField(exist = false) - @ApiModelProperty(value = "设计工程师") - private String designEngineer; - - /** - * 设计工程师 - */ - @TableField(exist = false) - @ApiModelProperty(value = "设计工程师ids") - private String designEngineers; - - /**评估人ID*/ - @TableField(exist = false) - @ApiModelProperty(value = "评估人ID") - private String assessorId; - - /**评估人名字*/ - @TableField(exist = false) - @ApiModelProperty(value = "评估人名字") - private String assessorName; - - /** - * 不涉及原因 - */ - @TableField(exist = false) - @ApiModelProperty(value = "不涉及原因") - private String notInvolved; - /** - * 上一节点处理人 - */ - @TableField(exist = false) - @ApiModelProperty(value = "上一节点处理人") - private String previousNodeHandler; - - @TableField(exist = false) - @ApiModelProperty(value = "条款关联用户") - private List processProjectAssessTermUserList; - - /** - * 评估反馈 - */ - @TableField(exist = false) - @ApiModelProperty(value = "评估反馈") - private String evaluationFeedback; - - /** - * 评估反馈翻译 - */ - @TableField(exist = false) - @ApiModelProperty(value = "评估反馈翻译") - private String evaluationFeedback_dictText; - - /** - * 依据描述 - */ - @TableField(exist = false) - @ApiModelProperty(value = "依据描述") - private String description; - - /** - * 佐证材料 - */ - @TableField(exist = false) - @ApiModelProperty(value = "佐证材料") - private String fileId; - - /** - * 预计整改完成日期 - */ - @TableField(exist = false) - @ApiModelProperty(value = "预计整改完成日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date expectedTime; - - /**评估日期*/ - @TableField(exist = false) - @ApiModelProperty(value = "评估日期") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date assessTime; - - /**风险点*/ - @TableField(exist = false) - @ApiModelProperty(value = "风险点") - private String riskPoints; - - /**验证方案*/ - @TableField(exist = false) - @ApiModelProperty(value = "验证方案") - private String validateSolution; - - /**不符合项*/ - @TableField(exist = false) - @ApiModelProperty(value = "不符合项") - private String nonConformance; - - /**应对措施*/ - @TableField(exist = false) - @ApiModelProperty(value = "应对措施") - private String countermeasures; - - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java deleted file mode 100644 index 21ef4e4a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - *项目合规评估流程关联条款关联用户 - *@author liJiaRao - *@date 2023-12-06 10:37 - */ -@ApiModel(description = "项目合规评估流程关联条款关联用户") -@Data -@TableName(value = "process_project_assess_term_user") -public class ProcessProjectAssessTermUser { - /** - * 主键ID - */ - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date createTime; - - /** - * 更新人 - */ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date updateTime; - - /** - * 所属部门 - */ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @ApiModelProperty(value = "0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 评估流程id - */ - @ApiModelProperty(value = "评估流程id") - private String assessmentId; - - /** - * 关联条款表id - */ - @ApiModelProperty(value = "关联条款表id") - private String termId; - - /** - * 责任单位id - */ - @ApiModelProperty(value = "责任单位id") - private String responsibleUnit; - - /** - * 责任单位负责人id - */ - @ApiModelProperty(value = "责任单位负责人id") - private String responsibleUnitLeader; - - /** - * 父执行实例流id - */ - @ApiModelProperty(value = "父执行实例流id") - private String parentExecutionId; - - /** - * 模块负责人id - */ - @ApiModelProperty(value = "模块负责人id") - private String moduleOwner; - - /** - * 不涉及原因 - */ - @ApiModelProperty(value = "不涉及原因") - private String notInvolved; - - /** - * 设计工程师 - */ - @ApiModelProperty(value = "设计工程师") - private String designEngineer; - - /** - * 评估反馈 - */ - @ApiModelProperty(value = "评估反馈") - private String evaluationFeedback; - - /** - * 评估反馈翻译 - */ - @TableField(exist = false) - @ApiModelProperty(value = "评估反馈翻译") - private String evaluationFeedback_dictText; - - /** - * 依据描述 - */ - @ApiModelProperty(value = "依据描述") - private String description; - - /** - * 佐证材料 - */ - @ApiModelProperty(value = "佐证材料") - private String fileId; - - /**不符合项*/ - @ApiModelProperty(value = "不符合项") - private String nonConformance; - - /**应对措施*/ - @ApiModelProperty(value = "应对措施") - private String countermeasures; - - /** - * 预计整改完成日期 - */ - @ApiModelProperty(value = "预计整改完成日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date expectedTime; - - /**风险点*/ - @ApiModelProperty(value = "风险点") - private String riskPoints; - - /**验证方案*/ - @ApiModelProperty(value = "验证方案") - private String validateSolution; - - /**评估日期*/ - @ApiModelProperty(value = "评估日期") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date assessTime; - - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/listener/ProcessProjectAssessCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/listener/ProcessProjectAssessCreateListener.java deleted file mode 100644 index 5bb396c5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/listener/ProcessProjectAssessCreateListener.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.listener; - -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessService; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.activiti.util.SpringContextUtil; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; - -import java.util.Date; - -/** - * @author liJiaRao - * @date 2023-10-13 16:43 - */ -public class ProcessProjectAssessCreateListener implements TaskListener { - @Override - public void notify(DelegateTask delegateTask) { - ProcessProjectAssessService processProjectAssessService = SpringContextUtil.getBean(ProcessProjectAssessService.class); - processProjectAssessService.createListener(delegateTask); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessLinkMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessLinkMapper.java deleted file mode 100644 index e36299d3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessLinkMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink; - -/** - * @author liJiaRao - * @date 2023-12-06 10:37 - */ -public interface ProcessProjectAssessLinkMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessMapper.java deleted file mode 100644 index 8a43a894..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess; - -/** - * @author liJiaRao - * @date 2023-12-05 16:29 - */ -public interface ProcessProjectAssessMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java deleted file mode 100644 index 9c0af615..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author liJiaRao - * @date 2023-12-06 10:37 - */ -public interface ProcessProjectAssessTermMapper extends BaseMapper { - List getByResponsibleUnitLeader(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("hasModuleOwner") Boolean hasModuleOwner); - - List getByModuleOwner(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasEngineer") Boolean hasEngineer); - List getByModuleOwnerHasEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); - - List getByDesignEngineer(@Param("assessmentId") String assessmentId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); - - List getByStandardsEngineer(@Param("assessmentId") String assessmentId); -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermUserMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermUserMapper.java deleted file mode 100644 index c36f0724..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/ProcessProjectAssessTermUserMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser; - -/** - * @author liJiaRao - * @date 2023-12-06 10:37 - */ -public interface ProcessProjectAssessTermUserMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessLinkMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessLinkMapper.xml deleted file mode 100644 index 1dd2a1d8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessLinkMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag, assessment_id, - standard_number, decomposition_order_Source - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessMapper.xml deleted file mode 100644 index 59882a69..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag, project_id - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml deleted file mode 100644 index 398d9243..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${alias}.id, ${alias}.create_by, ${alias}.create_time, ${alias}.update_by, ${alias}.update_time, ${alias}.org_code, ${alias}.del_flag, ${alias}.assessment_id, - ${alias}.standard_id, ${alias}.term_number, ${alias}.term_name, ${alias}.term_text, ${alias}.split_info_id, ${alias}.can_assign_flag - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml deleted file mode 100644 index 882116f1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermUserMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag, assessment_id, - trem_id, responsible_unit, responsible_unit_leader, sub_process_id, module_owner, - design_engineer, evaluation_feedback, description, file_id, expected_time - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessLinkService.java deleted file mode 100644 index 8bbe5a93..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessLinkService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessLinkMapper; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink; -/** - * - *@author liJiaRao - *@date 2023-12-05 15:57 - */ -@Service -public class ProcessProjectAssessLinkService extends ServiceImpl { - public void add(ProcessProjectAssessLink processProjectAssessLink) { - this.save(processProjectAssessLink); - } - - public void editById(ProcessProjectAssessLink processProjectAssessLink) { - this.updateById(processProjectAssessLink); - } - - public void deleteById(String id) { - this.removeById(id); - } - - public void deleteByIds(List idList) { - for (String id : idList) { - deleteById(id); - } - } - - public ProcessProjectAssessLink queryById(String id) { - ProcessProjectAssessLink processProjectAssessLink = this.getById(id); - return processProjectAssessLink; - } - - public List getByAssessmentId(String assessmentId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessLink::getAssessmentId,assessmentId); - return this.list(wrapper); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java deleted file mode 100644 index 6dc029f9..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ /dev/null @@ -1,1045 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.service; - -import java.util.Date; -import java.util.List; - -import cn.hutool.cache.Cache; -import cn.hutool.core.collection.CollStreamUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.thread.ThreadUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; -import com.jero.common.system.vo.LoginUser; -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.common.DraftCommon; -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.dto.BasicTaskInfoDTO; -import com.jero.modules.activiti.process.fb.dto.ProcessDTO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink; - -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO; -import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.activiti.util.ThreadLocalUtil; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; -import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; -import com.jero.modules.projectLibrary.common.AssessCommon; -import com.jero.modules.projectLibrary.entity.LawsAssess; -import com.jero.modules.projectLibrary.entity.LawsAssessResults; -import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; -import com.jero.modules.projectLibrary.entity.LawsProjectLibrary; -import com.jero.modules.projectLibrary.service.ILawsAssessResultsService; -import com.jero.modules.projectLibrary.service.ILawsAssessService; -import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; -import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService; -import org.activiti.engine.HistoryService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.delegate.DelegateExecution; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.task.Task; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess; -import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper; -import org.springframework.transaction.annotation.Transactional; - -/** - * @author liJiaRao - * @date 2023-12-05 15:57 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class ProcessProjectAssessService extends ServiceImpl { - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource - private IProcessHandleService processHandleService; - @Resource - private ProcessAllService processAllService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private TaskService taskService; - @Resource - private RuntimeService runtimeService; - @Resource - private HistoryService historyService; - @Resource - private ProcessProjectAssessLinkService processProjectAssessLinkService; - @Resource - private ProcessProjectAssessTermService processProjectAssessTermService; - @Resource - private ProcessProjectAssessTermUserService processProjectAssessTermUserService; - @Resource - private ILawsProjectLibraryService lawsProjectLibraryService; - //国内标准 - @Autowired - private ILawsDomesticStandardService lawsDomesticStandardService; - //海外标准 - @Autowired - private ILawsOverseasStandardService lawsOverseasStandardService; - @Resource - private SendMessageAPI sendMessageAPI; - @Resource - private ILawsAssessResultsService lawsAssessResultsService; - - @Resource - private ILawsAssessService lawsAssessService; - @Resource - private ILawsEvaluationNotMetService lawsEvaluationNotMetService; - - - HashMap tempCache = new HashMap<>(); - - public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) { - ProcessInfoVO draft = processHandleService.getDraftByDraftId(draftId); - return draft; - } - ProcessInfoVO draft = processHandleService.getDraftByTaskId(taskId); - if (draft != null){ - return draft; - } - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId); - String assessmentId = processInfoVO.getBusinessId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - Task task = processDTO.getTask(); - - String executionParentId = task.getFormKey(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - List processProjectAssessTermUserList = new ArrayList<>(); - List processProjectAssessTermList = new ArrayList<>(); - //获取所有用户信息 - List userList = sysBaseAPI.getAllUser(); - Map userNameMap = new HashMap<>(); - for (LoginUser loginUser : userList) { - userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo()); - } - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - String createUserId = processAll.getCreateUserId(); - //发起人 - String createUserName = userNameMap.get(createUserId); - //上一节点处理人 - Map previousNodeHandlerMap = new HashMap<>(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); - switch (taskDefinitionKey) { - //各部门主管级领导下发 - case ProcessProjectAssessCommon.GBMZGJLDXF: - processProjectAssessTermList = processProjectAssessTermService.getByResponsibleUnitLeader(assessmentId, originUserId); - break; - //各部门主管级领导（汇总）审批 - case ProcessProjectAssessCommon.GBMZGJLDSP: - processProjectAssessTermList = processProjectAssessTermService.getByResponsibleUnitLeaderHasModuleOwner(assessmentId, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); - previousNodeHandlerMap = processProjectAssessTermUserService.list(wrapper).stream() - .collect( - Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId, - Collectors.mapping(item -> { - return userNameMap.get(item.getModuleOwner()); - }, - Collectors.joining(","))) - ); - break; - //模块负责人分发 - case ProcessProjectAssessCommon.MKFZRFF: - processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId); - break; - //模块负责人审批 - case ProcessProjectAssessCommon.MKFZRSP: - processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId); - wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId); - processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper); - previousNodeHandlerMap = processProjectAssessTermUserList.stream() - .collect( - Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId, - Collectors.mapping(item -> { - return userNameMap.get(item.getDesignEngineer()); - }, - Collectors.joining(","))) - ); - break; - //模块负责人修改 - case ProcessProjectAssessCommon.MKFZRXG: - processProjectAssessTermList = processProjectAssessTermService.getByModuleOwner(assessmentId, originUserId, executionParentId); - wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId); - processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper); - previousNodeHandlerMap = processProjectAssessTermUserList.stream() - .collect( - Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId, - Collectors.mapping(item -> { - return userNameMap.get(item.getResponsibleUnitLeader()); - }, - Collectors.joining(","))) - ); - break; - //设计工程师评估 - case ProcessProjectAssessCommon.SJGCSPG: - case ProcessProjectAssessCommon.SJGCSPG2: - processProjectAssessTermList = processProjectAssessTermService.getByDesignEngineer(assessmentId, originUserId, executionParentId); - wrapper.eq(ProcessProjectAssessTermUser::getDesignEngineer, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionParentId); - processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper); - previousNodeHandlerMap = processProjectAssessTermUserList.stream() - .collect( - Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId, - Collectors.mapping(item -> { - return userNameMap.get(item.getModuleOwner()); - }, - Collectors.joining(","))) - ); - break; - //法规工程师归档 - case ProcessProjectAssessCommon.FGGCSGD: - processProjectAssessTermList = processProjectAssessTermService.getByStandardsEngineer(assessmentId); - //processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper); - previousNodeHandlerMap = processProjectAssessTermUserService.list(wrapper).stream() - .collect( - Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId, - Collectors.mapping(item -> { - return userNameMap.get(item.getResponsibleUnitLeader()); - }, - Collectors.joining(","))) - ); - break; - - default: - } - List dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); - Map dictevaluationFeedbackMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); - //给条款中保存关联的信息 - Map> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId); - for (ProcessProjectAssessTerm term : processProjectAssessTermList) { - String termId = term.getId(); - List termUsers = termIdListMap.get(termId); - if (CollectionUtil.isNotEmpty(termUsers)){ - for (ProcessProjectAssessTermUser termUser : termUsers) { - String evaluationFeedback = termUser.getEvaluationFeedback(); - termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback)); - } - ProcessProjectAssessTermUser termUser = termUsers.get(0); - term.setNotInvolved(termUser.getNotInvolved()); - term.setEvaluationFeedback(termUser.getEvaluationFeedback()); - term.setDescription(termUser.getDescription()); - term.setFileId(termUser.getFileId()); - term.setExpectedTime(termUser.getExpectedTime()); - term.setRiskPoints(termUser.getRiskPoints()); - term.setValidateSolution(termUser.getValidateSolution()); - term.setNotInvolved(termUser.getNotInvolved()); - term.setNonConformance(termUser.getNonConformance()); - term.setCountermeasures(termUser.getCountermeasures()); - } - String evaluationFeedback = term.getEvaluationFeedback(); - term.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback)); - term.setProcessProjectAssessTermUserList(termUsers); - String assessorId = term.getDesignEngineer(); - if (assessorId == null){ - assessorId = term.getModuleOwner(); - } - if (assessorId == null){ - assessorId = term.getResponsibleUnitLeader(); - } - term.setAssessorId(assessorId); - term.setAssessorName(userNameMap.get(assessorId)); - String previousNodeHandler = previousNodeHandlerMap.get(termId); - term.setPreviousNodeHandler(previousNodeHandler); - term.setPromoter(createUserName); - } - //拼接分类法规标题 - List decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); - Map decompositionOrderSourceMap = CollStreamUtil.toMap(decompositionOrderSourceDictModels, DictModel::getValue, DictModel::getText); - Map splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId); - List allProjectAssesTermList = new ArrayList<>(); - List usedSplitInfoId = new ArrayList<>(); - String previousAssessorId = null; - for (ProcessProjectAssessTerm term : processProjectAssessTermList) { - String assessorId = term.getAssessorId(); - String splitInfoId = term.getSplitInfoId(); - if (!usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId)) { - usedSplitInfoId.add(splitInfoId); - ProcessProjectAssessTerm titleTerm = splitInfoIdMap.get(splitInfoId); - ProcessProjectAssessTerm term1 = new ProcessProjectAssessTerm(); - term1.setTermName(titleTerm.getTermName()); - term1.setTermNumber(titleTerm.getTermNumber()); - term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText())); - term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger()); - term1.setPromoter(createUserName); - allProjectAssesTermList.add(term1); - }else if (usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId) && !Objects.equals(previousAssessorId,assessorId)){ - ProcessProjectAssessTerm titleTerm = splitInfoIdMap.get(splitInfoId); - ProcessProjectAssessTerm term1 = new ProcessProjectAssessTerm(); - term1.setTermName(titleTerm.getTermName()); - term1.setTermNumber(titleTerm.getTermNumber()); - term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText())); - term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger()); - term1.setPromoter(createUserName); - allProjectAssesTermList.add(term1); - } - previousAssessorId = assessorId; - allProjectAssesTermList.add(term); - } - ProcessProjectAssess projectAssess = this.getById(assessmentId); - String projectId = projectAssess.getProjectId(); - LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.getById(projectId); - ProcessProjectAssess processProjectAssess = new ProcessProjectAssess(); - processProjectAssess.setProjectId(projectId); - processProjectAssess.setProjectName(lawsProjectLibrary.getProjectName()); - - List projectAssessLinkList = processProjectAssessLinkService.getByAssessmentId(assessmentId); - for (ProcessProjectAssessLink processProjectAssessLink : projectAssessLinkList) { - String standardNumber = processProjectAssessLink.getStandardNumber(); - LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.queryByStandardNumber(standardNumber); - if (lawsDomesticStandard != null){ - String standardName = lawsDomesticStandard.getStandardName(); - String standardId = lawsDomesticStandard.getId(); - processProjectAssessLink.setSource(CommonConstant.STANDARD_SOURCE_1); - processProjectAssessLink.setStandardId(standardId); - processProjectAssessLink.setStandardName(standardName); - continue; - } - LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.queryByStandardNumber(standardNumber); - if (lawsOverseasStandard != null){ - String standardName = lawsOverseasStandard.getStandardName(); - String standardId = lawsOverseasStandard.getId(); - processProjectAssessLink.setSource(CommonConstant.STANDARD_SOURCE_2); - processProjectAssessLink.setStandardId(standardId); - processProjectAssessLink.setStandardName(standardName); - } - } - - ProcessProjectAssessVO processProjectAssessVO = new ProcessProjectAssessVO(); - processProjectAssessVO.setProcessProjectAssess(processProjectAssess); - processProjectAssessVO.setProcessProjectAssessLinkList(projectAssessLinkList); - processProjectAssessVO.setProcessProjectAssessTermList(allProjectAssesTermList); - processInfoVO.setBusinessInfoDTO(processProjectAssessVO); - return processInfoVO; - } - - public void startProcess(ProcessInfoVO processInfoVO) { - - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - - ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess(); - this.save(processProjectAssess); - String assessmentId = processProjectAssess.getId(); - processInfoVO.setBusinessId(assessmentId); - String projectId = processProjectAssess.getProjectId(); - - //保存关联标准 - List processProjectAssessLinkList = businessInfoDTO.getProcessProjectAssessLinkList(); - for (ProcessProjectAssessLink processProjectAssessLink : processProjectAssessLinkList) { - processProjectAssessLink.setId(null); - processProjectAssessLink.setAssessmentId(assessmentId); - String standardId = processProjectAssessLink.getStandardId(); - //更新项目库法规清单状态 - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(LawsAssess::getProjectId,projectId); - wrapper.eq(LawsAssess::getStandardId,standardId); - wrapper.set(LawsAssess::getProcessStatus,AssessCommon.UNDER_EVALUATION); - lawsAssessService.update(wrapper); - } - processProjectAssessLinkService.saveBatch(processProjectAssessLinkList); - //保存关联的条款、标准 - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - processProjectAssessTerm.setAssessmentId(assessmentId); - } - processProjectAssessTermService.saveBatch(processProjectAssessTermList); - //保存条款和负责人的关联关系 - List allResponsibleUnitLeaderList = new ArrayList<>(); - List saveProcessProjectAssessTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - String termId = processProjectAssessTerm.getId(); - processProjectAssessTerm.setAssessmentId(assessmentId); - Integer canAssignFlag = processProjectAssessTerm.getCanAssignFlag(); - //如果是不需要分派的先跳过 - if (YesOrNoEnum.NO.getInteger().equals(canAssignFlag)) { - continue; - } - String responsibleUnitLeaders = processProjectAssessTerm.getResponsibleUnitLeaders(); - if (StringUtils.isBlank(responsibleUnitLeaders)) { - throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); - } - //去重 - List responsibleUnitLeaderList = Arrays.asList(responsibleUnitLeaders.split(",")); - List distinctResponsibleUnitLeader = responsibleUnitLeaderList.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - for (String responsibleUnitLeader : distinctResponsibleUnitLeader) { - ProcessProjectAssessTermUser processProjectAssessTermUser = new ProcessProjectAssessTermUser(); - processProjectAssessTermUser.setAssessmentId(assessmentId); - processProjectAssessTermUser.setTermId(termId); - processProjectAssessTermUser.setResponsibleUnitLeader(responsibleUnitLeader); - saveProcessProjectAssessTermUserList.add(processProjectAssessTermUser); - } - allResponsibleUnitLeaderList.addAll(distinctResponsibleUnitLeader); - } - List distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - String distinctAllResponsibleUnitLeaderListJoin = CollectionUtil.join(distinctAllResponsibleUnitLeaderList, ","); - processProjectAssessTermUserService.saveBatch(saveProcessProjectAssessTermUserList); - - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_ASSESS)); // 流程定义id - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_ASSESS.getValue()); // 流程类型 - Map userInfoMap = new HashMap<>(); - userInfoMap.put(ProcessProjectAssessCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId()); - userInfoMap.put(ProcessProjectAssessCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin); - processInfoVO.setUserInfoMap(userInfoMap); - processHandleService.startProcess(processInfoVO); - - //start 先保存一份初始草稿 - processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); - processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null)); - saveToDraft(processInfoVO); - //end 保存初始草稿结束 - } - - public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = basicTaskInfoDTO.getTaskId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - String processInstanceId = processDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - processInfoVO.setBusinessId(processAll.getProjectId()); - Task task = processDTO.getTask(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - processHandleService.updateApprovalRecord(processInfoVO); - switch (taskDefinitionKey) { - //模块负责人审批 - case ProcessProjectAssessCommon.MKFZRSP: - mkfzrspApprove(processInfoVO, processDTO, pass); - break; - //各部门主管级领导（汇总）审批 - case ProcessProjectAssessCommon.GBMZGJLDSP: - gbmzgjldspApprove(processInfoVO, processDTO, pass); - break; - //模块负责人修改 - case ProcessProjectAssessCommon.MKFZRXG: - mkfzrxgApprove(processInfoVO, processDTO, pass); - break; - default: - } - - } - - private void mkfzrspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - String formKey = task.getFormKey(); - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTerm.getTermUserId()); - termUser.setParentExecutionId(executionId); - termUser.setModuleOwner(userId); - allTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(allTermUserList); - - if (!Objects.equals(userId,originUserId)){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); - wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); - List termUserList = processProjectAssessTermUserService.list(wrapper); - List updateTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTermUser.getId()); - termUser.setModuleOwner(userId); - updateTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(updateTermUserList); - } - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.PASS, pass); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - } - - private void gbmzgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - String businessId = processInfoVO.getBusinessId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - String assessmentId = processInfoVO.getBusinessId(); - //查询模块负责人列表 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); - wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); - List projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper); - List moduleOwnerList = projectAssessTermUsers.stream() - .map(ProcessProjectAssessTermUser::getModuleOwner) - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTerm.getTermUserId()); - termUser.setResponsibleUnitLeader(userId); - termUser.setParentExecutionId(executionId); - allTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(allTermUserList); - - if (!Objects.equals(userId,originUserId)){ - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); - wrapper1.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); - List termUserList = processProjectAssessTermUserService.list(wrapper1); - List updateTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTermUser.getId()); - termUser.setResponsibleUnitLeader(userId); - updateTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(updateTermUserList); - runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MANAGER_LEADER,userId); - } - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.PASS, pass); - if (!pass){ - runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MODULE_OWNER_LIST,moduleOwnerList); - } - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - } - //模块负责人修改 - private void mkfzrxgApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - String assessmentId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - String businessId = processInfoVO.getBusinessId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - String formKey = task.getFormKey(); - - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTerm.getTermUserId()); - termUser.setParentExecutionId(executionId); - termUser.setModuleOwner(userId); - termUser.setEvaluationFeedback(processProjectAssessTerm.getEvaluationFeedback()); - termUser.setDescription(processProjectAssessTerm.getDescription()); - termUser.setFileId(processProjectAssessTerm.getFileId()); - termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime()); - allTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(allTermUserList); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); - List projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper); - List designEngineerList = projectAssessTermUsers.stream() - .map(ProcessProjectAssessTermUser::getDesignEngineer) - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG2, designEngineerList); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST, designEngineerList); - variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size()); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - - if (!Objects.equals(userId,originUserId)){ - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); - wrapper1.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - wrapper1.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); - List termUserList = processProjectAssessTermUserService.list(wrapper1); - List updateTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTermUser.getId()); - termUser.setModuleOwner(userId); - updateTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(updateTermUserList); - } - } - - - public void submit(ProcessInfoVO processInfoVO) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = basicTaskInfoDTO.getTaskId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - String processInstanceId = processDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - processInfoVO.setBusinessId(processAll.getProjectId()); - Task task = processDTO.getTask(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - processHandleService.updateApprovalRecord(processInfoVO); - switch (taskDefinitionKey) { - //各部门主管级领导下发 - case ProcessProjectAssessCommon.GBMZGJLDXF: - gbmzgjldxfSubmit(processInfoVO, processDTO); - break; - //模块负责人分发 - case ProcessProjectAssessCommon.MKFZRFF: - mkfzrffSubmit(processInfoVO, processDTO); - break; - //设计工程师评估 - case ProcessProjectAssessCommon.SJGCSPG: - case ProcessProjectAssessCommon.SJGCSPG2: - sjgcspgSubmit(processInfoVO, processDTO); - break; - //模块负责人修改 - case ProcessProjectAssessCommon.MKFZRXG: - mkfzrxgApprove(processInfoVO, processDTO, true); - break; - //法规工程师归档 - case ProcessProjectAssessCommon.FGGCSGD: - fggcsgdSubmit(processInfoVO, processDTO); - break; - default: - } - } - - private void fggcsgdSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessProjectAssess projectAssess = this.getById(businessId); - String projectId = projectAssess.getProjectId(); - LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.getById(projectId); - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - - // 完成任务 - String taskId = processDTO.getTaskId(); - taskService.complete(taskId); - //同步数据到项目库的评估结果 - List standardIdList = new ArrayList<>(); - List sendMessageDTOList = new ArrayList<>(); - List lawsAssessResultsList = new ArrayList<>(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - for (ProcessProjectAssessTerm assessTerm : processProjectAssessTermList) { - Integer canAssignFlag = assessTerm.getCanAssignFlag(); - if (YesOrNoEnum.NO.getInteger().equals(canAssignFlag)){ - continue; - } - LawsAssessResults lawsAssessResults = new LawsAssessResults(); - lawsAssessResults.setProjectId(projectId); - lawsAssessResults.setProcessStatus(AssessCommon.EVALUATED); - lawsAssessResults.setAssessorId(assessTerm.getAssessorId()); - lawsAssessResults.setAssessorName(assessTerm.getAssessorName()); - lawsAssessResults.setAssessTime(assessTerm.getAssessTime()); - String evaluationFeedback = assessTerm.getEvaluationFeedback(); - lawsAssessResults.setAssessResults(evaluationFeedback); - //lawsAssessResults.setTermId(assessTerm.getSplitInfoId()); - lawsAssessResults.setStandardId(assessTerm.getStandardId()); - lawsAssessResults.setTermNumber(assessTerm.getTermNumber()); - lawsAssessResults.setTermName(assessTerm.getTermName()); - lawsAssessResults.setFileId(assessTerm.getFileId()); - lawsAssessResults.setRiskPoints(assessTerm.getRiskPoints()); - lawsAssessResults.setValidateSolution(assessTerm.getValidateSolution()); - lawsAssessResults.setExpectedTime(assessTerm.getExpectedTime()); - lawsAssessResults.setDescription(assessTerm.getDescription()); - lawsAssessResults.setNonConformance(assessTerm.getNonConformance()); - lawsAssessResults.setCountermeasures(assessTerm.getCountermeasures()); - lawsAssessResults.setReason(assessTerm.getDescription()); - lawsAssessResults.setProcessDefinitionId(processDTO.getProcessDefinitionId()); - lawsAssessResults.setProcessInstanceId(processDTO.getProcessInstanceId()); - lawsAssessResultsList.add(lawsAssessResults); - String standardId = assessTerm.getStandardId(); - LawsDomesticStandard domesticStandard = lawsDomesticStandardService.getById(standardId); - String standardName; - String standardNumber; - if (domesticStandard != null){ - standardName = domesticStandard.getStandardName(); - standardNumber = domesticStandard.getStandardNumber(); - }else { - LawsOverseasStandard overseasStandard = lawsOverseasStandardService.getById(standardId); - standardName = overseasStandard.getStandardName(); - standardNumber = overseasStandard.getStandardNumber(); - } - if (!standardIdList.contains(standardId)) { - standardIdList.add(standardId); - //发送消息 - String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels(); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE); - sendMessageDTO.setToUserId(carbonCopyPersonnels); - Map sendMap = new HashMap<>(); - sendMap.put("standardNumber", standardNumber); - sendMap.put("standardName", standardName); - sendMap.put("projectName", lawsProjectLibrary.getProjectName()); - sendMap.put("openType", "url"); - sendMap.put("openPage", "/projectLibrary/InconformityItemList?standardName=" + standardName + "&standardNumber=" + standardNumber + "&projectName=" + lawsProjectLibrary.getProjectName()); - sendMessageDTO.setMap(sendMap); - sendMessageDTOList.add(sendMessageDTO); - } - } - - lawsAssessResultsService.saveBatch(lawsAssessResultsList); - //更新法规清单的评估结果和流程状态 - Map> stringListMap = CollStreamUtil.groupByKey(lawsAssessResultsList, LawsAssessResults::getStandardId); - for (Map.Entry> next : stringListMap.entrySet()) { - String assessResults = AssessCommon.NOT_INVOLVED; - List assessResultsList = next.getValue(); - for (LawsAssessResults lawsAssessResults : assessResultsList) { - String assessResults1 = lawsAssessResults.getAssessResults(); - if (AssessCommon.NOT_COMPLIANT.equals(assessResults1)) { - assessResults = AssessCommon.NOT_COMPLIANT; - break; - } - if (AssessCommon.TO_BE_VERIFIED.equals(assessResults) - || AssessCommon.TO_BE_VERIFIED.equals(assessResults1)) { - assessResults = AssessCommon.TO_BE_VERIFIED; - continue; - } - if (AssessCommon.ACCORD_WITH.equals(assessResults1)) { - assessResults = AssessCommon.ACCORD_WITH; - } - } - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(LawsAssess::getProjectId, projectId); - wrapper.eq(LawsAssess::getStandardId, next.getKey()); - wrapper.set(LawsAssess::getAssessResults, assessResults); - wrapper.set(LawsAssess::getProcessStatus, AssessCommon.EVALUATED); - lawsAssessService.update(wrapper); - } - - //推送数据到未符合项，过滤出不符合和待验证的数据 - List saveLawsEvaluationNotMetList = processProjectAssessTermList.stream() - .filter(item -> AssessCommon.NOT_COMPLIANT.equals(item.getEvaluationFeedback()) - || AssessCommon.TO_BE_VERIFIED.equals(item.getEvaluationFeedback())) - .collect(Collectors.toList()); - List evaluationNotMetList = new ArrayList<>(); - for (ProcessProjectAssessTerm assessTerm : saveLawsEvaluationNotMetList) { - String standardId = assessTerm.getStandardId(); - LawsDomesticStandard domesticStandard = lawsDomesticStandardService.getById(standardId); - String source; - String standardName; - String standardNumber; - if (domesticStandard != null){ - source = CommonConstant.STANDARD_SOURCE_1; - standardName = domesticStandard.getStandardName(); - standardNumber = domesticStandard.getStandardNumber(); - }else { - LawsOverseasStandard overseasStandard = lawsOverseasStandardService.getById(standardId); - source = CommonConstant.STANDARD_SOURCE_2; - standardName = overseasStandard.getStandardName(); - standardNumber = overseasStandard.getStandardNumber(); - } - LawsEvaluationNotMet lawsEvaluationNotMet = new LawsEvaluationNotMet(); - lawsEvaluationNotMet.setProjectId(projectId); - lawsEvaluationNotMet.setProjectName(lawsProjectLibrary.getProjectName()); - lawsEvaluationNotMet.setStandardId(standardId); - lawsEvaluationNotMet.setSource(source); - lawsEvaluationNotMet.setStandardNumber(standardNumber); - lawsEvaluationNotMet.setStandardName(standardName); - String termNumber = assessTerm.getTermNumber(); - String termName = assessTerm.getTermName(); - if (!standardNumber.equals(termNumber)){ - lawsEvaluationNotMet.setTermNum(termNumber); - lawsEvaluationNotMet.setTermName(termName); - } - lawsEvaluationNotMet.setEngineerId(assessTerm.getAssessorId()); - lawsEvaluationNotMet.setExpectedTime(assessTerm.getExpectedTime()); - lawsEvaluationNotMet.setAssessResults(assessTerm.getEvaluationFeedback()); - lawsEvaluationNotMet.setState(AssessCommon.TO_BE_RECTIFIED); - lawsEvaluationNotMet.setDelFlag(0); - evaluationNotMetList.add(lawsEvaluationNotMet); - } - lawsEvaluationNotMetService.saveBatch(evaluationNotMetList); - //发送消息 - for (SendMessageDTO sendMessageDTO : sendMessageDTOList) { - sendMessageAPI.sendMessage(sendMessageDTO); - } - } - - //各部门主管级领导下发 - private void gbmzgjldxfSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - // 删除原先存储的关联 - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); - removeWrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId); - processProjectAssessTermUserService.remove(removeWrapper); - - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - List moduleOwnerIds = new ArrayList<>(); - Date date = new Date(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - String termId = processProjectAssessTerm.getId(); - Integer canAssignFlag = processProjectAssessTerm.getCanAssignFlag(); - String notInvolved = processProjectAssessTerm.getNotInvolved(); - if (YesOrNoEnum.NO.getInteger().equals(canAssignFlag)) { - continue; - } - if (StringUtils.isNotBlank(notInvolved)) { - ProcessProjectAssessTermUser newTermUser = new ProcessProjectAssessTermUser(); - newTermUser.setAssessmentId(businessId); - newTermUser.setTermId(termId); - newTermUser.setResponsibleUnitLeader(userId); - newTermUser.setParentExecutionId(executionId); - newTermUser.setNotInvolved(notInvolved); - newTermUser.setDescription(notInvolved); - newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED); - newTermUser.setAssessTime(date); - allTermUserList.add(newTermUser); - continue; - } - - String moduleOwners = processProjectAssessTerm.getModuleOwners(); - List moduleOwnerIdList = Arrays.asList(moduleOwners.split(",")); - for (String moduleOwnerId : moduleOwnerIdList) { - ProcessProjectAssessTermUser newTermUser = new ProcessProjectAssessTermUser(); - newTermUser.setAssessmentId(businessId); - newTermUser.setTermId(termId); - newTermUser.setResponsibleUnitLeader(userId); - newTermUser.setParentExecutionId(executionId); - newTermUser.setModuleOwner(moduleOwnerId); - moduleOwnerIds.add(moduleOwnerId); - allTermUserList.add(newTermUser); - } - } - processProjectAssessTermUserService.saveBatch(allTermUserList); - moduleOwnerIds = moduleOwnerIds.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, moduleOwnerIds); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, moduleOwnerIds); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - if (!Objects.equals(userId,originUserId)){ - runtimeService.setVariable(executionId,ProcessProjectAssessCommon.MANAGER_LEADER,userId); - } - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerIds); - variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size()); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - - } - - //模块负责人分发 - private void mkfzrffSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - String formKey = task.getFormKey(); - //拿到一条用于获取责任单位负责人 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); - wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); - wrapper.last("limit 1"); - ProcessProjectAssessTermUser one = processProjectAssessTermUserService.getOne(wrapper); - String responsibleUnitLeader = one.getResponsibleUnitLeader(); - // 删除原先存储的关联 - LambdaQueryWrapper removeWrapper = new LambdaQueryWrapper<>(); - removeWrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); - removeWrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - removeWrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); - - processProjectAssessTermUserService.remove(removeWrapper); - Date date = new Date(); - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - List designEngineerIds = new ArrayList<>(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - String termId = processProjectAssessTerm.getId(); - Integer canAssignFlag = processProjectAssessTerm.getCanAssignFlag(); - String notInvolved = processProjectAssessTerm.getNotInvolved(); - if (YesOrNoEnum.NO.getInteger().equals(canAssignFlag)) { - continue; - } - if (StringUtils.isNotBlank(notInvolved)) { - ProcessProjectAssessTermUser newTermUser = new ProcessProjectAssessTermUser(); - newTermUser.setAssessmentId(businessId); - newTermUser.setTermId(termId); - newTermUser.setResponsibleUnitLeader(responsibleUnitLeader); - newTermUser.setModuleOwner(userId); - newTermUser.setParentExecutionId(executionId); - newTermUser.setNotInvolved(notInvolved); - newTermUser.setDescription(notInvolved); - newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED); - newTermUser.setAssessTime(date); - allTermUserList.add(newTermUser); - continue; - } - - String designEngineers = processProjectAssessTerm.getDesignEngineers(); - List designEngineerIdList = Arrays.asList(designEngineers.split(",")); - for (String designEngineerId : designEngineerIdList) { - ProcessProjectAssessTermUser newTermUser = new ProcessProjectAssessTermUser(); - newTermUser.setAssessmentId(businessId); - newTermUser.setTermId(termId); - newTermUser.setResponsibleUnitLeader(responsibleUnitLeader); - newTermUser.setParentExecutionId(executionId); - newTermUser.setModuleOwner(userId); - newTermUser.setDesignEngineer(designEngineerId); - designEngineerIds.add(designEngineerId); - allTermUserList.add(newTermUser); - } - } - processProjectAssessTermUserService.saveBatch(allTermUserList); - designEngineerIds = designEngineerIds.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, designEngineerIds); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST, designEngineerIds); - variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerIds.size()); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - if (!Objects.equals(userId,originUserId)){ - } - } - - //设计工程师评估 - private void sjgcspgSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String formKey = task.getFormKey(); - String executionId = task.getExecutionId(); - Date date = new Date(); - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - String moduleOwner = null; - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTerm.getTermUserId()); - termUser.setDesignEngineer(userId); - termUser.setEvaluationFeedback(processProjectAssessTerm.getEvaluationFeedback()); - termUser.setDescription(processProjectAssessTerm.getDescription()); - termUser.setFileId(processProjectAssessTerm.getFileId()); - termUser.setNonConformance(processProjectAssessTerm.getNonConformance()); - termUser.setCountermeasures(processProjectAssessTerm.getCountermeasures()); - termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime()); - termUser.setRiskPoints(processProjectAssessTerm.getRiskPoints()); - termUser.setValidateSolution(processProjectAssessTerm.getValidateSolution()); - termUser.setParentExecutionId(executionId); - termUser.setAssessTime(date); - - allTermUserList.add(termUser); - String moduleOwner1 = processProjectAssessTerm.getModuleOwner(); - moduleOwner = moduleOwner1; - } - processProjectAssessTermUserService.updateBatchById(allTermUserList); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - if (StringUtils.isNotBlank(moduleOwner)){ - variables.put(ProcessProjectAssessCommon.MODULE_OWNER, moduleOwner); - } - taskService.complete(taskId,variables); - ThreadLocalUtil.remove(); - - if (!Objects.equals(userId,originUserId)){ - } - } - - - public void saveToDraft(ProcessInfoVO processInfoVO) { - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_ASSESS.getValue()); // 流程类型 - //保存businessId - String processInstanceId = basicProcessInfoDTO.getProcessInstanceId(); - if (StringUtils.isNotBlank(processInstanceId)){ - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - String projectId = processAll.getProjectId(); - processInfoVO.setBusinessId(projectId); - } - - processHandleService.saveToDraft(processInfoVO); - } - - public void createListener(DelegateTask delegateTask) { - String parentExecutionId = (String) ThreadLocalUtil.get(ProcessProjectAssessCommon.EXECUTION_ID); - //delegateTask.setVariableLocal(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId); - delegateTask.setFormKey(parentExecutionId); - if ("123".equals(delegateTask.getAssignee())) { - if (!delegateTask.getName().contains("自动")) { - runtimeService.setVariable(delegateTask.getExecutionId(),ProcessProjectAssessCommon.SKIP,true); - Map variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.SKIP, true); - variables.put(ProcessProjectAssessCommon.PASS, true); - taskService.complete(delegateTask.getId(), variables); - } - }else { - runtimeService.setVariable(delegateTask.getExecutionId(),ProcessProjectAssessCommon.SKIP,false); - } - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java deleted file mode 100644 index b5047614..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.service; - -import cn.hutool.core.collection.CollStreamUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.constant.enums.YesOrNoEnum; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessTermMapper; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -/** - * - *@author liJiaRao - *@date 2023-12-05 15:57 - */ -@Service -public class ProcessProjectAssessTermService extends ServiceImpl { - public void add(ProcessProjectAssessTerm processProjectAssessTerm) { - this.save(processProjectAssessTerm); - } - - public void editById(ProcessProjectAssessTerm processProjectAssessTerm) { - this.updateById(processProjectAssessTerm); - } - - public void deleteById(String id) { - this.removeById(id); - } - - public void deleteByIds(List idList) { - for (String id : idList) { - deleteById(id); - } - } - - public ProcessProjectAssessTerm queryById(String id) { - ProcessProjectAssessTerm processProjectAssessTerm = this.getById(id); - return processProjectAssessTerm; - } - - /** - * 获取部门主管领导的条款 - * @param assessmentId - * @param originUserId - * @return - */ - public List getByResponsibleUnitLeader(String assessmentId, String originUserId) { - List list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId,false); - return list; - } - public List getByResponsibleUnitLeaderHasModuleOwner(String assessmentId, String originUserId) { - List list = baseMapper.getByResponsibleUnitLeader(assessmentId,originUserId,true); - return list; - } - - /** - * 获取分类用的标准编号，标准名称列表 - */ - public Map getSplitInfoIdMap(String assessmentId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); - wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.NO.getInteger()); - List list = this.list(wrapper); - Map stringProcessProjectAssessTermMap = CollStreamUtil.toIdentityMap(list, ProcessProjectAssessTerm::getSplitInfoId); - return stringProcessProjectAssessTermMap; - } - - public List getByModuleOwner(String assessmentId, String originUserId, String executionParentId) { - List list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId,false); - return list; - } - - public List getByModuleOwnerHasEngineer(String assessmentId, String originUserId, String executionParentId) { - List list = baseMapper.getByModuleOwner(assessmentId,originUserId,executionParentId,true); - return list; - } - - public List getByDesignEngineer(String assessmentId, String originUserId, String executionParentId) { - List list = baseMapper.getByDesignEngineer(assessmentId,originUserId,executionParentId); - return list; - } - - public List getByStandardsEngineer(String assessmentId) { - List list = baseMapper.getByStandardsEngineer(assessmentId); - //LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); - //wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); - //List list = this.list(wrapper); - return list; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermUserService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermUserService.java deleted file mode 100644 index 33100e59..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermUserService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.service; - -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser; -import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessTermUserMapper; -/** - * - *@author liJiaRao - *@date 2023-12-05 15:57 - */ -@Service -public class ProcessProjectAssessTermUserService extends ServiceImpl { - public void add(ProcessProjectAssessTermUser processProjectAssessTermUser) { - this.save(processProjectAssessTermUser); - } - - public void editById(ProcessProjectAssessTermUser processProjectAssessTermUser) { - this.updateById(processProjectAssessTermUser); - } - - public void deleteById(String id) { - this.removeById(id); - } - - public void deleteByIds(List idList) { - for (String id : idList) { - deleteById(id); - } - } - - public ProcessProjectAssessTermUser queryById(String id) { - ProcessProjectAssessTermUser processProjectAssessTermUser = this.getById(id); - return processProjectAssessTermUser; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/vo/ProcessProjectAssessVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/vo/ProcessProjectAssessVO.java deleted file mode 100644 index c0fc4789..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/vo/ProcessProjectAssessVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.jero.modules.activiti.process.projectassess.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - *项目合规评估流程表VO - *@author liJiaRao - *@date 2023-12-05 16:29 - */ -@ApiModel(description = "项目合规评估流程表VO") -@Data -public class ProcessProjectAssessVO { - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessProjectAssess processProjectAssess; - - /**关联标准列表*/ - @ApiModelProperty(value = "关联标准列表") - private List processProjectAssessLinkList; - - /**关联条款列表*/ - @ApiModelProperty(value = "关联条款列表") - private List processProjectAssessTermList; - - /**征求意见列表*/ - @ApiModelProperty(value = "关联标准分派列表") - private List processProjectAssessTermUserList; - - @ApiModelProperty(value = "抄送人员") - private String carbonCopyPersonnels; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java deleted file mode 100644 index b2e19eb2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.common; - -/** - * @author liJiaRao - * @date 2023-12-23 20:11 - */ -public class ProcessProjectNotMetCommon { - public static final String STANDARDS_ENGINEER = "standardsEngineer"; - public static final String MANAGER_LEADER = "managerLeader"; - public static final String DESIGN_ENGINEER = "designEngineer"; - public static final String PASS = "pass"; - /** - *法规工程师发起整改 - */ - public static final String FGGCSFQZG = "fggcsfqzg"; - /** - *设计工程师上传整改材料 - */ - public static final String SJGCSSCZGCL = "sjgcssczgcl"; - /** - *主管级领导审批 - */ - public static final String ZGJLDSP = "zgjldsp"; - /** - *法规工程师审批 - */ - public static final String FGGCSSP = "fggcssp"; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/controller/ProcessProjectNotMetController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/controller/ProcessProjectNotMetController.java deleted file mode 100644 index 26c361f7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/controller/ProcessProjectNotMetController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet; -import com.jero.modules.activiti.process.projectnotmet.service.ProcessProjectNotMetService; -import com.jero.modules.activiti.process.projectnotmet.vo.ProcessProjectNotMetVO; -import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; -import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; - -/** - * 未符合项跟踪流程(process_project_not_met)表控制层 - * - * @author xxxxx - */ -@Slf4j -@Api(tags = "未符合项跟踪流程") -@RestController -@RequestMapping("/process/projectNotMet") -public class ProcessProjectNotMetController extends JeroController { - /** - * 服务对象 - */ - @Autowired - private ProcessProjectNotMetService processProjectNotMetService; - @Autowired - private ILawsEvaluationNotMetService lawsEvaluationNotMetService; - /** - * 分页列表查询 - */ - @AutoLog(value = "未符合项跟踪流程-查询未符合项") - @ApiOperation(value="未符合项跟踪流程-查询未符合项") - @GetMapping(value = "/pageForProcess") - public Result> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsEvaluationNotMetService.pageForProcess(lawsEvaluationNotMet, pageNo, pageSize, req); - return Result.OK(pageList); - } - - @DictPoint - @GetMapping("/queryProcessInfoVO") - @AutoLog(value = "未符合项跟踪流程-查询流程信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "draftId", value = "草稿id"), - @ApiImplicitParam(name = "taskId", value = "任务id"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id") - }) - @ApiOperation("未符合项跟踪流程-查询流程信息") - public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - ProcessInfoVO processInfoVO = processProjectNotMetService.queryProcessInfoVO(draftId, processInstanceId, taskId); - return Result.OK(processInfoVO); - } - - @AutoLog(value = "未符合项跟踪流程-发起流程") - @ApiOperation(value = "未符合项跟踪流程-发起流程") - @PostMapping(value = "/startProcess") - public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectNotMetService.startProcess(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "未符合项跟踪流程-同意") - @ApiOperation(value = "未符合项跟踪流程-同意") - @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectNotMetService.approveTask(processInfoVO, true); - return Result.OK(); - } - - @AutoLog(value = "未符合项跟踪流程-驳回") - @ApiOperation(value = "未符合项跟踪流程-驳回") - @PostMapping("/reject") - public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectNotMetService.approveTask(processInfoVO, false); - return Result.OK(); - } - - @AutoLog(value = "未符合项跟踪流程-提交") - @ApiOperation(value = "未符合项跟踪流程-提交") - @PostMapping("/submit") - public Result submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectNotMetService.submit(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "未符合项跟踪流程-保存为草稿") - @ApiOperation(value = "未符合项跟踪流程-保存为草稿") - @PostMapping(value = "/saveToDraft") - public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectNotMetService.saveToDraft(processInfoVO); - return Result.OK(); - } - - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java deleted file mode 100644 index e17e99a8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ - -/** - * 未符合项跟踪流程 - */ -@ApiModel(description = "未符合项跟踪流程") -@Data -@TableName(value = "process_project_not_met") -public class ProcessProjectNotMet { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** - * 主管级领导id - */ - @TableField(value = "manager_leader_id") - @ApiModelProperty(value = "主管级领导id") - private String managerLeaderId; - - /** - * 法规工程师id - */ - @TableField(value = "standards_engineer_id") - @ApiModelProperty(value = "法规工程师id") - private String standardsEngineerId; - - /** - * 创建人ID - */ - @TableField(value = "create_by") - @ApiModelProperty(value = "创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 修改人ID - */ - @TableField(value = "update_by") - @ApiModelProperty(value = "修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @TableField(value = "update_time") - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - /** - * 部门code - */ - @TableField(value = "org_code") - @ApiModelProperty(value = "部门code") - private String orgCode; - - /** - * 删除标识 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value = "删除标识") - private Integer delFlag; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java deleted file mode 100644 index 05152ef5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ - -/** - * 未符合项跟踪流程关联标准 - */ -@ApiModel(description = "未符合项跟踪流程关联标准") -@Data -@TableName(value = "process_project_not_met_link") -public class ProcessProjectNotMetLink { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** - * 流程主表id - */ - @ApiModelProperty(value = "未符合项id") - private String projectNotMetId; - - /** - * 流程主表id - */ - @TableField(value = "process_id") - @ApiModelProperty(value = "流程主表id") - private String processId; - - /** - * 标准id - */ - @TableField(value = "standard_id") - @ApiModelProperty(value = "标准id") - private String standardId; - - /** - * 来源 - */ - @TableField(value = "`source`") - @ApiModelProperty(value = "来源") - private String source; - - /** - * 标准编号 - */ - @TableField(value = "standard_number") - @ApiModelProperty(value = "标准编号") - private String standardNumber; - - /** - * 标准名称 - */ - @TableField(value = "standard_name") - @ApiModelProperty(value = "标准名称") - private String standardName; - - /** - * 项目ID - */ - @TableField(value = "project_id") - @ApiModelProperty(value = "项目ID") - private String projectId; - - /** - * 项目名称 - */ - @TableField(value = "project_name") - @ApiModelProperty(value = "项目名称") - private String projectName; - - /** - * 条款ID - */ - @TableField(value = "term_id") - @ApiModelProperty(value = "条款ID") - private String termId; - - /** - * 条款号 - */ - @TableField(value = "term_num") - @ApiModelProperty(value = "条款号") - private String termNum; - - /** - * 条款名称 - */ - @TableField(value = "term_name") - @ApiModelProperty(value = "条款名称") - private String termName; - - /**责任部门ID*/ - @Excel(name = "责任部门ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - @ApiModelProperty(value = "责任部门ID") - private String departmentId; - - /** - * 设计工程师ID - */ - @TableField(value = "engineer_id") - @ApiModelProperty(value = "设计工程师ID") - private String engineerId; - - /** - * 设计工程师名字 - */ - @TableField(value = "engineer_name") - @ApiModelProperty(value = "设计工程师名字") - private String engineerName; - - /** - * 依据描述 - */ - @ApiModelProperty(value = "依据描述") - private String description; - - /** - * 佐证材料 - */ - @ApiModelProperty(value = "佐证材料") - private String fileId; - - - /** - * 预计整改完成日期 - */ - @TableField(value = "expected_time") - @ApiModelProperty(value = "预计整改完成日期") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date expectedTime; - - /** - * 实际整改完成日期 - */ - @ApiModelProperty(value = "实际整改完成日期") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - private Date realityTime; - - /** - * 整改状态(1-待整改、2-整改中、3-审批中、4-已完成) - */ - @TableField(value = "`state`") - @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)") - private String state; - - - /**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/ - @Dict(dicCode = "assess_results") - @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)") - private String assessResults; - - /** - * 创建人ID - */ - @TableField(value = "create_by") - @ApiModelProperty(value = "创建人ID") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 修改人ID - */ - @TableField(value = "update_by") - @ApiModelProperty(value = "修改人ID") - private String updateBy; - - /** - * 修改时间 - */ - @TableField(value = "update_time") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - /** - * 部门code - */ - @TableField(value = "org_code") - @ApiModelProperty(value = "部门code") - private String orgCode; - - /** - * 删除标识 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value = "删除标识") - private Integer delFlag; - - @TableField(exist = false) - private String departmentId_dictText; - @TableField(exist = false) - private String engineerId_dictText; - @TableField(exist = false) - private String state_dictText; - @TableField(exist = false) - private String assessResults_dictText; - - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/job/NotMetWarningJob.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/job/NotMetWarningJob.java deleted file mode 100644 index ab034d7e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/job/NotMetWarningJob.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.job; - -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet; -import com.jero.modules.activiti.process.projectnotmet.service.ProcessProjectNotMetService; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.projectLibrary.common.AssessCommon; -import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; -import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author liJiaRao - * @date 2024-02-01 18:40 - */ -public class NotMetWarningJob implements Job { - @Resource - private SendMessageAPI sendMessageAPI; - @Resource - private ILawsEvaluationNotMetService lawsEvaluationNotMetService; - @Resource - private ProcessAllService processAllService; - @Resource - private ProcessProjectNotMetService processProjectNotMetService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Override - public void execute(JobExecutionContext context) throws JobExecutionException { - DateTime date = DateUtil.parseDateTime(DateUtil.formatDateTime(new Date())); - date = date - .setField(DateField.HOUR_OF_DAY,0) - .setField(DateField.MINUTE,0) - .setField(DateField.SECOND,0); - //预计整改完成日期前一天 - DateTime theDayBefore = DateUtil.offsetDay(date, -1); - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(LawsEvaluationNotMet::getExpectedTime,theDayBefore); - wrapper.eq(LawsEvaluationNotMet::getState,AssessCommon.RECTIFICATION); - List notMetList = lawsEvaluationNotMetService.list(wrapper); - for (LawsEvaluationNotMet notMet : notMetList) { - String processInstanceId = notMet.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - if (processAll == null){ - continue; - } - String projectId = processAll.getProjectId(); - ProcessProjectNotMet processProjectNotMet = processProjectNotMetService.getById(projectId); - List userIdList = new ArrayList<>(); - userIdList.add(processProjectNotMet.getManagerLeaderId()); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); - wrapper1.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()); - ProcessApprovalRecord approvalRecord = processApprovalRecordService.getOne(wrapper1); - userIdList.add(approvalRecord.getUserId()); - //发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.NOT_MET_WARNING); - String userIds = userIdList.stream().distinct().collect(Collectors.joining(",")); - sendMessageDTO.setToUserId(userIds); - Map sendMap = new HashMap<>(); - sendMap.put("prcName", processAll.getPrcName()); - sendMap.put("prcNum", processAll.getPrcNum()); - sendMap.put("openType", "url"); - sendMap.put("openPage", "/workCenter/processCenter/processCenter?prcNum=" + processAll.getPrcNum()); - sendMessageDTO.setMap(sendMap); - sendMessageAPI.sendMessage(sendMessageDTO); - } - - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetLinkMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetLinkMapper.java deleted file mode 100644 index 1f822c5a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetLinkMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ -public interface ProcessProjectNotMetLinkMapper extends BaseMapper { - List getByDesignEngineer(@Param("originUserId") String originUserId, @Param("processId") String processId); - - List getByLeader(@Param("processId") String processId); -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetMapper.java deleted file mode 100644 index 4ce43c54..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/ProcessProjectNotMetMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ -public interface ProcessProjectNotMetMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml deleted file mode 100644 index 9a366f67..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetLinkMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${alias}.id, ${alias}.process_id, ${alias}.standard_id, ${alias}.`source`, ${alias}.standard_number, ${alias}.standard_name, ${alias}.project_id, - ${alias}.project_name, ${alias}.term_id, ${alias}.term_num, ${alias}.term_name, ${alias}.engineer_id, ${alias}.engineer_name, ${alias}.expected_time, - ${alias}.`state`, ${alias}.create_by, ${alias}.create_time, ${alias}.update_by, ${alias}.update_time, ${alias}.org_code, - ${alias}.del_flag - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetMapper.xml deleted file mode 100644 index 3b2ab079..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/mapper/xml/ProcessProjectNotMetMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, manager_leader_id, standards_engineer_id, create_by, create_time, update_by, - update_time, org_code, del_flag - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetLinkService.java deleted file mode 100644 index 15987ee6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetLinkService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink; -import com.jero.modules.activiti.process.projectnotmet.mapper.ProcessProjectNotMetLinkMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ -@Service -public class ProcessProjectNotMetLinkService extends ServiceImpl { - @Resource - private ProcessProjectNotMetLinkMapper processProjectNotMetLinkMapper; - - public List getByDesignEngineer(String originUserId, String processId) { - return processProjectNotMetLinkMapper.getByDesignEngineer(originUserId,processId); - } - - public List getByLeader(String processId) { - return processProjectNotMetLinkMapper.getByLeader(processId); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java deleted file mode 100644 index 1862270e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ /dev/null @@ -1,360 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.service; - -import cn.hutool.core.collection.CollStreamUtil; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.system.vo.SysDepartModel; -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.common.DraftCommon; -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.dto.BasicTaskInfoDTO; -import com.jero.modules.activiti.process.fb.dto.ProcessDTO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon; -import com.jero.modules.activiti.process.projectnotmet.common.ProcessProjectNotMetCommon; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink; -import com.jero.modules.activiti.process.projectnotmet.mapper.ProcessProjectNotMetMapper; -import com.jero.modules.activiti.process.projectnotmet.vo.ProcessProjectNotMetVO; -import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; -import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.Execution; -import org.activiti.engine.task.Task; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; - -import static com.jero.modules.projectLibrary.common.AssessCommon.*; - -/** - * @author liJiaRao - * @date 2023-12-23 19:58 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class ProcessProjectNotMetService extends ServiceImpl { - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource - private IProcessHandleService processHandleService; - @Resource - private ProcessAllService processAllService; - @Resource - private ProcessApprovalRecordService processApprovalRecordService; - @Resource - private TaskService taskService; - @Resource - private ProcessProjectNotMetLinkService processProjectNotMetLinkService; - @Resource - private ILawsEvaluationNotMetService lawsEvaluationNotMetService; - @Resource - private RuntimeService runtimeService; - - public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) { - ProcessInfoVO draft = processHandleService.getDraftByDraftId(draftId); - return draft; - } - ProcessInfoVO draft = processHandleService.getDraftByTaskId(taskId); - if (draft != null){ - return draft; - } - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId); - String businessId = processInfoVO.getBusinessId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - Task task = processDTO.getTask(); - - String taskDefinitionKey = task.getTaskDefinitionKey(); - List processProjectNotMetLinks = new ArrayList<>(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId); - switch (taskDefinitionKey) { - case ProcessProjectNotMetCommon.SJGCSSCZGCL: - case ProcessProjectNotMetCommon.ZGJLDSP: - case ProcessProjectNotMetCommon.FGGCSSP: - processProjectNotMetLinks = processProjectNotMetLinkService.list(wrapper); - break; - default: - } - //获取所有用户信息 - List userList = sysBaseAPI.getAllUser(); - Map userNameMap = new HashMap<>(); - for (LoginUser loginUser : userList) { - userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo()); - } - List stateDictModels = sysBaseAPI.queryDictItemsByCode("state"); - Map stateDictMap = CollStreamUtil.toMap(stateDictModels, DictModel::getValue, DictModel::getText); - - List assessResultsDictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); - Map assessResultsDictMap = CollStreamUtil.toMap(assessResultsDictModels, DictModel::getValue, DictModel::getText); - - List allSysDepart = sysBaseAPI.getAllSysDepart(); - Map departNameMap = CollStreamUtil.toMap(allSysDepart, SysDepartModel::getId, SysDepartModel::getDepartName); - - - for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) { - String engineerId = processProjectNotMetLink.getEngineerId(); - processProjectNotMetLink.setEngineerId_dictText(userNameMap.get(engineerId)); - String state = processProjectNotMetLink.getState(); - processProjectNotMetLink.setState_dictText(stateDictMap.get(state)); - String assessResults = processProjectNotMetLink.getAssessResults(); - processProjectNotMetLink.setAssessResults_dictText(assessResultsDictMap.get(assessResults)); - String departmentId = processProjectNotMetLink.getDepartmentId(); - processProjectNotMetLink.setDepartmentId_dictText(departNameMap.get(departmentId)); - } - - ProcessProjectNotMet processProjectNotMet = this.getById(businessId); - ProcessProjectNotMetVO processProjectNotMetVO = new ProcessProjectNotMetVO(); - processProjectNotMetVO.setProcessProjectNotMet(processProjectNotMet); - processProjectNotMetVO.setProcessProjectNotMetLinks(processProjectNotMetLinks); - - processInfoVO.setBusinessInfoDTO(processProjectNotMetVO); - return processInfoVO; - } - - public void startProcess(ProcessInfoVO processInfoVO) { - //保存标准分发的设计工程师 - Map userInfoMap = processInfoVO.getUserInfoMap(); - ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet(); - if (processProjectNotMet == null){ - processProjectNotMet = new ProcessProjectNotMet(); - } - String managerLeader = (String) userInfoMap.get(ProcessProjectNotMetCommon.MANAGER_LEADER); - processProjectNotMet.setManagerLeaderId(managerLeader); - this.save(processProjectNotMet); - String processProjectNotMetId = processProjectNotMet.getId(); - processInfoVO.setBusinessId(processProjectNotMetId); - //保存关联未符合项表 - List processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); - //获取关联的未符合项id - List projectNotMetIdList = CollStreamUtil.toList(processProjectNotMetLinks, ProcessProjectNotMetLink::getId); - processProjectNotMetLinks.forEach(item -> { - item.setProjectNotMetId(item.getId()); - item.setProcessId(processProjectNotMetId); - item.setId(null); - } - ); - processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks); - ProcessProjectNotMetLink processProjectNotMetLink = processProjectNotMetLinks.get(0); - String standardNumber = processProjectNotMetLink.getStandardNumber(); - String standardName = processProjectNotMetLink.getStandardName(); - - - //启动流程 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - //改为手动流程名称 - //basicProcessInfoDTO.setProcessName(standardNumber+"-"+standardName+"未符合项跟踪"); - basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型 - userInfoMap.put(ProcessProjectNotMetCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId()); - userInfoMap.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, processProjectNotMetLink.getEngineerId()); - //processInfoVO.setUserInfoMap(userInfoMap); - processHandleService.startProcess(processInfoVO); - //更新未符合项列表状态 - String processInstanceId = basicProcessInfoDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.set(LawsEvaluationNotMet::getState, RECTIFICATION); - wrapper.set(LawsEvaluationNotMet::getPrcNum, processAll.getPrcNum()); - wrapper.set(LawsEvaluationNotMet::getProcessInstanceId, processAll.getProcessInstanceId()); - wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList); - lawsEvaluationNotMetService.update(wrapper); - //start 先保存一份初始草稿 - processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); - processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null)); - saveToDraft(processInfoVO); - //end 保存初始草稿结束 - } - - public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = basicTaskInfoDTO.getTaskId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - String processInstanceId = processDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - processInfoVO.setBusinessId(processAll.getProjectId()); - Task task = processDTO.getTask(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - processHandleService.updateApprovalRecord(processInfoVO); - switch (taskDefinitionKey) { - //主管级领导审批 - case ProcessProjectNotMetCommon.ZGJLDSP: - zgjldspApprove(processInfoVO, processDTO, pass); - break; - //法规工程师审批 - case ProcessProjectNotMetCommon.FGGCSSP: - fggcsspApprove(processInfoVO, processDTO, pass, processAll); - break; - default: - } - - - } - - private void zgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - String businessId = processInfoVO.getBusinessId(); - // 完成任务 - Map variables = new HashMap<>(); - if (!pass){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId); - wrapper.last("limit 1"); - ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper); - String engineerId = projectNotMetLink.getEngineerId(); - variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId); - } - variables.put(ProcessProjectNotMetCommon.PASS, pass); - variables.put(ProcessProjectNotMetCommon.MANAGER_LEADER, userId); - taskService.complete(processDTO.getTaskId(), variables); - if (!pass){ - ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); - List projectNotMetIdList = CollStreamUtil.toList(processProjectNotMetLinks, ProcessProjectNotMetLink::getProjectNotMetId); - //更新未符合项列表状态 - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.set(LawsEvaluationNotMet::getState, RECTIFICATION); - wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList); - lawsEvaluationNotMetService.update(wrapper); - } - if (!Objects.equals(userId,originUserId)){ - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessProjectNotMet::getId,businessId); - updateWrapper.set(ProcessProjectNotMet::getManagerLeaderId,userId); - update(updateWrapper); - } - } - - private void fggcsspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass, ProcessAll processAll) { - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Execution execution = processDTO.getExecution(); - String executionId = execution.getId(); - - //更新未符合项列表状态 - ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); - List projectNotMetIdList = CollStreamUtil.toList(processProjectNotMetLinks, ProcessProjectNotMetLink::getProjectNotMetId); - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.set(LawsEvaluationNotMet::getState, pass ? DONE : RECTIFICATION); - wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList); - lawsEvaluationNotMetService.update(wrapper); - //如果通过，更新未符合项列表的流程编号 - if (pass){ - for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) { - LambdaUpdateWrapper wrapper1 = new LambdaUpdateWrapper<>(); - wrapper1.set(LawsEvaluationNotMet::getPrcNum, processAll.getPrcNum()); - wrapper1.set(LawsEvaluationNotMet::getProcessInstanceId, processAll.getProcessInstanceId()); - wrapper1.set(LawsEvaluationNotMet::getFileId, processProjectNotMetLink.getFileId()); - wrapper1.set(LawsEvaluationNotMet::getDescription, processProjectNotMetLink.getDescription()); - wrapper1.in(LawsEvaluationNotMet::getId,processProjectNotMetLink.getProjectNotMetId()); - lawsEvaluationNotMetService.update(wrapper1); - } - } - if (!Objects.equals(userId,originUserId)){ - runtimeService.setVariable(executionId,ProcessProjectNotMetCommon.STANDARDS_ENGINEER,userId); - } - // 完成任务 - Map variables = new HashMap<>(); - if (!pass){ - String businessId = processInfoVO.getBusinessId(); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectNotMetLink::getProcessId,businessId); - wrapper1.last("limit 1"); - ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper1); - String engineerId = projectNotMetLink.getEngineerId(); - variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId); - } - variables.put(ProcessProjectNotMetCommon.PASS, pass); - taskService.complete(processDTO.getTaskId(), variables); - } - - public void submit(ProcessInfoVO processInfoVO) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = basicTaskInfoDTO.getTaskId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - String processInstanceId = processDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - String projectId = processAll.getProjectId(); - processInfoVO.setBusinessId(projectId); - Task task = processDTO.getTask(); - processHandleService.updateApprovalRecord(processInfoVO); - - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - //先查询分配的条款，更新 - ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); - - Date now = new Date(); - for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) { - processProjectNotMetLink.setFileId(processProjectNotMetLink.getFileId()); - processProjectNotMetLink.setDescription(processProjectNotMetLink.getDescription()); - processProjectNotMetLink.setEngineerId(userId); - processProjectNotMetLink.setRealityTime(now); - } - processProjectNotMetLinkService.updateBatchById(processProjectNotMetLinks); - taskService.complete(taskId); - List projectNotMetIdList = CollStreamUtil.toList(processProjectNotMetLinks, ProcessProjectNotMetLink::getProjectNotMetId); - //更新未符合项列表状态 - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.set(LawsEvaluationNotMet::getState, UNDER_APPROVAL); - wrapper.set(LawsEvaluationNotMet::getRealityTime, DateUtil.date()); - wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList); - lawsEvaluationNotMetService.update(wrapper); - if (!Objects.equals(userId,originUserId)){ - } - } - - public void saveToDraft(ProcessInfoVO processInfoVO) { - ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - if (businessInfoDTO != null) { - ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet(); - if (processProjectNotMet != null) { - processInfoVO.setBusinessId(processProjectNotMet.getId()); - } - } - - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - if (basicProcessInfoDTO == null){ - basicProcessInfoDTO = new BasicProcessInfoDTO(); - } - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型 - processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); - //保存businessId - String processInstanceId = basicProcessInfoDTO.getProcessInstanceId(); - if (StringUtils.isNotBlank(processInstanceId)){ - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - String projectId = processAll.getProjectId(); - processInfoVO.setBusinessId(projectId); - } - - processHandleService.saveToDraft(processInfoVO); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/vo/ProcessProjectNotMetVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/vo/ProcessProjectNotMetVO.java deleted file mode 100644 index 18916ea4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/vo/ProcessProjectNotMetVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jero.modules.activiti.process.projectnotmet.vo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet; -import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * 未符合项跟踪流程 - * - * @author liJiaRao - * @date 2023-12-23 19:58 - */ -@ApiModel(description = "未符合项跟踪流程VO") -@Data -public class ProcessProjectNotMetVO { - /** - * 业务基本信息 - */ - @ApiModelProperty(value = "业务基本信息") - private ProcessProjectNotMet processProjectNotMet; - - /** - * 关联标准列表 - */ - @ApiModelProperty(value = "关联标准列表") - private List processProjectNotMetLinks; - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java deleted file mode 100644 index adb838fa..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.common; - -/** - * @author liJiaRao - * @date 2024-01-15 17:25 - */ -public class ProcessProjectStandardCommon { - public static final String PASS = "pass"; - - public static final String STANDARDS_ENGINEER = "standardsEngineer"; - public static final String MANAGER_LEADER = "managerLeader"; - public static final String MANAGER_LEADER_LIST = "managerLeaderList"; - public static final String MANAGER_LEADER_LIST_SIZE = "managerLeaderListSize"; - public static final String MODULE_OWNER_LIST = "moduleOwnerList"; - public static final String MODULE_OWNER = "moduleOwner"; - public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize"; - public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; - public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize"; - - public static final String NOT_INVOLVED_MODULE_OWNER_LIST = "notInvolvedModuleOwnerList"; - public static final String NOT_INVOLVED_MODULE_OWNER_LIST_SIZE = "notInvolvedModuleOwnerListSize"; - - public static final String NOT_INVOLVED_MANAGER_LEADER_LIST = "notInvolvedManagerLeaderList"; - public static final String NOT_INVOLVED_MANAGER_LEADER_LIST_SIZE = "notInvolvedManagerLeaderListSize"; - - - //法规工程师发起 - public static final String FGGCSFQ = "fggcsfq"; - //部所主管级领导下发 - public static final String BSZGJLDXF_ = "bszgjldxf_"; - public static final String BSZGJLDXF_1 = "bszgjldxf_1"; - public static final String BSZGJLDXF_2 = "bszgjldxf_2"; - //模块责任人分发 - public static final String MKZRRFF_ = "mkzrrff_"; - public static final String MKZRRFF_1 = "mkzrrff_1"; - public static final String MKZRRFF_2 = "mkzrrff_2"; - public static final String MKZRRFF_3 = "mkzrrff_3"; - public static final String MKZRRFF_4 = "mkzrrff_4"; - public static final String MKZRRFF_5 = "mkzrrff_5"; - public static final String MKZRRFF_6 = "mkzrrff_6"; - public static final String MKZRRFF_7 = "mkzrrff_7"; - public static final String MKZRRFF_8 = "mkzrrff_8"; - //设计工程师评估 - public static final String SJGCSPG_ = "sjgcspg_"; - public static final String SJGCSPG_1 = "sjgcspg_1"; - //模块责任人审批 - public static final String MKZRRSP_ = "mkzrrsp_"; - public static final String MKZRRSP_1 = "mkzrrsp_1"; - //部所主管级领导审批 - public static final String BSZGJLDSP_ = "bszgjldsp_"; - public static final String BSZGJLDSP_1 = "bszgjldsp_1"; - public static final String BSZGJLDSP_2 = "bszgjldsp_2"; - public static final String BSZGJLDSP_3 = "bszgjldsp_3"; - //法规工程师审批 - public static final String FGGCSSP = "fggcssp"; - //设计工程师补充工作令编号 - public static final String SJGCSBCGZLBH = "sjgcsbcgzlbh"; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java deleted file mode 100644 index 350ff512..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/controller/ProcessProjectStandardController.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.controller; - -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; -import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; - -import javax.servlet.http.HttpServletRequest; - -import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermApprovalService; -import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardTermUserService; -import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO; -import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.documenttool.service.IDocumentSplitService; -import com.jero.modules.projectLibrary.entity.LawsAssess; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.web.bind.annotation.*; -import com.jero.common.api.vo.Result; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 法规合规评估流程表(process_project_standard)表控制层 - * - * @author xxxxx - */ -@Slf4j -@Api(tags = "法规合规评估流程表") -@RestController -@RequestMapping("process/projectStandard") -public class ProcessProjectStandardController extends JeroController { - /** - * 服务对象 - */ - @Resource - private ProcessProjectStandardService processProjectStandardService; - @Resource - private IDocumentSplitService documentSplitService; - @Resource - private ProcessProjectStandardTermUserService termUserService; - - - @DictPoint - @GetMapping("/queryProcessInfoVO") - @AutoLog(value = "法规合规评估流程-查询流程信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "draftId", value = "草稿id"), - @ApiImplicitParam(name = "taskId", value = "任务id"), - @ApiImplicitParam(name = "processInstanceId", value = "流程实例id") - }) - @ApiOperation("法规合规评估流程-查询流程信息") - public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - ProcessInfoVO processInfoVO = processProjectStandardService.queryProcessInfoVO(draftId, processInstanceId, taskId); - return Result.OK(processInfoVO); - } - - @AutoLog(value = "法规合规评估流程-发起流程") - @ApiOperation(value = "法规合规评估流程-发起流程") - @PostMapping(value = "/startProcess") - public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectStandardService.startProcess(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "法规合规评估流程-同意") - @ApiOperation(value = "法规合规评估流程-同意") - @PostMapping("/agree") - public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectStandardService.approveTask(processInfoVO, true); - return Result.OK(); - } - - @AutoLog(value = "法规合规评估流程-驳回") - @ApiOperation(value = "法规合规评估流程-驳回") - @PostMapping("/reject") - public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectStandardService.approveTask(processInfoVO, false); - return Result.OK(); - } - - @AutoLog(value = "法规合规评估流程-提交") - @ApiOperation(value = "法规合规评估流程-提交") - @PostMapping("/submit") - public Result submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectStandardService.submit(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "法规合规评估流程-保存为草稿") - @ApiOperation(value = "法规合规评估流程-保存为草稿") - @PostMapping(value = "/saveToDraft") - public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { - processProjectStandardService.saveToDraft(processInfoVO); - return Result.OK(); - } - - @AutoLog(value = "法规合规评估流程-查询标准列表") - @ApiOperation(value="查询标准列表") - @GetMapping(value = "/quaryStandard") - public Result> quaryStandard(ManyStandardSelectionBoxVO selectionBoxVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(processProjectStandardService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); - } - - /** - * 法规合规评估流程-查询条款列表 - * @return - */ - @AutoLog(value = "法规合规评估流程-查询条款列表") - @ApiOperation(value = "查询条款列表") - @PostMapping("/processProjectStandardGetList") - public Result> processProjectStandardGetList(@RequestBody ProcessProjectStandard processProjectStandard) { - String sarFileSplitInfoId = processProjectStandard.getSarFileSplitInfoId(); - List allList = new ArrayList<>(); - if (StringUtils.isNotBlank(sarFileSplitInfoId)) { - List termList = documentSplitService.processProjectStandardGetList(sarFileSplitInfoId); - termList.forEach(item -> item.setStandardId(processProjectStandard.getStandardId())); - allList.addAll(termList); - }else { - throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); - } - return Result.OK(allList); - } - - /** - * 法规合规评估流程-查询立项结果列表 - * @return - */ - @DictPoint - @AutoLog(value = "法规合规评估流程-查询立项结果列表") - @ApiOperation(value = "查询立项结果列表") - @GetMapping("/getTermApprovalList") - public Result> getTermApprovalList(@RequestParam(name="id") String id) { - List page = processProjectStandardService.getTermApprovalList(id); - return Result.OK(page); - } - - /** - * 法规合规评估流程-查询立项结果列表 - * @return - */ - @AutoLog(value = "法规合规评估流程-查询评估列表") - @ApiOperation(value = "查询评估列表") - @GetMapping("/getTermUserList") - public Result> getTermUserList(ProcessProjectStandardTermUser termUser, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage page = processProjectStandardService.getTermUserList(termUser,pageNo,pageSize); - return Result.OK(page); - } - - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java deleted file mode 100644 index 4a8ea85c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandard.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; - -import lombok.Data; - -/** - * - *@author liJiaRao - *@date 2024-01-15 16:18 - */ - -/** - * 法规合规评估流程表 - */ -@ApiModel(description = "法规合规评估流程表") -@Data -@TableName(value = "process_project_standard") -public class ProcessProjectStandard { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /** - * 创建人 - */ - @TableField(value = "create_by") - @ApiModelProperty(value = "创建人") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 更新人 - */ - @TableField(value = "update_by") - @ApiModelProperty(value = "更新人") - private String updateBy; - - /** - * 更新时间 - */ - @TableField(value = "update_time") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** - * 所属部门 - */ - @TableField(value = "org_code") - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value = "0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 来源(1-国内、2-海外) - */ - @TableField(value = "`source`") - @ApiModelProperty(value = "来源(1-国内、2-海外)") - private String source; - - /** - * 标准id - */ - @TableField(value = "standard_id") - @ApiModelProperty(value = "标准id") - private String standardId; - - /** - * 标准编号 - */ - @TableField(value = "standard_number") - @ApiModelProperty(value = "标准编号") - private String standardNumber; - - /** - * 标准名称 - */ - @TableField(value = "standard_name") - @ApiModelProperty(value = "标准名称") - private String standardName; - - /** - * 分解单来源 - */ - @TableField(value = "decomposition_order_source") - @ApiModelProperty(value = "分解单来源") - private String decompositionOrderSource; - - @TableField(exist = false) - @ApiModelProperty(value = "分解单来源列表") - private List decompositionOrderSourceVOList; - - @TableField(exist = false) - @ApiModelProperty(value = "拆分单id") - private String sarFileSplitInfoId; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java deleted file mode 100644 index f00975aa..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java +++ /dev/null @@ -1,236 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; - -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * - *@author liJiaRao - *@date 2024-01-15 16:27 - */ -/** - * 法规合规评估流程关联条款 - */ -@ApiModel(description="法规合规评估流程关联条款") -@Data -@TableName(value = "process_project_standard_term") -public class ProcessProjectStandardTerm { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value="主键ID") - private String id; - - /** - * 创建人 - */ - @TableField(value = "create_by") - @ApiModelProperty(value="创建人") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @ApiModelProperty(value="创建时间") - private Date createTime; - - /** - * 更新人 - */ - @TableField(value = "update_by") - @ApiModelProperty(value="更新人") - private String updateBy; - - /** - * 更新时间 - */ - @TableField(value = "update_time") - @ApiModelProperty(value="更新时间") - private Date updateTime; - - /** - * 所属部门 - */ - @TableField(value = "org_code") - @ApiModelProperty(value="所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value="0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 评估流程id - */ - @TableField(value = "process_id") - @ApiModelProperty(value="评估流程id") - private String processId; - - /** - * 标准id - */ - @TableField(value = "standard_id") - @ApiModelProperty(value="标准id") - private String standardId; - - /** - * 条款号 - */ - @TableField(value = "term_number") - @ApiModelProperty(value="条款号") - private String termNumber; - - /** - * 条款名称 - */ - @TableField(value = "term_name") - @ApiModelProperty(value="条款名称") - private String termName; - - /** - * 条款内容 - */ - @TableField(value = "term_text") - @ApiModelProperty(value="条款内容") - private String termText; - - /** - * 实施日期 - */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实施日期") - private Date implementationDate; - - /** - * 拆分单id - */ - @TableField(value = "split_info_id") - @ApiModelProperty(value="拆分单id") - private String splitInfoId; - - @ApiModelProperty(value="评估结果") - private String assessResults; - - @TableField(exist = false) - @ApiModelProperty(value="评估结果") - private String assessResults_dictText; - - /** - * 是否立项 - */ - @TableField(value = "project_approval_flag") - @ApiModelProperty(value="是否立项") - private String projectApprovalFlag; - - /** - * 是否立项 - */ - @TableField(exist = false) - @ApiModelProperty(value="是否立项") - private String projectApprovalFlag_dictText; - - /** - * 设计工程师 - */ - @TableField(value = "design_engineer") - @ApiModelProperty(value="设计工程师") - private String designEngineer; - - /** - * 设计工程师 - */ - @ApiModelProperty(value="设计工程师") - private String designEngineer_dictText; - - /** - * 抄送人员 - */ - @TableField(value = "carbon_copy_personnels") - @ApiModelProperty(value="抄送人员") - private String carbonCopyPersonnels; - - /** - * 不涉及原因 - */ - @TableField(exist = false) - @ApiModelProperty(value = "不涉及原因") - private String notInvolved; - - /** - * 是否与车型强关联 - */ - @TableField(exist = false) - @ApiModelProperty(value="是否与车型强关联") - private String isRelate; - - /** - * 车型系列 - */ - @TableField(exist = false) - @ApiModelProperty(value="车型系列") - private String modelSeries; - /** - * 车型系列 - */ - @TableField(exist = false) - @ApiModelProperty(value="车型系列") - private String modelSeries_dictText; - - /** - * 依据描述 - */ - @TableField(exist = false) - @ApiModelProperty(value="依据描述") - private String description; - - /** - * 佐证材料 - */ - @TableField(exist = false) - @ApiModelProperty(value="佐证材料") - private String fileId; - - @TableField(exist = false) - @ApiModelProperty(value="模块负责人") - private String moduleOwner; - - @TableField(exist = false) - @ApiModelProperty(value="模块负责人") - private String moduleOwner_dictText; - - - @TableField(exist = false) - @ApiModelProperty(value="责任单位联络人") - private String responsibleUnitLeader; - - @TableField(exist = false) - @ApiModelProperty(value="") - private String termUserId; - - /**工作令编号*/ - @TableField(exist = false) - @ApiModelProperty(value = "工作令编号") - private String workNumber; - /**项目名称*/ - @TableField(exist = false) - @ApiModelProperty(value = "项目名称") - private String projectName; - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java deleted file mode 100644 index 99fbb9b2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermApproval.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Data; - -/** - * - *@author liJiaRao - *@date 2024-01-17 15:00 - */ -/** - * 法规合规评估流程关联条款主管立项表 - */ -@ApiModel(description="法规合规评估流程关联条款主管立项表") -@Data -@TableName(value = "process_project_standard_term_approval") -public class ProcessProjectStandardTermApproval { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value="主键ID") - private String id; - - /** - * 创建人 - */ - @TableField(value = "create_by") - @ApiModelProperty(value="创建人") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @ApiModelProperty(value="创建时间") - private Date createTime; - - /** - * 更新人 - */ - @TableField(value = "update_by") - @ApiModelProperty(value="更新人") - private String updateBy; - - /** - * 更新时间 - */ - @TableField(value = "update_time") - @ApiModelProperty(value="更新时间") - private Date updateTime; - - /** - * 所属部门 - */ - @TableField(value = "org_code") - @ApiModelProperty(value="所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value="0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 评估流程id - */ - @TableField(value = "process_id") - @ApiModelProperty(value="评估流程id") - private String processId; - - /** - * 责任单位负责人id - */ - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") - @TableField(value = "responsible_unit_leader") - @ApiModelProperty(value="责任单位负责人id") - private String responsibleUnitLeader; - - /** - * 关联条款表id - */ - @TableField(value = "term_id") - @ApiModelProperty(value="关联条款表id") - private String termId; - - /** - * 评估结果(1-符合、2-不符合、3-不涉及) - */ - @Dict(dicCode = "assess_results") - @TableField(value = "assess_results") - @ApiModelProperty(value="评估结果(1-符合、2-不符合、3-不涉及)") - private String assessResults; - - /** - * 是否立项 - */ - @Dict(dicCode = "yn") - @TableField(value = "project_approval_flag") - @ApiModelProperty(value="是否立项") - private String projectApprovalFlag; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java deleted file mode 100644 index 77037527..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.enterprise.entity.vo.DeclareFileList; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.Collections; -import java.util.Date; -import java.util.List; - -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; - -/** - * - *@author liJiaRao - *@date 2024-01-15 16:27 - */ -/** - * 法规合规评估流程关联条款关联用户 - */ -@ApiModel(description="法规合规评估流程关联条款关联用户") -@Data -@TableName(value = "process_project_standard_term_user") -public class ProcessProjectStandardTermUser { - /** - * 主键ID - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - @ApiModelProperty(value="主键ID") - private String id; - - /** - * 创建人 - */ - @TableField(value = "create_by") - @ApiModelProperty(value="创建人") - private String createBy; - - /** - * 创建时间 - */ - @TableField(value = "create_time") - @ApiModelProperty(value="创建时间") - private Date createTime; - - /** - * 更新人 - */ - @TableField(value = "update_by") - @ApiModelProperty(value="更新人") - private String updateBy; - - /** - * 更新时间 - */ - @TableField(value = "update_time") - @ApiModelProperty(value="更新时间") - private Date updateTime; - - /** - * 所属部门 - */ - @TableField(value = "org_code") - @ApiModelProperty(value="所属部门") - private String orgCode; - - /** - * 0表示未删除,1表示删除 - */ - @TableField(value = "del_flag") - @ApiModelProperty(value="0表示未删除,1表示删除") - private Integer delFlag; - - /** - * 评估流程id - */ - @TableField(value = "process_id") - @ApiModelProperty(value="评估流程id") - private String processId; - - /** - * 部所级领导父执行id - */ - @ApiModelProperty(value="部所级领导父执行id") - private String leaderParentExecutionId; - - /** - * 关联条款表id - */ - @TableField(value = "term_id") - @ApiModelProperty(value="关联条款表id") - private String termId; - - /** - * 责任单位负责人id - */ - @TableField(value = "responsible_unit_leader") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @ApiModelProperty(value="责任单位负责人id") - private String responsibleUnitLeader; - - /** - * 责任单位 - */ - @TableField(value = "responsible_unit") - @ApiModelProperty(value="责任单位") - private String responsibleUnit; - - /** - * 模块负责人id - */ - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @TableField(value = "module_owner") - @ApiModelProperty(value="模块负责人id") - private String moduleOwner; - - /**评估结果(1-符合、2-不符合)*/ - @TableField(value = "assess_results") - @Dict(dicCode = "assess_results") - @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-不涉及)") - private String assessResults; - - /** - * 不涉及原因 - */ - @TableField(value = "not_involved") - @ApiModelProperty(value="不涉及原因") - private String notInvolved; - - /** - * 设计工程师 - */ - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @Excel(name = "姓名", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "realname") - @TableField(value = "design_engineer") - @ApiModelProperty(value="设计工程师") - private String designEngineer; - - /** - * 父执行实例流id - */ - @TableField(value = "parent_execution_id") - @ApiModelProperty(value="父执行实例流id") - private String parentExecutionId; - - /** - * 是否与车型强关联 - */ - @TableField(value = "is_relate") - @ApiModelProperty(value="是否与车型强关联") - private String isRelate; - /** - * 车型系列 - */ - @TableField(value = "model_series") - @Dict(dicCode = "model_series") - @Excel(name = "车型", width = 15, dicCode = "model_series") - @ApiModelProperty(value="车型系列") - private String modelSeries; - /** - * 车型系列 - */ - @TableField(exist = false) - @ApiModelProperty(value="车型系列") - private String modelSeries_dictText; - - /** - * 依据描述 - */ - @TableField(value = "description") - @Excel(name = "依据描述", width = 15) - @ApiModelProperty(value="依据描述") - private String description; - - /** - * 佐证材料 - */ - @TableField(value = "file_id") - @ApiModelProperty(value="佐证材料") - private String fileId; - - /** - * 是否立项 - */ - @TableField(value = "project_approval_flag") - @ApiModelProperty(value="是否立项") - private Integer projectApprovalFlag; - - /** - * 任务id - */ - @TableField(exist = false) - @ApiModelProperty(value="任务id") - private String taskId; - - /** - * 工号 - */ - @TableField(exist = false) - @ApiModelProperty(value="工号") - private String userName; - - /** - * 姓名 - */ - @TableField(exist = false) - @ApiModelProperty(value="姓名") - private String realName; - /** - * 部门id - */ - @TableField(exist = false) - @ApiModelProperty(value="部门id") - private String departId; - - @TableField(exist = false) - @ApiModelProperty(value = "相关材料文件名") - @ExcelCollection(name = "") - private List declareFileList = Collections.emptyList(); -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java deleted file mode 100644 index 7e4c9f65..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/listener/ProcessProjectStandardAutoListener.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.listener; - -import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessService; -import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; -import com.jero.modules.activiti.util.SpringContextUtil; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; - -/** - * @author liJiaRao - * @date 2023-10-13 16:43 - */ -public class ProcessProjectStandardAutoListener implements TaskListener { - @Override - public void notify(DelegateTask delegateTask) { - ProcessProjectStandardService processProjectAssessService = SpringContextUtil.getBean(ProcessProjectStandardService.class); - processProjectAssessService.autoComplete(delegateTask); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java deleted file mode 100644 index a246b2ae..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; - -/** - * @author liJiaRao - * @date 2024-01-15 16:18 - */ -public interface ProcessProjectStandardMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermApprovalMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermApprovalMapper.java deleted file mode 100644 index 4abeb470..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermApprovalMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; - -/** - * - *@author liJiaRao - *@date 2024-01-17 15:00 - */ -public interface ProcessProjectStandardTermApprovalMapper extends BaseMapper { -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java deleted file mode 100644 index 264070dd..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *@author liJiaRao - *@date 2024-01-15 16:27 - */ -public interface ProcessProjectStandardTermMapper extends BaseMapper { - List getByResponsibleUnitLeader(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("hasModuleOwner") Boolean hasModuleOwner); - - List getByResponsibleUnitLeaderSp(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("parentId") String parentId); - - List getByModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasDesignEngineer") Boolean hasDesignEngineer); - - List getByRejectModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); - - List getByModuleOwnerAutoComplete(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); - - List getByDesignEngineer(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); - - List getByStandardsEngineer(@Param("processId") String processId); - - List getByTermDesignEngineer(@Param("processId") String processId, @Param("originUserId") String originUserId); -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java deleted file mode 100644 index 93c4a860..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermUserMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; -import org.apache.ibatis.annotations.Param; - -/** - * - *@author liJiaRao - *@date 2024-01-15 16:27 - */ -public interface ProcessProjectStandardTermUserMapper extends BaseMapper { - Page selectPageByUser(Page page, @Param("termUser") ProcessProjectStandardTermUser termUser); - -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml deleted file mode 100644 index 895d68d5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag, `source`, - standard_number, standard_name, decomposition_order_Source - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermApprovalMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermApprovalMapper.xml deleted file mode 100644 index 9618cb3b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermApprovalMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag, process_id, - responsible_unit_leader, term_id, assess_results, project_approval_flag - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml deleted file mode 100644 index 5be28086..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${alias}.id, ${alias}.create_by, ${alias}.create_time, ${alias}.update_by, ${alias}.update_time, ${alias}.org_code, ${alias}.del_flag, ${alias}.process_id, ${alias}. - standard_id, ${alias}.term_number, ${alias}.term_name, ${alias}.term_text, ${alias}.implementation_date, ${alias}.split_info_id, ${alias}.project_approval_flag, ${alias}. - design_engineer, ${alias}.carbon_copy_personnels - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml deleted file mode 100644 index 72cdeda7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermUserMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, create_by, create_time, update_by, update_time, org_code, del_flag, process_id, - term_id, responsible_unit_leader, responsible_unit, module_owner, not_involved, design_engineer, - parent_execution_id, model_series, description, file_id, project_approval_flag - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java deleted file mode 100644 index 852f803d..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ /dev/null @@ -1,1141 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.service; - -import cn.hutool.core.collection.CollStreamUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; -import com.jero.common.system.vo.LoginUser; -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.common.DraftCommon; -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.dto.BasicTaskInfoDTO; -import com.jero.modules.activiti.process.fb.dto.ProcessDTO; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon; -import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; -import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermMapper; -import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermUserMapper; -import com.jero.modules.activiti.process.projectstandard.vo.ProcessProjectStandardVO; -import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.util.ThreadLocalUtil; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.mapper.LawsCommonMapper; -import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; -import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; -import com.jero.modules.projectLibrary.common.AssessCommon; -import com.jero.modules.projectLibrary.entity.LawsSpecialProjectLibrary; -import com.jero.modules.projectLibrary.service.ILawsSpecialProjectLibraryService; -import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; -import com.jero.modules.split.entity.SarFileSplitInfoEO; -import com.jero.modules.split.service.ISarFileSplitInfoService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.delegate.DelegateExecution; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.runtime.Execution; -import org.activiti.engine.task.Task; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; -import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardMapper; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * - *@author liJiaRao - *@date 2024-01-15 16:17 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class ProcessProjectStandardService extends ServiceImpl { - - @Resource - private LawsCommonMapper lawsCommonMapper; - @Resource - private ISarFileSplitInfoService sarFileSplitInfoService; - @Resource - private ProcessAllService processAllService; - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource - private RuntimeService runtimeService; - @Resource - private TaskService taskService; - @Resource - private IProcessHandleService processHandleService; - @Resource - private SendMessageAPI sendMessageAPI; - //国内标准 - @Autowired - private ILawsDomesticStandardService lawsDomesticStandardService; - //海外标准 - @Autowired - private ILawsOverseasStandardService lawsOverseasStandardService; - @Resource - private ProcessProjectStandardTermMapper termMapper; - @Resource - private ProcessProjectStandardTermService termService; - @Resource - private ProcessProjectStandardTermUserMapper termUserMapper; - @Resource - private ProcessProjectStandardTermUserService termUserService; - @Resource - private ProcessProjectStandardTermApprovalService termApprovalService; - @Resource - private ILawsSpecialProjectLibraryService lawsSpecialProjectLibraryService; - - - - public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) { - ProcessInfoVO draft = processHandleService.getDraftByDraftId(draftId); - return draft; - } - ProcessInfoVO draft = processHandleService.getDraftByTaskId(taskId); - if (draft != null){ - return draft; - } - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId); - String processId = processInfoVO.getBusinessId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - Task task = processDTO.getTask(); - Execution execution = processDTO.getExecution(); - String parentId = execution.getParentId(); - - String executionParentId = task.getFormKey(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - if (taskDefinitionKey.contains("_") - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.MKZRRFF_) - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.BSZGJLDSP_) - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.BSZGJLDXF_)){ - taskDefinitionKey = taskDefinitionKey.substring(0,taskDefinitionKey.length()-1); - } - List processProjectStandardTermUserList = new ArrayList<>(); - List processProjectStandardTermList = new ArrayList<>(); - List approvalList1 = new ArrayList<>(); - //获取所有用户信息 - List userList = sysBaseAPI.getAllUser(); - Map userNameMap = new HashMap<>(); - for (LoginUser loginUser : userList) { - userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo()); - } - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - //发起人 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, processId); - List termUserList = new ArrayList<>(); - switch (taskDefinitionKey) { - //部所主管级领导下发 - case ProcessProjectStandardCommon.BSZGJLDXF_1: - processProjectStandardTermList = termMapper.getByResponsibleUnitLeader(processId, originUserId, true); - break; - //驳回后部所主管级领导下发 - case ProcessProjectStandardCommon.BSZGJLDXF_2: - processProjectStandardTermList = termMapper.getByResponsibleUnitLeader(processId, originUserId, false); - break; - //模块责任人分发 - case ProcessProjectStandardCommon.MKZRRFF_1: - case ProcessProjectStandardCommon.MKZRRFF_6: - processProjectStandardTermList = termMapper.getByModuleOwner(processId, originUserId, executionParentId, false); - break; - //驳回后模块责任人分发 - case ProcessProjectStandardCommon.MKZRRFF_4: - case ProcessProjectStandardCommon.MKZRRFF_5: - case ProcessProjectStandardCommon.MKZRRFF_8: - processProjectStandardTermList = termMapper.getByRejectModuleOwner(processId, originUserId, executionParentId); - break; - //设计工程师评估 - case ProcessProjectStandardCommon.SJGCSPG_: - processProjectStandardTermList = termMapper.getByDesignEngineer(processId, originUserId, executionParentId); - break; - //模块责任人审批 - case ProcessProjectStandardCommon.MKZRRSP_: - processProjectStandardTermList = termMapper.getByModuleOwner(processId, originUserId, executionParentId, true); - wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, executionParentId); - termUserList = termUserService.list(wrapper); - break; - //部所主管级领导审批 - case ProcessProjectStandardCommon.BSZGJLDSP_1: - case ProcessProjectStandardCommon.BSZGJLDSP_3: - processProjectStandardTermList = termMapper.getByResponsibleUnitLeaderSp(processId, originUserId,parentId); - wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId); - termUserList = termUserService.list(wrapper); - break; - //部所主管级领导审批 - case ProcessProjectStandardCommon.BSZGJLDSP_2: - processProjectStandardTermList = termMapper.getByResponsibleUnitLeaderSp(processId, originUserId, null); - wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId); - termUserList = termUserService.list(wrapper); - break; - //法规工程师审批 - case ProcessProjectStandardCommon.FGGCSSP: - processProjectStandardTermList = termMapper.getByStandardsEngineer(processId); - termUserList = termUserService.list(wrapper); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectStandardTermApproval::getProcessId,processId); - approvalList1 = termApprovalService.list(wrapper1); - break; - //设计工程师补充工作令编号 - case ProcessProjectStandardCommon.SJGCSBCGZLBH: - processProjectStandardTermList = termMapper.getByTermDesignEngineer(processId, originUserId); - - break; - - default: - } - List modelSeriesDict = sysBaseAPI.queryDictItemsByCode("model_series"); - Map modelSeriesDictMap = CollStreamUtil.toMap(modelSeriesDict, DictModel::getValue, DictModel::getText); - - List dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); - Map assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); - Map> termIdApprovalListMap = CollStreamUtil.groupByKey(approvalList1, ProcessProjectStandardTermApproval::getTermId); - - //给条款中保存关联的信息 - Map> termIdListMap = CollStreamUtil.groupByKey(termUserList, ProcessProjectStandardTermUser::getTermId); - for (ProcessProjectStandardTerm term : processProjectStandardTermList) { - String termId = term.getId(); - String assessResults = term.getAssessResults(); - if (termIdListMap.containsKey(termId)) { - List termUsers = termIdListMap.get(termId); - - List moduleOwnerList = new ArrayList<>(); - List responsibleUnitLeaderList = new ArrayList<>(); - if (!ProcessProjectStandardCommon.MKZRRSP_.equals(taskDefinitionKey)){ - for (ProcessProjectStandardTermUser termUser : termUsers) { - moduleOwnerList.add(termUser.getModuleOwner()); - responsibleUnitLeaderList.add(termUser.getResponsibleUnitLeader()); - } - List assessResultList = CollStreamUtil.toList(termUsers, ProcessProjectStandardTermUser::getAssessResults); - if (assessResultList.contains(AssessCommon.NOT_COMPLIANT)){ - assessResults = AssessCommon.NOT_COMPLIANT; - }else if (assessResultList.contains(AssessCommon.ACCORD_WITH)){ - assessResults = AssessCommon.ACCORD_WITH; - }else { - assessResults = AssessCommon.NOT_INVOLVED; - } - } - - if (ProcessProjectStandardCommon.BSZGJLDSP_1.equals(taskDefinitionKey) - ||ProcessProjectStandardCommon.BSZGJLDSP_2.equals(taskDefinitionKey) - ||ProcessProjectStandardCommon.BSZGJLDSP_3.equals(taskDefinitionKey)){ - List userNameList = new ArrayList<>(); - moduleOwnerList.stream() - .filter(Objects::nonNull) - .distinct().forEach(i ->{ - userNameList.add(userNameMap.get(i)) ; - }); - term.setModuleOwner_dictText(String.join(",", userNameList)); - } - if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){ - List userNameList = new ArrayList<>(); - responsibleUnitLeaderList.stream() - .filter(Objects::nonNull) - .distinct().forEach(i ->{ - userNameList.add(userNameMap.get(i)) ; - }); - term.setResponsibleUnitLeader(String.join(",", userNameList)); - } - - term.setAssessResults(assessResults); - } - term.setAssessResults_dictText(assessResultsMap.get(assessResults)); - String projectApprovalFlag; - if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){ - projectApprovalFlag = YesOrNoEnum.NO.getValue(); - if (termIdApprovalListMap.containsKey(termId)){ - List termApprovalList = termIdApprovalListMap.get(termId); - for (ProcessProjectStandardTermApproval termApproval : termApprovalList) { - String projectApprovalFlag1 = termApproval.getProjectApprovalFlag(); - if (YesOrNoEnum.YES.getValue().equals(projectApprovalFlag1)){ - projectApprovalFlag = YesOrNoEnum.YES.getValue(); - break; - } - } - } - } - else if (ProcessProjectStandardCommon.SJGCSBCGZLBH.equals(taskDefinitionKey)){ - projectApprovalFlag = term.getProjectApprovalFlag(); - } - else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) { - projectApprovalFlag = YesOrNoEnum.YES.getValue(); - }else { - projectApprovalFlag = YesOrNoEnum.NO.getValue(); - } - term.setProjectApprovalFlag(projectApprovalFlag); - term.setProjectApprovalFlag_dictText(YesOrNoEnum.getNameByValue(projectApprovalFlag)); - - String modelSeries = term.getModelSeries(); - term.setModelSeries_dictText(sysBaseAPI.translateByDictMap(modelSeriesDictMap,modelSeries)); - String designEngineer = term.getDesignEngineer(); - term.setDesignEngineer_dictText(userNameMap.get(designEngineer)); - } - String moduleOwner1 = null; - if (processProjectStandardTermList.size()>0){ - ProcessProjectStandardTerm term = processProjectStandardTermList.get(0); - String moduleOwner = term.getModuleOwner(); - moduleOwner1 = userNameMap.get(moduleOwner); - } - ProcessProjectStandard processProjectStandard = this.getById(processId); - - - ProcessProjectStandardVO processProjectStandardVO = new ProcessProjectStandardVO(); - processProjectStandardVO.setModuleOwner(moduleOwner1); - processProjectStandardVO.setProcessProjectStandard(processProjectStandard); - processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList); - if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){ - String termId = processProjectStandardTermList.get(0).getId(); - if (termIdApprovalListMap.containsKey(termId)) { - List approvalList = termIdApprovalListMap.get(termId); - for (ProcessProjectStandardTermApproval termApproval : approvalList) { - String responsibleUnitLeader = termApproval.getResponsibleUnitLeader(); - termApproval.setResponsibleUnitLeader(userNameMap.get(responsibleUnitLeader)); - String assessResults = termApproval.getAssessResults(); - termApproval.setAssessResults(assessResultsMap.get(assessResults)); - String projectApprovalFlag = termApproval.getProjectApprovalFlag(); - termApproval.setProjectApprovalFlag(YesOrNoEnum.YES.getValue().equals(projectApprovalFlag)?YesOrNoEnum.YES.getName():YesOrNoEnum.NO.getName()); - } - processProjectStandardVO.setProcessProjectStandardTermApprovalList(approvalList); - } - - } - processInfoVO.setBusinessInfoDTO(processProjectStandardVO); - return processInfoVO; - } - - public void saveToDraft(ProcessInfoVO processInfoVO) { - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_STANDARD.getValue()); // 流程类型 - //保存businessId - String processInstanceId = basicProcessInfoDTO.getProcessInstanceId(); - if (StringUtils.isNotBlank(processInstanceId)){ - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - String projectId = processAll.getProjectId(); - processInfoVO.setBusinessId(projectId); - } - - processHandleService.saveToDraft(processInfoVO); - } - - public void startProcess(ProcessInfoVO processInfoVO) { - - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - - ProcessProjectStandard processProjectStandard = businessInfoDTO.getProcessProjectStandard(); - processProjectStandard.setId(null); - this.save(processProjectStandard); - String processId = processProjectStandard.getId(); - processInfoVO.setBusinessId(processId); - String standardId = processProjectStandard.getStandardId(); - String source = processProjectStandard.getSource(); - Date implementationDate; - if (CommonConstant.STANDARD_SOURCE_1.equals(source)) { - LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(standardId); - implementationDate = lawsDomesticStandard.getImplementationDate(); - }else { - LawsOverseasStandard overseasStandard = lawsOverseasStandardService.getById(standardId); - implementationDate = overseasStandard.getImplementationDate(); - } - //保存条款 - List processProjectStandardTermList = businessInfoDTO.getProcessProjectStandardTermList(); - for (ProcessProjectStandardTerm term : processProjectStandardTermList) { - term.setId(null); - term.setProcessId(processId); - term.setImplementationDate(implementationDate); - } - termService.saveBatch(processProjectStandardTermList); - // 保存关联关系 - List allResponsibleUnitLeaderList = new ArrayList<>(); - List termUserList = new ArrayList<>(); - for (ProcessProjectStandardTerm term : processProjectStandardTermList) { - String termId = term.getId(); - String responsibleUnitLeaders = term.getResponsibleUnitLeader(); - if (StringUtils.isBlank(responsibleUnitLeaders)) { - throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); - } - List responsibleUnitLeaderList = Arrays.asList(responsibleUnitLeaders.split(",")); - List distinctResponsibleUnitLeader = responsibleUnitLeaderList.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - for (String responsibleUnitLeaderId : distinctResponsibleUnitLeader) { - ProcessProjectStandardTermUser termUser = new ProcessProjectStandardTermUser(); - termUser.setProcessId(processId); - termUser.setTermId(termId); - termUser.setResponsibleUnitLeader(responsibleUnitLeaderId); - termUserList.add(termUser); - } - allResponsibleUnitLeaderList.addAll(distinctResponsibleUnitLeader); - } - termUserService.saveBatch(termUserList); - - List distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - String distinctAllResponsibleUnitLeaderListJoin = CollectionUtil.join(distinctAllResponsibleUnitLeaderList, ","); - //启动 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_STANDARD)); // 流程定义id - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_STANDARD.getValue()); // 流程类型 - Map userInfoMap = new HashMap<>(); - userInfoMap.put(ProcessProjectStandardCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId()); - userInfoMap.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin); - processInfoVO.setUserInfoMap(userInfoMap); - processHandleService.startProcess(processInfoVO); - //保存一份初始草稿 - processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); - processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null)); - saveToDraft(processInfoVO); - //end 保存初始草稿结束 - } - - public void submit(ProcessInfoVO processInfoVO) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = basicTaskInfoDTO.getTaskId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - String processInstanceId = processDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - processInfoVO.setBusinessId(processAll.getProjectId()); - Task task = processDTO.getTask(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - if (taskDefinitionKey.contains("_") - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.MKZRRFF_) - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.BSZGJLDXF_)){ - taskDefinitionKey = taskDefinitionKey.substring(0,taskDefinitionKey.length()-1); - } - processHandleService.updateApprovalRecord(processInfoVO); - switch (taskDefinitionKey){ - //部所主管级领导下发 - case ProcessProjectStandardCommon.BSZGJLDXF_1: - bszgjldxfSubmit(processInfoVO, processDTO,false); - break; - //驳回后部所主管级领导下发 - case ProcessProjectStandardCommon.BSZGJLDXF_2: - bszgjldxfSubmit(processInfoVO, processDTO,true); - break; - //模块责任人分发 - case ProcessProjectStandardCommon.MKZRRFF_1: - case ProcessProjectStandardCommon.MKZRRFF_6: - mkzrrffSubmit(processInfoVO, processDTO, false); - break; - //驳回后模块责任人分发 - case ProcessProjectStandardCommon.MKZRRFF_4: - case ProcessProjectStandardCommon.MKZRRFF_5: - case ProcessProjectStandardCommon.MKZRRFF_8: - mkzrrffSubmit(processInfoVO, processDTO, true); - break; - //设计工程师评估 - case ProcessProjectStandardCommon.SJGCSPG_: - sjgcspgSubmit(processInfoVO, processDTO); - break; - //设计工程师补充工作令编号 - case ProcessProjectStandardCommon.SJGCSBCGZLBH: - sjgcsbcgzlbhSubmit(processInfoVO, processDTO); - break; - default: - } - } - - public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - String taskId = basicTaskInfoDTO.getTaskId(); - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - String processInstanceId = processDTO.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - processInfoVO.setBusinessId(processAll.getProjectId()); - Task task = processDTO.getTask(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - if (taskDefinitionKey.contains("_") - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.MKZRRFF_) - && !taskDefinitionKey.contains(ProcessProjectStandardCommon.BSZGJLDSP_)){ - taskDefinitionKey = taskDefinitionKey.substring(0,taskDefinitionKey.length()-1); - } - processHandleService.updateApprovalRecord(processInfoVO); - switch (taskDefinitionKey) { - //模块责任人审批 - case ProcessProjectStandardCommon.MKZRRSP_: - mkzrrspApprove(processInfoVO, processDTO, pass); - break; - //部所主管级领导审批 - case ProcessProjectStandardCommon.BSZGJLDSP_1: - case ProcessProjectStandardCommon.BSZGJLDSP_3: - bszgjldspApprove(processInfoVO, processDTO, pass, true); - break; - //部所主管级领导审批 - case ProcessProjectStandardCommon.BSZGJLDSP_2: - bszgjldspApprove(processInfoVO, processDTO, pass, false); - break; - //法规工程师审批 - case ProcessProjectStandardCommon.FGGCSSP: - fggcsspApprove(processInfoVO, processDTO, pass); - break; - default: - } - } - - //模块责任人审批 - private void mkzrrspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - String parentExecutionId = task.getFormKey(); - //查询表单 - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - List designEngineerList = termList.stream().map(ProcessProjectStandardTerm::getDesignEngineer) - .filter(Objects::nonNull) - .distinct() - .collect(Collectors.toList()); - - if (!Objects.equals(userId,originUserId)){ - //更新数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, parentExecutionId); - List termUserList = termUserService.list(wrapper); - List updateTermUserList = new ArrayList<>(); - for (ProcessProjectStandardTermUser termUser : termUserList) { - ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser(); - update.setModuleOwner(userId); - update.setId(termUser.getId()); - updateTermUserList.add(update); - } - termUserService.updateBatchById(updateTermUserList); - runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MODULE_OWNER,userId); - } - // 完成任务 - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId); - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectStandardCommon.PASS, pass); - if (!pass){ - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList); - } - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - } - //部所主管级领导审批 - private void bszgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass, boolean hasParent) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - //查询表单 - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - List termApprovalList = new ArrayList<>(); - //删除之前的立项结果 - List termIdList = termList.stream().map(ProcessProjectStandardTerm::getId).collect(Collectors.toList()); - LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); - deleteWrapper.eq(ProcessProjectStandardTermApproval::getProcessId,businessId); - deleteWrapper.eq(ProcessProjectStandardTermApproval::getResponsibleUnitLeader,originUserId); - deleteWrapper.in(ProcessProjectStandardTermApproval::getTermId,termIdList); - termApprovalService.remove(deleteWrapper); - //保存立项结果 - for (ProcessProjectStandardTerm term : termList) { - ProcessProjectStandardTermApproval termApproval = new ProcessProjectStandardTermApproval(); - termApproval.setProcessId(businessId); - termApproval.setResponsibleUnitLeader(userId); - termApproval.setTermId(term.getId()); - termApproval.setAssessResults(term.getAssessResults()); - termApproval.setProjectApprovalFlag(term.getProjectApprovalFlag()); - termApprovalList.add(termApproval); - } - termApprovalService.saveBatch(termApprovalList); - - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - // 完成任务 - Map variables = new HashMap<>(); - //如果驳回查询下一步的模块责任人 - if (!pass){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId,businessId); - wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader,originUserId); - List termUserList = termUserMapper.selectList(wrapper); - for (ProcessProjectStandardTermUser termUser : termUserList) { - termUser.setParentExecutionId(executionId); - } - termUserService.updateBatchById(termUserList); - //选择不涉及的模块责任人 - List notInvolvedModuleOwnerList = termUserList.stream() - .filter(i -> StringUtils.isBlank(i.getDesignEngineer())) - .map(ProcessProjectStandardTermUser::getModuleOwner) - .filter(Objects::nonNull) - .distinct() - .collect(Collectors.toList()); - //选择设计工程师的模块责任人 - List moduleOwnerList = termUserList.stream() - .filter(i -> StringUtils.isNotBlank(i.getDesignEngineer())) - .map(ProcessProjectStandardTermUser::getModuleOwner) - .filter(Objects::nonNull) - .distinct() - .collect(Collectors.toList()); - if (notInvolvedModuleOwnerList.size() == 0){ - notInvolvedModuleOwnerList.add("123"); - } - if (moduleOwnerList.size() == 0){ - moduleOwnerList.add("123"); - } - variables.put(ProcessProjectStandardCommon.NOT_INVOLVED_MODULE_OWNER_LIST, notInvolvedModuleOwnerList); - variables.put(ProcessProjectStandardCommon.NOT_INVOLVED_MODULE_OWNER_LIST_SIZE, notInvolvedModuleOwnerList.size()); - variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerList); - variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerList.size()); - } - if (!Objects.equals(userId,originUserId)){ - //更新数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId); - List termUserList = termUserService.list(wrapper); - List updateTermUserList = new ArrayList<>(); - for (ProcessProjectStandardTermUser termUser : termUserList) { - ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser(); - update.setResponsibleUnitLeader(userId); - update.setId(termUser.getId()); - updateTermUserList.add(update); - } - termUserService.updateBatchById(updateTermUserList); - runtimeService.setVariable(executionId,ProcessProjectStandardCommon.MANAGER_LEADER,userId); - } - String taskId = processDTO.getTaskId(); - variables.put(ProcessProjectStandardCommon.PASS, pass); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - } - - //法规工程师审批 - private void fggcsspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - //查询流程信息 - ProcessAll process = processAllService.getByProcessInstanceId(processDTO.getProcessInstanceId()); - ProcessProjectStandard processProjectStandard = this.getById(businessId); - - //查询不符合的评估 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - wrapper.eq(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_COMPLIANT); - List notCompliantList = termUserService.list(wrapper); - Map> termIdMap = CollStreamUtil.groupByKey(notCompliantList, ProcessProjectStandardTermUser::getTermId); - //查询全部评估 - wrapper.clear(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - List allTermUserList = termUserService.list(wrapper); - Map> allTermIdMap = CollStreamUtil.groupByKey(allTermUserList, ProcessProjectStandardTermUser::getTermId); - //查询表单 - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - - List updateTermList = new ArrayList<>(); - List updateTermUserList = new ArrayList<>(); - Date date = new Date(); - for (ProcessProjectStandardTerm term : termList) { - ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm(); - String termId = term.getId(); - String assessResults = term.getAssessResults(); - String projectApprovalFlag = term.getProjectApprovalFlag(); - String designEngineer = term.getDesignEngineer(); - if (!pass){ - continue; - } - term1.setId(termId); - term1.setDesignEngineer(designEngineer); - term1.setAssessResults(assessResults); - term1.setProjectApprovalFlag(projectApprovalFlag); - updateTermList.add(term1); - - LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary(); - projectLibrary.setSource(processProjectStandard.getSource()); - String standardNumber = processProjectStandard.getStandardNumber(); - projectLibrary.setStandardNumber(standardNumber); - String standardName = processProjectStandard.getStandardName(); - projectLibrary.setStandardName(standardName); - projectLibrary.setStandardId(processProjectStandard.getStandardId()); - String termName = term.getTermName(); - String termNumber = term.getTermNumber(); - if (!Objects.equals(termName,standardName) && !Objects.equals(termNumber,standardNumber)){ - projectLibrary.setTermNumber(termNumber); - projectLibrary.setTermName(termName); - } - projectLibrary.setStandardState(processProjectStandard.getDecompositionOrderSource()); - projectLibrary.setResult(term.getAssessResults()); - projectLibrary.setMaterial(term.getFileId()); - projectLibrary.setValuationTime(date); - projectLibrary.setProjectApproval(term.getProjectApprovalFlag()); - projectLibrary.setProcessInstanceId(process.getProcessInstanceId()); - projectLibrary.setProcessNum(process.getPrcNum()); - projectLibrary.setProcessTermId(termId); - //存入不符合描述，车型系列 - if (termIdMap.containsKey(termId)) { - List termUserList = termIdMap.get(termId); - String description = termUserList.stream().map(ProcessProjectStandardTermUser::getDescription).collect(Collectors.joining(",")); - projectLibrary.setDescription(description); - String modelSeries = termUserList.stream().map(ProcessProjectStandardTermUser::getModelSeries).distinct().collect(Collectors.joining(",")); - modelSeries = Arrays.stream(modelSeries.split(",")).distinct().collect(Collectors.joining(",")); - projectLibrary.setModelSeries(modelSeries); - } - if (allTermIdMap.containsKey(termId)) { - List termUserList = allTermIdMap.get(termId); - for (ProcessProjectStandardTermUser termUser : termUserList) { - ProcessProjectStandardTermUser updateTermUser = new ProcessProjectStandardTermUser(); - updateTermUser.setId(termUser.getId()); - String designEngineer1 = termUser.getDesignEngineer(); - updateTermUser.setAssessResults(assessResults); - if(StringUtils.isBlank(designEngineer1)){ - designEngineer1 = termUser.getModuleOwner(); - updateTermUser.setDescription(termUser.getNotInvolved()); - } - if(StringUtils.isBlank(designEngineer1)){ - designEngineer1 = termUser.getResponsibleUnitLeader(); - } - updateTermUser.setDesignEngineer(designEngineer1); - updateTermUserList.add(updateTermUser); - } - } - //推送数据到法规项目库 - lawsSpecialProjectLibraryService.save(projectLibrary); - } - //更新数据 - if (pass){ - termService.updateBatchById(updateTermList); - termUserService.updateBatchById(updateTermUserList); - }else { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - updateWrapper.set(ProcessProjectStandardTermUser::getLeaderParentExecutionId, null); - termUserService.update(updateWrapper); - } - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectStandardCommon.PASS, pass); - if (pass){ - List designEngineerList = updateTermList.stream() - .map(ProcessProjectStandardTerm::getDesignEngineer) - .filter(Objects::nonNull) - .distinct() - .collect(Collectors.toList()); - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList); - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size()); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSBCGZLBH, designEngineerList); - }else { - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - wrapper1.isNotNull(ProcessProjectStandardTermUser::getResponsibleUnitLeader); - List termUserList = termUserService.list(wrapper1); - //选择不涉及的模块责任人 - List notInvolvedManagerLeaderList = termUserList.stream() - .filter(i -> StringUtils.isBlank(i.getModuleOwner())) - .map(ProcessProjectStandardTermUser::getResponsibleUnitLeader) - .distinct() - .collect(Collectors.toList()); - //选择设计工程师的模块责任人 - List managerLeaderList = termUserList.stream() - .filter(i -> StringUtils.isNotBlank(i.getModuleOwner())) - .map(ProcessProjectStandardTermUser::getResponsibleUnitLeader) - .distinct() - .collect(Collectors.toList()); - variables.put(ProcessProjectStandardCommon.NOT_INVOLVED_MANAGER_LEADER_LIST, notInvolvedManagerLeaderList); - variables.put(ProcessProjectStandardCommon.NOT_INVOLVED_MANAGER_LEADER_LIST_SIZE, notInvolvedManagerLeaderList.size()); - variables.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, managerLeaderList); - variables.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST_SIZE, managerLeaderList.size()); - } - if (!Objects.equals(userId,originUserId)){ - //更新数据 - runtimeService.setVariable(executionId,ProcessProjectStandardCommon.STANDARDS_ENGINEER,userId); - } - taskService.complete(taskId, variables); - if (pass){ - for (ProcessProjectStandardTerm term : termList) { - List carbonCopyPersonnelList = Arrays.asList(term.getCarbonCopyPersonnels().split(",")); - //发送消息 - String carbonCopyPersonnels = carbonCopyPersonnelList.stream().distinct().collect(Collectors.joining(",")); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_STANDARD_COMPLETE); - sendMessageDTO.setToUserId(carbonCopyPersonnels); - Map sendMap = new HashMap<>(); - sendMap.put("prcName", process.getPrcName()); - sendMap.put("termNumber", term.getTermNumber()); - sendMap.put("termName", term.getTermName()); - sendMap.put("openType", "url"); - sendMap.put("openPage", "/projectLibrary/SpecialProjectLibrary?standardId=" + term.getStandardId()); - sendMessageDTO.setMap(sendMap); - sendMessageAPI.sendMessage(sendMessageDTO); - } - } - - - } - - //部所主管级领导下发 - private void bszgjldxfSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean isAfterReject) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - Execution execution = processDTO.getExecution(); - String executionParentId = execution.getParentId(); - // 查询原先存储的关联 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId); - if (isAfterReject){ - wrapper.isNull(ProcessProjectStandardTermUser::getModuleOwner); - } - List termUserList = termUserService.list(wrapper); - - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - Map termUserIdMap = CollStreamUtil.toIdentityMap(termList, ProcessProjectStandardTerm::getTermUserId); - List termApprovalList = new ArrayList<>(); - - //删除之前的立项结果 - List termIdList = termList.stream().map(ProcessProjectStandardTerm::getId).collect(Collectors.toList()); - LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); - deleteWrapper.eq(ProcessProjectStandardTermApproval::getProcessId,businessId); - deleteWrapper.eq(ProcessProjectStandardTermApproval::getResponsibleUnitLeader,originUserId); - deleteWrapper.in(ProcessProjectStandardTermApproval::getTermId,termIdList); - - List moduleOwnerIds = new ArrayList<>(); - for (ProcessProjectStandardTermUser termUser : termUserList) { - String termUserId = termUser.getId(); - ProcessProjectStandardTerm term = termUserIdMap.get(termUserId); - String notInvolved = term.getNotInvolved(); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId); - updateWrapper.set(ProcessProjectStandardTermUser::getResponsibleUnitLeader, userId); - updateWrapper.set(ProcessProjectStandardTermUser::getLeaderParentExecutionId,executionParentId); - if (StringUtils.isNotBlank(notInvolved)){ - updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved); - updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED); - //保存立项结果 - ProcessProjectStandardTermApproval termApproval = new ProcessProjectStandardTermApproval(); - termApproval.setProcessId(businessId); - termApproval.setResponsibleUnitLeader(userId); - termApproval.setTermId(term.getId()); - termApproval.setAssessResults(AssessCommon.NOT_INVOLVED); - termApproval.setProjectApprovalFlag(YesOrNoEnum.NO.getValue()); - termApprovalList.add(termApproval); - }else { - String moduleOwner = term.getModuleOwner(); - if (StringUtils.isBlank(moduleOwner)){ - throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); - } - updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved, null); - updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, null); - updateWrapper.set(ProcessProjectStandardTermUser::getModuleOwner, moduleOwner); - updateWrapper.set(ProcessProjectStandardTermUser::getParentExecutionId, executionId); - moduleOwnerIds.add(moduleOwner); - } - termUserService.update(updateWrapper); - } - termApprovalService.saveBatch(termApprovalList); - moduleOwnerIds = moduleOwnerIds.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRFF_1, moduleOwnerIds); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRSP_1, moduleOwnerIds); - - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - if (!Objects.equals(userId,originUserId)){ - variables.put(ProcessProjectStandardCommon.MANAGER_LEADER,userId); - } - variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST, moduleOwnerIds); - variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size()); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - - } - - //模块责任人分发 - //驳回后模块责任人分发 - private void mkzrrffSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean isAfterReject) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - String parentExecutionId = task.getFormKey(); - - // 查询原先存储的关联 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); - wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, parentExecutionId); - if (isAfterReject){ - wrapper.isNull(ProcessProjectStandardTermUser::getDesignEngineer); - } - List termUserList = termUserService.list(wrapper); - //查询表单 - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - Map termUserIdMap = CollStreamUtil.toIdentityMap(termList, ProcessProjectStandardTerm::getTermUserId); - //保存所有新增的关联用户 - List allInsertTermUserList = new ArrayList<>(); - //保存所有设计工程师 - List designEngineerIds = new ArrayList<>(); - for (ProcessProjectStandardTermUser termUser : termUserList) { - String termUserId = termUser.getId(); - ProcessProjectStandardTerm term = termUserIdMap.get(termUserId); - String notInvolved = term.getNotInvolved(); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId); - updateWrapper.set(ProcessProjectStandardTermUser::getModuleOwner, userId); - //如果是不涉及就更新 - if (StringUtils.isNotBlank(notInvolved)){ - updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved); - updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED); - termUserService.update(updateWrapper); - }else { - //如果设计工程师有一个就更新，有多个就新增剩下的 - String designEngineers = term.getDesignEngineer(); - if (StringUtils.isBlank(designEngineers)){ - throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); - } - List designEngineerList = Arrays.asList(designEngineers.split(",")); - designEngineerIds.addAll(designEngineerList); - updateWrapper.set(ProcessProjectStandardTermUser::getDesignEngineer, designEngineerList.get(0)); - updateWrapper.set(ProcessProjectStandardTermUser::getParentExecutionId, executionId); - updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, null); - termUserService.update(updateWrapper); - - if (designEngineerList.size() >= 2){ - for (int i = 1; i < designEngineerList.size(); i++) { - ProcessProjectStandardTermUser termUser1 = new ProcessProjectStandardTermUser(); - BeanUtils.copyProperties(termUser,termUser1); - termUser1.setId(null); - termUser1.setDesignEngineer(designEngineerList.get(i)); - termUser1.setModuleOwner(userId); - termUser1.setParentExecutionId(executionId); - allInsertTermUserList.add(termUser1); - } - } - } - } - //新增的关联用户 - termUserService.saveBatch(allInsertTermUserList); - designEngineerIds = designEngineerIds.stream() - .filter(Objects::nonNull) - .distinct().collect(Collectors.toList()); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, designEngineerIds); - if (!Objects.equals(userId,originUserId)){ - } - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId); - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - int size = designEngineerIds.size(); - if (size > 0){ - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerIds); - } - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, size); - variables.put(ProcessProjectAssessCommon.SKIP, false); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); - } - - //设计工程师评估 - private void sjgcspgSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - String userId = CurrentUserUtil.getId(); - Task task = processDTO.getTask(); - String formKey = task.getFormKey(); - String executionId = task.getExecutionId(); - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - String moduleOwnerId = termList.get(0).getModuleOwner(); - List udpateTermUserList = new ArrayList<>(); - for (ProcessProjectStandardTerm term : termList) { - ProcessProjectStandardTermUser termUser = new ProcessProjectStandardTermUser(); - termUser.setId(term.getTermUserId()); - termUser.setDesignEngineer(userId); - termUser.setAssessResults(term.getAssessResults()); - termUser.setIsRelate(term.getIsRelate()); - termUser.setModelSeries(term.getModelSeries()); - termUser.setDescription(term.getDescription()); - termUser.setFileId(term.getFileId()); - udpateTermUserList.add(termUser); - } - termUserService.updateBatchById(udpateTermUserList); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey); - if (!Objects.equals(userId,originUserId)){ - } - // 完成任务 - String taskId = processDTO.getTaskId(); - Map variables = new HashMap<>(); - variables.put(ProcessProjectStandardCommon.MODULE_OWNER, moduleOwnerId); - taskService.complete(taskId,variables); - ThreadLocalUtil.remove(); - } - - //设计工程师补充工作令编号 - private void sjgcsbcgzlbhSubmit(ProcessInfoVO processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - Task task = processDTO.getTask(); - String formKey = task.getFormKey(); - String executionId = task.getExecutionId(); - ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List termList = businessInfoDTO.getProcessProjectStandardTermList(); - for (ProcessProjectStandardTerm term : termList) { - String termId = term.getId(); - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(LawsSpecialProjectLibrary::getProcessTermId,termId); - wrapper.set(LawsSpecialProjectLibrary::getWorkNumber,term.getWorkNumber()); - wrapper.set(LawsSpecialProjectLibrary::getProjectName,term.getProjectName()); - lawsSpecialProjectLibraryService.update(wrapper); - } - // 完成任务 - String taskId = processDTO.getTaskId(); - taskService.complete(taskId); - } - - public IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); - IPage standardSelectionVO = lawsCommonMapper.getStandardSelectionVO(page,selectionBoxVO); - this.assignment(standardSelectionVO.getRecords()); - return standardSelectionVO; - } - - public void assignment(List records) { - List dictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); - for (StandardSelectionVO assess : records) { - String standardId = assess.getId(); - String source = assess.getSource(); - - // 查询标准拆分表 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - // 标准id - queryWrapper.eq(SarFileSplitInfoEO::getStandardId, standardId); - // 拆分表发布标识 - queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId); - // 文件字段标识 - queryWrapper.isNotNull(SarFileSplitInfoEO::getFileType); - List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); - - Map flagMap = new HashMap<>(); - ListmapList = new ArrayList<>(); - sarFileSplitInfoEOList.forEach(e -> flagMap.put(e.getFileType(), e.getId())); - for (DictModel dictModel : dictModels) { - String text = dictModel.getText(); - String value = dictModel.getValue(); - DecompositionOrderSourceVO decompositionOrderSourceVO = new DecompositionOrderSourceVO(); - decompositionOrderSourceVO.setText(text); - decompositionOrderSourceVO.setValue(value); - decompositionOrderSourceVO.setSarFileSplitInfoId(flagMap.get(value)); - mapList.add(decompositionOrderSourceVO); - } - assess.setDecompositionOrderSourceVOList(mapList); - } - } - - public void autoComplete(DelegateTask delegateTask) { - String assignee = delegateTask.getAssignee(); - Map variables = new HashMap<>(); - if ("123".equals(assignee)){ - DelegateExecution execution = delegateTask.getExecution(); - runtimeService.setVariable(execution.getId(), ProcessProjectAssessCommon.SKIP, true); - variables.put(ProcessProjectAssessCommon.SKIP, true); - }else { - String executionParentId = delegateTask.getFormKey(); - String processInstanceId = delegateTask.getProcessInstanceId(); - ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); - String projectId = processAll.getProjectId(); - List termList = termMapper.getByModuleOwnerAutoComplete(projectId, assignee, executionParentId); - List designEngineerIds = termList.stream() - .map(ProcessProjectStandardTerm::getDesignEngineer) - .distinct() - .collect(Collectors.toList()); - ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionParentId); - variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerIds); - variables.put(ProcessProjectAssessCommon.SKIP, false); - } - taskService.complete(delegateTask.getId(),variables); - ThreadLocalUtil.remove(); - - } - - /** - * 获取分类用的标准编号，标准名称列表 - */ - public Map getSplitInfoIdMap(String processId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessProjectStandardTerm::getProcessId,processId); - List list = termService.list(wrapper); - Map stringProcessProjectStandardTermMap = CollStreamUtil.toIdentityMap(list, ProcessProjectStandardTerm::getSplitInfoId); - return stringProcessProjectStandardTermMap; - } - - public IPage getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) { - String taskId = termUser.getTaskId(); - if (taskId != null){ - ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - termUser.setResponsibleUnitLeader(originUserId); - } - Page page = new Page<>(pageNo, pageSize); - Page pageList = termUserMapper.selectPageByUser(page, termUser); - return pageList; - } - - public List getTermApprovalList(String id) { - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(ProcessProjectStandardTermApproval::getTermId,id); - return termApprovalService.list(wrapper1); - } - - public void auto(DelegateTask delegateTask) { - taskService.complete(delegateTask.getId()); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermApprovalService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermApprovalService.java deleted file mode 100644 index 2bdc9f05..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermApprovalService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.service; - -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; -import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermApprovalMapper; -/** - * - *@author liJiaRao - *@date 2024-01-17 15:00 - */ -@Service -public class ProcessProjectStandardTermApprovalService extends ServiceImpl { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java deleted file mode 100644 index 2f6dfdad..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.service; - -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; -import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermMapper; -/** - * - *@author liJiaRao - *@date 2024-01-15 16:27 - */ -@Service -public class ProcessProjectStandardTermService extends ServiceImpl { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java deleted file mode 100644 index 6466675e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardTermUserService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; -import com.jero.modules.activiti.process.projectstandard.mapper.ProcessProjectStandardTermUserMapper; -/** - * - *@author liJiaRao - *@date 2024-01-15 16:27 - */ -@Service -public class ProcessProjectStandardTermUserService extends ServiceImpl { - @Resource - private ISysBaseAPI sysBaseAPI; - - public IPage queryPage(ProcessProjectStandardTermUser processProjectStandardTermUser, Integer pageNo, Integer pageSize, - HttpServletRequest req){ - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processProjectStandardTermUser, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - Page pageList = page(page, queryWrapper); - //获取所有用户信息 - List userList = sysBaseAPI.getAllUser(); - Map userNameMap = new HashMap<>(); - for (LoginUser loginUser : userList) { - userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo()); - } - for (ProcessProjectStandardTermUser record : pageList.getRecords()) { - String moduleOwner = record.getModuleOwner(); - record.setModuleOwner(userNameMap.get(moduleOwner)); - String designEngineer = record.getDesignEngineer(); - record.setDesignEngineer(userNameMap.get(designEngineer)); - } - return pageList; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java deleted file mode 100644 index 4ce090bf..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.vo; - -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandard; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermApproval; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author liJiaRao - * @date 2024-01-15 16:24 - */ -@Data -public class ProcessProjectStandardVO { - /**业务基本信息*/ - @ApiModelProperty(value = "业务基本信息") - private ProcessProjectStandard processProjectStandard; - /**上一节点处理人*/ - @ApiModelProperty(value = "上一节点处理人") - private String moduleOwner; - /**关联条款列表*/ - @ApiModelProperty(value = "关联条款列表") - private List processProjectStandardTermList; - /**关联标准分派列表*/ - @ApiModelProperty(value = "关联标准分派列表") - private List processProjectStandardTermUserList; - /**立项结果列表*/ - @ApiModelProperty(value = "立项结果列表") - private List processProjectStandardTermApprovalList; -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java deleted file mode 100644 index 72725321..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/StandardSelectionVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.jero.modules.activiti.process.projectstandard.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.List; - -/** - * @Author: liao - * @Date: 2023/9/11 15:52 - * @Description: 多选标准弹框 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class StandardSelectionVO { - @ApiModelProperty(value = "来源（1国标、2外标）") - private String source; - @ApiModelProperty(value = "主键ID") - private String id; - @ApiModelProperty(value = "标准编号") - private String standardNumber; - @ApiModelProperty(value = "标准名称") - private String standardName; - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "发布日期") - private java.util.Date releaseDate; - @ApiModelProperty(value = "标准状态") - @Dict(dicCode = "standard_state") - private String standardState; - @ApiModelProperty(value = "在产车实施日期") - private String onTheProductionDate; - @ApiModelProperty(value = "新车型实施日期") - private String newModelImplementationDate; - @ApiModelProperty(value = "分解单来源列表") - private List decompositionOrderSourceVOList; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index a5e0767d..52a438d0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -1,18 +1,16 @@ package com.jero.modules.activiti.service; import cn.hutool.core.collection.CollStreamUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.PushWorkflowIntegrationAPI; import com.jero.common.api.dto.message.HiworkTodoAdd; import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; +import com.jero.modules.common.service.SendMessageAPI; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; @@ -27,21 +25,11 @@ import com.jero.modules.activiti.mapper.ProcessAllMapper; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus; -import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; -import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService; -import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision; -import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; -import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon; -import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; -import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.ResolveTaskParam; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService; import lombok.extern.slf4j.Slf4j; @@ -81,17 +69,10 @@ public class ProcessAllService extends ServiceImpl private SendMessageAPI sendMessageAPI; @Resource private ProcessDraftService processDraftService; - @Resource - private EsRevisionService revisionService; - @Resource private EnterpriseStandardPlanService espService; @Resource - private PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI; - @Resource private EnterpriseStandardRecheckPlanService esRecheckService; - @Resource - private ProcessEsRecheckService processEsRecheckService; private static final List INSPECT_PROCESS = Arrays.asList( ProcessTypeEnum.FB_ENTRY_CHANGE.getValue(), @@ -259,14 +240,6 @@ public class ProcessAllService extends ServiceImpl processApprovalRecord.setCreateTime(null); approvalRecordService.save(processApprovalRecord); - // 制修订流程强制撤回后需要更改企标计划的项目状态为未开始 - if (Objects.equals(prcType, ProcessTypeEnum.ES_REVISION.getValue())) { - this.revisionForcedWithdrawalProcess(processInstanceId); - } - // 企标复审流程强制撤回后需要更改企标复审计划的内置状态为未开始 - if (Objects.equals(prcType, ProcessTypeEnum.ES_RECHECK.getValue())) { - this.recheckForcedWithdrawalProcess(processInstanceId); - } //todo 同步删除操作到统一待办 //查询所有待办任务 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -283,31 +256,7 @@ public class ProcessAllService extends ServiceImpl todoAddList.add(hiworkTodoAdd); } - pushWorkflowIntegrationAPI.sendDeleteTask(todoAddList); - } - - private void revisionForcedWithdrawalProcess(String processInstanceId) { - ProcessEsRevision revision = revisionService.getOne(new LambdaQueryWrapper() - .eq(ProcessEsRevision::getProcessInstanceId, processInstanceId)); - String espId = revision.getEspId(); - if (StrUtil.isBlank(espId)) { - throw new JeroBootException("强制撤回企标制修订流程失败，找不到对应的企标计划"); - } - espService.update(new LambdaUpdateWrapper() - .eq(EnterpriseStandardPlan::getId, espId) - .set(EnterpriseStandardPlan::getProjectStatus, ESPProjectStatus.NOT_STARTED.getValue())); - } - - private void recheckForcedWithdrawalProcess(String processInstanceId) { - ProcessEsRecheck recheckProcess = processEsRecheckService.getOne(new LambdaQueryWrapper() - .eq(ProcessEsRecheck::getProcessInstanceId, processInstanceId)); - String recheckPlanId = recheckProcess.getRecheckPlanId(); - if (StrUtil.isBlank(recheckPlanId)) { - throw new JeroBootException("强制撤回企标更改流程失败，找不到对应的企标复审计划"); - } - esRecheckService.update(new LambdaUpdateWrapper() - .eq(EnterpriseStandardRecheckPlan::getId, recheckPlanId) - .set(EnterpriseStandardRecheckPlan::getInProcessFlag, YesOrNoEnum.NO.getValue())); +// pushWorkflowIntegrationAPI.sendDeleteTask(todoAddList); } public void delegateTask(DelegateTaskParam param) { @@ -459,16 +408,6 @@ public class ProcessAllService extends ServiceImpl if (!Objects.isNull(processNode) && VariableTypeEnum.STRING.getName().equals(processNode.getVariableType())){ runtimeService.setVariable(task.getExecutionId(), processNode.getVariableName(), toUserId); } - // 稽查延期申请流程 稽查联络人评估 节点特殊处理 - if (ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue().equals(processAll.getPrcType()) - && EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processApprovalRecord.getNodeId())){ - IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class); - processEsInspectDelayApplyService.update( - new LambdaUpdateWrapper() - .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()) - .eq(ProcessEsInspectDelayApply::getLiaisons, userId) - .set(ProcessEsInspectDelayApply::getLiaisons, toUserId)); - } } public void deleteByPrcId(String prcId) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java index 5c0924b0..70114f42 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java @@ -12,7 +12,6 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.mapper.ProcessApprovalRecordMapper; -import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant; import com.jero.modules.laws.common.util.CurrentUserUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -94,34 +93,6 @@ public class ProcessApprovalRecordService extends ServiceImpl records) { - boolean hasExpertCheckNode = false; - // 遍历审批记录，将任务节点名称特殊处理 - for (ProcessApprovalRecord record : records) { - String nodeName = record.getTaskName(); - if (StrUtil.isNotBlank(nodeName)){ - if (nodeName.equals(EsInitChangeConstant.EXPERT_CHECK)) { - hasExpertCheckNode = true; - } - } - } - - for (ProcessApprovalRecord record : records) { - String nodeName = record.getTaskName(); - if (StrUtil.isNotBlank(nodeName)){ - if (Objects.equals(nodeName, EsInitChangeConstant.MAIN_DRAFT_USER_LEADER) && hasExpertCheckNode) { - record.setTaskName("发起人主管级领导审批"); - } - if (Objects.equals(nodeName, EsInitChangeConstant.MAIN_DRAFT_USER_LEADER_LEADER) && hasExpertCheckNode) { - record.setTaskName("发起人主管级上一级领导审批"); - } - if (Objects.equals(nodeName, EsInitChangeConstant.MAIN_DRAFT_USER_LEADER) && !hasExpertCheckNode) { - record.setTaskName("主起草人主管级领导审批"); - } - if (Objects.equals(nodeName, EsInitChangeConstant.MAIN_DRAFT_USER_LEADER_LEADER) && !hasExpertCheckNode) { - record.setTaskName("主起草人主管级上一级领导审批"); - } - } - } } public ProcessApprovalRecord getMyLastComplete(String processInstanceId, String nodeId, String userId) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index 475722f2..840ca8aa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -10,12 +10,6 @@ import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.mapper.ProcessModelNodeMapper; import com.jero.modules.activiti.mapper.ProcessNodeMapper; import com.jero.modules.activiti.process.common.enums.ProcessType; -import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant; -import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPApplicationCategoryEnum; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType; -import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; -import com.jero.modules.activiti.process.esRevision.entity.RevisionTaskNodeIdConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -26,7 +20,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -42,9 +35,6 @@ public class ProcessNodeService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessModelNode::getNodeType, "userTask"); @@ -118,29 +108,11 @@ public class ProcessNodeService extends ServiceImpl processNodeList = this.list(wrapper); List processNodeList = processNodeMapper.selectByIdPdIdAndPiId(processDefinitionId, processInstanceId); - // 制修订流程特殊处理 - if (processDefinitionId.contains(ProcessType.ES_REVISION.getProcessKey())) { - specialProcessEsRevisionPre(processNodeList); - } // 可跳过节点判断 processNodeList = processNodeList.stream().filter(v -> YesOrNoEnum.NO.getValue().equals(v.getIsSkip()) || (YesOrNoEnum.YES.getValue().equals(v.getIsSkip()) && StringUtils.isNotBlank(v.getLinkUserIds()))) .collect(Collectors.toList()); - // 制修订流程特殊后处理 - if (processDefinitionId.contains(ProcessType.ES_REVISION.getProcessKey())) { - specialProcessEsRevisionEnd(processNodeList); - } - // 启用封存废止流程特殊后处理 - if (processDefinitionId.contains(ProcessType.ES_ENABLE.getProcessKey()) || - processDefinitionId.contains(ProcessType.ES_ARCHIVE.getProcessKey()) || - processDefinitionId.contains(ProcessType.ES_ABOLISH.getProcessKey())) { - specialProcessEsMiniProcessEnd(processNodeList); - } - // 立项变更流程特殊后处理 - if (processDefinitionId.contains(ProcessType.ES_INIT_CHANGE.getProcessKey())) { - specialProcessEsInitChange(processNodeList, processInstanceId); - } // 复审流程特殊后处理 if (processDefinitionId.contains(ProcessType.ES_RECHECK.getProcessKey())) { specialProcessEsRecheck(processNodeList, processInstanceId); @@ -159,50 +131,6 @@ public class ProcessNodeService extends ServiceImpl processNodeList, String processInstanceId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); - List processEsInitChanges = esInitChangeService.list(wrapper); - if (CollectionUtils.isNotEmpty(processEsInitChanges)) { - ProcessEsInitChange processEsInitChange = processEsInitChanges.get(0); - if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.INITIATION.getValue())) { - // 删除主起草人抄送节点 - processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.AUTO_COPY)); - // 将两个节点改名 - processNodeList.forEach(processNode -> { - if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) { - processNode.setNodeName("发起人主管级领导审批"); - } - if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER_LEADER)) { - processNode.setNodeName("发起人主管级上一级领导审批"); - } - }); - } - // 将两个节点改名 - if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.CHANGE.getValue())) { - // 删除专家审批节点 - processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.EXPERT_CHECK)); - processNodeList.forEach(processNode -> { - if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) { - processNode.setNodeName("主起草人主管级领导审批"); - } - if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER_LEADER)) { - processNode.setNodeName("主起草人主管级上一级领导审批"); - } - }); - } - // 如果不是责任部门变更流程的话，需要删除三个节点 - if (!Objects.equals(processEsInitChange.getProjectType(), ESPProjectType.RESPONSIBLE_DEPT_CHANGE.getValue())) { - // 删除新起草部门主管级上一级领导下发节点 - processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.NEW_MAIN_DRAFT_LEADER_LEADER)); - // 删除新起草部门主管级领导确认节点 - processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.NEW_MAIN_DRAFT_LEADER)); - // 删除相关人员会签节点 - processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.RELATE_USER_SIGN)); - } - } - } - private void specialProcessEsMiniProcessEnd(List processNodeList) { // 如果第三个节点有选人信息，则判断相关人员会签节点是否有人，如果没人，则删除相关人员会签节点 if (processNodeList.size() >= 3) { @@ -215,71 +143,4 @@ public class ProcessNodeService extends ServiceImpl processNodeList) { - String contactUser = null; - String adviceObject = null; - for (ProcessNode processNode : processNodeList) { - if (RevisionTaskNodeIdConstant.CONTACT_USER_DISTRIBUTE.equals(processNode.getXmlNodeId())) { - contactUser = processNode.getLinkUserIds(); - } - if (RevisionTaskNodeIdConstant.ADVICE.equals(processNode.getXmlNodeId())) { - adviceObject = processNode.getLinkUserIds(); - } - } - if (StrUtil.isNotBlank(contactUser)) { - processNodeList.forEach(r -> { - if (RevisionTaskNodeIdConstant.CONTACT_USER_LEADER_APPROVAL.equals(r.getXmlNodeId()) - && r.getLinkUserIds() == null) { - r.setLinkUserIds("tempUser"); - } - }); - } - if (StrUtil.isNotBlank(contactUser) && StrUtil.isBlank(adviceObject)) { - processNodeList.forEach(r -> { - if (RevisionTaskNodeIdConstant.ADVICE.equals(r.getXmlNodeId())) { - r.setLinkUserIds("tempUser"); - } - }); - } - } - - /** - * 后处理 - * - * @param processNodeList - */ - private void specialProcessEsRevisionEnd(List processNodeList) { - String adviceObject = null; - boolean adviceFlag = false; - for (ProcessNode processNode : processNodeList) { - if (RevisionTaskNodeIdConstant.ADVICE.equals(processNode.getXmlNodeId())) { - adviceObject = processNode.getLinkUserIds(); - } - if (RevisionTaskNodeIdConstant.CONTACT_USER_DISTRIBUTE.equals(processNode.getXmlNodeId()) || - RevisionTaskNodeIdConstant.ADVICE.equals(processNode.getXmlNodeId()) || - RevisionTaskNodeIdConstant.CONTACT_USER_COLLECT.equals(processNode.getXmlNodeId()) || - RevisionTaskNodeIdConstant.CONTACT_USER_LEADER_APPROVAL.equals(processNode.getXmlNodeId())) { - adviceFlag = true; - } - } - if ("tempUser".equals(adviceObject)) { - processNodeList.forEach(r -> { - if (RevisionTaskNodeIdConstant.ADVICE.equals(r.getXmlNodeId())) { - r.setLinkUserIds(null); - } - if (RevisionTaskNodeIdConstant.CONTACT_USER_LEADER_APPROVAL.equals(r.getXmlNodeId())) { - r.setLinkUserIds(null); - } - }); - } - if (!adviceFlag) { - processNodeList.removeIf(processNode -> RevisionTaskNodeIdConstant.MAIN_DRAFT_USER_COLLECT_SECOND.equals(processNode.getXmlNodeId())); - } - } } diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/SendMessageAPI.java b/laws-modules/src/main/java/com/jero/modules/common/service/SendMessageAPI.java similarity index 89% rename from laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/SendMessageAPI.java rename to laws-modules/src/main/java/com/jero/modules/common/service/SendMessageAPI.java index 0474e634..a189fbb3 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/SendMessageAPI.java +++ b/laws-modules/src/main/java/com/jero/modules/common/service/SendMessageAPI.java @@ -1,4 +1,4 @@ -package com.jero.common.api.vo; +package com.jero.modules.common.service; import com.jero.common.api.dto.message.SendMessageDTO; @@ -7,6 +7,7 @@ import com.jero.common.api.dto.message.SendMessageDTO; * @Date: 2023/10/27 15:15 * @Description: 发送消息 */ + public interface SendMessageAPI { /** diff --git a/laws-modules/src/main/java/com/jero/modules/common/service/impl/SendMessageServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/common/service/impl/SendMessageServiceImpl.java new file mode 100644 index 00000000..ee39fcb9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/common/service/impl/SendMessageServiceImpl.java @@ -0,0 +1,106 @@ +package com.jero.modules.common.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.dto.message.SendMessageDTO; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.common.service.SendMessageAPI; +import com.jero.modules.message.entity.SysMessageTemplate; +import com.jero.modules.message.handle.ISendMsgHandle; +import com.jero.modules.message.handle.impl.SmsSendMsgHandle; +import com.jero.modules.message.service.ISysMessageTemplateService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * @Author: liao + * @Date: 2023/10/17 11:23 + * @Description: 发送消息 + */ +@Slf4j +@Service +public class SendMessageServiceImpl implements SendMessageAPI { + + @Resource + private ISysMessageTemplateService sysMessageTemplateService; + @Value("${hiwork.isSend}") + private Boolean isSend; + @Value("${hiwork.hiworkUrlPrefix}") + private String hiworkUrlPrefix; + + /** + * @Author: liao + * @Date: 2023/10/17 11:25 + * @Description: 根据模板发送消息 + **/ + @Override + public void sendMessage(SendMessageDTO sendMessageDTO) { + if (StringUtils.isEmpty(sendMessageDTO.getToUserId())) { + throw new JeroBootException("消息接收人id不能为空"); + } + if (StringUtils.isEmpty(sendMessageDTO.getTemplateCode())) { + throw new JeroBootException("消息模板编码不能为空!"); + } + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(SysMessageTemplate::getTemplateCode, sendMessageDTO.getTemplateCode()); + List sysSmsTemplates = sysMessageTemplateService.list(query); + if (CollectionUtils.isEmpty(sysSmsTemplates)) { + throw new JeroBootException("消息模板不存在"); + } + SysMessageTemplate sysMessageTemplate = sysSmsTemplates.get(0); + + String openType = sysMessageTemplate.getOpenType(); + String openPage = sysMessageTemplate.getOpenPage(); + + try { + // 替换模板内容 + if (!Objects.isNull(sendMessageDTO.getMap())) { + Map map = sendMessageDTO.getMap(); + map.forEach((k, v) -> sysMessageTemplate.setTemplateContent( + sysMessageTemplate.getTemplateContent().replace("${" + k + "}", v))); + if (null != map.get("openType")) { + openType = map.get("openType"); + } + if (null != map.get("openPage")) { + openPage = map.get("openPage"); + } + } + + List typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(",")); + if (StrUtil.isNotBlank(openPage)) { + if (openPage.contains("/workCenter/processCenter/processCenter")) { + if (openPage.contains("?")) { + openPage = openPage + "&activeTab=TodoList"; + } else { + openPage = openPage + "?activeTab=TodoList"; + } + } + } + String finalOpenType = openType; + String finalOpenPage = openPage; + typeList.forEach(type -> { + log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), type); + ISendMsgHandle sendMsgHandle; + // 普通系统消息 + sendMsgHandle = new SmsSendMsgHandle(); + if (isSend) { + sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, finalOpenPage); + } + }); + } catch (Exception e) { + log.error("发送消息异常", e); + throw new JeroBootException("发送消息异常"); + } + + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java index 2693c1ec..14dfcd98 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.activiti.process.projectstandard.vo.StandardSelectionVO; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.tag.entity.LawsTag; @@ -96,5 +95,4 @@ public interface LawsCommonMapper { ManyStandardSelectionBox getSingleStandard(@Param("standardNumber") String standardNumber, @Param("id") String id); - IPage getStandardSelectionVO(Page page, @Param("vo") ManyStandardSelectionBoxVO selectionBoxVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index d549075b..313ee724 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -139,50 +139,50 @@ - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 03c23c37..4f02110a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1,7 +1,6 @@ package com.jero.modules.laws.common.service.impl; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -21,8 +20,6 @@ import com.jero.common.util.IntekeyUtils; import com.jero.common.util.MessageUtils; import com.jero.common.util.MinioUtil; import com.jero.modules.activiti.process.common.enums.StandardStateEnum; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.bindPart.docking.DockingService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.service.ILawsCommonService; @@ -103,9 +100,6 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import static com.jero.modules.bindPart.docking.DockingServiceImpl.STANDARD_ABOLISH; -import static com.jero.modules.bindPart.docking.DockingServiceImpl.STANDARD_EDIT; - /** * @Author: liao * @Date: 2023/8/23 16:54 @@ -178,15 +172,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Resource private PartNameService partNameService; - @Resource - private IProcessFbStandardConsultationService processFbStandardConsultationService; - @Resource private ISysDepartService departService; - @Resource - private DockingService dockingService; - public static boolean ENCRYPT_ENABLE; public static String DECRYPT_URL; public static String DECRYPT_APP_CODE; @@ -884,7 +872,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { (standardState.contains("3") || standardState.contains("4"))) { // 修改标准状态为发布或报批后，征求意见流程的超期待办，流程结束，不进入已办中 try { - processFbStandardConsultationService.endOverDueBackLog(String.valueOf(parameterMap.get("id"))); +// processFbStandardConsultationService.endOverDueBackLog(String.valueOf(parameterMap.get("id"))); } catch (Exception e) { log.error(e.getMessage()); } @@ -1005,11 +993,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } } // 判断是否是改为废止 - if (isAbolish) { - dockingService.sendStandardChangeToSCM(id, module, STANDARD_ABOLISH, null); - } else{ - dockingService.sendStandardChangeToSCM(id, module, STANDARD_EDIT, null); - } +// if (isAbolish) { +// dockingService.sendStandardChangeToSCM(id, module, STANDARD_ABOLISH, null); +// } else{ +// dockingService.sendStandardChangeToSCM(id, module, STANDARD_EDIT, null); +// } } catch (Exception e) { log.error("E采通同步标准信息出错", e); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/common/DirectoryComparator.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/common/DirectoryComparator.java deleted file mode 100644 index 1336c73a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/common/DirectoryComparator.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jero.modules.laws.consultation.common; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; - -import java.util.Comparator; - -/** - * @ClassName: DirectoryComparator - * @Description: - * @Author: yjz - * @Date: 2023-11-03 11:24 - * @Version: 1.0 - **/ -public class DirectoryComparator implements Comparator { - public int compare(ProcessFbConsultationList dir1, ProcessFbConsultationList dir2) { - String sortNumber1 = dir1.getChapterNumber(); - String sortNumber2 = dir2.getChapterNumber(); - - String[] parts1 = sortNumber1.split("\\."); - String[] parts2 = sortNumber2.split("\\."); - - int i = 0; - while (i < parts1.length && i < parts2.length) { - int part1 = tryParseInt(parts1[i]); - int part2 = tryParseInt(parts2[i]); - - if (part1 != part2) { - return part1 - part2; - } - - i++; - } - - return parts1.length - parts2.length; - } - - private int tryParseInt(String str) { - try { - return Integer.parseInt(str); - } catch(NumberFormatException e) { - return str.hashCode(); - } - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java deleted file mode 100644 index 4d877cf5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.jero.modules.laws.consultation.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.laws.consultation.service.IConsultationService; -import com.jero.modules.laws.consultation.vo.ProcessFbConsultationListVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @ClassName: ConsultationController - * @Description: - * @Author: yjz - * @Date: 2023-12-04 09:31 - * @Version: 1.0 - **/ -@Api(tags="征求意见") -@RestController -@RequestMapping("/laws/consultation") -@Slf4j -public class ConsultationController { - private final IConsultationService consultationService; - - public ConsultationController(IConsultationService consultationService) { - this.consultationService = consultationService; - } - - /** - * 征求意见-分页查询 - * @return - */ - @AutoLog(value = "征求意见-分页查询") - @ApiOperation(value="征求意见-分页查询", notes="征求意见-分页查询") - @GetMapping(value = "/queryByPage") - @RequiresPermissions("askForAdvice:search") - public Result> queryByPage(ProcessFbStandardConsultation processFbStandardConsultation, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(consultationService.queryByPage(processFbStandardConsultation, pageNo, pageSize)); - } - - /** - * 征求意见-详情 - * @return - */ - @AutoLog(value = "征求意见-详情") - @ApiOperation(value="征求意见-详情", notes="征求意见-详情") - @GetMapping(value = "/queryDetailByBusinessId") - @Translation - @RequiresPermissions("askForAdvice:search") - public Result queryDetailByBusinessId(String businessId, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(consultationService.queryDetailByBusinessId(businessId, pageNo, pageSize)); - } - - /** - * 征求意见详情-导出 - * @param request - * @param response - */ - @AutoLog(value = "征求意见详情-导出") - @ApiOperation(value = "征求意见详情-导出") - @GetMapping("/exportExcel") - @RequiresPermissions("askForAdvice:detail:export") - public void exportExcel(String businessId, HttpServletRequest request, HttpServletResponse response) { - consultationService.exportExcel(businessId, request, response); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/entity/Consultation.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/entity/Consultation.java deleted file mode 100644 index 1d67bcda..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/entity/Consultation.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.laws.consultation.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @ClassName: consultation - * @Description: - * @Author: yjz - * @Date: 2023-12-04 09:33 - * @Version: 1.0 - **/ -@Data -public class Consultation { - /**id*/ - @Excel(name = "id", width = 15) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; - - /**征求意见周期*/ - @Excel(name = "征求意见周期", width = 15) - @ApiModelProperty(value = "征求意见周期") - private java.lang.String consultationPeriod; - - /**征求意见开始日期*/ - @Excel(name = "征求意见开始日期", width = 15) - @ApiModelProperty(value = "征求意见开始日期") - private java.lang.String consultationBeginDate; - - /**征求意见结束日期*/ - @Excel(name = "征求意见结束日期", width = 15) - @ApiModelProperty(value = "征求意见结束日期") - private java.lang.String consultationEndDate; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/mapper/ConsultationMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/mapper/ConsultationMapper.java deleted file mode 100644 index b601d1cd..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/mapper/ConsultationMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.modules.laws.consultation.mapper; - -/** - * @InterfaceName: ConsultationMapper - * @Description: - * @Author: yjz - * @Date: 2023-12-04 09:34 - * @Version: 1.0 - **/ -public interface ConsultationMapper { -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/mapper/xml/ConsultationMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/consultation/mapper/xml/ConsultationMapper.xml deleted file mode 100644 index 66aaef60..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/mapper/xml/ConsultationMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/IConsultationService.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/IConsultationService.java deleted file mode 100644 index 298de583..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/IConsultationService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.jero.modules.laws.consultation.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.laws.consultation.vo.ProcessFbConsultationListVO; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * @InterfaceName: consultationService - * @Description: - * @Author: yjz - * @Date: 2023-12-04 09:33 - * @Version: 1.0 - **/ -public interface IConsultationService { - /** - * 征求意见-分页查询 - * @param processFbStandardConsultation - * @param pageNo - * @param pageSize - * @return - */ - IPage queryByPage(ProcessFbStandardConsultation processFbStandardConsultation, Integer pageNo, Integer pageSize); - - /** - * 征求意见-详情 - * @param businessId - * @return - */ - List queryDetailByBusinessId(String businessId); - - /** - * 征求意见详情-导出 - * @param businessId - * @param request - * @param response - */ - void exportExcel(String businessId, HttpServletRequest request, HttpServletResponse response); - - /** - * 征求意见-详情 - * @param businessId - * @param pageNo - * @param pageSize - * @return - */ - ProcessFbConsultationListVO queryDetailByBusinessId(String businessId, Integer pageNo, Integer pageSize); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java deleted file mode 100644 index 794c8286..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java +++ /dev/null @@ -1,295 +0,0 @@ -package com.jero.modules.laws.consultation.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationListService; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.laws.consultation.common.DirectoryComparator; -import com.jero.modules.laws.consultation.service.IConsultationService; -import com.jero.modules.laws.consultation.vo.ProcessFbConsultationListVO; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysDictService; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.OutputStream; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @ClassName: ConsultationServiceImpl - * @Description: - * @Author: yjz - * @Date: 2023-12-04 09:33 - * @Version: 1.0 - **/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ConsultationServiceImpl implements IConsultationService { - private final IProcessFbStandardConsultationService processFbStandardConsultationService; - private final IProcessFbConsultationListService processFbConsultationListService; - private final ILawsDomesticStandardService lawsDomesticStandardService; - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - private final ISysDepartService sysDepartService; - private final IOSSFileService ossFileService; - private final ISysDictService sysDictService; - - public ConsultationServiceImpl(IProcessFbStandardConsultationService processFbStandardConsultationService, - IProcessFbConsultationListService processFbConsultationListService, - ILawsDomesticStandardService lawsDomesticStandardService, - ILawsEnterpriseStandardService lawsEnterpriseStandardService, - ISysDepartService sysDepartService, - IOSSFileService ossFileService, - ISysDictService sysDictService) { - this.processFbStandardConsultationService = processFbStandardConsultationService; - this.processFbConsultationListService = processFbConsultationListService; - this.lawsDomesticStandardService = lawsDomesticStandardService; - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - this.sysDepartService = sysDepartService; - this.ossFileService = ossFileService; - this.sysDictService = sysDictService; - } - - @Override - public IPage queryByPage(ProcessFbStandardConsultation processFbStandardConsultation, Integer pageNo, Integer pageSize) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.isNotNull(ProcessFbStandardConsultation::getConsultationEndDate); - if (StringUtils.isNotBlank(processFbStandardConsultation.getConsultationPeriod())){ - String[] date = processFbStandardConsultation.getConsultationPeriod().split(","); - queryWrapper.and(qw -> qw.between(ProcessFbStandardConsultation::getConsultationBeginDate, date[0], date[1]) - .or().between(ProcessFbStandardConsultation::getConsultationEndDate, date[0], date[1])); - } - if (StringUtils.isNotBlank(processFbStandardConsultation.getStandardNameNumber())){ - queryWrapper.and(qw -> qw.like(ProcessFbStandardConsultation::getStandardNumber, processFbStandardConsultation.getStandardNameNumber()) - .or().like(ProcessFbStandardConsultation::getStandardName, processFbStandardConsultation.getStandardNameNumber())); - } - queryWrapper.orderByDesc(ProcessFbStandardConsultation::getConsultationEndDate).orderByDesc(ProcessFbStandardConsultation::getUpdateTime); - IPage page = processFbStandardConsultationService.page(new Page<>(pageNo, pageSize), queryWrapper); - List records = page.getRecords(); - fillProperty(records); - return page; - } - - private void fillProperty(List processFbStandardConsultations) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - for (ProcessFbStandardConsultation StandardConsultation : processFbStandardConsultations) { - String standardName = StandardConsultation.getStandardName(); - - // 国标 - LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(StandardConsultation.getStandardId()); - // 企标 - LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getById(StandardConsultation.getStandardId()); - if (!Objects.isNull(lawsDomesticStandard)){ - standardName = lawsDomesticStandard.getStandardName(); - StandardConsultation.setSource("1"); - }else if (!Objects.isNull(lawsEnterpriseStandard)){ - standardName = lawsEnterpriseStandard.getStandardName(); - StandardConsultation.setSource("3"); - } - - StandardConsultation.setStandardNameNumber(StandardConsultation.getStandardNumber() + " " + standardName); - StandardConsultation.setConsultationPeriod( - dateFormat.format(StandardConsultation.getConsultationBeginDate()) + " ~ " + - dateFormat.format(StandardConsultation.getConsultationEndDate())); - } - } - - @Override - public List queryDetailByBusinessId(String businessId) { - List list = processFbConsultationListService.list( - new LambdaQueryWrapper() - .eq(ProcessFbConsultationList::getBusinessId, businessId)); - list.sort(new DirectoryComparator()); - setProperty(list); - return list; - } - - private void setProperty(List list) { - // 提出部门 - for (ProcessFbConsultationList consultationList : list) { - List sysDeparts = sysDepartService.queryUserDeparts(consultationList.getDesignEngineerId()); - if (!sysDeparts.isEmpty()){ - consultationList.setDepart(sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","))); - } - - if (StringUtils.isNotBlank(consultationList.getBasisFile())){ - // 依据材料 - List fileIds = Arrays.asList(consultationList.getBasisFile().split(",")); - List fileList = ossFileService.list(new LambdaQueryWrapper().in(OSSFile::getId, fileIds)); - consultationList.setBasisFileName(fileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","))); - } - } - } - - @Override - public void exportExcel(String businessId, HttpServletRequest request, HttpServletResponse response) { - List processFbConsultationLists = queryDetailByBusinessId(businessId); - try (Workbook workbook = new XSSFWorkbook()) { - String name = "意见详情"; - // sheet页 - XSSFSheet sheet = (XSSFSheet) workbook.createSheet(name); - // 列宽 - sheet.setDefaultColumnWidth(20); - - //样式 - CellStyle cellStyle = workbook.createCellStyle(); - // 水平、垂直居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - - // 表头 - createHead(sheet, cellStyle); - // 内容 - setContent(processFbConsultationLists, sheet, cellStyle); - - //输出Excel文件 - OutputStream output = response.getOutputStream(); - response.reset(); - //设置响应头 - response.setContentType("application/excel"); - response.setHeader("Content-Disposition","attachment;filename="+ name +".xlsx"); - workbook.write(output); - output.close(); - }catch (Exception e){ - if(LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) { - throw new JeroBootException("导出失败！"); - }else{ - throw new JeroBootException("Export failure!"); - } - } - } - - @Override - public ProcessFbConsultationListVO queryDetailByBusinessId(String businessId, Integer pageNo, Integer pageSize) { - ProcessFbConsultationListVO processFbConsultationListVO = new ProcessFbConsultationListVO(); - ProcessFbStandardConsultation processFbStandardConsultation = processFbStandardConsultationService.getById(businessId); - List processFbStandardConsultations = new ArrayList<>(); - processFbStandardConsultations.add(processFbStandardConsultation); - fillProperty(processFbStandardConsultations); - processFbConsultationListVO.setProcessFbStandardConsultation(processFbStandardConsultations.get(0)); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(ProcessFbConsultationList::getBusinessId, businessId); - List list = processFbConsultationListService.list(queryWrapper); - list.sort(new DirectoryComparator()); - // 手动分页 - IPage page = new Page<>(pageNo ,pageSize); - page.setTotal(list.size()); - page.setRecords( - list.stream() - .skip((long) (Math.max(1, pageNo) - 1) * pageSize) - .limit(pageSize) - .collect(Collectors.toList())); - setProperty(list); - processFbConsultationListVO.setProcessFbConsultationList(page); - return processFbConsultationListVO; - } - - private void setContent(List processFbConsultationLists, XSSFSheet sheet, CellStyle cellStyle) { - for (int i = 0; i < processFbConsultationLists.size(); i++) { - int index = i + 2; - Row headerRow = sheet.createRow(index); - ProcessFbConsultationList processFbConsultation = processFbConsultationLists.get(i); - // 条款号 - Cell cell1 = headerRow.createCell(0); - cell1.setCellValue(processFbConsultation.getChapterNumber()); - cell1.setCellStyle(cellStyle); - // 条款名称 - Cell cell2 = headerRow.createCell(1); - cell2.setCellValue(processFbConsultation.getChapterName()); - cell2.setCellStyle(cellStyle); - // 修改前 - Cell cell3 = headerRow.createCell(2); - cell3.setCellValue(processFbConsultation.getModificationBefore()); - cell3.setCellStyle(cellStyle); - // 修改后 - Cell cell4 = headerRow.createCell(3); - cell4.setCellValue(processFbConsultation.getModificationAfter()); - cell4.setCellStyle(cellStyle); - // 修改理由 - Cell cell5 = headerRow.createCell(4); - cell5.setCellValue(processFbConsultation.getModificationReason()); - cell5.setCellStyle(cellStyle); - // 提出部门 - Cell cell6 = headerRow.createCell(5); - cell6.setCellValue(processFbConsultation.getDepart()); - cell6.setCellStyle(cellStyle); - // 提出人 - Cell cell7 = headerRow.createCell(6); - cell7.setCellValue(processFbConsultation.getDesignEngineerName()); - cell7.setCellStyle(cellStyle); - // 处理意见 - Cell cell8 = headerRow.createCell(7); - String isAdopt = sysDictService.queryDictTextByKey("consultation_opinion", processFbConsultation.getIsAdopt()); - cell8.setCellValue(isAdopt); - cell8.setCellStyle(cellStyle); - // 依据描述 - Cell cell9 = headerRow.createCell(8); - cell9.setCellValue(processFbConsultation.getBasisDescription()); - cell9.setCellStyle(cellStyle); - // 佐证材料 - if (StringUtils.isNotBlank(processFbConsultation.getBasisFile())){ - Cell cell10 = headerRow.createCell(9); - List fileIds = Arrays.asList(processFbConsultation.getBasisFile().split(",")); - List fileList = ossFileService.list(new LambdaQueryWrapper().in(OSSFile::getId, fileIds)); - cell10.setCellValue(fileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","))); - cell10.setCellStyle(cellStyle); - } - } - } - - private static void createHead(XSSFSheet sheet, CellStyle cellStyle) { - String[] firstHead = {"条款号", "条款名称", "修改意见内容（包括理由或依据）", "提出部门", "提出人", "处理意见", "依据描述", "佐证材料"}; - String[] secondHead = {"修改前", "修改后", "修改理由"}; - // 创建第一行 - Row headerRowFirst = sheet.createRow(0); - for (int i = 0; i < firstHead.length; i++) { - int index = i; - if (i > 2){ - index = i + 2; - } - Cell cell = headerRowFirst.createCell(index); - cell.setCellValue(firstHead[i]); - cell.setCellStyle(cellStyle); - CellRangeAddress region; - if (index == 2){ - // 横向合并单元格 - region = new CellRangeAddress(0, 0, index, index + 2); - }else { - // 纵向合并单元格 - region = new CellRangeAddress(0, 1, index, index); - } - sheet.addMergedRegionUnsafe(region); - } - // 创建第二行 - Row headerRowSecond = sheet.createRow(1); - for (int i = 0; i < 3; i++) { - Cell cell = headerRowSecond.createCell(i + 2); - cell.setCellValue(secondHead[i]); - cell.setCellStyle(cellStyle); - } - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/vo/ProcessFbConsultationListVO.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/vo/ProcessFbConsultationListVO.java deleted file mode 100644 index fe673c7b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/vo/ProcessFbConsultationListVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jero.modules.laws.consultation.vo; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @ClassName: ProcessFbConsultationListVO - * @Description: - * @Author: yjz - * @Date: 2023-12-05 11:33 - * @Version: 1.0 - **/ -@Data -public class ProcessFbConsultationListVO { - /**标准征求意见*/ - @Excel(name = "标准征求意见流程表", width = 15) - @ApiModelProperty(value = "标准征求意见流程表") - private ProcessFbStandardConsultation processFbStandardConsultation; - /**标准征求意见流程-征求意见列表表*/ - @Excel(name = "标准征求意见流程-征求意见列表表", width = 15) - @ApiModelProperty(value = "标准征求意见流程-征求意见列表表") - private IPage processFbConsultationList; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/common/LawsCustomCompareCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/common/LawsCustomCompareCommon.java deleted file mode 100644 index 6e6335bb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/common/LawsCustomCompareCommon.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.jero.modules.laws.customcompare.common; - -/** - * @Author: yjz - * @Date: 2023/10/13/11:46 - * @Description: - */ -public class LawsCustomCompareCommon { - private LawsCustomCompareCommon(){ - } - - /** - * 是否公开(1：是，0：否) - */ - public static final String IS_SHOW_1 = "1"; - /** - * 是否公开(1：是，0：否) - */ - public static final String IS_SHOW_0 = "0"; - /** - * 标准类型（1：国内，2：海外，3：企业） - */ - public static final String STANDARD_TYPE1 = "1"; - /** - * 标准类型（1：国内，2：海外，3：企业） - */ - public static final String STANDARD_TYPE2 = "2"; - /** - * 标准类型（1：国内，2：海外，3：企业） - */ - public static final String STANDARD_TYPE3 = "3"; - /** - * 清单维护类型（1：特点，2：对比项） - */ - public static final String INVENTORY_TYPE_1 = "1"; - /** - * 清单维护类型（1：特点，2：对比项） - */ - public static final String INVENTORY_TYPE_2 = "2"; -} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareCellController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareCellController.java deleted file mode 100644 index 480f18a0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareCellController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.customcompare.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 自定义对比单元格内容表 - * - * @author yjz - * @since 2023-10-24 17:59:27 - */ -@RestController -@RequestMapping("/customCompare/lawsCustomCompareCell") -public class LawsCustomCompareCellController { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java deleted file mode 100644 index 2fa24592..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.jero.modules.laws.customcompare.controller; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareCellService; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInventoryService; -import com.jero.modules.laws.customcompare.vo.LawsCustomCompareInfoVO; -import com.jero.modules.laws.customcompare.vo.StandardSaveVO; -import com.jero.modules.laws.customcompare.vo.StandardVO; -import com.jero.modules.laws.customcompare.vo.TableDetailVO; -import com.jero.modules.system.vo.IdMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - * 自定义对比 - * - * @author yjz - * @since 2023-10-24 17:45:51 - */ -@Api(tags="自定义对比") -@Slf4j -@RestController -@RequestMapping("/customCompare/lawsCustomCompareInfo") -public class LawsCustomCompareInfoController { - - private final ILawsCustomCompareInfoService lawsCustomCompareInfoService; - private final ILawsCustomCompareCellService lawsCustomCompareCellService; - private final ILawsCustomCompareInventoryService lawsCustomCompareInventoryService; - - public LawsCustomCompareInfoController(ILawsCustomCompareInfoService lawsCustomCompareInfoService, - @Lazy ILawsCustomCompareCellService lawsCustomCompareCellService, - @Lazy ILawsCustomCompareInventoryService lawsCustomCompareInventoryService) { - this.lawsCustomCompareInfoService = lawsCustomCompareInfoService; - this.lawsCustomCompareCellService = lawsCustomCompareCellService; - this.lawsCustomCompareInventoryService = lawsCustomCompareInventoryService; - } - - /** - * 自定义对比-分页列表查询 - * @return - */ - @AutoLog(value = "自定义对比-分页列表查询") - @ApiOperation(value="自定义对比-分页列表查询", notes="自定义对比-分页列表查询") - @GetMapping(value = "/queryByPage") - @RequiresPermissions("customComparison:search") - public Result> queryByPage(LawsCustomCompareInfoVO lawsCustomCompareInfoVO, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(lawsCustomCompareInfoService.queryByPage(lawsCustomCompareInfoVO, pageNo, pageSize)); - } - - /** - * 自定义对比-标准检索分页列表查询 - * @return - */ - @AutoLog(value = "自定义对比-标准检索分页列表查询") - @ApiOperation(value="自定义对比-标准检索分页列表查询", notes="自定义对比-标准检索分页列表查询") - @GetMapping(value = "/queryStandard") - @RequiresPermissions("customComparison:search") - public Result> queryStandard(StandardVO standardVO, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(lawsCustomCompareInfoService.queryStandard(standardVO, pageNo, pageSize)); - } - - /** - * 自定义对比-标准检索列表查询 - * @return - */ - @AutoLog(value = "自定义对比-标准检索列表查询") - @ApiOperation(value="自定义对比-标准检索列表查询", notes="自定义对比-标准检索列表查询") - @GetMapping(value = "/queryStandardList") - @RequiresPermissions("customComparison:search") - public Result> queryStandardList(StandardVO standardVO) { - return Result.OK(lawsCustomCompareInfoService.queryStandardList(standardVO)); - } - - /** - * 自定义对比-删除标准列表 - * @return - */ - @AutoLog(value = "自定义对比-删除标准列表") - @ApiOperation(value="自定义对比-删除标准列表", notes="自定义对比-删除标准列表") - @GetMapping(value = "/delStandard") - @RequiresPermissions("customComparison:edit") - public Result delStandard(@ApiParam("自定义对比id") String infoId, @ApiParam("标准id") String standardId) { - lawsCustomCompareInfoService.delStandard(infoId, standardId); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-标准列表查询 - * @return - */ - @AutoLog(value = "自定义对比-标准列表分页查询") - @ApiOperation(value="自定义对比-标准列表分页查询", notes="自定义对比-标准列表分页查询") - @GetMapping(value = "/queryStandardByInfoId") - @RequiresPermissions("customComparison:search") - public Result> queryStandardList(@ApiParam("自定义对比id") String infoId, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(lawsCustomCompareInfoService.queryStandardByInfoId(infoId, pageNo, pageSize)); - } - - /** - * 自定义对比-表格详情 - * @return - */ - @AutoLog(value = "自定义对比-表格详情") - @ApiOperation(value="自定义对比-表格详情", notes="自定义对比-表格详情") - @GetMapping(value = "/queryTableDetail") - @RequiresPermissions("customComparison:search") - public Result queryTableDetail(@ApiParam("自定义对比id") String infoId) { - return Result.OK(lawsCustomCompareInfoService.queryTableDetail(infoId)); - } - - /** - * 自定义对比-清单维护 - * @return - */ - @AutoLog(value = "自定义对比-清单维护列表查询") - @ApiOperation(value="自定义对比-清单维护列表查询", notes="自定义对比-清单维护列表查询") - @GetMapping(value = "/queryInventory") - @RequiresPermissions("customComparison:search") - public Result> queryInventoryByInfoId(@ApiParam("自定义对比id") String infoId) { - return Result.OK(lawsCustomCompareInfoService.queryInventory(infoId)); - } - - /** - * 自定义对比-清单维护编辑 - * @return - */ - @AutoLog(value = "自定义对比-清单维护编辑") - @ApiOperation(value="自定义对比-清单维护编辑", notes="自定义对比-清单维护编辑") - @PostMapping(value = "/editInventory") - @RequiresPermissions("customComparison:edit") - public Result editInventory(@ApiParam("清单维护数据")@RequestBody Map map) { - lawsCustomCompareInfoService.editInventory(map); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-标准检索保存 - * @return - */ - @AutoLog(value = "自定义对比-标准检索保存") - @ApiOperation(value="自定义对比-标准检索保存", notes="自定义对比-标准检索保存") - @PostMapping(value = "/saveStandard") - @RequiresPermissions("customComparison:edit") - public Result saveStandard(@RequestBody StandardSaveVO standardSaveVO) { - return Result.OK(MessageUtils.getMessage(ResultCommon.OK), lawsCustomCompareInfoService.saveStandard(standardSaveVO)); - } - - /** - * 自定义对比-单元格内容保存 - * @return - */ - @AutoLog(value = "自定义对比-单元格内容保存") - @ApiOperation(value="自定义对比-单元格内容保存", notes="自定义对比-单元格内容保存") - @PostMapping(value = "/saveCell") - @RequiresPermissions("customComparison:edit") - public Result> saveCell(@RequestBody LawsCustomCompareCell lawsCustomCompareCell) { - // 水平越权 - lawsCustomCompareInfoService.isHorizontalOverstep(lawsCustomCompareCell.getInfoId()); - lawsCustomCompareCellService.saveOrUpdate(lawsCustomCompareCell); - lawsCustomCompareInfoService.editCompareCreateTime(lawsCustomCompareCell.getInfoId()); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-单元格对比分析结果保存 - * @return - */ - @AutoLog(value = "自定义对比-单元格对比分析结果保存") - @ApiOperation(value="自定义对比-单元格对比分析结果保存", notes="自定义对比-单元格对比分析结果保存") - @PostMapping(value = "/saveCellCompareResult") - @RequiresPermissions("customComparison:edit") - public Result> saveCellCompareResult(@RequestBody LawsCustomCompareInventory lawsCustomCompareCell) { - // 水平越权 - lawsCustomCompareInfoService.isHorizontalOverstep(lawsCustomCompareCell.getInfoId()); - lawsCustomCompareInventoryService.saveOrUpdate(lawsCustomCompareCell); - lawsCustomCompareInfoService.editCompareCreateTime(lawsCustomCompareCell.getInfoId()); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-通过id查询 - * @return - */ - @AutoLog(value = "自定义对比-通过id查询") - @ApiOperation(value="自定义对比-通过id查询", notes="自定义对比-通过id查询") - @GetMapping(value = "/queryById") - @Translation - @RequiresPermissions("customComparison:search") - public Result queryById(@ApiParam("id")String id) { - return Result.OK(lawsCustomCompareInfoService.queryById(id)); - } - - /** - * 自定义对比-保存 - * @return - */ - @AutoLog(value = "自定义对比-保存") - @ApiOperation(value="自定义对比-保存", notes="自定义对比-保存") - @PostMapping(value = "/save") - @RequiresPermissions("customComparison:edit") - public Result save(@RequestBody LawsCustomCompareInfo lawsCustomCompareInfo) { - // 水平越权 - if (StringUtils.isNotBlank(lawsCustomCompareInfo.getId())){ - lawsCustomCompareInfoService.isHorizontalOverstep(lawsCustomCompareInfo.getId()); - } - // 清单名称唯一性校验 - lawsCustomCompareInfoService.uniqueVerify(lawsCustomCompareInfo.getId(), lawsCustomCompareInfo.getListName()); - lawsCustomCompareInfoService.saveOrUpdate(lawsCustomCompareInfo); - lawsCustomCompareInfoService.editCompareCreateTime(lawsCustomCompareInfo.getId()); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-根据id删除 - * @return - */ - @AutoLog(value = "自定义对比-根据id删除") - @ApiOperation(value="自定义对比-根据id删除", notes="自定义对比-根据id删除") - @PostMapping(value = "/delById") - @RequiresPermissions("customComparison:delete") - public Result delById(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())) { - return Result.error("请选择数据!"); - } - // 水平越权 - lawsCustomCompareInfoService.isHorizontalOverstep(map.getId()); - lawsCustomCompareInfoService.delById(map.getId()); - lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-根据id删除特点/对比项 - * @return - */ - @AutoLog(value = "自定义对比-根据id删除特点/对比项") - @ApiOperation(value="自定义对比-根据id删除特点/对比项", notes="自定义对比-根据id删除特点/对比项") - @PostMapping(value = "/delInventoryById") - @RequiresPermissions("customComparison:edit") - public Result delInventoryById(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())) { - return Result.error("请选择数据!"); - } - // 水平越权 - LawsCustomCompareInventory lawsCustomCompareInventory = lawsCustomCompareInventoryService.getById(map.getId()); - lawsCustomCompareInfoService.isHorizontalOverstep(lawsCustomCompareInventory.getInfoId()); - lawsCustomCompareInventoryService.removeById(map.getId()); - lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 自定义对比-导出 - * @param request - * @param response - */ - @AutoLog(value = "自定义对比-导出") - @ApiOperation(value = "自定义对比-导出") - @GetMapping("/exportExcel") - @RequiresPermissions("customComparison:edit") - public void exportExcel(String infoId, HttpServletRequest request, HttpServletResponse response) { - lawsCustomCompareInfoService.exportExcel(infoId, request, response); - } -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoStandardController.java deleted file mode 100644 index c9d2d345..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoStandardController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.customcompare.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 自定义对比_标准 关联表 - * - * @author yjz - * @since 2023-10-24 17:57:06 - */ -@RestController -@RequestMapping("/customCompare/lawsCustomCompareInfoStandard") -public class LawsCustomCompareInfoStandardController { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInventoryController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInventoryController.java deleted file mode 100644 index d45a329c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInventoryController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.customcompare.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 自定义对比清单维护表 - * - * @author yjz - * @since 2023-10-24 17:57:49 - */ -@RestController -@RequestMapping("/customCompare/lawsCustomCompareInventory") -public class LawsCustomCompareInventoryController { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareCell.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareCell.java deleted file mode 100644 index ffe7b2e8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareCell.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.jero.modules.laws.customcompare.entity; - - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 自定义对比单元格内容表 - * - * @author yjz - * @since 2023-10-24 17:59:27 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class LawsCustomCompareCell extends BaseEntity { - /**自定义对比id*/ - @ApiModelProperty(value = "自定义对比id") - private String infoId; - /**标准id*/ - @ApiModelProperty(value = "标准id") - private String standardId; - /**特点id*/ - @ApiModelProperty(value = "特点id") - private String featureId; - /**对比项id*/ - @ApiModelProperty(value = "对比项id") - private String compareItemId; - /**单元格内容*/ - @ApiModelProperty(value = "单元格内容") - private String content; - /**文件id*/ - @ApiModelProperty(value = "文件id") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String fileId; -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInfo.java deleted file mode 100644 index 5aacfb54..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jero.modules.laws.customcompare.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 自定义对比表 - * - * @author yjz - * @since 2023-10-24 17:45:58 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class LawsCustomCompareInfo extends BaseEntity { - /**清单名称*/ - @ApiModelProperty(value = "清单名称") - private String listName; - /**是否公开(1：是，0：否)*/ - @ApiModelProperty(value = "是否公开(1：是，0：否)") - private String isShow; - /**是否公开(1：是，0：否)*/ - @ApiModelProperty(value = "是否隐藏表格（1：是 0：否）") - private String hiddenTable; - /**操作人*/ - @ApiModelProperty(value = "操作人") - @TableField(exist = false) - private String author; - /**文件id*/ - @ApiModelProperty(value = "文件id") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String fileId; -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInfoStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInfoStandard.java deleted file mode 100644 index 5cca9933..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInfoStandard.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jero.modules.laws.customcompare.entity; - - -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 自定义对比_标准 关联表 - * - * @author yjz - * @since 2023-10-24 17:57:06 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class LawsCustomCompareInfoStandard extends BaseEntity { - /**自定义对比id*/ - @ApiModelProperty(value = "自定义对比id") - private String infoId; - /**标准id*/ - @ApiModelProperty(value = "标准id") - private String standardId; - /**标准号*/ - @ApiModelProperty(value = "标准号") - private String standardNumber; - /**标准类型（1：国内，2：海外，3：企业）*/ - @ApiModelProperty(value = "标准类型（1：国内，2：海外，3：企业）") - private String standardType; -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInventory.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInventory.java deleted file mode 100644 index c5436012..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/entity/LawsCustomCompareInventory.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.laws.customcompare.entity; - - -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 自定义对比清单维护表 - * - * @author yjz - * @since 2023-10-24 17:57:49 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class LawsCustomCompareInventory extends BaseEntity { - /**自定义对比id*/ - @ApiModelProperty(value = "自定义对比id") - private String infoId; - /**单元格文本*/ - @ApiModelProperty(value = "单元格文本") - private String cellTitle; - /**清单维护类型（1：特点，2：对比项）*/ - @ApiModelProperty(value = "清单维护类型（1：特点，2：对比项）") - @Dict(dicCode = "inventory_type") - private String inventoryType; - /**排序*/ - @ApiModelProperty(value = "排序") - private Integer orderNum; - /**对比分析结果*/ - @ApiModelProperty(value = "对比分析结果") - private String compareResult; - /**颜色*/ - @ApiModelProperty(value = "颜色") - private String colour; -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java deleted file mode 100644 index 61774709..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jero.modules.laws.customcompare.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; - -/** - * @Author: yjz - * @Date: 2023/10/24/18:02 - * @Description: - */ -public interface LawsCustomCompareCellMapper extends BaseMapper { -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java deleted file mode 100644 index a1c88589..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.jero.modules.laws.customcompare.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo; -import com.jero.modules.laws.customcompare.vo.LawsCustomCompareInfoVO; -import com.jero.modules.laws.customcompare.vo.StandardVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Author: yjz - * @Date: 2023/10/24/17:50 - * @Description: - */ -public interface LawsCustomCompareInfoMapper extends BaseMapper { - - /** - * 自定义对比-分页列表查询 - * @param page - * @param queryWrapper - * @return - */ - IPage queryByPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - - /** - * 自定义对比-标准检索 - * @param page - * @param queryWrapper - * @return - */ - IPage queryStandard(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - - /** - * 自定义对比-标准检索 - * @param queryWrapper - * @return - */ - List queryStandardList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); - - /** - * 自定义对比-自定义对比-通过id查询 - * @param queryWrapper - * @return - */ - LawsCustomCompareInfoVO queryById(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java deleted file mode 100644 index cb4b5fd8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jero.modules.laws.customcompare.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfoStandard; - -/** - * @Author: yjz - * @Date: 2023/10/24/18:02 - * @Description: - */ -public interface LawsCustomCompareInfoStandardMapper extends BaseMapper { -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java deleted file mode 100644 index 5a1e3e8f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jero.modules.laws.customcompare.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; - -/** - * @Author: yjz - * @Date: 2023/10/24/18:02 - * @Description: - */ -public interface LawsCustomCompareInventoryMapper extends BaseMapper { -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareCellMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareCellMapper.xml deleted file mode 100644 index 5e9163c6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareCellMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml deleted file mode 100644 index 38b2ec3e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - select * from (select i.id, - list_name, - group_concat(s.standard_number order by s.create_time) referenceStandard, - (select group_concat(os.country_or_region order by s1.create_time) - from laws_custom_compare_info_standard s1 - left join laws_overseas_standard os on s1.standard_id = os.id and s1.standard_type = '2' and os.del_flag = 0 - where s1.del_flag = 0 and s1.info_id = i.id - ) referenceCountry, - is_show, - hidden_table, - u.username username, - u.realname realname, - u.id authorId, - concat(u.realname, '(', u.username, ')') author, - i.create_by, - i.create_time, - i.update_by, - i.update_time, - i.del_flag - from laws_custom_compare_info i - left join laws_custom_compare_info_standard s on i.id = s.info_id and s.del_flag = 0 - left join sys_user u on i.create_by = u.username and u.del_flag = 0 - group by i.id) t - ${ew.customSqlSegment} - - - - select standard.* - from (select id, standard_number, standard_name, standard_state, '' country_or_region, release_date, 1 standard_type, create_time - from laws_domestic_standard - where del_flag = 0 - union all - select id, standard_number, standard_name, standard_state, country_or_region, release_date, 2 standard_type, create_time - from laws_overseas_standard - where del_flag = 0 - union all - select id, standard_number, standard_name, standard_state, '' country_or_region, release_date, 3 standard_type, create_time - from laws_enterprise_standard - where del_flag = 0) standard - ${ew.customSqlSegment} - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoStandard.xml b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoStandard.xml deleted file mode 100644 index 5b89041f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoStandard.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInventoryMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInventoryMapper.xml deleted file mode 100644 index 590de37e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInventoryMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareCellService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareCellService.java deleted file mode 100644 index 2fb5f391..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareCellService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jero.modules.laws.customcompare.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; - -/** - * 自定义对比单元格内容表(LawsCustomCompareCell)表服务接口 - * - * @author yjz - * @since 2023-10-24 17:59:28 - */ -public interface ILawsCustomCompareCellService extends IService { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java deleted file mode 100644 index 41734ac3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.jero.modules.laws.customcompare.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo; -import com.jero.modules.laws.customcompare.vo.LawsCustomCompareInfoVO; -import com.jero.modules.laws.customcompare.vo.StandardSaveVO; -import com.jero.modules.laws.customcompare.vo.StandardVO; -import com.jero.modules.laws.customcompare.vo.TableDetailVO; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - * 自定义对比(LawsCustomCompareInfo)表服务接口 - * - * @author yjz - * @since 2023-10-24 17:45:58 - */ -public interface ILawsCustomCompareInfoService extends IService { - - /** - * 自定义对比-分页列表查询 - * @param lawsCustomCompareInfoVO - * @param pageNo - * @param pageSize - * @return - */ - IPage queryByPage(LawsCustomCompareInfoVO lawsCustomCompareInfoVO, Integer pageNo, Integer pageSize); - - /** - * 自定义对比-标准检索分页列表查询 - * @param standardVO - * @param pageNo - * @param pageSize - * @return - */ - IPage queryStandard(StandardVO standardVO, Integer pageNo, Integer pageSize); - - - /** - *自定义对比-标准检索列表查询 - * @param standardVO - * @return - */ - List queryStandardList(StandardVO standardVO); - - /** - * 自定义对比-通过id查询 - * @param id - * @return - */ - LawsCustomCompareInfoVO queryById(String id); - - /** - * 自定义对比-标准检索保存 - * - * @param standardSaveVO - * @return - */ - String saveStandard(StandardSaveVO standardSaveVO); - - /** - * 自定义对比-表格详情 - * @param infoId - * @return - */ - TableDetailVO queryTableDetail(String infoId); - - /** - * 自定义对比-根据id删除 - * @param id - */ - void delById(String id); - - /** - * 自定义对比-清单维护列表查询 - * @param infoId - */ - Map queryInventory(String infoId); - - /** - * 自定义对比-标准列表分页查询 - * @param infoId - * @return - */ - IPage queryStandardByInfoId(String infoId,Integer pageNo, Integer pageSize); - - /** - * 自定义对比-删除标准列表 - * @param infoId - * @param standardId - */ - void delStandard(String infoId, String standardId); - - /** - * 自定义对比-导出 - * @param request - * @param response - */ - void exportExcel(String infoId, HttpServletRequest request, HttpServletResponse response); - - /** - * 自定义对比-清单维护编辑 - * @param map - */ - void editInventory(Map map); - - /** - * 自定义对比-更新对比时间 - * @param id - */ - void editCompareCreateTime(String id); - - /** - * 自定义对比-是否水平越权 - */ - void isHorizontalOverstep(String ids); - - /** - * 自定义对比-清单名称唯一性校验 - * @param id - * @param listName - */ - void uniqueVerify(String id, String listName); - - /** - * 标准删除时 - * @param ids - */ - void deleteByStandardId(String ids); -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoStandardService.java deleted file mode 100644 index 338567f7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoStandardService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jero.modules.laws.customcompare.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfoStandard; - -/** - * 自定义对比_标准 关联表(LawsCustomCompareInfoStandard)表服务接口 - * - * @author yjz - * @since 2023-10-24 17:57:09 - */ -public interface ILawsCustomCompareInfoStandardService extends IService { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInventoryService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInventoryService.java deleted file mode 100644 index 0bf05429..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInventoryService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jero.modules.laws.customcompare.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; - -/** - * 自定义对比清单维护表(LawsCustomCompareInventory)表服务接口 - * - * @author yjz - * @since 2023-10-24 17:57:49 - */ -public interface ILawsCustomCompareInventoryService extends IService { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareCellServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareCellServiceImpl.java deleted file mode 100644 index b4db1efd..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareCellServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jero.modules.laws.customcompare.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; -import com.jero.modules.laws.customcompare.mapper.LawsCustomCompareCellMapper; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareCellService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 自定义对比单元格内容表(LawsCustomCompareCell)表服务实现类 - * - * @author yjz - * @since 2023-10-24 17:59:28 - */ -@Service -@Transactional -public class LawsCustomCompareCellServiceImpl extends ServiceImpl implements ILawsCustomCompareCellService { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java deleted file mode 100644 index b575fdd5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java +++ /dev/null @@ -1,866 +0,0 @@ -package com.jero.modules.laws.customcompare.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.*; -import com.jero.modules.laws.customcompare.common.LawsCustomCompareCommon; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfoStandard; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; -import com.jero.modules.laws.customcompare.mapper.LawsCustomCompareInfoMapper; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareCellService; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoStandardService; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInventoryService; -import com.jero.modules.laws.customcompare.vo.LawsCustomCompareInfoVO; -import com.jero.modules.laws.customcompare.vo.StandardSaveVO; -import com.jero.modules.laws.customcompare.vo.StandardVO; -import com.jero.modules.laws.customcompare.vo.TableDetailVO; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.system.entity.SysDict; -import com.jero.modules.system.entity.SysDictItem; -import com.jero.modules.system.service.ISysDictItemService; -import com.jero.modules.system.service.ISysDictService; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.shiro.SecurityUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -/** - * - * - * @author yjz - * @since 2023-10-24 17:45:59 - */ -@Service -@Transactional -public class LawsCustomCompareInfoServiceImpl extends ServiceImpl implements ILawsCustomCompareInfoService { - private final LawsCustomCompareInfoMapper lawsCustomCompareInfoMapper; - private final ILawsCustomCompareInfoStandardService lawsCustomCompareInfoStandardService; - private final ILawsCustomCompareInventoryService lawsCustomCompareInventoryService; - private final ILawsCustomCompareCellService lawsCustomCompareCellService; - private final ILawsDomesticStandardService lawsDomesticStandardService; - private final ILawsOverseasStandardService lawsOverseasStandardService; - private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; - private final ISysDictService sysDictService; - private final ISysDictItemService sysDictItemService; - private final IOSSFileService iossFileService; - public static final String STANDARD_NUMBER = "standard_number"; - public static final String IS_SHOW = "is_show"; - public static final String EXPORT_EXCEL_TEMP = "exportExcelTemp"; - - public LawsCustomCompareInfoServiceImpl(LawsCustomCompareInfoMapper lawsCustomCompareInfoMapper, - ILawsCustomCompareInfoStandardService lawsCustomCompareInfoStandardService, - ILawsCustomCompareInventoryService lawsCustomCompareInventoryService, - ILawsCustomCompareCellService lawsCustomCompareCellService, - ILawsDomesticStandardService lawsDomesticStandardService, - ILawsOverseasStandardService lawsOverseasStandardService, - ILawsEnterpriseStandardService lawsEnterpriseStandardService, - ISysDictService sysDictService, - ISysDictItemService sysDictItemService, IOSSFileService iossFileService) { - this.lawsCustomCompareInfoMapper = lawsCustomCompareInfoMapper; - this.lawsCustomCompareInfoStandardService = lawsCustomCompareInfoStandardService; - this.lawsCustomCompareInventoryService = lawsCustomCompareInventoryService; - this.lawsCustomCompareCellService = lawsCustomCompareCellService; - this.lawsDomesticStandardService = lawsDomesticStandardService; - this.lawsOverseasStandardService = lawsOverseasStandardService; - this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; - this.sysDictService = sysDictService; - this.sysDictItemService = sysDictItemService; - this.iossFileService = iossFileService; - } - - @Value("${jero.path.exportExcelTempPath}") - private String exportExcelTempPath; - - @Override - public IPage queryByPage(LawsCustomCompareInfoVO lawsCustomCompareInfoVO, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getListName()), "list_name", lawsCustomCompareInfoVO.getListName()); - queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getReferenceStandard()), "referenceStandard", lawsCustomCompareInfoVO.getReferenceStandard()); - if (StringUtils.isNotBlank(lawsCustomCompareInfoVO.getReferenceCountry())){ - List list = Arrays.asList(lawsCustomCompareInfoVO.getReferenceCountry().split(",")); - queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.like("referenceCountry", v)))); - } - queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getAuthor()), "realname", lawsCustomCompareInfoVO.getAuthor()); - queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getIsShow()), IS_SHOW, lawsCustomCompareInfoVO.getIsShow()); - - // 数据权限，默认只能查看公开的数据和操作人是当前登录人的数据，管理员查看所有 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List roleIds = Arrays.asList(loginUser.getRoleIds().split(",")); - if (!roleIds.contains("admin")){ - queryWrapper.and(qw -> - qw.and(qwi -> qwi.eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_0) - .eq("create_by", loginUser.getUsername())) - .or().eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_1)); - } - queryWrapper.eq("del_flag", 0); - queryWrapper.orderByDesc("id"); - return lawsCustomCompareInfoMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper); - } - - @Override - public IPage queryStandard(StandardVO standardVO, Integer pageNo, Integer pageSize) { - QueryWrapper queryWrapper = getStandardVOQueryWrapper(standardVO); - return lawsCustomCompareInfoMapper.queryStandard(new Page<>(pageNo, pageSize), queryWrapper); - } - - @NotNull - private static QueryWrapper getStandardVOQueryWrapper(StandardVO standardVO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - // 标准编号/标准名称 - if (StringUtils.isNotBlank(standardVO.getStandardNumberOrName())){ - queryWrapper.and(qw -> qw - .like(STANDARD_NUMBER, standardVO.getStandardNumberOrName()) - .or() - .like("standard_name", standardVO.getStandardNumberOrName())); - } - if (StringUtils.isNotBlank(standardVO.getIds())){ - List list = Arrays.asList(standardVO.getIds().split(",")); - queryWrapper.in("id", list); - } - if(StringUtils.isNotBlank(standardVO.getStandardNumbers())){ - List list = Arrays.asList(standardVO.getStandardNumbers().split(",")); - queryWrapper.in(STANDARD_NUMBER, list); - } - queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardNumber()), STANDARD_NUMBER, standardVO.getStandardNumber()); - queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardState()), "standard_state", standardVO.getStandardState()); - queryWrapper.apply(StringUtils.isNotBlank(standardVO.getReleaseDateBegin()), - "date_format (create_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", standardVO.getReleaseDateBegin()) - .apply(StringUtils.isNotBlank(standardVO.getReleaseDatesEnd()), - "date_format (create_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", standardVO.getReleaseDatesEnd()); - queryWrapper.orderByDesc("create_time"); - return queryWrapper; - } - - @Override - public List queryStandardList(StandardVO standardVO) { - QueryWrapper queryWrapper = getStandardVOQueryWrapper(standardVO); - return lawsCustomCompareInfoMapper.queryStandardList(queryWrapper); - } - - @Override - public LawsCustomCompareInfoVO queryById(String id) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("id", id); - return lawsCustomCompareInfoMapper.queryById(queryWrapper); - } - - @Override - public String saveStandard(StandardSaveVO standardSaveVO) { - // 自定义对比表 - LawsCustomCompareInfo lawsCustomCompareInfo = standardSaveVO.getLawsCustomCompareInfo(); - String id = String.valueOf(SnowflakeUtils.snowflake()); - // 自定义对比数据不存在则新增 - if (StringUtils.isBlank(lawsCustomCompareInfo.getId())){ - lawsCustomCompareInfo.setId(id); - } - uniqueVerify(lawsCustomCompareInfo.getId(), lawsCustomCompareInfo.getListName()); - saveOrUpdate(lawsCustomCompareInfo); - - // 自定义对比_标准 旧数据 - List oldData = lawsCustomCompareInfoStandardService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, lawsCustomCompareInfo.getId())); - - // 自定义对比_标准 处理数据 - StandardVO standardVO = new StandardVO(); - standardVO.setStandardNumbers(standardSaveVO.getStandardNumber()); - // 查询勾选标准 - List standardVOS = queryStandardList(standardVO); - // 数据拷贝 - List lawsCustomCompareInfoStandards = BeanCopyUtils.copyBeanList(standardVOS, LawsCustomCompareInfoStandard.class); - - // 收集数据id集合 - List infoStandardIdList = new ArrayList<>(); - // 收集标准id集合 - List standardIdList = new ArrayList<>(); - for (LawsCustomCompareInfoStandard lawsCustomCompareInfoStandard : lawsCustomCompareInfoStandards) { - String standardId = lawsCustomCompareInfoStandard.getId(); - String snowflakeId = String.valueOf(SnowflakeUtils.snowflake()); - // 是否已存在此标准 存在更新，不存在新增 - Optional optional = oldData.stream().filter(v -> v.getStandardId().equals(lawsCustomCompareInfoStandard.getId())).findFirst(); - if (optional.isPresent()){ - lawsCustomCompareInfoStandard.setId(optional.get().getId()); - }else { - lawsCustomCompareInfoStandard.setId(snowflakeId); - } - infoStandardIdList.add(lawsCustomCompareInfoStandard.getId()); - lawsCustomCompareInfoStandard.setInfoId(lawsCustomCompareInfo.getId()); - lawsCustomCompareInfoStandard.setStandardId(standardId); - standardIdList.add(standardId); - lawsCustomCompareInfoStandard.setCreateBy(""); - lawsCustomCompareInfoStandard.setCreateTime(null); - lawsCustomCompareInfoStandard.setUpdateBy(""); - lawsCustomCompareInfoStandard.setUpdateTime(null); - lawsCustomCompareInfoStandardService.saveOrUpdate(lawsCustomCompareInfoStandard); - } - - // 删除旧数据 - if (standardVOS.isEmpty()){ - // 自定义对比_标准 删除 - lawsCustomCompareInfoStandardService.remove( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, lawsCustomCompareInfo.getId())); - // 自定义对比单元格 删除 - lawsCustomCompareCellService.remove( - new LambdaUpdateWrapper() - .eq(LawsCustomCompareCell::getInfoId, lawsCustomCompareInfo.getId())); - }else { - // 自定义对比_标准 删除 - lawsCustomCompareInfoStandardService.remove( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, lawsCustomCompareInfo.getId()) - .notIn(LawsCustomCompareInfoStandard::getId, infoStandardIdList)); - // 自定义对比单元格 删除 - lawsCustomCompareCellService.remove( - new LambdaUpdateWrapper() - .eq(LawsCustomCompareCell::getInfoId, lawsCustomCompareInfo.getId()) - .notIn(LawsCustomCompareCell::getStandardId, standardIdList)); - } - editCompareCreateTime(lawsCustomCompareInfo.getId()); - return lawsCustomCompareInfo.getId(); - } - - @Override - public TableDetailVO queryTableDetail(String infoId) { - // 水平越权 - isHorizontalOverstep(infoId); - TableDetailVO tableDetailVO = new TableDetailVO(); - // 处理表头 - setCountryMap(infoId, tableDetailVO); - // 处理特点/对比项 - setRanksMap(infoId, tableDetailVO); - // 处理单元格 - setList(infoId, tableDetailVO); - return tableDetailVO; - } - - @Override - public void delById(String id) { - // 删除自定义对比表 - removeById(id); - // 删除自定义对比_标准 关联表 - lawsCustomCompareInfoStandardService.remove( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, id)); - // 删除自定义对比清单维护表 - lawsCustomCompareInventoryService.remove( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInventory::getInfoId, id)); - // 删除自定义对比单元格内容表 - lawsCustomCompareCellService.remove( - new LambdaQueryWrapper() - .eq(LawsCustomCompareCell::getInfoId, id)); - } - - @Override - public Map queryInventory(String infoId) { - // 水平越权 - isHorizontalOverstep(infoId); - List list = lawsCustomCompareInventoryService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInventory::getInfoId, infoId)); - - Map map = new HashMap<>(); - // 特点 - List feature = list.stream() - .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_1.equals(v.getInventoryType())) - .collect(Collectors.toList()); - // 对比项 - List compareItem = list.stream() - .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_2.equals(v.getInventoryType())) - .collect(Collectors.toList()); - - List sysDictItemList = getDicItem("inventory_type"); - - Optional featureDicItem = sysDictItemList.stream() - .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_1.equals(v.getItemValue())) - .findFirst(); - - Optional compareItemDicItem = sysDictItemList.stream() - .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_2.equals(v.getItemValue())) - .findFirst(); - - if (featureDicItem.isPresent()){ - map.put(featureDicItem.get().getItemText(), feature); - }else { - map.put("特点", new ArrayList()); - } - - if (compareItemDicItem.isPresent()){ - map.put(compareItemDicItem.get().getItemText(), compareItem); - }else { - map.put("对比项", new ArrayList()); - } - return map; - } - - @Override - public IPage queryStandardByInfoId(String infoId, Integer pageNo, Integer pageSize){ - // 水平越权 - isHorizontalOverstep(infoId); - // 自定义对比_标准 关联表 - List list = lawsCustomCompareInfoStandardService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, infoId) - .orderByAsc(LawsCustomCompareInfoStandard::getCreateTime)); - if (!list.isEmpty()){ - // 查询标准数据 - List standardIdList = list.stream().map(LawsCustomCompareInfoStandard::getStandardId).collect(Collectors.toList()); - StandardVO standardVO = new StandardVO(); - standardVO.setIds(String.join(",", standardIdList)); - return queryStandard(standardVO, pageNo, pageSize); - } - return new Page<>(); - } - - @Override - public void delStandard(String infoId, String standardId) { - // 水平越权 - isHorizontalOverstep(infoId); - // 删除自定义对比_标准 关联表数据 - lawsCustomCompareInfoStandardService.remove( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, infoId) - .eq(LawsCustomCompareInfoStandard::getStandardId, standardId)); - editCompareCreateTime(standardId); - } - - @Override - public void exportExcel(String infoId, HttpServletRequest request, HttpServletResponse response) { - // 水平越权 - isHorizontalOverstep(infoId); - // 获取清单数据 - TableDetailVO tableDetailVO = queryTableDetail(infoId); - // 获取国家/地区内容和标准内容 - Map> countryMap = tableDetailVO.getCountryMap(); - // 内容整合 - List standardVOS = new ArrayList<>(); - countryMap.forEach((k, v) -> standardVOS.addAll(v)); - - Map> ranksMap = tableDetailVO.getRanksMap(); - // 获取特点内容 - List featureList = ranksMap.get("特点"); - // 获取对比项内容 - List compareList = ranksMap.get("对比项"); - - // 获取单元格内容 - List list = tableDetailVO.getList(); - - try (Workbook workbook = new HSSFWorkbook()){ - String fileName = "清单详情.xls"; - // sheet页 - HSSFSheet sheet = (HSSFSheet) workbook.createSheet("清单详情"); - // 列宽 - sheet.setDefaultColumnWidth(20); - - //样式 - CellStyle cellStyle = workbook.createCellStyle(); - // 水平、垂直居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - - // 创建表头内容 - createTableHeader(sheet, countryMap, featureList, cellStyle); - // 创建第二行内容 - createTableSecondRow(sheet, standardVOS, featureList, cellStyle); - // 创建单元格内容 - createTableCellContent(sheet, standardVOS, featureList, compareList, list, cellStyle); - String exportPath = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, "清单详情"); - // excel临时保存到本地并在同级创建文件夹 - generateExcel(workbook, fileName, exportPath); - // 生成zip文件返回文件流 - ZipUtil.toZip(exportPath, response.getOutputStream(), response, true); - //删除指定文件夹 - FileUtils.deleteFolders(exportPath); - }catch (Exception e){ - log.error(e.getMessage()); - throw new JeroBootException("导出失败!"); - } - } - - @Override - public void editInventory(Map map) { - String infoId = (String) map.get("infoId"); - // 水平越权 - isHorizontalOverstep(infoId); - // 获取旧数据信息 - List list = lawsCustomCompareInventoryService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInventory::getInfoId, infoId)); - - //重新更新或者添加新数据 - List featureList = JSON.parseArray(JSON.toJSONString(map.get("特点")), LawsCustomCompareInventory.class); - List compareList = JSON.parseArray(JSON.toJSONString(map.get("对比项")), LawsCustomCompareInventory.class); - - lawsCustomCompareInventoryService.saveOrUpdateBatch(featureList); - lawsCustomCompareInventoryService.saveOrUpdateBatch(compareList); - - // 不是第一次添加 - if (!list.isEmpty()){ - List idList = list.stream().map(LawsCustomCompareInventory::getId).collect(Collectors.toList()); - List featureIdList = featureList.stream().map(LawsCustomCompareInventory::getId).collect(Collectors.toList()); - List compareIdList = compareList.stream().map(LawsCustomCompareInventory::getId).collect(Collectors.toList()); - - idList.removeAll(featureIdList); - idList.removeAll(compareIdList); - - if (!idList.isEmpty()){ - // 删除旧数据 - lawsCustomCompareInventoryService.remove( - new LambdaQueryWrapper() - .in(LawsCustomCompareInventory::getId, idList)); - // 删除单元格数据 - lawsCustomCompareCellService.remove( - new LambdaQueryWrapper() - .in(LawsCustomCompareCell::getInfoId, infoId) - .and(v -> v.eq(LawsCustomCompareCell::getFeatureId, idList) - .or().eq(LawsCustomCompareCell::getCompareItemId, idList))); - } - } - editCompareCreateTime(infoId); - } - - @Override - public void editCompareCreateTime(String id) { - update(new LambdaUpdateWrapper() - .eq(LawsCustomCompareInfo::getId, id) - .set(LawsCustomCompareInfo::getCreateTime, new Date())); - } - - @Override - public void isHorizontalOverstep(String ids) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List roleIds = Arrays.asList(loginUser.getRoleIds().split(",")); - QueryWrapper queryWrapper = new QueryWrapper<>(); - List idList = Arrays.asList(ids.split(",")); - queryWrapper.in("id", idList); - if (!roleIds.contains("admin")){ - queryWrapper.and(qw -> - qw.and(qwi -> qwi.eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_0) - .eq("create_by", loginUser.getUsername())) - .or().eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_1)); - }else { - return; - } - int count = count(queryWrapper); - if (count <= 0 || count != idList.size()){ - if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { - throw new JeroBootException("无权限!"); - }else{ - throw new JeroBootException("No access!"); - } - } - } - - @Override - public void uniqueVerify(String id, String listName) { - if (StringUtils.isNotBlank(listName)){ - int count = count(new LambdaQueryWrapper() - .eq(LawsCustomCompareInfo::getListName, listName) - .ne(StringUtils.isNotBlank(id), LawsCustomCompareInfo::getId, id)); - if (count > 0){ - throw new JeroBootException("清单名称已存在!"); - } - } - } - - @Override - public void deleteByStandardId(String ids) { - if (StrUtil.isBlank(ids)) { - return; - } - LambdaQueryWrapper ccsWrapper = new LambdaQueryWrapper<>(); - ccsWrapper.in(LawsCustomCompareInfoStandard::getStandardId, Arrays.asList(ids.split(","))); - List list = lawsCustomCompareInfoStandardService.list(ccsWrapper); - Set infoIdsSet = new HashSet<>(); - list.forEach(i -> infoIdsSet.add(i.getInfoId())); - removeByIds(infoIdsSet); - } - - private void createTableCellContent(HSSFSheet sheet, List standardVOS, List featureList, List compareList, List list, CellStyle cellStyle) { - for (int i = 2; i <= compareList.size() + 2; i++) { - // 创建行 - Row indexRow = sheet.createRow(i); - // 创建列 - Cell indexCell = indexRow.createCell(0); - indexCell.setCellStyle(cellStyle); - - if (i == 2){ - // 特点列 - createFeatureColumn(standardVOS, featureList, indexRow, indexCell, cellStyle, sheet); - }else { - // 普通列 - /** - * createOrdinaryColumn(standardVOS, featureList, compareList, list, i, indexRow, indexCell); - */ - indexCell.setCellValue(compareList.get(i - 3).getCellTitle()); - - int index = 0; - for (StandardVO standardVO : standardVOS) { - for (LawsCustomCompareInventory lawsCustomCompareInventory : featureList) { - index += 1; - // 创建列 - Cell cell = indexRow.createCell(index); - cell.setCellStyle(cellStyle); - int finalI = i; - Optional cellOptional = list.stream() - .filter(v -> Objects.equals(lawsCustomCompareInventory.getId(), v.getFeatureId()) - && Objects.equals(standardVO.getId(), v.getStandardId()) - && Objects.equals(compareList.get(finalI - 3).getId(), v.getCompareItemId())) - .findFirst(); - int finalIndex = index; - cellOptional.ifPresent(v -> { - cell.setCellValue(v.getContent()); - // 处理文件 - writeFile(v); - // 对比分析结果 - int allSize = featureList.size() * standardVOS.size(); - setCompareResult(finalIndex, allSize, indexRow, compareList, cellStyle, finalI); - }); - } - } - } - } - } - - private void setCompareResult(int finalIndex, int allSize, Row indexRow, List compareList, CellStyle cellStyle, int finalI) { - // 最后一列 - if (finalIndex == allSize){ - // 对比分析结果 - Cell cellEnd = indexRow.createCell(finalIndex + 1); - cellEnd.setCellStyle(cellStyle); - if (StringUtils.isNotBlank(compareList.get(finalI - 3).getCompareResult())){ - cellEnd.setCellValue(compareList.get(finalI - 3).getCompareResult()); - } - } - } - - private void writeFile(LawsCustomCompareCell v) { - if (StringUtils.isNotBlank(v.getFileId())){ - String exportPath = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, "清单详情"); - OSSFile ossFile = iossFileService.getById(v.getFileId()); - InputStream download = MinioUtil.download(ossFile.getUrl()); - inputStreamToFile(download, exportPath + File.separator + ossFile.getFileName()); - } - } - - public void inputStreamToFile (InputStream inputStream, String filePath) { - String replacePath = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, "清单详情"); - File saveFile = new File(replacePath); - // 导出路径 没有则创建 - if (!saveFile.exists()) { - saveFile.mkdirs(); - } - File file = new File(filePath); - try (FileOutputStream outputStream = new FileOutputStream(file)){ - int bytesRead; - byte[] buffer = new byte[1024]; - - while ((bytesRead = inputStream.read(buffer)) != -1) { - outputStream.write(buffer, 0, bytesRead); - } - } catch (IOException e) { - throw new JeroBootException("生成文件失败！"); - } - } - - /** - * - * private static void createOrdinaryColumn(List standardVOS, List featureList, List compareList, List list, int i, Row indexRow, Cell indexCell) { - * indexCell.setCellValue(compareList.get(i - 3).getCellTitle()); - * - * int index = 0; - * for (StandardVO standardVO : standardVOS) { - * for (LawsCustomCompareInventory lawsCustomCompareInventory : featureList) { - * index += 1; - * // 创建列 - * Cell cell = indexRow.createCell(index); - * // cell.setCellStyle(cellStyle); - * Optional cellOptional = list.stream() - * .filter(v -> Objects.equals(lawsCustomCompareInventory.getId(), v.getFeatureId()) - * && Objects.equals(standardVO.getId(), v.getStandardId()) - * && Objects.equals(compareList.get(i - 3).getId(), v.getCompareItemId())) - * .findFirst(); - * cellOptional.ifPresent(v -> cell.setCellValue(v.getContent())); - * } - * } - * } - */ - - private static void createFeatureColumn(List standardVOS, List featureList, Row indexRow, Cell indexCell, CellStyle cellStyle, HSSFSheet sheet) { - indexCell.setCellValue("特点/对比项"); - // 计算列数量 - int index = 0; - for (int i = 0; i < standardVOS.size(); i++) { - for (LawsCustomCompareInventory lawsCustomCompareInventory : featureList) { - index += 1; - // 创建列 - Cell cell = indexRow.createCell(index); - cell.setCellValue(lawsCustomCompareInventory.getCellTitle()); - cell.setCellStyle(cellStyle); - - // 对比分析结果 - if (index == featureList.size() * standardVOS.size()){ - Row row = sheet.getRow(0); - Cell cellEnd = row.createCell(index + 1); - cellEnd.setCellStyle(cellStyle); - cellEnd.setCellValue("对比分析结果"); - // 合并单元格 - CellRangeAddress region = new CellRangeAddress(0, 2, index + 1, index + 1); - sheet.addMergedRegionUnsafe(region); - } - } - } - } - - private void createTableSecondRow(HSSFSheet sheet, List standardVOS, List featureList, CellStyle cellStyle) { - // 创建第二行 - Row row = sheet.createRow(1); - // 创建列 - Cell cell = row.createCell(0); - cell.setCellValue("标准号"); - cell.setCellStyle(cellStyle); - - // 计算第二行文字内容和需要合并的单元格 - // 下标 - AtomicInteger index = new AtomicInteger(); - // 计算下次合并单元格起始 - AtomicInteger nextMergeFirst = new AtomicInteger(); - for (StandardVO standardVO : standardVOS) { - index.addAndGet(1); - // 创建列 - Cell indexCell = row.createCell(index.get() + nextMergeFirst.get()); - indexCell.setCellValue(standardVO.getStandardNumber()); - indexCell.setCellStyle(cellStyle); - // 特点数量 - int featureSize = featureList.size(); - // 只有一个单元格则不合并 - if ((index.get() + nextMergeFirst.get()) != (index.get() + featureSize - 1 + nextMergeFirst.get())){ - // 合并单元格(参数说明：起始行，结束行，起始列，结束列) - CellRangeAddress region = new CellRangeAddress(1, 1, index.get() + nextMergeFirst.get(), index.get() + featureSize - 1 + nextMergeFirst.get()); - sheet.addMergedRegionUnsafe(region); - nextMergeFirst.set(nextMergeFirst.get() + featureSize - 1); - } - } - } - - private void createTableHeader(HSSFSheet sheet, Map> countryMap, List featureList, CellStyle cellStyle) { - // 创建第一行 - Row headerRow = sheet.createRow(0); - // 创建列 - Cell cell = headerRow.createCell(0); - cell.setCellValue("国家/地区"); - cell.setCellStyle(cellStyle); - - if (!countryMap.isEmpty()){ - // 下标 - AtomicInteger index = new AtomicInteger(); - // 计算下次合并单元格起始 - AtomicInteger nextMergeFirst = new AtomicInteger(); - countryMap.forEach((k, v) -> { - index.addAndGet(1); - // 标准数量 - int standardSize = v.size(); - // 特点数量 - int featureSize = featureList.size(); - // 单元格合并数量 - int merge = standardSize * featureSize; - // 首先先填充内容，再合并单元格 - Cell indexCell = headerRow.createCell(index.get() + nextMergeFirst.get()); - indexCell.setCellValue(k); - indexCell.setCellStyle(cellStyle); - // 只有一个单元格则不合并 - if ((index.get() + nextMergeFirst.get()) != (index.get() + nextMergeFirst.get() + merge - 1)){ - // 合并单元格(参数说明：起始行，结束行，起始列，结束列) - CellRangeAddress region = new CellRangeAddress(0, 0, index.get() + nextMergeFirst.get(), index.get() + nextMergeFirst.get() + merge - 1); - sheet.addMergedRegion(region); - nextMergeFirst.set(merge - 1); - } - }); - } - } - - private void generateExcel(Workbook workbook, String fileName, String exportPath) throws IOException { - File saveFile = new File(exportPath); - // 导出路径 没有则创建 - if (!saveFile.exists()) { - saveFile.mkdirs(); - } - // 生成excel文件路径 - String excelPath = exportPath + File.separator + fileName; - // 写出excel文件 - try (FileOutputStream fos = new FileOutputStream(excelPath)){ - workbook.write(fos); - }catch (Exception e){ - throw new JeroBootException(e.getMessage()); - } - } - - private void setList(String infoId, TableDetailVO tableDetailVO) { - List cellList = lawsCustomCompareCellService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareCell::getInfoId, infoId)); - tableDetailVO.setList(cellList); - } - - private void setRanksMap(String infoId, TableDetailVO tableDetailVO) { - List inventoryList = lawsCustomCompareInventoryService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInventory::getInfoId, infoId) - .orderByAsc(LawsCustomCompareInventory::getCreateTime)); - if (!inventoryList.isEmpty()){ - List sysDictItemList = getDicItem("inventory_type"); - Map> ranksMap = inventoryList.stream() - .map(v -> { - // 字典翻译 - Optional sysDictIte = sysDictItemList.stream() - .filter(o -> v.getInventoryType() - .equals(o.getItemValue())).map(SysDictItem::getItemText).findFirst(); - sysDictIte.ifPresent(v::setInventoryType); - return v; - }) - .collect(Collectors.groupingBy(LawsCustomCompareInventory::getInventoryType)); - if (!ranksMap.containsKey("特点")){ - ranksMap.put("特点", new ArrayList<>()); - } - if (!ranksMap.containsKey("对比项")){ - ranksMap.put("对比项", new ArrayList<>()); - } - tableDetailVO.setRanksMap(ranksMap); - }else{ - Map> map = new HashMap<>(); - map.put("特点", new ArrayList<>()); - map.put("对比项", new ArrayList<>()); - tableDetailVO.setRanksMap(map); - } - } - - private void setCountryMap(String infoId, TableDetailVO tableDetailVO) { - List infoStandardList = lawsCustomCompareInfoStandardService.list( - new LambdaQueryWrapper() - .eq(LawsCustomCompareInfoStandard::getInfoId, infoId) - .orderByAsc(LawsCustomCompareInfoStandard::getCreateTime)); - if (!infoStandardList.isEmpty()){ - // 国内 - List domesticIds = infoStandardList.stream() - .filter(v -> LawsCustomCompareCommon.STANDARD_TYPE1.equals(v.getStandardType())) - .map(LawsCustomCompareInfoStandard::getStandardId) - .collect(Collectors.toList()); - List lawsDomesticStandards = new ArrayList<>(); - if (!domesticIds.isEmpty()){ - lawsDomesticStandards = lawsDomesticStandardService.listByIds(domesticIds); - } - - // 海外 - List overseasIds= infoStandardList.stream() - .filter(v -> LawsCustomCompareCommon.STANDARD_TYPE2.equals(v.getStandardType())) - .map(LawsCustomCompareInfoStandard::getStandardId) - .collect(Collectors.toList()); - List lawsOverseasStandards = new ArrayList<>(); - if (!overseasIds.isEmpty()){ - lawsOverseasStandards = lawsOverseasStandardService.listByIds(overseasIds); - } - - // 企业 - List enterpriseIds = infoStandardList.stream() - .filter(v -> LawsCustomCompareCommon.STANDARD_TYPE3.equals(v.getStandardType())) - .map(LawsCustomCompareInfoStandard::getStandardId) - .collect(Collectors.toList()); - List lawsEnterpriseStandards = new ArrayList<>(); - if (!enterpriseIds.isEmpty()){ - lawsEnterpriseStandards = lawsEnterpriseStandardService.listByIds(enterpriseIds); - } - - // 处理数据 - List standardVOList = new ArrayList<>(); - List domesticStandardVOList = BeanCopyUtils.copyBeanList(lawsDomesticStandards, StandardVO.class); - List overseasStandardVOList = BeanCopyUtils.copyBeanList(lawsOverseasStandards, StandardVO.class); - List enterpriseStandardVOList = BeanCopyUtils.copyBeanList(lawsEnterpriseStandards, StandardVO.class); - standardVOList.addAll(domesticStandardVOList); - standardVOList.addAll(overseasStandardVOList); - standardVOList.addAll(enterpriseStandardVOList); - Map> countryMap = getCountryMap(infoId, standardVOList); - tableDetailVO.setCountryMap(countryMap); - }else { - Map> countryMap = new HashMap<>(); - tableDetailVO.setCountryMap(countryMap); - } - } - - @NotNull - private Map> getCountryMap(String infoId, List standardVOList) { - // 获取字典 - List sysDictItemList = getDicItem("country_or_region"); - // 按国家/地区分组 - List countryMap = standardVOList.stream() - .map(v -> { - v.setInfoId(infoId); - // 字典翻译 - String countryOrRegion = v.getCountryOrRegion(); - if (StringUtils.isNotBlank(countryOrRegion)) { - List list = Arrays.asList(countryOrRegion.split(",")); - List sysDictItems = sysDictItemList.stream() - .filter(o -> list - .contains(o.getItemValue())).map(SysDictItem::getItemText).collect(Collectors.toList()); - if (!sysDictItems.isEmpty()) { - v.setCountryOrRegion(String.join(",", sysDictItems)); - }else { - v.setCountryOrRegion(""); - } - } else { - v.setCountryOrRegion(""); - } - return v; - }).collect(Collectors.toList()); - return countryMap.stream().collect(Collectors.groupingBy(StandardVO::getCountryOrRegion)); - } - - private List getDicItem(String dicCode) { - SysDict sysDict = sysDictService.getOne( - new LambdaQueryWrapper() - .eq(SysDict::getDictCode, dicCode), false); - if (Objects.isNull(sysDict)){ - return new ArrayList<>(); - } - List sysDictItemList = sysDictItemService.list( - new LambdaQueryWrapper() - .eq(SysDictItem::getDictId, sysDict.getId())); - return Optional.of(sysDictItemList).orElse(new ArrayList<>()); - } -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoStandardServiceImpl.java deleted file mode 100644 index e27d1251..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoStandardServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jero.modules.laws.customcompare.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfoStandard; -import com.jero.modules.laws.customcompare.mapper.LawsCustomCompareInfoStandardMapper; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoStandardService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 自定义对比_标准 关联表(LawsCustomCompareInfoStandard)表服务实现类 - * - * @author yjz - * @since 2023-10-24 17:57:09 - */ -@Service -@Transactional -public class LawsCustomCompareInfoStandardServiceImpl extends ServiceImpl implements ILawsCustomCompareInfoStandardService { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInventoryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInventoryServiceImpl.java deleted file mode 100644 index 59253100..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInventoryServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jero.modules.laws.customcompare.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; -import com.jero.modules.laws.customcompare.mapper.LawsCustomCompareInventoryMapper; -import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInventoryService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 自定义对比清单维护表 - * - * @author yjz - * @since 2023-10-24 17:57:49 - */ -@Service -@Transactional -public class LawsCustomCompareInventoryServiceImpl extends ServiceImpl implements ILawsCustomCompareInventoryService { - -} - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/LawsCustomCompareInfoVO.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/LawsCustomCompareInfoVO.java deleted file mode 100644 index 82f0dc39..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/LawsCustomCompareInfoVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jero.modules.laws.customcompare.vo; - -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author: yjz - * @Date: 2023/10/25/9:09 - * @Description: - */ -@Data -public class LawsCustomCompareInfoVO { - /**id*/ - @ApiModelProperty(value = "id") - private String id; - /**清单名称*/ - @ApiModelProperty(value = "清单名称") - private String listName; - /**涉及标准*/ - @ApiModelProperty(value = "涉及标准") - private String referenceStandard; - /**涉及国家*/ - @ApiModelProperty(value = "涉及国家") - @Dict(dicCode = "country_or_region") - private String referenceCountry; - /**比对时间*/ - @ApiModelProperty(value = "比对时间") - private Date createTime; - /**是否公开(1：是，0：否)*/ - @ApiModelProperty(value = "是否公开(1：是，0：否)") - @Dict(dicCode = "yn") - private String isShow; - /**是否公开(1：是，0：否)*/ - @ApiModelProperty(value = "是否隐藏表格（1：是 0：否）") - @Dict(dicCode = "yn") - private String hiddenTable; - /**操作人*/ - @ApiModelProperty(value = "操作人") - private String createBy; - /**操作人id*/ - @ApiModelProperty(value = "操作人id") - private String authorId; - /**操作人翻译*/ - @ApiModelProperty(value = "操作人翻译") - private String author; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java deleted file mode 100644 index fcde4ff6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jero.modules.laws.customcompare.vo; - -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: yjz - * @Date: 2023/10/25/15:25 - * @Description: - */ -@Data -public class StandardSaveVO { - /**自定义对比表*/ - @ApiModelProperty(value = "自定义对比表") - private LawsCustomCompareInfo lawsCustomCompareInfo; - /**标准号*/ - @ApiModelProperty(value = "标准号") - private String standardNumber; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardVO.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardVO.java deleted file mode 100644 index 5e73c39a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jero.modules.laws.customcompare.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author: yjz - * @Date: 2023/10/25/14:04 - * @Description: - */ -@Data -public class StandardVO { - /**id*/ - @ApiModelProperty(value = "id") - private String id; - /**标准号*/ - @ApiModelProperty(value = "标准号") - private String standardNumber; - /**标准名称*/ - @ApiModelProperty(value = "标准名称") - private String standardName; - /**标准状态*/ - @ApiModelProperty(value = "标准状态") - @Dict(dicCode = "standard_state") - private String standardState; - /**国家/地区*/ - @ApiModelProperty(value = "国家/地区") - @Dict(dicCode = "country_or_region") - private String countryOrRegion; - /**发布日期*/ - @ApiModelProperty(value = "发布日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date releaseDate; - /**标准类型（1：国内，2：海外，3：企业）*/ - @ApiModelProperty(value = "标准类型（1：国内，2：海外，3：企业）") - @Dict(dicCode = "standard_source") - private String standardType; - - /**自定义对比id 表格详情用*/ - @ApiModelProperty(value = "自定义对比id 表格详情用") - private String infoId; - /**标准编号/标准名称 搜索用*/ - @ApiModelProperty(value = "标准编号/标准名称 搜索用") - private String standardNumberOrName; - /**发布日期开始 搜索用*/ - @ApiModelProperty(value = "发布日期开始 搜索用") - private String releaseDateBegin; - /**发布日期结束 搜索用*/ - @ApiModelProperty(value = "发布日期结束 搜索用") - private String releaseDatesEnd; - /**ids 搜索用*/ - @ApiModelProperty(value = "ids 搜索用") - private String ids; - /**标准号 搜索用*/ - @ApiModelProperty(value = "标准号 搜索用") - private String standardNumbers; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java deleted file mode 100644 index 7fc07330..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jero.modules.laws.customcompare.vo; - -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; -import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @Author: yjz - * @Date: 2023/10/25/15:56 - * @Description: - */ -@Data -public class TableDetailVO { - /**表头*/ - @ApiModelProperty(value = "表头") - private Map> countryMap; - /**清单维护*/ - @ApiModelProperty(value = "清单维护") - private Map> ranksMap; - /**单元格*/ - @ApiModelProperty(value = "单元格") - private List list; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java index ed43098f..9bccd797 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; +import com.jero.modules.common.service.SendMessageAPI; import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index e3466031..1918301c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -2,8 +2,6 @@ package com.jero.modules.laws.documenttool.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.entity.SplitFileInfo; @@ -165,10 +163,6 @@ public interface IDocumentSplitService { */ LawsDocumentSplitView queryView(Map parameter); - List processProjectAssessGetList(String ids); - - List processProjectStandardGetList(String sarFileSplitInfoId); - /** * 文档拆分-发布 * @param parameter diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 45db38fd..86b5bd4f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1,6 +1,5 @@ package com.jero.modules.laws.documenttool.service.impl; -import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; import com.alibaba.fastjson.JSON; @@ -14,14 +13,11 @@ import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.FileUtils; import com.jero.common.util.MessageUtils; import com.jero.common.util.UUIDUtils; import com.jero.common.util.ZipUtil; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTerm; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.documenttool.common.DirectoryComparator; @@ -1083,56 +1079,6 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { lawsDocumentSplitView.setDocumentSplitDetail(documentSplitDetailByList); return lawsDocumentSplitView; } - @Override - public List processProjectAssessGetList(String ids) { - List processProjectAssessTermList = new ArrayList<>(); - List processManuscriptDictModels = sysBaseAPI.queryDictItemsByCode("process_manuscript"); - Map processManuscriptMap = CollStreamUtil.toMap(processManuscriptDictModels, DictModel::getValue, DictModel::getText); - for (String id : ids.split(",")) { - ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm(); - // 文档拆分信息 - DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id); - processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber()); - processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle()); - processProjectAssessTerm.setSplitInfoId(id); - processProjectAssessTerm.setTermText(processManuscriptMap.get(documentSplitInfo1.getFileType())); - processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.NO.getInteger()); - processProjectAssessTermList.add(processProjectAssessTerm); - // 文档拆分详情 - Map parameter = new HashMap<>(); - parameter.put(INFO_ID, id); - List> documentSplitDetailByList = queryDocumentSplitDetailByList(parameter); - for (Map map : documentSplitDetailByList) { - ProcessProjectAssessTerm processProjectAssessTerm1 = new ProcessProjectAssessTerm(); - processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num"))); - processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title"))); - processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content"))); - processProjectAssessTerm1.setSplitInfoId(id); - processProjectAssessTerm1.setCanAssignFlag(YesOrNoEnum.YES.getInteger()); - processProjectAssessTermList.add(processProjectAssessTerm1); - } - } - return processProjectAssessTermList; - } - - @Override - public List processProjectStandardGetList(String sarFileSplitInfoId) { - List processProjectAssessTermList = new ArrayList<>(); - ProcessProjectStandardTerm term = new ProcessProjectStandardTerm(); - // 文档拆分详情 - Map parameter = new HashMap<>(); - parameter.put(INFO_ID, sarFileSplitInfoId); - List> documentSplitDetailByList = queryDocumentSplitDetailByList(parameter); - for (Map map : documentSplitDetailByList) { - ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm(); - term1.setTermNumber(String.valueOf(map.get("item_num"))); - term1.setTermName(String.valueOf(map.get("item_title"))); - term1.setTermText(String.valueOf(map.get("item_content"))); - term1.setSplitInfoId(sarFileSplitInfoId); - processProjectAssessTermList.add(term1); - } - return processProjectAssessTermList; - } @Override public void publish(Map parameter) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index dadaac94..411d2162 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -3,7 +3,6 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -162,11 +161,6 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "企标稽查计划id") private String processEsInspectPlanId; - /**意见*/ - @ApiModelProperty(value = "意见") - @TableField(exist = false) - private List processEsInspectPlanOpinionList; - //================================= /** * ids 查询用 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index cffbdbf3..12ea5022 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -8,9 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.util.BeanCopyUtils; import com.jero.common.util.oConvertUtils; -import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; -import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; @@ -79,12 +76,6 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); @@ -356,17 +347,6 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl list) { - for (EnterpriseStandardInspectVo enterpriseStandardInspectVo : list) { - // 翻译 - enterpriseStandardInspectVo.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getInspectUser(), "")); - enterpriseStandardInspectVo.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getStandardizationDockingUser(), "")); - enterpriseStandardInspectVo.setActualInspectUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getActualInspectUser(), "")); - // 意见 - List processEsInspectPlanOpinionList = processEsInspectPlanOpinionService.findLastByGroup(enterpriseStandardInspectVo.getProcessEsInspectPlanId()); - if (CollectionUtils.isNotEmpty(processEsInspectPlanOpinionList)){ - enterpriseStandardInspectVo.setProcessEsInspectPlanOpinionList(processEsInspectPlanOpinionList); - } - } } @NotNull diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java index 39649726..417acf19 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java @@ -8,9 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.CommonAPI; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.SysDictItemCore; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPChangeType; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType; import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.util.ImportUtil; @@ -76,12 +73,6 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl queryPageList(ESPlanQueryDTO esPlanQueryDTO, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esPlanMapper.page(page, esPlanQueryDTO); - // 未开始的才可以删除，发起流程的时候需要判断计划有没有被删除，如果计划被删除了则需要重新制定计划 - page.getRecords().forEach(enterpriseStandardPlanVo -> { - enterpriseStandardPlanVo.setAllowDel( - ESPProjectStatus.NOT_STARTED.getValue() - .equals(enterpriseStandardPlanVo.getProjectStatus())); - }); return page; } @@ -102,24 +93,6 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType) { List projectStatusList = new ArrayList<>(); - // 构建查询参数 - if (ESPProjectType.MERGE.getValue().equals(projectType)) { - // 合并 未开始 修订+修订 制定+制定 - projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue()); - esPlanQueryDTO.setProjectStatusList(projectStatusList); - } else if (ESPProjectType.RESPONSIBLE_DEPT_CHANGE.getValue().equals(projectType)) { - // 责任部门变更 未开始/进行中 - projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue()); - projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue()); - esPlanQueryDTO.setProjectStatusList(projectStatusList); - } else { - // 完成时间变更 未开始/进行中/逾期 - // 工作中止 未开始/进行中/逾期 - projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue()); - projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue()); - projectStatusList.add(ESPProjectStatus.OVERDUE.getValue()); - esPlanQueryDTO.setProjectStatusList(projectStatusList); - } IPage page = new Page<>(pageNo, pageSize); esPlanMapper.page(page, esPlanQueryDTO); return page; @@ -200,11 +173,11 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl verifyBatchEsNumber(List standardNumbers) { - // 判断是否和企标库中重复 - LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); - esWrapper.in(LawsEnterpriseStandard::getStandardNumber, standardNumbers); - esWrapper.eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getInteger()); - List numList = esService.list(esWrapper) - .stream().map(LawsEnterpriseStandard::getStandardNumber).collect(Collectors.toList()); - // 判断是否和企标计划库中重复 - LambdaQueryWrapper planWrapper = new LambdaQueryWrapper<>(); - planWrapper.in(EnterpriseStandardPlan::getNewEnStandardNo, standardNumbers); - planWrapper.eq(EnterpriseStandardPlan::getDelFlag, YesOrNoEnum.NO.getInteger()); - numList.addAll(espService.list(planWrapper) - .stream().map(EnterpriseStandardPlan::getNewEnStandardNo).collect(Collectors.toList())); - // 判断是否和立项流程中重复 - // 已经撤回的立项流程不需要判断重复 - LambdaQueryWrapper processAllLambdaQueryWrapper = new LambdaQueryWrapper<>(); - processAllLambdaQueryWrapper.eq(ProcessAll::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue()); - processAllLambdaQueryWrapper.ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()); - List paList = processAllService.list(processAllLambdaQueryWrapper); - List processInstanceIdList = new ArrayList<>(); - if (paList != null && !paList.isEmpty()) { - processInstanceIdList = paList.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); - } - LambdaQueryWrapper initChangeWrapper = new LambdaQueryWrapper<>(); - initChangeWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue()); - initChangeWrapper.in(!standardNumbers.isEmpty(), ProcessEsInitChange::getNewEnStandardNo, standardNumbers); - initChangeWrapper.in(!processInstanceIdList.isEmpty(), ProcessEsInitChange::getProcessInstanceId, processInstanceIdList); - numList.addAll(initChangeService.list(initChangeWrapper) - .stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList())); List duplicateStandardNumbers = new ArrayList<>(); - for (String standardNumber : standardNumbers) { - if (numList.contains(standardNumber)) { - duplicateStandardNumbers.add(standardNumber); - } - } return duplicateStandardNumbers; } @@ -375,12 +336,7 @@ public class EnterpriseStandardUtil { if (paList != null && !paList.isEmpty()) { processInstanceIdList = paList.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); } - LambdaQueryWrapper initChangeWrapper = new LambdaQueryWrapper<>(); - initChangeWrapper.in(ProcessEsInitChange::getNewEnStandardNo, standardNumbers); - initChangeWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue()); - initChangeWrapper.in(ProcessEsInitChange::getProcessInstanceId, processInstanceIdList); - numList.addAll(initChangeService.list(initChangeWrapper) - .stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList())); + List duplicateStandardNumbers = new ArrayList<>(); for (EnterpriseStandardPlan esp : plans) { if (numList.contains(esp.getNewEnStandardNo())) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java b/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java deleted file mode 100644 index f0b0ebb1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.jero.modules.laws.library.controller; - -import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.util.MessageUtils; -import com.jero.common.api.vo.ResultCommon; -import com.jero.modules.laws.library.entity.LawsAnswerLibrary; -import com.jero.modules.laws.library.entity.LawsProblemLibrary; -import com.jero.modules.laws.library.service.ILawsProblemLibraryService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; - - -/** - * @Description: 问答库-问题 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -@Api(tags = "问答库") -@RestController -@RequestMapping("/laws/library/lawsProblemLibrary") -@Slf4j -public class LawsProblemLibraryController extends JeroController { - - @Autowired - private ILawsProblemLibraryService lawsProblemLibraryService; - - @AutoLog(value = "问答库-分页列表查询") - @ApiOperation(value = "问答库-分页列表查询", notes = "问答库-问题-分页列表查询") - @GetMapping(value = "/page") - @RequiresPermissions("businessSupport:questionAnswer:search") - public Result> queryPageList(LawsProblemLibrary lawsProblemLibrary, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsProblemLibraryService.queryPage(lawsProblemLibrary, pageNo, pageSize, req); - return Result.OK(pageList); - } - - @AutoLog(value = "问答库-提出问题") - @ApiOperation(value = "问答库-提出问题", notes = "问答库-提出问题") - @PostMapping(value = "/addProblem") - @RequiresPermissions("businessSupport:questionAnswer:quiz") - public Result addProblem(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "国内标准-提出问题") - @ApiOperation(value = "国内标准-提出问题", notes = "国内标准-提出问题") - @PostMapping(value = "/addProblem/GB") - @RequiresPermissions("domesticStandard:submitQuestion") - public Result addProblemGB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibrary.setType("1"); - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "海外标准-提出问题") - @ApiOperation(value = "海外标准-提出问题", notes = "海外标准-提出问题") - @PostMapping(value = "/addProblem/FB") - @RequiresPermissions("overseasStandard:submitQuestion") - public Result addProblemFB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibrary.setType("2"); - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "企业标准-提出问题") - @ApiOperation(value = "企业标准-提出问题", notes = "企业标准-提出问题") - @PostMapping(value = "/addProblem/QB") - @RequiresPermissions("enterpriseStandard:detail:submitQuestion") - public Result addProblemQB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) { - lawsProblemLibrary.setType("3"); - lawsProblemLibraryService.addProblem(lawsProblemLibrary); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "问答库-回答问题") - @ApiOperation(value = "问答库-回答问题", notes = "问答库-回答问题") - @PostMapping(value = "/addAnswer") - @RequiresPermissions("quiz:detail:answerSubmit") - public Result addAnswer(@Validated @RequestBody LawsAnswerLibrary lawsAnswerLibrary) { - lawsProblemLibraryService.addAnswer(lawsAnswerLibrary); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "问答库-通过id查询") - @ApiOperation(value = "问答库-通过id查询", notes = "问答库-通过id查询") - @GetMapping(value = "/queryById") - @Translation - @RequiresPermissions("businessSupport:questionAnswer:detail") - public Result queryById(@RequestParam(name = "id") String id) { - LawsProblemLibrary lawsProblemLibrary = lawsProblemLibraryService.queryById(id); - return Result.OK(lawsProblemLibrary); - } - - @AutoLog(value = "问答库-通过id删除问题") - @ApiOperation(value = "问答库-通过id删除问题", notes = "问答库-通过id删除问题") - @PostMapping(value = "/deleteProblem") - @RequiresPermissions("businessSupport:questionAnswer:delete") - public Result deleteProblem(@RequestBody Map map) { - if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { - return Result.error(MessageUtils.getMessage(ResultCommon.SELECT_DATA)); - } - lawsProblemLibraryService.deleteProblem(map.get("id")); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "问答库-通过id删除回答") - @ApiOperation(value = "问答库-通过id删除回答", notes = "问答库-通过id删除回答") - @PostMapping(value = "/deleteAnswer") - @RequiresPermissions("quiz:detail:deleteAnswer") - public Result deleteAnswer(@RequestBody Map map) { - if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { - return Result.error(MessageUtils.getMessage(ResultCommon.SELECT_DATA)); - } - lawsProblemLibraryService.deleteAnswer(map.get("id")); - return Result.OK(ResultCommon.OK); - } - - @AutoLog(value = "问答库-是否置顶") - @ApiOperation(value = "问答库-是否置顶", notes = "问答库-是否置顶") - @GetMapping(value = "/isTop") - @RequiresPermissions("quiz:detail:topOrCancel") - public Result isTop(@RequestParam(name = "id") String id) { - lawsProblemLibraryService.isTop(id); - return Result.OK(ResultCommon.OK); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java deleted file mode 100644 index 8fac30ee..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsAnswerLibrary.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.jero.modules.laws.library.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - - -/** - * @Description: 问答库-回答 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -@Data -@TableName("laws_answer_library") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_answer_library对象", description="问答库-回答") -public class LawsAnswerLibrary implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - private java.lang.String orgCode; - /**问题id*/ - @Excel(name = "问题id", width = 15) - @ApiModelProperty(value = "问题id") - private java.lang.String problemId; - /**答案描述*/ - @Excel(name = "答案描述", width = 15) - @ApiModelProperty(value = "答案描述") - private java.lang.String answerDescription; - /**是否置顶（0否,1是）*/ - @Excel(name = "是否置顶（0否,1是）", width = 15) - @ApiModelProperty(value = "是否置顶（0否,1是）") - private java.lang.Integer isTop; - /**回答人id*/ - @Excel(name = "回答人id", width = 15) - @ApiModelProperty(value = "回答人id") - private java.lang.String userId; - - /**回答人头像*/ - @ApiModelProperty(value = "回答人头像") - @TableField(exist = false) - private java.lang.String avatar; - /**回答人名称*/ - @ApiModelProperty(value = "回答人名称") - @TableField(exist = false) - private java.lang.String name; - /**回答人部门*/ - @ApiModelProperty(value = "回答人部门") - @TableField(exist = false) - private java.lang.String departName; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java deleted file mode 100644 index ddbfd706..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.jero.modules.laws.library.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - - -/** - * @Description: 问答库-问题 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -@Data -@TableName("laws_problem_library") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_problem_library对象", description="问答库-问题") -public class LawsProblemLibrary implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - @Dict(dictTable = "sys_depart", dicCode = "org_code", dicText = "depart_name") - private java.lang.String orgCode; - /**0表示未删除,1表示删除*/ - @Excel(name = "0表示未删除,1表示删除", width = 15) - @ApiModelProperty(value = "0表示未删除,1表示删除") - private java.lang.Integer delFlag; - /**分类（国内1、海外2、企业3、其他4）*/ - @Excel(name = "分类（国内1、海外2、企业3、其他4）", width = 15) - @ApiModelProperty(value = "分类（国内1、海外2、企业3、其他4）") - @Dict(dicCode = "problem_library_type") - private java.lang.String type; - /**标准id*/ - @Excel(name = "标准id", width = 15) - @ApiModelProperty(value = "标准id") - private java.lang.String standardId; - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; - /**标准名称*/ - @Excel(name = "标准名称", width = 15) - @ApiModelProperty(value = "标准名称") - private java.lang.String standardName; - /**标题*/ - @Excel(name = "标题", width = 15) - @ApiModelProperty(value = "标题") - private java.lang.String title; - /**项目*/ - @Excel(name = "项目", width = 15) - @ApiModelProperty(value = "项目") - @Dict(dictTable = "laws_project_library", dicCode = "id", dicText = "project_name") - private java.lang.String project; - /**问题描述*/ - @Excel(name = "问题描述", width = 15) - @ApiModelProperty(value = "问题描述") - private java.lang.String problemDescription; - /**提问时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "提问时间") - private java.util.Date quizTime; - /**附件*/ - @Excel(name = "附件", width = 15) - @ApiModelProperty(value = "附件") - private java.lang.String file; - /**是否有人回答（0否,1是）*/ - @Excel(name = "是否有人回答（0否,1是）", width = 15) - @ApiModelProperty(value = "是否有人回答（0否,1是）") - private java.lang.Integer isAnswer; - /**发帖人id*/ - @Excel(name = "发帖人id", width = 15) - @ApiModelProperty(value = "发帖人id") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - private java.lang.String userId; - - /**回答列表*/ - @ApiModelProperty(value = "回答列表") - @TableField(exist = false) - private List answerList; - /**回答数*/ - @ApiModelProperty(value = "回答数") - @TableField(exist = false) - private Integer answerCount; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/LawsAnswerLibraryMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/LawsAnswerLibraryMapper.java deleted file mode 100644 index 12dfd23d..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/LawsAnswerLibraryMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.laws.library.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.laws.library.entity.LawsAnswerLibrary; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 问答库-回答 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -public interface LawsAnswerLibraryMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/LawsProblemLibraryMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/LawsProblemLibraryMapper.java deleted file mode 100644 index 4cc7f218..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/LawsProblemLibraryMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.laws.library.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.laws.library.entity.LawsProblemLibrary; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 问答库-问题 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -public interface LawsProblemLibraryMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/xml/LawsAnswerLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/xml/LawsAnswerLibraryMapper.xml deleted file mode 100644 index b35dca67..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/xml/LawsAnswerLibraryMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/xml/LawsProblemLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/xml/LawsProblemLibraryMapper.xml deleted file mode 100644 index ef35e587..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/mapper/xml/LawsProblemLibraryMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/ILawsAnswerLibraryService.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/ILawsAnswerLibraryService.java deleted file mode 100644 index 346c01aa..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/ILawsAnswerLibraryService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.laws.library.service; - -import com.jero.modules.laws.library.entity.LawsAnswerLibrary; -import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; - -/** - * @Description: 问答库-回答 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -public interface ILawsAnswerLibraryService extends IService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/ILawsProblemLibraryService.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/ILawsProblemLibraryService.java deleted file mode 100644 index ac2a7551..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/ILawsProblemLibraryService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.jero.modules.laws.library.service; - -import com.jero.modules.laws.library.entity.LawsAnswerLibrary; -import com.jero.modules.laws.library.entity.LawsProblemLibrary; -import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; - -/** - * @Description: 问答库-问题 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -public interface ILawsProblemLibraryService extends IService { - - /** - * @Author: liao - * @Date: 2023/9/28 13:44 - * @Description: 分页查询 - **/ - IPage queryPage(LawsProblemLibrary lawsProblemLibrary, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * @Author: liao - * @Date: 2023/9/28 11:47 - * @Description: 添加问题 - **/ - void addProblem(LawsProblemLibrary lawsProblemLibrary); - - /** - * @Author: liao - * @Date: 2023/9/28 13:51 - * @Description: 回答问题 - **/ - void addAnswer(LawsAnswerLibrary lawsAnswerLibrary); - - /** - * @Author: liao - * @Date: 2023/9/28 13:48 - * @Description: 通过id查询 - **/ - LawsProblemLibrary queryById(String id); - - /** - * @Author: liao - * @Date: 2023/9/28 13:44 - * @Description: 根据id删除问题 - **/ - void deleteProblem(String id); - - /** - * @Author: liao - * @Date: 2023/9/28 14:18 - * @Description: 通过id删除回答 - **/ - void deleteAnswer(String id); - - /** - * @Author: liao - * @Date: 2023/9/28 14:21 - * @Description: 是否置顶 - **/ - void isTop(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsAnswerLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsAnswerLibraryServiceImpl.java deleted file mode 100644 index 5056ec7b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsAnswerLibraryServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.modules.laws.library.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.modules.laws.library.entity.LawsAnswerLibrary; -import com.jero.modules.laws.library.mapper.LawsAnswerLibraryMapper; -import com.jero.modules.laws.library.service.ILawsAnswerLibraryService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - -/** - * @Description: 问答库-回答 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsAnswerLibraryServiceImpl extends ServiceImpl implements ILawsAnswerLibraryService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java deleted file mode 100644 index a5c7576a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java +++ /dev/null @@ -1,294 +0,0 @@ -package com.jero.modules.laws.library.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.SendMessageAPI; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.api.vo.ResultCommon; -import com.jero.modules.laws.common.constant.DictCommon; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.service.ILawsCommonService; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; -import com.jero.modules.laws.library.entity.LawsAnswerLibrary; -import com.jero.modules.laws.library.entity.LawsProblemLibrary; -import com.jero.modules.laws.library.mapper.LawsProblemLibraryMapper; -import com.jero.modules.laws.library.service.ILawsAnswerLibraryService; -import com.jero.modules.laws.library.service.ILawsProblemLibraryService; -import com.jero.modules.sys.utils.UserUtils; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysDictItem; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; - -import java.util.*; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; - -import javax.annotation.Resource; -import javax.management.relation.Role; -import javax.servlet.http.HttpServletRequest; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - -/** - * @Description: 问答库-问题 - * @Author: jero-boot - * @Date: 2023-09-28 - * @Version: V1.0 - */ -@Service -@Slf4j -@Transactional(rollbackFor = JeroBootException.class) -public class LawsProblemLibraryServiceImpl extends ServiceImpl implements ILawsProblemLibraryService { - - @Autowired - private ILawsCommonService lawsCommonService; - @Autowired - private ILawsAnswerLibraryService lawsAnswerLibraryService; - @Autowired - private ISysUserService sysUserService; - @Autowired - private ISysDepartService sysDepartService; - @Resource - private SendMessageAPI sendMessageAPI; - - @Resource - private ISysUserService userService; - - @Value("${adminRoleCode}") - private String adminRoleCode; - - @Override - public IPage queryPage(LawsProblemLibrary lawsProblemLibrary, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsProblemLibrary, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * @Author: liao - * @Date: 2023/9/28 11:48 - * @Description: 添加问题 - **/ - @Override - public void addProblem(LawsProblemLibrary lawsProblemLibrary) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (StringUtils.isBlank(lawsProblemLibrary.getTitle())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "title"); - } - if (StringUtils.isBlank(lawsProblemLibrary.getProblemDescription())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "problemDescription"); - } - if (Objects.isNull(lawsProblemLibrary.getQuizTime())) { - lawsProblemLibrary.setQuizTime(new Date()); - } - // 如果是国内、海外、企业 - if (!"4".equals(lawsProblemLibrary.getType())) { - if (StringUtils.isBlank(lawsProblemLibrary.getStandardNumber())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "standardNumber"); - } - ManyStandardSelectionBox singleStandard = lawsCommonService.getSingleStandard(lawsProblemLibrary.getStandardNumber(), null); - lawsProblemLibrary.setStandardId(singleStandard.getId()); - lawsProblemLibrary.setStandardName(singleStandard.getStandardName()); - } - lawsProblemLibrary.setUserId(loginUser.getId()); - lawsProblemLibrary.setOrgCode(loginUser.getOrgCode()); - lawsProblemLibrary.setIsAnswer(0); - - save(lawsProblemLibrary); - } - - /** - * @Author: liao - * @Date: 2023/9/28 13:51 - * @Description: 回答问题 - **/ - @Override - public void addAnswer(LawsAnswerLibrary lawsAnswerLibrary) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (StringUtils.isBlank(lawsAnswerLibrary.getProblemId())) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "problemId"); - } - - // 处理水平越权 自己提的问题自己不能回复 - LawsProblemLibrary problem = getById(lawsAnswerLibrary.getProblemId()); - if (loginUser.getUsername().equals(problem.getCreateBy())) { - throw new JeroBootException(ResultCommon.NO_PERMISSION); - } - - lawsAnswerLibrary.setUserId(loginUser.getId()); - lawsAnswerLibrary.setOrgCode(loginUser.getOrgCode()); - lawsAnswerLibrary.setIsTop(0); - lawsAnswerLibrary.setCreateTime(new Date()); - - lawsAnswerLibraryService.save(lawsAnswerLibrary); - - // 更新问题的回答状态 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(LawsProblemLibrary::getIsAnswer, 1); - updateWrapper.eq(LawsProblemLibrary::getId, lawsAnswerLibrary.getProblemId()); - update(updateWrapper); - } - - /** - * @Author: liao - * @Date: 2023/9/28 13:48 - * @Description: 通过id查询 - **/ - @Override - public LawsProblemLibrary queryById(String id) { - LawsProblemLibrary lawsProblemLibrary = getById(id); - if (Objects.isNull(lawsProblemLibrary)) { - throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsAnswerLibrary::getProblemId, id); - queryWrapper.orderByDesc(LawsAnswerLibrary::getIsTop).orderByDesc(LawsAnswerLibrary::getCreateTime); - List answerList = lawsAnswerLibraryService.list(queryWrapper); - - if (CollectionUtils.isNotEmpty(answerList)) { - List userIdList = answerList.stream() - .map(LawsAnswerLibrary::getUserId).collect(Collectors.toList()); - List orgCodeList = answerList.stream() - .map(LawsAnswerLibrary::getOrgCode).collect(Collectors.toList()); - LambdaQueryWrapper userQueryWrapper = new LambdaQueryWrapper<>(); - userQueryWrapper.in(SysUser::getId, userIdList); - List userList = sysUserService.list(userQueryWrapper); - LambdaQueryWrapper departQueryWrapper = new LambdaQueryWrapper<>(); - departQueryWrapper.in(SysDepart::getOrgCode, orgCodeList); - List departList = sysDepartService.list(departQueryWrapper); - answerList.forEach(answer -> { - SysUser sysUser = userList.stream().filter(user -> answer.getUserId() - .equals(user.getId())).collect(Collectors.toList()).get(0); - if (StrUtil.isNotBlank(answer.getOrgCode())) { - List sysDepartList = departList.stream().filter(depart -> answer.getOrgCode() - .equals(depart.getOrgCode())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(sysDepartList)) { - answer.setDepartName(sysDepartList.get(0).getDepartName()); - } - } - answer.setAvatar(sysUser.getAvatar()); - answer.setName(sysUser.calcNameWorkNo()); - }); - } - - lawsProblemLibrary.setAnswerList(answerList); - lawsProblemLibrary.setAnswerCount(answerList.size()); - - return lawsProblemLibrary; - } - - /** - * @Author: liao - * @Date: 2023/9/28 13:48 - * @Description: 根据id删除问题 - **/ - @Override - public void deleteProblem(String id) { - // 处理水平越权 只有创建人可以删除问题 - LoginUser currentUser = UserUtils.getCurrentUser(); - LawsProblemLibrary problem = getById(id); - if (!currentUser.getUsername().equals(problem.getCreateBy())) { - throw new JeroBootException(ResultCommon.NO_PERMISSION); - } - removeById(id); - } - - /** - * @Author: liao - * @Date: 2023/9/28 14:18 - * @Description: 通过id删除回答 - **/ - @Override - public void deleteAnswer(String id) { - // 处理水平越权 管理员和创建者才可以删除所有评论 其他人只能删除自己的评论 - LoginUser currentUser = UserUtils.getCurrentUser(); - List userRoleList = userService.getRole(currentUser.getUsername()); - LawsAnswerLibrary answer = lawsAnswerLibraryService.getById(id); - // 如果是管理员权限 则跳过验证 - List adminRoleList = Arrays.asList(adminRoleCode.split(",")); - // 如果不是管理员权限 且不是问题创建者 且不是回答创建者 则没有权限 - SysUser user = userService.getById(answer.getUserId()); - if (adminRoleList.stream().noneMatch(userRoleList::contains)) { - if (!currentUser.getUsername().equals(user.getUsername())) { - throw new JeroBootException(ResultCommon.NO_PERMISSION); - } - } - lawsAnswerLibraryService.removeById(id); - } - - /** - * @Author: liao - * @Date: 2023/9/28 14:21 - * @Description: 是否置顶 - **/ - @Override - public void isTop(String id) { - LawsAnswerLibrary lawsAnswerLibrary = lawsAnswerLibraryService.getById(id); - if (Objects.isNull(lawsAnswerLibrary)) { - throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } - // 处理水平越权 管理员和创建者才可以删除所有评论 其他人只能删除自己的评论 - LoginUser currentUser = UserUtils.getCurrentUser(); - List userRoleList = userService.getRole(currentUser.getUsername()); - // 如果是管理员权限 则跳过验证 - List adminRoleList = Arrays.asList(adminRoleCode.split(",")); - // 如果不是管理员权限 且不是问题创建者 且不是回答创建者 则没有权限 - if (adminRoleList.stream().noneMatch(userRoleList::contains)) { - LawsProblemLibrary problem = getById(lawsAnswerLibrary.getProblemId()); - if (!currentUser.getUsername().equals(problem.getCreateBy())) { - throw new JeroBootException(ResultCommon.NO_PERMISSION); - } - } - - if (0 == lawsAnswerLibrary.getIsTop()) { - lawsAnswerLibrary.setIsTop(1); - // 发送消息 - sendMsg(lawsAnswerLibrary); - } else { - lawsAnswerLibrary.setIsTop(0); - } - lawsAnswerLibraryService.updateById(lawsAnswerLibrary); - } - - /** - * @Author: liao - * @Date: 2023/11/10 15:15 - * @Description: 发送消息 - **/ - private void sendMsg(LawsAnswerLibrary lawsAnswerLibrary) { - log.info("lawsAnswerLibrary.getProblemId()的id为:{}", lawsAnswerLibrary.getProblemId()); - LawsProblemLibrary lawsProblemLibrary = getById(lawsAnswerLibrary.getProblemId()); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.LAWS_PROBLEM_LIBRARY); - sendMessageDTO.setToUserId(lawsAnswerLibrary.getUserId()); - Map map = new HashMap<>(); - map.put("standardNumber", lawsProblemLibrary.getStandardNumber()); - map.put("standardName", lawsProblemLibrary.getStandardName()); - map.put("title", lawsProblemLibrary.getTitle()); - map.put("openType", "url"); - log.info("openPage:{}", "/businessSupport/questionDetail?id=" + lawsAnswerLibrary.getProblemId() + "&canAnswer=1"); - map.put("openPage", "/businessSupport/questionDetail?id=" + lawsAnswerLibrary.getProblemId() + "&canAnswer=1"); - sendMessageDTO.setMap(map); - sendMessageAPI.sendMessage(sendMessageDTO); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index ee652278..c1dc1203 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.SendMessageAPI; +import com.jero.modules.common.service.SendMessageAPI; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.DateUtil; import com.jero.modules.laws.localTool.entity.LawsEarlyWarningMessage; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 51a6cb02..74d7a3da 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -8,7 +8,6 @@ import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; @@ -55,8 +54,6 @@ public class LawsDomesticController { private ILawsUpdateRecordService lawsUpdateRecordService; @Autowired private ILawsStandardSharingService lawsStandardSharingService; - @Autowired - private IProcessFbEntryChangeService processFbEntryChangeService; @Resource private ISarFileSplitInfoService splitInfoService; @@ -161,7 +158,7 @@ public class LawsDomesticController { @RequiresPermissions("domesticStandard:delete") public Result deleteByIdsAndModule(@RequestBody @ApiParam(name = "ids", value = "主键（多个用逗号分隔）") Map parameterMap) { // 删除校验 - processFbEntryChangeService.delCheck((String) parameterMap.get("ids")); +// processFbEntryChangeService.delCheck((String) parameterMap.get("ids")); //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index d17d3893..a7194d4f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -5,23 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.esChange.service.ProcessEsChangeService; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; -import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; -import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; +import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; @@ -30,7 +27,9 @@ import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; -import io.swagger.annotations.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -82,9 +81,6 @@ public class LawsEnterpriseController { @Resource private ILawsCustomCompareInfoService customCompareService; - @Resource - private ProcessEsChangeService esChangeService; - private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @AutoLog(value = "企业法规标准-分页列表查询") @@ -189,7 +185,7 @@ public class LawsEnterpriseController { throw new JeroBootException(MessageUtils.getMessage(ResultCommon.NO_AUTH)); } // 检查是否在企标更改流程中，如果在流程中则不允许删除 - esChangeService.delCheck((String) parameterMap.get("ids")); +// esChangeService.delCheck((String) parameterMap.get("ids")); //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); @@ -209,7 +205,7 @@ public class LawsEnterpriseController { // 水平越权校验 esAuthUserService.isDeleteHorizontalOverstep((String) parameterMap.get("ids")); // 检查是否在企标更改流程中，如果在流程中则不允许删除 - esChangeService.delCheck((String) parameterMap.get("ids")); +// esChangeService.delCheck((String) parameterMap.get("ids")); // 删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 082cf5be..a8bf6c4d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -9,7 +9,6 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; @@ -56,8 +55,6 @@ public class LawsOverseasController { private ILawsUpdateRecordService lawsUpdateRecordService; @Autowired private ILawsStandardSharingService lawsStandardSharingService; - @Autowired - private IProcessFbEntryChangeService processFbEntryChangeService; @Resource private ILawsCustomCompareInfoService customCompareService; @Resource @@ -160,7 +157,7 @@ public class LawsOverseasController { @RequiresPermissions("overseasStandard:delete") public Result deleteByIdsAndModule(@RequestBody @ApiParam(name = "ids", value = "主键（多个用逗号分隔）") Map parameterMap) { // 删除校验 - processFbEntryChangeService.delCheck((String) parameterMap.get("ids")); +// processFbEntryChangeService.delCheck((String) parameterMap.get("ids")); //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java index 3505f1b6..8af015c4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java @@ -2,7 +2,7 @@ package com.jero.modules.laws.standard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.common.api.vo.SendMessageAPI; +import com.jero.modules.common.service.SendMessageAPI; import com.jero.common.system.vo.LoginUser; import com.jero.modules.laws.common.constant.DictCommon; import com.jero.modules.laws.common.constant.FieldCommon; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java deleted file mode 100644 index e1a478d0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/common/LawsStandardizationCommon.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.jero.modules.laws.standardization.common; - -/** - * @ClassName: LawsStandardizationCommon - * @Description: - * @Author: yjz - * @Date: 2024-01-22 09:36 - * @Version: 1.0 - **/ -public class LawsStandardizationCommon { - private LawsStandardizationCommon(){ - - } - - /** - * 标准化活动节点类型 ROOT:总标委，WYH:委员会，FBW:委员会，GROUP:工作组 - */ - public static final String ROOT = "ROOT"; - /** - * 标准化活动节点类型 ROOT:总标委，WYH:委员会，FBW:委员会，GROUP:工作组 - */ - public static final String WYH = "WYH"; - /** - * 标准化活动节点类型 ROOT:总标委，WYH:委员会，FBW:委员会，GROUP:工作组 - */ - public static final String FBW = "FBW"; - /** - * 标准化活动节点类型 ROOT:总标委，WYH:委员会，FBW:委员会，GROUP:工作组 - */ - public static final String GROUP = "GROUP"; - - /** - * 层级 0，1，2，3 - */ - public static final Long LEVEL_0 = 0L; - /** - * 层级 0，1，2，3 - */ - public static final Long LEVEL_1 = 1L; - /** - * 层级 0，1，2，3 - */ - public static final Long LEVEL_2 = 2L; - /** - * 层级 0，1，2，3 - */ - public static final Long LEVEL_3 = 3L; - - /** - * 来源 1:新增 2:会后管理流程 - */ - public static final String SOURCE_1 = "1"; - /** - * 来源 1:新增 2:会后管理流程 - */ - public static final String SOURCE_2 = "2"; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java deleted file mode 100644 index 6c0c184b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.jero.modules.laws.standardization.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.api.vo.ResultCommon; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.common.system.base.controller.JeroController; -import com.jero.common.util.MessageUtils; -import com.jero.modules.laws.standardization.common.LawsStandardizationCommon; -import com.jero.modules.laws.standardization.entity.*; -import com.jero.modules.laws.standardization.service.ILawsStandardizationService; -import com.jero.modules.laws.standardization.vo.StandardizationVO; -import com.jero.modules.system.vo.IdMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.context.annotation.Lazy; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - - /** - * @Description: 标准化活动 - * @Author: jero-boot - * @Date: 2023-10-23 - * @Version: V1.0 - */ -@Api(tags="标准化活动") -@RestController -@RequestMapping("/laws/standardization/lawsStandardization") -@Slf4j -public class LawsStandardizationController extends JeroController { - private final ILawsStandardizationService lawsStandardizationService; - - public LawsStandardizationController(@Lazy ILawsStandardizationService lawsStandardizationService) { - this.lawsStandardizationService = lawsStandardizationService; - } - - /** - * 标准化活动-树结构查询 - * @return - */ - @AutoLog(value = "标准化活动-树结构查询") - @ApiOperation(value="标准化活动-树结构查询", notes="标准化活动-树结构查询") - @GetMapping(value = "/queryTreeList") - @RequiresPermissions("standardActivity:search") - @Translation - public Result queryTreeList() { - return Result.OK(lawsStandardizationService.queryTreeList()); - } - - /** - * 标准化活动-列表查询 - * @return - */ - @AutoLog(value = "标准化活动-列表查询") - @ApiOperation(value="标准化活动-列表查询", notes="标准化活动-列表查询") - @GetMapping(value = "/queryList") - @Translation - public Result> queryList(LawsStandardization lawsStandardization) { - return Result.OK(lawsStandardizationService.queryList(lawsStandardization)); - } - - /** - * 标准化活动-树结构查询 - * @return - */ - @AutoLog(value = "标准化活动-统计列表") - @ApiOperation(value="标准化活动-统计列表", notes="标准化活动-统计列表") - @GetMapping(value = "/queryStatistics") - @RequiresPermissions("standardActivity:statistical") - @Translation - public Result> queryStatistics() { - return Result.OK(lawsStandardizationService.queryStatistics()); - } - - /** - * 新增or编辑 - * - * @param standardizationVO - * @return - */ - @AutoLog(value = "标准化活动-添加") - @ApiOperation(value="标准化活动-添加", notes="标准化活动-添加") - @PostMapping(value = "/add") - @RequiresPermissions("standardActivity:add") - public Result add(@Validated @RequestBody StandardizationVO standardizationVO) { - lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_1); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 新增or编辑 - * - * @param standardizationVO - * @return - */ - @AutoLog(value = "标准化活动-编辑") - @ApiOperation(value="标准化活动-编辑", notes="标准化活动-编辑") - @PostMapping(value = "/edit") - @RequiresPermissions("standardActivity:edit") - public Result edit(@Validated @RequestBody StandardizationVO standardizationVO) { - lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_1); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - /** - * 标准化活动-通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "标准化活动-通过id查询") - @ApiOperation(value="标准化活动-通过id查询", notes="标准化活动-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - return Result.OK(lawsStandardizationService.queryById(id)); - } - - /** - * 标准化活动-会议统计-联络人联系方式 - * - * @param standardizationId - * @return - */ - @AutoLog(value = "标准化活动-会议统计-联络人联系方式") - @ApiOperation(value="标准化活动-会议统计-联络人联系方式", notes="标准化活动-会议统计-联络人联系方式") - @GetMapping(value = "/queryLiaisonByStandardizationId") - @RequiresPermissions("standardActivity:statistical") - public Result> queryLiaisonByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) { - return Result.OK(lawsStandardizationService.queryLiaisonByStandardizationId(standardizationId)); - } - - /** - * 标准化活动-会议统计-集团参与情况 - * - * @param standardizationId - * @return - */ - @AutoLog(value = "标准化活动-会议统计-集团参与情况") - @ApiOperation(value="标准化活动-会议统计-集团参与情况", notes="标准化活动-会议统计-集团参与情况") - @GetMapping(value = "/queryGroupByStandardizationId") - @RequiresPermissions("standardActivity:statistical") - public Result> queryGroupByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) { - return Result.OK(lawsStandardizationService.queryGroupByStandardizationId(standardizationId)); - } - - /** - * 标准化活动-会议统计-支付信息 - * - * @param standardizationId - * @return - */ - @AutoLog(value = "标准化活动-会议统计-支付信息") - @ApiOperation(value="标准化活动-会议统计-支付信息", notes="标准化活动-会议统计-支付信息") - @GetMapping(value = "/queryPaymentByStandardizationId") - @RequiresPermissions("standardActivity:statistical") - @Translation - public Result> queryPaymentByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) { - return Result.OK(lawsStandardizationService.queryPaymentByStandardizationId(standardizationId)); - } - - /** - * 标准化活动-会议统计-参会记录 - * - * @param standardizationId - * @return - */ - @AutoLog(value = "标准化活动-会议统计-参会记录") - @ApiOperation(value="标准化活动-会议统计-参会记录", notes="标准化活动-会议统计-参会记录") - @GetMapping(value = "/queryMeetingByStandardizationId") - @RequiresPermissions("standardActivity:statistical") - public Result> queryMeetingByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) { - return Result.OK(lawsStandardizationService.queryMeetingByStandardizationId(standardizationId)); - } - - /** - * 标准化活动-会议统计-参会记录（分页） - * - * @param standardizationId - * @return - */ - @AutoLog(value = "标准化活动-会议统计-参会记录（分页）") - @ApiOperation(value="标准化活动-会议统计-参会记录（分页）", notes="标准化活动-会议统计-参会记录（分页）") - @GetMapping(value = "/queryMeetingPageByStandardizationId") - public Result> queryMeetingPageByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(lawsStandardizationService.queryMeetingPageByStandardizationId(standardizationId, pageNo, pageSize)); - } - - /** - * 标准化活动-详情通过id查询 - * @return - */ - @AutoLog(value = "标准化活动-详情通过id查询") - @ApiOperation(value="标准化活动-详情通过id查询", notes="标准化活动-详情通过id查询") - @GetMapping(value = "/queryDetailById") - @Translation - @RequiresPermissions("standardActivity:view") - public Result queryDetailById(@ApiParam("id") String id) { - return Result.OK(lawsStandardizationService.queryDetailById(id)); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化活动-通过id删除") - @ApiOperation(value="标准化活动-通过id删除", notes="标准化活动-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - lawsStandardizationService.delete(map.getId()); - return Result.OK("删除成功!"); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java deleted file mode 100644 index 32959cea..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.jero.modules.laws.standardization.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; -import com.jero.modules.laws.standardization.service.ILawsStandardizationGroupService; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; - - - /** - * @Description: 标准化-集团参与情况 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Api(tags="标准化-集团参与情况") -@RestController -@RequestMapping("/laws/standardization/lawsStandardizationGroup") -@Slf4j -public class LawsStandardizationGroupController extends JeroController { - @Autowired - private ILawsStandardizationGroupService lawsStandardizationGroupService; - - /** - * 分页列表查询 - * - * @param lawsStandardizationGroup - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "标准化-集团参与情况-分页列表查询") - @ApiOperation(value="标准化-集团参与情况-分页列表查询", notes="标准化-集团参与情况-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(LawsStandardizationGroup lawsStandardizationGroup, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsStandardizationGroupService.queryPage(lawsStandardizationGroup, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param lawsStandardizationGroup - * @param req - * @return - */ - @AutoLog(value = "标准化-集团参与情况-列表查询") - @ApiOperation(value="标准化-集团参与情况-列表查询", notes="标准化-集团参与情况-列表查询") - @GetMapping(value = "/list") - public Result> queryList(LawsStandardizationGroup lawsStandardizationGroup, HttpServletRequest req) { - List list = lawsStandardizationGroupService.queryList(lawsStandardizationGroup, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param lawsStandardizationGroup - * @return - */ - @AutoLog(value = "标准化-集团参与情况-添加") - @ApiOperation(value="标准化-集团参与情况-添加", notes="标准化-集团参与情况-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody LawsStandardizationGroup lawsStandardizationGroup) { - lawsStandardizationGroupService.add(lawsStandardizationGroup); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param lawsStandardizationGroup - * @return - */ - @AutoLog(value = "标准化-集团参与情况-编辑") - @ApiOperation(value="标准化-集团参与情况-编辑", notes="标准化-集团参与情况-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody LawsStandardizationGroup lawsStandardizationGroup) { - lawsStandardizationGroupService.editById(lawsStandardizationGroup); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-集团参与情况-通过id删除") - @ApiOperation(value="标准化-集团参与情况-通过id删除", notes="标准化-集团参与情况-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - lawsStandardizationGroupService.deleteById(map.getId()); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-集团参与情况-批量删除") - @ApiOperation(value="标准化-集团参与情况-批量删除", notes="标准化-集团参与情况-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - if (StringUtils.isBlank(map.getIds())){ - return Result.error("请选择数据!"); - } - this.lawsStandardizationGroupService.deleteByIds(Arrays.asList(map.getIds().split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "标准化-集团参与情况-通过id查询") - @ApiOperation(value="标准化-集团参与情况-通过id查询", notes="标准化-集团参与情况-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - LawsStandardizationGroup lawsStandardizationGroup = lawsStandardizationGroupService.queryById(id); - if(lawsStandardizationGroup==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(lawsStandardizationGroup); - } - - /** - * 导出excel - * - * @param request - * @param lawsStandardizationGroup - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationGroup lawsStandardizationGroup) { - return super.exportXls(request, lawsStandardizationGroup, LawsStandardizationGroup.class, "标准化-集团参与情况"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, LawsStandardizationGroup.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java deleted file mode 100644 index 943918c3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.jero.modules.laws.standardization.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; -import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; - - - /** - * @Description: 标准化-联络人 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Api(tags="标准化-联络人") -@RestController -@RequestMapping("/laws/standardization/lawsStandardizationLiaison") -@Slf4j -public class LawsStandardizationLiaisonController extends JeroController { - @Autowired - private ILawsStandardizationLiaisonService lawsStandardizationLiaisonService; - - /** - * 分页列表查询 - * - * @param lawsStandardizationLiaison - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "标准化-联络人-分页列表查询") - @ApiOperation(value="标准化-联络人-分页列表查询", notes="标准化-联络人-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(LawsStandardizationLiaison lawsStandardizationLiaison, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsStandardizationLiaisonService.queryPage(lawsStandardizationLiaison, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param lawsStandardizationLiaison - * @param req - * @return - */ - @AutoLog(value = "标准化-联络人-列表查询") - @ApiOperation(value="标准化-联络人-列表查询", notes="标准化-联络人-列表查询") - @GetMapping(value = "/list") - public Result> queryList(LawsStandardizationLiaison lawsStandardizationLiaison, HttpServletRequest req) { - List list = lawsStandardizationLiaisonService.queryList(lawsStandardizationLiaison, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param lawsStandardizationLiaison - * @return - */ - @AutoLog(value = "标准化-联络人-添加") - @ApiOperation(value="标准化-联络人-添加", notes="标准化-联络人-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody LawsStandardizationLiaison lawsStandardizationLiaison) { - lawsStandardizationLiaisonService.add(lawsStandardizationLiaison); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param lawsStandardizationLiaison - * @return - */ - @AutoLog(value = "标准化-联络人-编辑") - @ApiOperation(value="标准化-联络人-编辑", notes="标准化-联络人-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody LawsStandardizationLiaison lawsStandardizationLiaison) { - lawsStandardizationLiaisonService.editById(lawsStandardizationLiaison); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-联络人-通过id删除") - @ApiOperation(value="标准化-联络人-通过id删除", notes="标准化-联络人-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - lawsStandardizationLiaisonService.deleteById(map.getId()); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-联络人-批量删除") - @ApiOperation(value="标准化-联络人-批量删除", notes="标准化-联络人-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - if (StringUtils.isBlank(map.getIds())){ - return Result.error("请选择数据!"); - } - this.lawsStandardizationLiaisonService.deleteByIds(Arrays.asList(map.getIds().split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "标准化-联络人-通过id查询") - @ApiOperation(value="标准化-联络人-通过id查询", notes="标准化-联络人-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - LawsStandardizationLiaison lawsStandardizationLiaison = lawsStandardizationLiaisonService.queryById(id); - if(lawsStandardizationLiaison==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(lawsStandardizationLiaison); - } - - /** - * 导出excel - * - * @param request - * @param lawsStandardizationLiaison - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationLiaison lawsStandardizationLiaison) { - return super.exportXls(request, lawsStandardizationLiaison, LawsStandardizationLiaison.class, "标准化-联络人"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, LawsStandardizationLiaison.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java deleted file mode 100644 index 94fc2787..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.jero.modules.laws.standardization.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; -import com.jero.modules.laws.standardization.service.ILawsStandardizationMeetingService; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; - - - /** - * @Description: 标准化-参会记录 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Api(tags="标准化-参会记录") -@RestController -@RequestMapping("/laws/standardization/lawsStandardizationMeeting") -@Slf4j -public class LawsStandardizationMeetingController extends JeroController { - @Autowired - private ILawsStandardizationMeetingService lawsStandardizationMeetingService; - - /** - * 分页列表查询 - * - * @param lawsStandardizationMeeting - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "标准化-参会记录-分页列表查询") - @ApiOperation(value="标准化-参会记录-分页列表查询", notes="标准化-参会记录-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(LawsStandardizationMeeting lawsStandardizationMeeting, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsStandardizationMeetingService.queryPage(lawsStandardizationMeeting, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param lawsStandardizationMeeting - * @param req - * @return - */ - @AutoLog(value = "标准化-参会记录-列表查询") - @ApiOperation(value="标准化-参会记录-列表查询", notes="标准化-参会记录-列表查询") - @GetMapping(value = "/list") - public Result> queryList(LawsStandardizationMeeting lawsStandardizationMeeting, HttpServletRequest req) { - List list = lawsStandardizationMeetingService.queryList(lawsStandardizationMeeting, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param lawsStandardizationMeeting - * @return - */ - @AutoLog(value = "标准化-参会记录-添加") - @ApiOperation(value="标准化-参会记录-添加", notes="标准化-参会记录-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody LawsStandardizationMeeting lawsStandardizationMeeting) { - lawsStandardizationMeetingService.add(lawsStandardizationMeeting); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param lawsStandardizationMeeting - * @return - */ - @AutoLog(value = "标准化-参会记录-编辑") - @ApiOperation(value="标准化-参会记录-编辑", notes="标准化-参会记录-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody LawsStandardizationMeeting lawsStandardizationMeeting) { - lawsStandardizationMeetingService.editById(lawsStandardizationMeeting); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-参会记录-通过id删除") - @ApiOperation(value="标准化-参会记录-通过id删除", notes="标准化-参会记录-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - lawsStandardizationMeetingService.deleteById(map.getId()); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-参会记录-批量删除") - @ApiOperation(value="标准化-参会记录-批量删除", notes="标准化-参会记录-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - if (StringUtils.isBlank(map.getIds())){ - return Result.error("请选择数据!"); - } - this.lawsStandardizationMeetingService.deleteByIds(Arrays.asList(map.getIds().split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "标准化-参会记录-通过id查询") - @ApiOperation(value="标准化-参会记录-通过id查询", notes="标准化-参会记录-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - LawsStandardizationMeeting lawsStandardizationMeeting = lawsStandardizationMeetingService.queryById(id); - if(lawsStandardizationMeeting==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(lawsStandardizationMeeting); - } - - /** - * 导出excel - * - * @param request - * @param lawsStandardizationMeeting - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationMeeting lawsStandardizationMeeting) { - return super.exportXls(request, lawsStandardizationMeeting, LawsStandardizationMeeting.class, "标准化-参会记录"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, LawsStandardizationMeeting.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java deleted file mode 100644 index 9ac1249f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.jero.modules.laws.standardization.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; -import com.jero.modules.laws.standardization.service.ILawsStandardizationPaymentService; -import com.jero.modules.system.vo.IdMapBody; -import com.jero.modules.system.vo.IdsMapBody; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; - - - /** - * @Description: 标准化-支付信息 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Api(tags="标准化-支付信息") -@RestController -@RequestMapping("/laws/standardization/lawsStandardizationPayment") -@Slf4j -public class LawsStandardizationPaymentController extends JeroController { - @Autowired - private ILawsStandardizationPaymentService lawsStandardizationPaymentService; - - /** - * 分页列表查询 - * - * @param lawsStandardizationPayment - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "标准化-支付信息-分页列表查询") - @ApiOperation(value="标准化-支付信息-分页列表查询", notes="标准化-支付信息-分页列表查询") - @GetMapping(value = "/page") - public Result> queryPageList(LawsStandardizationPayment lawsStandardizationPayment, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = lawsStandardizationPaymentService.queryPage(lawsStandardizationPayment, pageNo, pageSize, req); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @param lawsStandardizationPayment - * @param req - * @return - */ - @AutoLog(value = "标准化-支付信息-列表查询") - @ApiOperation(value="标准化-支付信息-列表查询", notes="标准化-支付信息-列表查询") - @GetMapping(value = "/list") - public Result> queryList(LawsStandardizationPayment lawsStandardizationPayment, HttpServletRequest req) { - List list = lawsStandardizationPaymentService.queryList(lawsStandardizationPayment, req); - return Result.OK(list); - } - - /** - * 添加 - * - * @param lawsStandardizationPayment - * @return - */ - @AutoLog(value = "标准化-支付信息-添加") - @ApiOperation(value="标准化-支付信息-添加", notes="标准化-支付信息-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody LawsStandardizationPayment lawsStandardizationPayment) { - lawsStandardizationPaymentService.add(lawsStandardizationPayment); - return Result.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param lawsStandardizationPayment - * @return - */ - @AutoLog(value = "标准化-支付信息-编辑") - @ApiOperation(value="标准化-支付信息-编辑", notes="标准化-支付信息-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody LawsStandardizationPayment lawsStandardizationPayment) { - lawsStandardizationPaymentService.editById(lawsStandardizationPayment); - return Result.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-支付信息-通过id删除") - @ApiOperation(value="标准化-支付信息-通过id删除", notes="标准化-支付信息-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - return Result.error("请选择数据!"); - } - lawsStandardizationPaymentService.deleteById(map.getId()); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "标准化-支付信息-批量删除") - @ApiOperation(value="标准化-支付信息-批量删除", notes="标准化-支付信息-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody IdsMapBody map) { - if (StringUtils.isBlank(map.getIds())){ - return Result.error("请选择数据!"); - } - this.lawsStandardizationPaymentService.deleteByIds(Arrays.asList(map.getIds().split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "标准化-支付信息-通过id查询") - @ApiOperation(value="标准化-支付信息-通过id查询", notes="标准化-支付信息-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - LawsStandardizationPayment lawsStandardizationPayment = lawsStandardizationPaymentService.queryById(id); - if(lawsStandardizationPayment==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(lawsStandardizationPayment); - } - - /** - * 导出excel - * - * @param request - * @param lawsStandardizationPayment - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, LawsStandardizationPayment lawsStandardizationPayment) { - return super.exportXls(request, lawsStandardizationPayment, LawsStandardizationPayment.class, "标准化-支付信息"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, LawsStandardizationPayment.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java deleted file mode 100644 index 5b7be4c9..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.jero.modules.laws.standardization.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.util.List; - - -/** - * @Description: 标准化活动 - * @Author: jero-boot - * @Date: 2023-10-23 - * @Version: V1.0 - */ -@Data -@TableName("laws_standardization") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_standardization对象", description="标准化活动") -public class LawsStandardization extends BaseEntity { - private static final long serialVersionUID = 1L; - - /**上级节点ID*/ - @Excel(name = "上级节点ID", width = 15) - @ApiModelProperty(value = "上级节点ID") - private java.lang.String pid; - /**上级节点名称*/ - @Excel(name = "上级节点名称", width = 15) - @ApiModelProperty(value = "上级节点名称") - @TableField(exist = false) - private java.lang.String supperName; - /**节点类型*/ - @Excel(name = "节点类型", width = 15) - @ApiModelProperty(value = "节点类型(ROOT:总标委，WYH:委员会，FBW:分标委，GROUP:工作组)") - @Dict(dicCode = "standardization_type") - private java.lang.String standardizationType; - /**编号*/ - @Excel(name = "编号", width = 15) - @ApiModelProperty(value = "编号") - private java.lang.String num; - /**名称*/ - @Excel(name = "名称", width = 15) - @ApiModelProperty(value = "名称") - private java.lang.String name; - /**标准化工作领域*/ - @Excel(name = "标准化工作领域", width = 15) - @ApiModelProperty(value = "标准化工作领域") - private java.lang.String workingArea; - /**备注*/ - @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") - private java.lang.String notes; - /**部门code*/ - @Excel(name = "部门code", width = 15) - @ApiModelProperty(value = "部门code") - private java.lang.String orgCode; - /**层级*/ - @Excel(name = "层级", width = 15) - @ApiModelProperty(value = "层级") - private Long level; - - /**子节点*/ - @TableField(exist = false) - private List children; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java deleted file mode 100644 index 3779262f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.jero.modules.laws.standardization.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - - -/** - * @Description: 标准化-集团参与情况 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Data -@TableName("laws_standardization_group") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_standardization_group对象", description="标准化-集团参与情况") -public class LawsStandardizationGroup extends BaseEntity { - private static final long serialVersionUID = 1L; - - /**标准化活动ID*/ - @Excel(name = "标准化活动ID", width = 15) - @ApiModelProperty(value = "标准化活动ID") - private java.lang.String standardizationId; - /**我司在工作组排名顺序*/ - @Excel(name = "我司在工作组排名顺序", width = 15) - @ApiModelProperty(value = "我司在工作组排名顺序") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private java.lang.String sort; - /**我司人员id*/ - @Excel(name = "我司人员id", width = 15) - @ApiModelProperty(value = "我司人员id") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private java.lang.String personnelId; - /**我司人员*/ - @Excel(name = "我司人员", width = 15) - @ApiModelProperty(value = "我司人员") - @TableField(exist = false) - private java.lang.String personnel; - /**工号*/ - @Excel(name = "工号", width = 15) - @ApiModelProperty(value = "工号") - @TableField(exist = false) - private java.lang.String jobNum; - /**单位*/ - @Excel(name = "单位", width = 15) - @ApiModelProperty(value = "单位") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private java.lang.String unit; - /**部门*/ - @Excel(name = "部门", width = 15) - @ApiModelProperty(value = "部门") - @TableField(exist = false) - private java.lang.String department; - /**电话*/ - @Excel(name = "电话", width = 15) - @ApiModelProperty(value = "电话") - @TableField(exist = false) - private java.lang.String phone; - /**邮箱*/ - @Excel(name = "邮箱", width = 15) - @ApiModelProperty(value = "邮箱") - @TableField(exist = false) - private java.lang.String mailbox; - /**身份*/ - @Excel(name = "身份", width = 15) - @ApiModelProperty(value = "身份") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private java.lang.String identity; - /**资料*/ - @Excel(name = "资料", width = 15) - @ApiModelProperty(value = "资料") - @TableField(updateStrategy = FieldStrategy.IGNORED, exist = false) - private java.lang.String feeData; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java deleted file mode 100644 index c3981320..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.jero.modules.laws.standardization.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - - -/** - * @Description: 标准化-联络人 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Data -@TableName("laws_standardization_liaison") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_standardization_liaison对象", description="标准化-联络人") -public class LawsStandardizationLiaison extends BaseEntity { - private static final long serialVersionUID = 1L; - - /**标准化活动ID*/ - @Excel(name = "标准化活动ID", width = 15) - @ApiModelProperty(value = "标准化活动ID") - private String standardizationId; - /**联络人*/ - @Excel(name = "联络人", width = 15) - @ApiModelProperty(value = "联络人") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String liaison; - /**会议名称*/ - @Excel(name = "会议名称", width = 15) - @ApiModelProperty(value = "会议名称") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String name; - /**单位*/ - @Excel(name = "单位", width = 15) - @ApiModelProperty(value = "单位") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String unit; - /**电话*/ - @Excel(name = "电话", width = 15) - @ApiModelProperty(value = "电话") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String phone; - /**邮箱*/ - @Excel(name = "邮箱", width = 15) - @ApiModelProperty(value = "邮箱") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String mailbox; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java deleted file mode 100644 index 1909a890..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.jero.modules.laws.standardization.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - - -/** - * @Description: 标准化-参会记录 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Data -@TableName("laws_standardization_meeting") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_standardization_meeting对象", description="标准化-参会记录") -public class LawsStandardizationMeeting extends BaseEntity { - private static final long serialVersionUID = 1L; - - /**标准化活动ID*/ - @Excel(name = "标准化活动ID", width = 15) - @ApiModelProperty(value = "标准化活动ID") - private String standardizationId; - /**参会日期*/ - @Excel(name = "参会日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "参会日期") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private Date participationTime; - /**会议名称*/ - @Excel(name = "会议名称", width = 15) - @ApiModelProperty(value = "会议名称") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String name; - /**参会人员id*/ - @Excel(name = "参会人员id", width = 15) - @ApiModelProperty(value = "参会人员id") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private java.lang.String personnelId; - /**参会人员*/ - @Excel(name = "参会人员", width = 15) - @ApiModelProperty(value = "参会人员") - @TableField(exist = false) - private String personnel; - /**来源*/ - @Excel(name = "来源（1：新增 2：会后管理流程）", width = 15) - @ApiModelProperty(value = "来源（1：新增 2：会后管理流程）") - private String source; - /**会议资料*/ - @Excel(name = "会议资料", width = 15) - @ApiModelProperty(value = "会议资料") - @TableField(exist = false) - private String meetingData; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java deleted file mode 100644 index eb8ad3b5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jero.modules.laws.standardization.entity; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.jero.common.aspect.annotation.Dict; -import com.jero.modules.laws.documenttool.entity.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; - - -/** - * @Description: 标准化-支付信息 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Data -@TableName("laws_standardization_payment") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_standardization_payment对象", description="标准化-支付信息") -public class LawsStandardizationPayment extends BaseEntity { - private static final long serialVersionUID = 1L; - - /**标准化活动ID*/ - @Excel(name = "标准化活动ID", width = 15) - @ApiModelProperty(value = "标准化活动ID") - private String standardizationId; - /**费用*/ - @Excel(name = "费用", width = 15) - @ApiModelProperty(value = "费用") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String fee; - /**年份*/ - @Excel(name = "年份", width = 15) - @ApiModelProperty(value = "年份") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String year; - /**状态*/ - @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") - @TableField(updateStrategy = FieldStrategy.IGNORED) - @Dict(dicCode = "pay_state") - private String state; - /**计划内*/ - @Excel(name = "计划内", width = 15) - @ApiModelProperty(value = "计划内") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String plan; - /**缴费方式*/ - @Excel(name = "缴费方式", width = 15) - @ApiModelProperty(value = "缴费方式") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String pay; - /**费用列支*/ - @Excel(name = "费用列支", width = 15) - @ApiModelProperty(value = "费用列支") - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String feeListing; - /**资料*/ - @Excel(name = "资料", width = 15) - @ApiModelProperty(value = "资料") - @TableField(exist = false) - private String feeData; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java deleted file mode 100644 index 96c46fb8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationGroupMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.laws.standardization.mapper; - -import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 标准化-集团参与情况 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface LawsStandardizationGroupMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java deleted file mode 100644 index 95adadc7..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationLiaisonMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.laws.standardization.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; - -/** - * @Description: 标准化-联络人 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface LawsStandardizationLiaisonMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java deleted file mode 100644 index 6625f1d5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.laws.standardization.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.laws.standardization.entity.LawsStandardization; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 标准化活动 - * @Author: jero-boot - * @Date: 2023-10-23 - * @Version: V1.0 - */ -public interface LawsStandardizationMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java deleted file mode 100644 index 9a73811e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationMeetingMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.laws.standardization.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; - -/** - * @Description: 标准化-参会记录 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface LawsStandardizationMeetingMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java deleted file mode 100644 index f2e7de2a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/LawsStandardizationPaymentMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.laws.standardization.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; - -/** - * @Description: 标准化-支付信息 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface LawsStandardizationPaymentMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml deleted file mode 100644 index 2f9424ff..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationGroupMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml deleted file mode 100644 index 64a68819..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationLiaisonMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml deleted file mode 100644 index 2e7f2a24..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml deleted file mode 100644 index f1810bc0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationMeetingMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml deleted file mode 100644 index 26f4ba1c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/mapper/xml/LawsStandardizationPaymentMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java deleted file mode 100644 index c4b0475c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationGroupService.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.jero.modules.laws.standardization.service; - -import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; -import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; - -/** - * @Description: 标准化-集团参与情况 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface ILawsStandardizationGroupService extends IService { - - /** - * 分页查询 - * - * @param lawsStandardizationGroup - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(LawsStandardizationGroup lawsStandardizationGroup, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param lawsStandardizationGroup - * @param req - * @return - */ - List queryList(LawsStandardizationGroup lawsStandardizationGroup, HttpServletRequest req); - - /** - * 保存 - * - * @param lawsStandardizationGroup - * @return - */ - void add(LawsStandardizationGroup lawsStandardizationGroup); - - /** - * 更新 - * - * @param lawsStandardizationGroup - * @return - */ - void editById(LawsStandardizationGroup lawsStandardizationGroup); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - LawsStandardizationGroup queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java deleted file mode 100644 index f71597f8..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationLiaisonService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jero.modules.laws.standardization.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 标准化-联络人 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface ILawsStandardizationLiaisonService extends IService { - - /** - * 分页查询 - * - * @param lawsStandardizationLiaison - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(LawsStandardizationLiaison lawsStandardizationLiaison, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param lawsStandardizationLiaison - * @param req - * @return - */ - List queryList(LawsStandardizationLiaison lawsStandardizationLiaison, HttpServletRequest req); - - /** - * 保存 - * - * @param lawsStandardizationLiaison - * @return - */ - void add(LawsStandardizationLiaison lawsStandardizationLiaison); - - /** - * 更新 - * - * @param lawsStandardizationLiaison - * @return - */ - void editById(LawsStandardizationLiaison lawsStandardizationLiaison); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - LawsStandardizationLiaison queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java deleted file mode 100644 index e8d5b355..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationMeetingService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jero.modules.laws.standardization.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 标准化-参会记录 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface ILawsStandardizationMeetingService extends IService { - - /** - * 分页查询 - * - * @param lawsStandardizationMeeting - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(LawsStandardizationMeeting lawsStandardizationMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param lawsStandardizationMeeting - * @param req - * @return - */ - List queryList(LawsStandardizationMeeting lawsStandardizationMeeting, HttpServletRequest req); - - /** - * 保存 - * - * @param lawsStandardizationMeeting - * @return - */ - void add(LawsStandardizationMeeting lawsStandardizationMeeting); - - /** - * 更新 - * - * @param lawsStandardizationMeeting - * @return - */ - void editById(LawsStandardizationMeeting lawsStandardizationMeeting); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - LawsStandardizationMeeting queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java deleted file mode 100644 index c98529f0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationPaymentService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.jero.modules.laws.standardization.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * @Description: 标准化-支付信息 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -public interface ILawsStandardizationPaymentService extends IService { - - /** - * 分页查询 - * - * @param lawsStandardizationPayment - * @param pageNo - * @param pageSize - * @param req - * @return - */ - IPage queryPage(LawsStandardizationPayment lawsStandardizationPayment, Integer pageNo, Integer pageSize, HttpServletRequest req); - - /** - * 列表查询 - * - * @param lawsStandardizationPayment - * @param req - * @return - */ - List queryList(LawsStandardizationPayment lawsStandardizationPayment, HttpServletRequest req); - - /** - * 保存 - * - * @param lawsStandardizationPayment - * @return - */ - void add(LawsStandardizationPayment lawsStandardizationPayment); - - /** - * 更新 - * - * @param lawsStandardizationPayment - * @return - */ - void editById(LawsStandardizationPayment lawsStandardizationPayment); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - LawsStandardizationPayment queryById(String id); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java deleted file mode 100644 index d5374b50..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jero.modules.laws.standardization.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.standardization.entity.*; -import com.jero.modules.laws.standardization.vo.StandardizationVO; - -import java.util.List; - -/** - * @Description: 标准化活动 - * @Author: jero-boot - * @Date: 2023-10-23 - * @Version: V1.0 - */ -public interface ILawsStandardizationService extends IService { - /** - * 新增or编辑 - * - * @param standardizationVO - * @return - */ - void addOrUpdateStandardization(StandardizationVO standardizationVO, String source); - - /** - * 标准化活动-根据id查询 - * - * @param id - * @return - */ - LawsStandardization queryById(String id); - - /** - * 更新 - * - * @param lawsStandardization - * @return - */ - void editById(LawsStandardization lawsStandardization); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 标准化活动-树结构查询 - * @return - */ - LawsStandardization queryTreeList(); - - /** - * 标准化活动-详情通过id查询 - * @param id - * @return - */ - StandardizationVO queryDetailById(String id); - - /** - * 标准化活动-统计列表 - * @return - */ - List queryStatistics(); - - /** - * 标准化活动-会议统计-联络人联系方式 - * @param standardizationId - * @return - * @param standardizationId - * @return - */ - List queryLiaisonByStandardizationId(String standardizationId); - - /** - * 标准化活动-会议统计-集团参与情况 - * @param standardizationId - * @return - */ - List queryGroupByStandardizationId(String standardizationId); - - /** - * 标准化活动-会议统计-支付信息 - * @param standardizationId - * @return - */ - List queryPaymentByStandardizationId(String standardizationId); - - /** - * 标准化活动-会议统计-参会记录 - * @param standardizationId - * @return - */ - List queryMeetingByStandardizationId(String standardizationId); - - /** - * 标准化活动-通过id删除 - * @param id - */ - void delete(String id); - - /** - * 标准化活动-会议统计-参会记录（分页） - * @param standardizationId - * @param pageNo - * @param pageSize - * @return - */ - IPage queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize); - - /** - * 标准化活动-列表查询 - * @param lawsStandardization - * @return - */ - List queryList(LawsStandardization lawsStandardization); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java deleted file mode 100644 index 6c04244b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationGroupServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.jero.modules.laws.standardization.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup; -import com.jero.modules.laws.standardization.mapper.LawsStandardizationGroupMapper; -import com.jero.modules.laws.standardization.service.ILawsStandardizationGroupService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - -/** - * @Description: 标准化-集团参与情况 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsStandardizationGroupServiceImpl extends ServiceImpl implements ILawsStandardizationGroupService { - - - /** - * 分页查询 - * - * @param lawsStandardizationGroup - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(LawsStandardizationGroup lawsStandardizationGroup, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationGroup, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param lawsStandardizationGroup - * @param req - * @return - */ - @Override - public List queryList(LawsStandardizationGroup lawsStandardizationGroup, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(lawsStandardizationGroup, req.getParameterMap())); - } - - /** - * 保存 - * - * @param lawsStandardizationGroup - * @return - */ - @Override - public void add(LawsStandardizationGroup lawsStandardizationGroup) { - Date now = new Date(); - lawsStandardizationGroup.setCreateTime(now); - lawsStandardizationGroup.setUpdateTime(now); - save(lawsStandardizationGroup); - } - - /** - * 更新 - * - * @param lawsStandardizationGroup - * @return - */ - @Override - public void editById(LawsStandardizationGroup lawsStandardizationGroup) { - Date now = new Date(); - lawsStandardizationGroup.setUpdateTime(now); - saveOrUpdate(lawsStandardizationGroup); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public LawsStandardizationGroup queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java deleted file mode 100644 index 0c928a74..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationLiaisonServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jero.modules.laws.standardization.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison; -import com.jero.modules.laws.standardization.mapper.LawsStandardizationLiaisonMapper; -import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - - -/** - * @Description: 标准化-联络人 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsStandardizationLiaisonServiceImpl extends ServiceImpl implements ILawsStandardizationLiaisonService { - - - /** - * 分页查询 - * - * @param lawsStandardizationLiaison - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(LawsStandardizationLiaison lawsStandardizationLiaison, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationLiaison, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param lawsStandardizationLiaison - * @param req - * @return - */ - @Override - public List queryList(LawsStandardizationLiaison lawsStandardizationLiaison, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(lawsStandardizationLiaison, req.getParameterMap())); - } - - /** - * 保存 - * - * @param lawsStandardizationLiaison - * @return - */ - @Override - public void add(LawsStandardizationLiaison lawsStandardizationLiaison) { - Date now = new Date(); - lawsStandardizationLiaison.setCreateTime(now); - lawsStandardizationLiaison.setUpdateTime(now); - save(lawsStandardizationLiaison); - } - - /** - * 更新 - * - * @param lawsStandardizationLiaison - * @return - */ - @Override - public void editById(LawsStandardizationLiaison lawsStandardizationLiaison) { - Date now = new Date(); - lawsStandardizationLiaison.setUpdateTime(now); - saveOrUpdate(lawsStandardizationLiaison); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public LawsStandardizationLiaison queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java deleted file mode 100644 index 4c193279..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationMeetingServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jero.modules.laws.standardization.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting; -import com.jero.modules.laws.standardization.mapper.LawsStandardizationMeetingMapper; -import com.jero.modules.laws.standardization.service.ILawsStandardizationMeetingService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - - -/** - * @Description: 标准化-参会记录 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsStandardizationMeetingServiceImpl extends ServiceImpl implements ILawsStandardizationMeetingService { - - - /** - * 分页查询 - * - * @param lawsStandardizationMeeting - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(LawsStandardizationMeeting lawsStandardizationMeeting, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationMeeting, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param lawsStandardizationMeeting - * @param req - * @return - */ - @Override - public List queryList(LawsStandardizationMeeting lawsStandardizationMeeting, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(lawsStandardizationMeeting, req.getParameterMap())); - } - - /** - * 保存 - * - * @param lawsStandardizationMeeting - * @return - */ - @Override - public void add(LawsStandardizationMeeting lawsStandardizationMeeting) { - Date now = new Date(); - lawsStandardizationMeeting.setCreateTime(now); - lawsStandardizationMeeting.setUpdateTime(now); - save(lawsStandardizationMeeting); - } - - /** - * 更新 - * - * @param lawsStandardizationMeeting - * @return - */ - @Override - public void editById(LawsStandardizationMeeting lawsStandardizationMeeting) { - Date now = new Date(); - lawsStandardizationMeeting.setUpdateTime(now); - saveOrUpdate(lawsStandardizationMeeting); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public LawsStandardizationMeeting queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java deleted file mode 100644 index 13d23d75..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationPaymentServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jero.modules.laws.standardization.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment; -import com.jero.modules.laws.standardization.mapper.LawsStandardizationPaymentMapper; -import com.jero.modules.laws.standardization.service.ILawsStandardizationPaymentService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - - -/** - * @Description: 标准化-支付信息 - * @Author: jero-boot - * @Date: 2023-11-02 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsStandardizationPaymentServiceImpl extends ServiceImpl implements ILawsStandardizationPaymentService { - - - /** - * 分页查询 - * - * @param lawsStandardizationPayment - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @Override - public IPage queryPage(LawsStandardizationPayment lawsStandardizationPayment, Integer pageNo, Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardizationPayment, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - return page(page, queryWrapper); - } - - /** - * 列表查询 - * - * @param lawsStandardizationPayment - * @param req - * @return - */ - @Override - public List queryList(LawsStandardizationPayment lawsStandardizationPayment, HttpServletRequest req) { - return list(QueryGenerator.initQueryWrapper(lawsStandardizationPayment, req.getParameterMap())); - } - - /** - * 保存 - * - * @param lawsStandardizationPayment - * @return - */ - @Override - public void add(LawsStandardizationPayment lawsStandardizationPayment) { - Date now = new Date(); - lawsStandardizationPayment.setCreateTime(now); - lawsStandardizationPayment.setUpdateTime(now); - save(lawsStandardizationPayment); - } - - /** - * 更新 - * - * @param lawsStandardizationPayment - * @return - */ - @Override - public void editById(LawsStandardizationPayment lawsStandardizationPayment) { - Date now = new Date(); - lawsStandardizationPayment.setUpdateTime(now); - saveOrUpdate(lawsStandardizationPayment); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public LawsStandardizationPayment queryById(String id) { - return getById(id); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java deleted file mode 100644 index 4925d3a1..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ /dev/null @@ -1,628 +0,0 @@ -package com.jero.modules.laws.standardization.service.impl; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.PasswordUtil; -import com.jero.common.util.SnowflakeUtils; -import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; -import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolder; -import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; -import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFolderService; -import com.jero.modules.laws.standardization.common.LawsStandardizationCommon; -import com.jero.modules.laws.standardization.entity.*; -import com.jero.modules.laws.standardization.mapper.LawsStandardizationMapper; -import com.jero.modules.laws.standardization.service.*; -import com.jero.modules.laws.standardization.vo.StandardizationVO; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - - -/** - * @Description: 标准化活动 - * @Author: jero-boot - * @Date: 2023-10-23 - * @Version: V1.0 - */ -@Slf4j -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsStandardizationServiceImpl extends ServiceImpl implements ILawsStandardizationService { - private final ILawsStandardizationService lawsStandardizationService; - private final ILawsStandardizationGroupService lawsStandardizationGroupService; - private final ILawsStandardizationLiaisonService lawsStandardizationLiaisonService; - private final ILawsStandardizationPaymentService lawsStandardizationPaymentService; - private final ILawsStandardizationMeetingService lawsStandardizationMeetingService; - private final IOSSFileService ossFileService; - private final ILawsDataCenterFileService lawsDataCenterFileService; - private final ILawsDataCenterFolderService lawsDataCenterFolderService; - private final ISysUserService sysUserService; - private final ISysDepartService sysDepartService; - - public LawsStandardizationServiceImpl(@Lazy ILawsStandardizationService lawsStandardizationService, - ILawsStandardizationGroupService lawsStandardizationGroupService, - ILawsStandardizationLiaisonService lawsStandardizationLiaisonService, - ILawsStandardizationPaymentService lawsStandardizationPaymentService, - ILawsStandardizationMeetingService lawsStandardizationMeetingService, - IOSSFileService ossFileService, - ILawsDataCenterFileService lawsDataCenterFileService, - ILawsDataCenterFolderService lawsDataCenterFolderService, - ISysUserService sysUserService, - ISysDepartService sysDepartService) { - this.lawsStandardizationService = lawsStandardizationService; - this.lawsStandardizationGroupService = lawsStandardizationGroupService; - this.lawsStandardizationLiaisonService = lawsStandardizationLiaisonService; - this.lawsStandardizationPaymentService = lawsStandardizationPaymentService; - this.lawsStandardizationMeetingService = lawsStandardizationMeetingService; - this.ossFileService = ossFileService; - this.lawsDataCenterFileService = lawsDataCenterFileService; - this.lawsDataCenterFolderService = lawsDataCenterFolderService; - this.sysUserService = sysUserService; - this.sysDepartService = sysDepartService; - } - - /** - * 新增or编辑 - * - * @param standardizationVO - * @return - */ - @Override - public void addOrUpdateStandardization(StandardizationVO standardizationVO, String source) { - LawsStandardization lawsStandardization = standardizationVO.getLawsStandardization(); - List standardizationLiaisonList = standardizationVO.getStandardizationLiaisonList(); - List standardizationGroupList = standardizationVO.getStandardizationGroupList(); - List standardizationPaymentList = standardizationVO.getStandardizationPayments(); - List standardizationMeetingList = standardizationVO.getStandardizationMeetings(); - - if (StringUtils.isBlank(lawsStandardization.getId())){ - lawsStandardization.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - // 基础信息 - lawsStandardizationService.saveOrUpdate(lawsStandardization); - - // 联络人联系方式 - saveOrUpdateLiaison(lawsStandardization, standardizationLiaisonList); - - // 集团参与情况 - saveOrUpdateGroup(lawsStandardization, standardizationGroupList); - - // 支付信息 - saveOrUpdatePayment(lawsStandardization, standardizationPaymentList); - - // 参会记录 - saveOrUpdateMeeting(lawsStandardization, standardizationMeetingList, source); - } - - private void saveOrUpdateLiaison(LawsStandardization lawsStandardization, List standardizationLiaisonList) { - if (standardizationLiaisonList.isEmpty()){ - // 删除全部数据 - lawsStandardizationLiaisonService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationLiaison::getStandardizationId, lawsStandardization.getId())); - return; - } - - for (LawsStandardizationLiaison standardizationLiaison : standardizationLiaisonList) { - if (StringUtils.isBlank(standardizationLiaison.getId())){ - standardizationLiaison.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - standardizationLiaison.setStandardizationId(lawsStandardization.getId()); - } - - // 保存或更新联络人联系方式 - lawsStandardizationLiaisonService.saveOrUpdateBatch(standardizationLiaisonList); - - // 删除旧数据 - List idList = standardizationLiaisonList.stream().map(LawsStandardizationLiaison::getId).collect(Collectors.toList()); - lawsStandardizationLiaisonService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationLiaison::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationLiaison::getId, idList)); - } - - - /** - * 保存或更新会议信息 - * - * @param lawsStandardization 标准化活动 - * @param standardizationMeetingList 标准化-参会记录 - * @param source - */ - private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List standardizationMeetingList, String source) { - if (standardizationMeetingList.isEmpty()){ - // 删除全部数据 - lawsStandardizationMeetingService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId())); - return; - } - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - for (LawsStandardizationMeeting standardizationMeeting : standardizationMeetingList) { - standardizationMeeting.setStandardizationId(lawsStandardization.getId()); - - if (StringUtils.isBlank(standardizationMeeting.getId())){ - standardizationMeeting.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - - if (StringUtils.isNotBlank(standardizationMeeting.getMeetingData())){ - List meetingDataList = Arrays.asList(standardizationMeeting.getMeetingData().split(",")); - - // 更新文件信息 - ossFileService.update(new LambdaUpdateWrapper() - .in(OSSFile::getId, meetingDataList) - .set(OSSFile::getConnectId, standardizationMeeting.getId())); - - // 会后管理流程结束调用则不删除 - if (!LawsStandardizationCommon.SOURCE_2.equals(source)){ - // 删除旧文件 - ossFileService.remove(new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, standardizationMeeting.getId()) - .notIn(OSSFile::getId, meetingDataList)); - } - - // 同步文件到资料中心 - toDataCentre(lawsStandardization, loginUser, standardizationMeeting, meetingDataList); - } else { - // 删除旧文件 - ossFileService.remove(new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, standardizationMeeting.getId())); - } - } - - // 保存或更新参会记录 - lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList); - - // 会后管理流程结束调用则不删除 - if (!LawsStandardizationCommon.SOURCE_2.equals(source)){ - // 删除旧数据 - List idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList()); - lawsStandardizationMeetingService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationMeeting::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationMeeting::getId, idList)); - } - } - - private void toDataCentre(LawsStandardization lawsStandardization, LoginUser loginUser, LawsStandardizationMeeting standardizationMeeting, List meetingDataList) { - for (String meetingData : meetingDataList) { - // 校验重复上传 - int count = lawsDataCenterFileService.count(new LambdaUpdateWrapper() - .eq(LawsDataCenterFile::getFileId, meetingData)); - if (count > 0){ - continue; - } - - LawsDataCenterFile lawsDataCenterFile = new LawsDataCenterFile(); - lawsDataCenterFile.setFileId(meetingData); - // XXX（分标委名称）- XXX（工作组名称）-会议名称 - String fileDescription = getAndSetFileDescription(lawsStandardization, standardizationMeeting.getName(), lawsDataCenterFile); - lawsDataCenterFile.setFileDescription(fileDescription); - lawsDataCenterFile.setCreateBy(standardizationMeeting.getCreateBy()); - List sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy()); - SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy()); - List orgCodeList = sysDeparts.stream().map(SysDepart::getOrgCode).collect(Collectors.toList()); - lawsDataCenterFile.setPushRangeIds(standardizationMeeting.getPersonnelId()); - lawsDataCenterFile.setOwnerId(Objects.isNull(sysUser) ? loginUser.getId() : sysUser.getId()); - lawsDataCenterFile.setUploader(Objects.isNull(sysUser) ? loginUser.calcNameWorkNo() : sysUser.calcNameWorkNo()); - lawsDataCenterFile.setOrgCode(String.join(",", orgCodeList)); - String folderId = lawsDataCenterFile.getFolderId(); - if (StringUtils.isNotBlank(folderId)){ - for (String fId : folderId.split(",")) { - lawsDataCenterFile.setFolderId(fId); - lawsDataCenterFileService.add(lawsDataCenterFile, false); - } - }else { - lawsDataCenterFileService.add(lawsDataCenterFile, false); - } - } - } - - private String getAndSetFileDescription(LawsStandardization lawsStandardization, String name, LawsDataCenterFile lawsDataCenterFile) { - StringBuilder stringBuilder = new StringBuilder(); - if (LawsStandardizationCommon.GROUP.equals(lawsStandardization.getStandardizationType())){ - // 工作组层级：XXX（分标委名称）- XXX（工作组名称）-会议名称 - LawsStandardization fatherNode = getOne(new LambdaQueryWrapper() - .eq(LawsStandardization::getId, lawsStandardization.getPid())); - stringBuilder.append(fatherNode.getName()).append("-").append(lawsStandardization.getName()); - - // 绑定目录 - // 先匹配分标委名称 - List fatherFolder = lawsDataCenterFolderService.list( - new LambdaQueryWrapper() - .eq(LawsDataCenterFolder::getFolderName, fatherNode.getName())); - if (!fatherFolder.isEmpty()){ - List idList = fatherFolder.stream().map(LawsDataCenterFolder::getId).collect(Collectors.toList()); - // 查询子集, 再匹配工作组名称 - List lawsDataCenterFolderList = lawsDataCenterFolderService.list( - new LambdaQueryWrapper() - .in(LawsDataCenterFolder::getParentId, idList) - .eq(LawsDataCenterFolder::getFolderName, lawsStandardization.getName())); - if (!lawsDataCenterFolderList.isEmpty()){ - lawsDataCenterFile.setFolderId(lawsDataCenterFolderList.stream().map(LawsDataCenterFolder::getId).collect(Collectors.joining(","))); - }else { - // 工作组不存在则绑定到分标委目录 - lawsDataCenterFile.setFolderId(String.join(",", idList)); - } - } - }else { - // （分标委/委员会/总标委名称）-会议名称 - stringBuilder.append(lawsStandardization.getName()); - - // 绑定目录 - List lawsDataCenterFolderList = lawsDataCenterFolderService.list( - new LambdaQueryWrapper() - .eq(LawsDataCenterFolder::getFolderName, lawsStandardization.getName())); - if (!lawsDataCenterFolderList.isEmpty()){ - lawsDataCenterFile.setFolderId(lawsDataCenterFolderList.stream().map(LawsDataCenterFolder::getId).collect(Collectors.joining(","))); - } - } - return stringBuilder.append("-").append(name).toString(); - } - - /** - * 保存或更新支付信息 - * - * @param lawsStandardization 标准化活动对象 - * @param standardizationPaymentList 支付信息列表 - */ - private void saveOrUpdatePayment(LawsStandardization lawsStandardization, List standardizationPaymentList) { - if (standardizationPaymentList.isEmpty()){ - // 删除全部数据 - lawsStandardizationPaymentService.remove(new LambdaQueryWrapper() - .eq(LawsStandardizationPayment::getStandardizationId, lawsStandardization.getId())); - return; - } - - for (LawsStandardizationPayment lawsStandardizationPayment : standardizationPaymentList) { - lawsStandardizationPayment.setStandardizationId(lawsStandardization.getId()); - - if (StringUtils.isBlank(lawsStandardizationPayment.getId())){ - lawsStandardizationPayment.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - - // 如果支付信息的费用数据不为空，则进行文件信息的更新和旧文件的删除操作 - if (StringUtils.isNotBlank(lawsStandardizationPayment.getFeeData())){ - List feeDataList = Arrays.asList(lawsStandardizationPayment.getFeeData().split(",")); - - // 更新文件信息 - ossFileService.update(new LambdaUpdateWrapper() - .in(OSSFile::getId, feeDataList) - .set(OSSFile::getConnectId, lawsStandardizationPayment.getId())); - - // 删除旧文件 - ossFileService.remove(new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationPayment.getId()) - .notIn(OSSFile::getId, feeDataList)); - } else { - // 删除旧文件 - ossFileService.remove(new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationPayment.getId())); - } - } - - // 保存或更新支付信息 - lawsStandardizationPaymentService.saveOrUpdateBatch(standardizationPaymentList); - - // 删除旧数据 - List idList = standardizationPaymentList.stream().map(LawsStandardizationPayment::getId).collect(Collectors.toList()); - lawsStandardizationPaymentService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationPayment::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationPayment::getId, idList)); - } - - - /** - * 保存或更新集团参与情况 - * - * @param lawsStandardization 标准化活动 - * @param standardizationGroupList 集团参与情况列表 - */ - private void saveOrUpdateGroup(LawsStandardization lawsStandardization, List standardizationGroupList) { - if (standardizationGroupList.isEmpty()){ - // 删除全部数据 - lawsStandardizationGroupService.remove(new LambdaQueryWrapper() - .eq(LawsStandardizationGroup::getStandardizationId, lawsStandardization.getId())); - return; - } - - for (LawsStandardizationGroup lawsStandardizationGroup : standardizationGroupList) { - lawsStandardizationGroup.setStandardizationId(lawsStandardization.getId()); - - if (StringUtils.isBlank(lawsStandardizationGroup.getId())){ - lawsStandardizationGroup.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - - // 处理文件 - if (StringUtils.isNotBlank(lawsStandardizationGroup.getFeeData())){ - // 将文件信息转换为OSSFile对象并更新 - List feeDataList = Arrays.asList(lawsStandardizationGroup.getFeeData().split(",")); - ossFileService.update(new LambdaUpdateWrapper() - .in(OSSFile::getId, feeDataList) - .set(OSSFile::getConnectId, lawsStandardizationGroup.getId())); - - // 删除旧文件 - ossFileService.remove(new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationGroup.getId()) - .notIn(OSSFile::getId, feeDataList)); - } else { - // 删除旧文件 - ossFileService.remove(new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationGroup.getId())); - } - } - - // 保存或更新集团参与情况 - lawsStandardizationGroupService.saveOrUpdateBatch(standardizationGroupList); - - // 删除旧数据 - List idList = standardizationGroupList.stream().map(LawsStandardizationGroup::getId).collect(Collectors.toList()); - lawsStandardizationGroupService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationGroup::getStandardizationId, lawsStandardization.getId()) - .notIn(LawsStandardizationGroup::getId, idList)); - } - - - /** - * 更新 - * - * @param lawsStandardization - * @return - */ - @Override - public void editById(LawsStandardization lawsStandardization) { - Date now = new Date(); - lawsStandardization.setUpdateTime(now); - saveOrUpdate(lawsStandardization); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 标准化活动-根据id查询 - * - * @param id - * @return - */ - @Override - public LawsStandardization queryById(String id) { - LawsStandardization lawsStandardization = getById(id); - // 填充上级节点名称 - LawsStandardization standardization = getOne(new LambdaQueryWrapper() - .eq(LawsStandardization::getId, lawsStandardization.getPid()), false); - if (!Objects.isNull(standardization) && StringUtils.isNotBlank(standardization.getName())){ - lawsStandardization.setSupperName(standardization.getName()); - } - return lawsStandardization; - } - - @Override - public LawsStandardization queryTreeList() { - // 查询所有数据 - List list = list(new LambdaQueryWrapper().orderByAsc(LawsStandardization::getCreateTime)); - return list.stream() - .filter(v -> "0".equals(v.getPid())) - .map(v ->{ - v.setChildren(createChildren(v, list)); - return v; - }).collect(Collectors.toList()).get(0); - } - - @Override - public StandardizationVO queryDetailById(String id) { - StandardizationVO standardizationVO = new StandardizationVO(); - // 基础信息 - standardizationVO.setLawsStandardization(queryById(id)); - // 联络人联系方式 - standardizationVO.setStandardizationLiaisonList(queryLiaisonByStandardizationId(id)); - // 集团参与情况 - standardizationVO.setStandardizationGroupList(queryGroupByStandardizationId(id)); - // 支付信息 - standardizationVO.setStandardizationPayments(queryPaymentByStandardizationId(id)); - // 参会记录 - standardizationVO.setStandardizationMeetings(queryMeetingByStandardizationId(id)); - return standardizationVO; - } - - @Override - public List queryStatistics() { - List list = list( - new LambdaQueryWrapper() - .orderByDesc(LawsStandardization::getCreateTime)); - for (LawsStandardization lawsStandardization : list) { - // 填充上级节点名称 - LawsStandardization standardization = getOne(new LambdaQueryWrapper() - .eq(LawsStandardization::getId, lawsStandardization.getPid())); - if (!Objects.isNull(standardization) && StringUtils.isNotBlank(standardization.getName())){ - lawsStandardization.setSupperName(standardization.getName()); - } - } - return list; - } - - @Override - public List queryLiaisonByStandardizationId(String standardizationId) { - return lawsStandardizationLiaisonService.list( - new LambdaQueryWrapper() - .eq(LawsStandardizationLiaison::getStandardizationId, standardizationId) - .orderByDesc(LawsStandardizationLiaison::getCreateTime)); - } - - @Override - public List queryGroupByStandardizationId(String standardizationId) { - List lawsStandardizationGroupList = lawsStandardizationGroupService.list( - new LambdaQueryWrapper() - .eq(LawsStandardizationGroup::getStandardizationId, standardizationId) - .orderByDesc(LawsStandardizationGroup::getCreateTime)); - for (LawsStandardizationGroup lawsStandardizationGroup : lawsStandardizationGroupList) { - // 人员信息 - setUserInfo(lawsStandardizationGroup); - - // 文件信息 - List ossFileList = ossFileService.list( - new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationGroup.getId())); - - if (!ossFileList.isEmpty()){ - String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); - lawsStandardizationGroup.setFeeData(fileIds); - } - } - return lawsStandardizationGroupList; - } - - private void setUserInfo(LawsStandardizationGroup lawsStandardizationGroup) { - if (StringUtils.isNotBlank(lawsStandardizationGroup.getPersonnelId())){ - // 我司人员 - SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper() - .eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()), false); - lawsStandardizationGroup.setPersonnel(sysUser.getRealname()); - // 工号 - lawsStandardizationGroup.setJobNum(sysUser.getUsername()); - //部门 - List sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); - if (CollectionUtils.isNotEmpty(sysDeparts)){ - String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); - lawsStandardizationGroup.setDepartment(departNames); - } - // 电话 - lawsStandardizationGroup.setPhone(DesensitizedUtil.mobilePhone(PasswordUtil.decrypt(sysUser.getPhone()))); - // 邮箱 - lawsStandardizationGroup.setMailbox(PasswordUtil.desensitizedEmail(PasswordUtil.decrypt(sysUser.getEmail()))); - } - } - - @Override - public List queryPaymentByStandardizationId(String standardizationId) { - List lawsStandardizationPaymentList = lawsStandardizationPaymentService.list( - new LambdaQueryWrapper() - .eq(LawsStandardizationPayment::getStandardizationId, standardizationId) - .orderByDesc(LawsStandardizationPayment::getCreateTime)); - for (LawsStandardizationPayment lawsStandardizationPayment : lawsStandardizationPaymentList) { - // 文件信息 - List ossFileList = ossFileService.list( - new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationPayment.getId())); - - if (!ossFileList.isEmpty()){ - String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); - lawsStandardizationPayment.setFeeData(fileIds); - } - } - return lawsStandardizationPaymentList; - } - - @Override - public List queryMeetingByStandardizationId(String standardizationId) { - List lawsStandardizationMeetingList = lawsStandardizationMeetingService.list( - new LambdaQueryWrapper() - .eq(LawsStandardizationMeeting::getStandardizationId, standardizationId) - .orderByDesc(LawsStandardizationMeeting::getCreateTime)); - setUserInfo(lawsStandardizationMeetingList); - return lawsStandardizationMeetingList; - } - - @Override - public IPage queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize) { - IPage page = lawsStandardizationMeetingService.page(new Page<>(pageNo, pageSize), - new LambdaQueryWrapper() - .eq(LawsStandardizationMeeting::getStandardizationId, standardizationId) - .orderByDesc(LawsStandardizationMeeting::getCreateTime)); - setUserInfo(page.getRecords()); - return page; - } - - @Override - public List queryList(LawsStandardization lawsStandardization) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(lawsStandardization.getStandardizationType()), LawsStandardization::getStandardizationType, lawsStandardization.getStandardizationType()); - queryWrapper.eq(StringUtils.isNotBlank(lawsStandardization.getPid()), LawsStandardization::getPid, lawsStandardization.getPid()); - queryWrapper.orderByAsc(LawsStandardization::getCreateTime); - return list(queryWrapper); - } - - private void setUserInfo(List lawsStandardizationMeetingList) { - for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) { - // 人员信息 - if (StringUtils.isNotBlank(lawsStandardizationMeeting.getPersonnelId())){ - // 参会人员 - List sysUserList = sysUserService.listByIds(Arrays.asList(lawsStandardizationMeeting.getPersonnelId().split(","))); - lawsStandardizationMeeting.setPersonnel(sysUserList.stream().map(SysUser::getRealname).collect(Collectors.joining(","))); - } - // 文件信息 - List ossFileList = ossFileService.list( - new LambdaQueryWrapper() - .eq(OSSFile::getConnectId, lawsStandardizationMeeting.getId())); - - if (!ossFileList.isEmpty()){ - String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(",")); - lawsStandardizationMeeting.setMeetingData(fileIds); - } - } - } - - @Override - public void delete(String id) { - deleteById(id); - lawsStandardizationLiaisonService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationLiaison::getStandardizationId, id)); - lawsStandardizationGroupService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationGroup::getStandardizationId, id)); - lawsStandardizationPaymentService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationPayment::getStandardizationId, id)); - lawsStandardizationMeetingService.remove( - new LambdaQueryWrapper() - .eq(LawsStandardizationMeeting::getStandardizationId, id)); - } - - /** - * 递归创建子节点 - * - * @param tree 当前树节点 - * @param treeList 树节点列表 - * @return 子节点列表 - */ - private List createChildren(LawsStandardization tree, List treeList){ - List collect = treeList.stream().filter(v -> tree.getId().equals(v.getPid())).collect(Collectors.toList()); - return collect.stream() - .map(v -> { - v.setChildren(createChildren(v, treeList)); - return v; - }) - .collect(Collectors.toList()); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java deleted file mode 100644 index 7c5efacc..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/vo/StandardizationVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jero.modules.laws.standardization.vo; - -import com.jero.modules.laws.standardization.entity.*; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @ClassName: StandaraizationVO - * @Description: - * @Author: yjz - * @Date: 2023-11-02 14:20 - * @Version: 1.0 - **/ -@Data -public class StandardizationVO { - /**基础信息*/ - @ApiModelProperty(value = "基础信息") - private LawsStandardization lawsStandardization; - /**联络人联系方式*/ - @ApiModelProperty(value = "联络人联系方式") - private ListstandardizationLiaisonList; - /**集团参与情况*/ - @ApiModelProperty(value = "集团参与情况") - private List standardizationGroupList; - /**支付信息*/ - @ApiModelProperty(value = "支付信息") - private List standardizationPayments; - /**参会记录*/ - @ApiModelProperty(value = "参会记录") - private List standardizationMeetings; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java index 09151ac9..40d22faf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java @@ -11,16 +11,8 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.enums.ProcessTypeEnum; -import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey; -import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; -import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationUserLinkService; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.jero.modules.activiti.process.fb.service.IProcessHandleService; -import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; -import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo; import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; @@ -35,8 +27,6 @@ import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; @@ -67,8 +57,6 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { private final ISarFileCompareInfoService sarFileCompareInfoService; private final ILawsCustomCompareInfoService lawsCustomCompareInfoService; private final ISysUserService sysUserService; - private final IProcessHandleService processHandleService; - private final IProcessFbStandardConsultationService processFbStandardConsultationService; @Resource private RuntimeService runtimeService; @@ -78,17 +66,13 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { ISarFileSplitInfoService sarFileSplitInfoService, ISarFileCompareInfoService sarFileCompareInfoService, ILawsCustomCompareInfoService lawsCustomCompareInfoService, - ISysUserService sysUserService, - IProcessHandleService processHandleService, - IProcessFbStandardConsultationService processFbStandardConsultationService) { + ISysUserService sysUserService) { this.lawsTaskTransferMapper = lawsTaskTransferMapper; this.enterpriseStandardPlanService = enterpriseStandardPlanService; this.sarFileSplitInfoService = sarFileSplitInfoService; this.sarFileCompareInfoService = sarFileCompareInfoService; this.lawsCustomCompareInfoService = lawsCustomCompareInfoService; this.sysUserService = sysUserService; - this.processHandleService = processHandleService; - this.processFbStandardConsultationService = processFbStandardConsultationService; } @Override @@ -164,67 +148,6 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { @Override public void processDBTransferBatch(List lawsProcessDBList) { - // 水平越权 - List idlist = lawsProcessDBList.stream().map(LawsProcessDB::getId).collect(Collectors.toList()); - isHorizontalOverstepByProcessDB(String.join(",", idlist)); - - for (LawsProcessDB lawsProcessDb : lawsProcessDBList) { - String taskId = lawsProcessDb.getTaskId(); - String user = lawsProcessDb.getUser(); - String toUserId = lawsProcessDb.getTransferUser(); - String projectId = lawsProcessDb.getProjectId(); - // 征求意见流程特殊处理 - if (ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue().equals(lawsProcessDb.getPrcType())) { - processHandleService.transfer(taskId, toUserId); - TaskService taskService = SpringContextUtil.getBean(TaskService.class); - IProcessFbConsultationUserLinkService processFbConsultationUserLinkService = - SpringContextUtil.getBean(IProcessFbConsultationUserLinkService.class); - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - String taskDefinitionKey = task.getTaskDefinitionKey(); - String executionId = task.getExecutionId(); - // 设计工程师填写征求意见 - if (ConsultationTaskKey.DESIGN_ENGINEER_1.equals(taskDefinitionKey) - || ConsultationTaskKey.DESIGN_ENGINEER_2.equals(taskDefinitionKey)){ - processFbConsultationUserLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) - .eq(ProcessFbConsultationUserLink::getDesignEngineerId, user) - .set(ProcessFbConsultationUserLink::getDesignEngineerId, toUserId) - .set(ProcessFbConsultationUserLink::getOriginDesignEngineerId, CurrentUserUtil.getId())); - } - // 模块负责人分发/模块负责人汇总填写意见 - if (ConsultationTaskKey.MODULE_OWNER_START.equals(taskDefinitionKey) - || ConsultationTaskKey.MODULE_OWNER_END_1.equals(taskDefinitionKey) - || ConsultationTaskKey.MODULE_OWNER_END_2.equals(taskDefinitionKey) - || ConsultationTaskKey.MODULE_OWNER_END_3.equals(taskDefinitionKey)){ - processFbConsultationUserLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) - .eq(ProcessFbConsultationUserLink::getModuleOwnerId, user) - .set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId) - .set(ProcessFbConsultationUserLink::getOriginModuleOwnerId, CurrentUserUtil.getId())); - - runtimeService.setVariable(executionId, "moduleOwner", toUserId); - } - // 各部所主管级领导分发/各部所主管级领导审批/各部所主管级领导汇总 - if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_END_1.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_END_4.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_COLLECT_2.equals(taskDefinitionKey) - || ConsultationTaskKey.DEPART_LEADER_COLLECT_3.equals(taskDefinitionKey)){ - processFbConsultationUserLinkService.update( - new LambdaUpdateWrapper() - .eq(ProcessFbConsultationUserLink::getBusinessId, projectId) - .eq(ProcessFbConsultationUserLink::getDepartLeaderId, user) - .set(ProcessFbConsultationUserLink::getDepartLeaderId, toUserId) - .set(ProcessFbConsultationUserLink::getOriginDepartLeaderId, CurrentUserUtil.getId())); - - runtimeService.setVariable(executionId, "departLeader", toUserId); - } - continue; - } - processHandleService.transfer(taskId, toUserId); - } } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index 9e86f019..598d27ac 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -7,7 +7,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.dto.message.SendMessageDTO; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; -import com.jero.common.api.vo.SendMessageAPI; +import com.jero.modules.common.service.SendMessageAPI; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java index 54e8a2f4..556620f3 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java @@ -1,26 +1,20 @@ package com.jero.modules.projectLibrary.service.impl; import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.ResultCommon; -import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.BeanCopyUtils; import com.jero.common.util.FileUtils; -import com.jero.common.util.MinioUtil; import com.jero.common.util.ZipUtil; -import com.jero.modules.activiti.process.projectstandard.entity.ProcessProjectStandardTermUser; -import com.jero.modules.activiti.process.projectstandard.service.ProcessProjectStandardService; import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.enterprise.entity.vo.DeclareFileList; import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; -import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.projectLibrary.entity.LawsProjectLibrary; import com.jero.modules.projectLibrary.entity.LawsSpecialProjectLibrary; import com.jero.modules.projectLibrary.mapper.LawsSpecialProjectLibraryMapper; import com.jero.modules.projectLibrary.service.ILawsSpecialProjectLibraryService; @@ -36,25 +30,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.Arrays; -import java.util.List; -import java.util.Date; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.io.File; +import java.io.FileOutputStream; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; @@ -75,8 +60,6 @@ public class LawsSpecialProjectLibraryServiceImpl extends ServiceImpl termUserPage = processProjectStandardService.getTermUserList(termUser, -1, -1); - List termUserList = termUserPage.getRecords(); - //导出描述依据和佐证材料 - if (!termUserList.isEmpty()) { - //标准编号+条款号的文件夹 - String termUserUrl = url + File.separator + standardNumber.replaceAll("[/\\\\:*?|\"<>]", "") + File.separator + (StringUtils.isBlank(termNumber)?"":termNumber) ; - File termUserFile = new File(termUserUrl); - if (!termUserFile.exists()){ - boolean mkdirs = termUserFile.mkdirs(); - log.info("创建临时子目录：{}", mkdirs); - }else { - int i = 1; - while (true){ - String newFileUrl = (termUserUrl.endsWith(File.separator) ? termUserUrl.substring(0, termUserUrl.length() - 1) : termUserUrl) + " (" + i + ")"; - termUserFile = new File(newFileUrl); - if (!termUserFile.exists()){ - boolean mkdirs = termUserFile.mkdirs(); - log.info("创建临时子目录：{}", mkdirs); - break; - } - i++; - } - } - //佐证材料 - for (ProcessProjectStandardTermUser standardTermUser : termUserList) { - String fileId = standardTermUser.getFileId(); - if (StringUtils.isNotBlank(fileId)){ - List fileIdList = Arrays.asList(fileId.split(",")); - List ossFileList = ossFileService.listByIds(fileIdList); - if (!ossFileList.isEmpty()){ - // 赋值 - List declareFileLists = BeanCopyUtils.copyBeanList(ossFileList, DeclareFileList.class); - standardTermUser.setDeclareFileList(declareFileLists); - // 写出文件 - for (OSSFile ossFile : ossFileList) { - InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl()); - // pdf加水印 - if (StringUtils.endsWithIgnoreCase(ossFile.getFileName(), ".pdf")){ - inputStream = sysWaterMarkUtil.addWatermarkToPdf(inputStream); - } - // 导出文件 - String filePath = termUserFile + File.separator + ossFile.getFileName(); - enterpriseStandardDeclareService.writeToLocal(filePath, inputStream); - } - } - } - } - //描述依据 - try (FileOutputStream fos1 = new FileOutputStream(termUserFile + File.separator + termUserFileName + ".xls")){ - // 生成excel - Workbook workbook1 = ExcelExportUtil.exportExcel(exportParams, ProcessProjectStandardTermUser.class, termUserList); - // 导出excel - workbook1.write(fos1); - }catch (Exception e){ - log.error(e.getMessage()); - throw new JeroBootException("excel导出失败!"); - } - - } +// ProcessProjectStandardTermUser termUser = new ProcessProjectStandardTermUser(); +// termUser.setTermId(processTermId); +// IPage termUserPage = processProjectStandardService.getTermUserList(termUser, -1, -1); +// List termUserList = termUserPage.getRecords(); +// //导出描述依据和佐证材料 +// if (!termUserList.isEmpty()) { +// //标准编号+条款号的文件夹 +// String termUserUrl = url + File.separator + standardNumber.replaceAll("[/\\\\:*?|\"<>]", "") + File.separator + (StringUtils.isBlank(termNumber)?"":termNumber) ; +// File termUserFile = new File(termUserUrl); +// if (!termUserFile.exists()){ +// boolean mkdirs = termUserFile.mkdirs(); +// log.info("创建临时子目录：{}", mkdirs); +// }else { +// int i = 1; +// while (true){ +// String newFileUrl = (termUserUrl.endsWith(File.separator) ? termUserUrl.substring(0, termUserUrl.length() - 1) : termUserUrl) + " (" + i + ")"; +// termUserFile = new File(newFileUrl); +// if (!termUserFile.exists()){ +// boolean mkdirs = termUserFile.mkdirs(); +// log.info("创建临时子目录：{}", mkdirs); +// break; +// } +// i++; +// } +// } +// //佐证材料 +// for (ProcessProjectStandardTermUser standardTermUser : termUserList) { +// String fileId = standardTermUser.getFileId(); +// if (StringUtils.isNotBlank(fileId)){ +// List fileIdList = Arrays.asList(fileId.split(",")); +// List ossFileList = ossFileService.listByIds(fileIdList); +// if (!ossFileList.isEmpty()){ +// // 赋值 +// List declareFileLists = BeanCopyUtils.copyBeanList(ossFileList, DeclareFileList.class); +// standardTermUser.setDeclareFileList(declareFileLists); +// // 写出文件 +// for (OSSFile ossFile : ossFileList) { +// InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl()); +// // pdf加水印 +// if (StringUtils.endsWithIgnoreCase(ossFile.getFileName(), ".pdf")){ +// inputStream = sysWaterMarkUtil.addWatermarkToPdf(inputStream); +// } +// // 导出文件 +// String filePath = termUserFile + File.separator + ossFile.getFileName(); +// enterpriseStandardDeclareService.writeToLocal(filePath, inputStream); +// } +// } +// } +// } +// //描述依据 +// try (FileOutputStream fos1 = new FileOutputStream(termUserFile + File.separator + termUserFileName + ".xls")){ +// // 生成excel +// Workbook workbook1 = ExcelExportUtil.exportExcel(exportParams, ProcessProjectStandardTermUser.class, termUserList); +// // 导出excel +// workbook1.write(fos1); +// }catch (Exception e){ +// log.error(e.getMessage()); +// throw new JeroBootException("excel导出失败!"); +// } +// +// } } Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsSpecialProjectLibrary.class, exportList); // 导出excel diff --git a/laws-single-startup/src/test/java/com/jero/SecurityToolsTest.java b/laws-single-startup/src/test/java/com/jero/SecurityToolsTest.java deleted file mode 100644 index dc8ed397..00000000 --- a/laws-single-startup/src/test/java/com/jero/SecurityToolsTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jero; - -import cn.hutool.json.JSONObject; -import com.jero.common.util.security.SecurityTools; -import com.jero.common.util.security.entity.*; -import org.junit.Test; - -public class SecurityToolsTest { - @Test - public void Test(){ - MyKeyPair mkeyPair = SecurityTools.generateKeyPair(); - - JSONObject msg = new JSONObject(); - msg.put("name", "党政辉"); - msg.put("age", 50); - JSONObject identity = new JSONObject(); - identity.put("type", "01"); - identity.put("no", "210882165896524512"); - msg.put("identity", identity); - - // 签名加密部分 - SecuritySignReq signReq = new SecuritySignReq(); - // data为要加密的报文字符串 - signReq.setData(msg.toString()); - // 为rsa私钥 - signReq.setPrikey(mkeyPair.getPriKey()); - // 调用签名方法 - SecuritySignResp sign = SecurityTools.sign(signReq); - // 打印出来加密数据 - // signData为签名数据 - // data为aes加密数据 - // asekey为ras加密过的aeskey - System.out.println(new JSONObject(sign).toStringPretty()); - - // 验签解密部分 - SecurityReq req = new SecurityReq(); - //对方传过来的数据一一对应 - req.setAesKey(sign.getAesKey()); - req.setData(sign.getData()); - req.setSignData(sign.getSignData()); - //我们的公钥 - req.setPubKey(mkeyPair.getPubKey()); - //验签方法调用 - SecurityResp securityResp = SecurityTools.valid(req); - //解密报文data为解密报文 - //sucess 为验签成功失败标志 true代码验签成功，false代表失败 - System.out.println(new JSONObject(securityResp).toStringPretty()); - } -} diff --git a/laws-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java b/laws-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java deleted file mode 100644 index be692dc0..00000000 --- a/laws-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.jero.modules.online.desform.test; - -import com.alibaba.fastjson.JSONObject; -import com.jero.JeroSystemSingleApplication; -import com.jero.common.constant.CommonConstant; -import com.jero.common.system.util.JwtUtil; -import com.jero.common.util.RedisUtil; -import com.jero.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * 表单设计器 API 接口单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) -@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) -public class DesformApiTest { - - @Autowired - private RedisUtil redisUtil; - - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jero-boot/desform/api/"; - - // 请实际使用时替换成你自己的用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - - /** - * 表单code，实际使用时可以替换成你要测试的表单code - */ - private final String DESFORM_CODE = "qingjiadan"; - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("name", "张三"); - params.put("sex", "1"); - params.put("begin_time", "2019-12-27"); - params.put("remarks", "生病了"); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：修改 - */ - @Test - public void testEdit() { - // 数据Id - String dataId = "f43ea15c654337fbcb2336dd5422ffc3"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 PUT 代表提交修改数据 - HttpMethod method = HttpMethod.PUT; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("name", "李四"); - params.put("sex", "0"); - params.put("begin_time", "2019-12-27"); - params.put("remarks", "感冒了"); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：删除 - */ - @Test - public void testDelete() { - // 数据Id - String dataId = "f43ea15c654337fbcb2336dd5422ffc3"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 DELETE 代表删除数据 - HttpMethod method = HttpMethod.DELETE; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - /** - * 测试用例：查询记录 - */ - @Test - public void testQuery() { - // 数据Id - String dataId = "18146ddaa062296442a9310a51baf67b"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + DESFORM_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - private String getToken() { - String token = JwtUtil.sign(USERNAME, PASSWORD); - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60); - return token; - } - - private HttpHeaders getHeaders(String token) { - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } - -} diff --git a/laws-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java b/laws-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java deleted file mode 100644 index 73ec7470..00000000 --- a/laws-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.jero.modules.online.desform.test; - -import com.alibaba.fastjson.JSONObject; -import com.jero.JeroSystemSingleApplication; -import com.jero.common.constant.CommonConstant; -import com.jero.common.system.util.JwtUtil; -import com.jero.common.util.RedisUtil; -import com.jero.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * online api online表单单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) -@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) -public class OnlineApiTest { - @Autowired - private RedisUtil redisUtil; - - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jero-boot/online/cgform/api/"; - - // 请实际使用时替换成你自己的用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - - /** - * online表单code，实际使用时可以替换成你要测试的表单code - * （测试表test_demo） - */ - private final String ONLINE_CODE = "d35109c3632c4952a19ecc094943dd71"; - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "form/" + ONLINE_CODE; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("name", "张三"); - params.put("sex", "1"); - params.put("age",15); - params.put("descc", "

富文本编辑

"); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：修改 - */ - @Test - public void testEdit() { - // dataId - String dataId = "1331797913880883201"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "form/" + ONLINE_CODE; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 PUT 代表提交修改数据 - HttpMethod method = HttpMethod.PUT; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("id", dataId); - params.put("name", "张三"); - params.put("sex", "1"); - params.put("age",30); - params.put("descc", "

富文本编辑，重新编辑

"); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：删除 - */ - @Test - public void testDelete() { - // 数据id - String dataId = "1331797913880883201"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "form/" + ONLINE_CODE + "/" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 DELETE 代表删除数据 - HttpMethod method = HttpMethod.DELETE; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - /** - * 测试用例：查询记录 - */ - @Test - public void testQuery() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "getData/"+ ONLINE_CODE ; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - private String getToken() { - String token = JwtUtil.sign(USERNAME, PASSWORD); - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60); - return token; - } - - private HttpHeaders getHeaders(String token) { - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } -} diff --git a/laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java b/laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java deleted file mode 100644 index 1ac8caa7..00000000 --- a/laws-single-startup/src/test/java/com/jero/modules/standard/domestic/StandardTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.modules.standard.domestic; - -import com.jero.JeroSystemSingleApplication; -import com.jero.modules.docking.asms.util.AsmsPostUtil; -import com.jero.modules.laws.standard.entity.LawsDomesticStandard; -import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * @Author: liao - * @Date: 2023/9/14 17:14 - * @Description: - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) -public class StandardTest { - - @Autowired - private ILawsDomesticStandardService lawsDomesticStandardService; - @Autowired - private AsmsPostUtil asmsPostUtil; - - @Test - public void getByIdTest() { - LawsDomesticStandard byId = lawsDomesticStandardService.getById("86a75ae628c9485ca002b56551606684"); - System.out.println(byId); - } - - @Test - public void testAsmsPost() { - asmsPostUtil.sendGetReq("/countriesregions/list", null); - } - -} diff --git a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java b/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java deleted file mode 100644 index b05388d5..00000000 --- a/laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.jero.modules.standard.enterprise; - -import com.github.javafaker.Faker; -import com.jero.JeroSystemSingleApplication; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.util.Random; -import java.util.concurrent.TimeUnit; - -/** - * @author: Mzaxd - * @Date: 2023/9/7 15:36 - */ - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) -public class LawsEnterpriseStandardTest { - - @Resource - private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; - - @Resource - private EnterpriseStandardRmrEvaluateDetailService enterpriseStandardRmrEvaluateDetailService; - - @Resource - private EnterpriseStandardPlanService enterpriseStandardPlanService; - - private static final Faker faker = new Faker(); - private static final Random random = new Random(); - - public static LawsEnterpriseStandard generateRandomEnterpriseStandard() { - LawsEnterpriseStandard lawsEnterpriseStandard = new LawsEnterpriseStandard(); - - //lawsEnterpriseStandard.setDelFlag(faker.bool().bool() ? 1 : 0); - lawsEnterpriseStandard.setStandardCode(faker.code().ean13()); - lawsEnterpriseStandard.setNameCode(faker.code().asin()); - lawsEnterpriseStandard.setCategoryCode(faker.commerce().department()); - lawsEnterpriseStandard.setYearNumber(String.valueOf(faker.number().numberBetween(1990, 2023))); - lawsEnterpriseStandard.setStandardCategory(faker.commerce().department()); - lawsEnterpriseStandard.setGradeClassification(faker.book().genre()); - lawsEnterpriseStandard.setCompIllustration(faker.lorem().sentence()); - //lawsEnterpriseStandard.setTryFlag(faker.bool().bool() ? 1 : 0); - lawsEnterpriseStandard.setTrialPeriod(String.valueOf(faker.number().numberBetween(1, 12)) + " months"); - lawsEnterpriseStandard.setMainDraftingUser(faker.name().fullName()); - lawsEnterpriseStandard.setMainDraftingUnit(faker.company().name()); - lawsEnterpriseStandard.setMainDraftingUnitResponsiblePerson(faker.name().fullName()); - lawsEnterpriseStandard.setCooperationUnit(faker.company().name()); - lawsEnterpriseStandard.setPartName(faker.lorem().word()); - - // ... continue with more fields as needed - - lawsEnterpriseStandard.setStandardNumber(faker.code().ean8()); - lawsEnterpriseStandard.setStandardName(faker.commerce().productName()); - lawsEnterpriseStandard.setStandardEnglishName(faker.commerce().productName()); - lawsEnterpriseStandard.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS)); - lawsEnterpriseStandard.setImplementationDate(faker.date().past(1, TimeUnit.SECONDS)); - //lawsEnterpriseStandard.setStandardState(faker.random().nextInt(5)); - - return lawsEnterpriseStandard; - } - - public static EnterpriseStandardPlan generateRandomEnterpriseStandardPlan() { - EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan(); - - //enterpriseStandardPlan.setDelFlag(faker.bool().bool() ? 1 : 0); - enterpriseStandardPlan.setMainDraftingUser(faker.name().fullName()); - enterpriseStandardPlan.setMainDraftingUnit(faker.company().name()); - enterpriseStandardPlan.setMainDraftingUnitResponsiblePerson(faker.name().fullName()); - - - // ... continue with more fields as needed - - enterpriseStandardPlan.setReleaseDate(faker.date().past(1, TimeUnit.SECONDS)); - - return enterpriseStandardPlan; - } - @Test - public void insertRandomES() { - LawsEnterpriseStandard randomData = generateRandomEnterpriseStandard(); - ILawsEnterpriseStandardService.save(randomData); - System.out.println(randomData); - } - - @Test - public void insertRandomESRmrDetail() { - for (int i = 0; i < 6; i++) { - EnterpriseStandardRmrEvaluateDetail random = new EnterpriseStandardRmrEvaluateDetail(); - random.setEvaluateItem(String.valueOf(i + 1)); - random.setDeductionScoreReason("无"); - enterpriseStandardRmrEvaluateDetailService.save(random); - } - } - - @Test - public void insertRandomESP() { - for (int i = 0; i < 1; i++) { - EnterpriseStandardPlan random = generateRandomEnterpriseStandardPlan(); - enterpriseStandardPlanService.save(random); - } - } - -} diff --git a/laws-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java b/laws-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java deleted file mode 100644 index 9b8df993..00000000 --- a/laws-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.jero.modules.system.test; - -import com.jero.JeroSystemSingleApplication; -import com.jero.common.constant.CommonConstant; -import com.jero.common.system.util.JwtUtil; -import com.jero.common.util.RedisUtil; -import com.jero.common.util.RestUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import com.alibaba.fastjson.JSONObject; -import org.springframework.http.ResponseEntity; - -/** - * 系统用户单元测试 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) -@SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) -public class SysUserTest { - @Autowired - private RedisUtil redisUtil; - - /** - * 测试地址：实际使用时替换成你自己的地址 - */ - private final String BASE_URL = "http://localhost:8080/jero-boot/sys/user/"; - - // 请实际使用时替换成你自己的用户名和密码 - private final String USERNAME = "admin"; - private final String PASSWORD = "123456"; - - /** - * 测试用例：新增 - */ - @Test - public void testAdd() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "add" ; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 POST 代表提交新增数据 - HttpMethod method = HttpMethod.POST; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("username", "wangwuTest"); - params.put("password", "123456"); - params.put("confirmpassword","123456"); - params.put("realname", "单元测试"); - params.put("activitiSync", "1"); - params.put("userIdentity","1"); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：修改 - */ - @Test - public void testEdit() { - // 数据Id - String dataId = "1331795062924374018"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "edit"; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 PUT 代表提交修改数据 - HttpMethod method = HttpMethod.PUT; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - JSONObject params = new JSONObject(); - params.put("username", "wangwuTest"); - params.put("realname", "单元测试1111"); - params.put("activitiSync", "1"); - params.put("userIdentity","1"); - params.put("id",dataId); - - System.out.println("请求参数：" + params.toJSONString()); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, params, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - - /** - * 测试用例：删除 - */ - @Test - public void testDelete() { - // 数据Id - String dataId = "1331795062924374018"; - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "delete" + "?id=" + dataId; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 DELETE 代表删除数据 - HttpMethod method = HttpMethod.DELETE; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - /** - * 测试用例：查询记录 - */ - @Test - public void testQuery() { - // 用户Token - String token = this.getToken(); - // 请求地址 - String url = BASE_URL + "list"; - // 请求 Header （用于传递Token） - HttpHeaders headers = this.getHeaders(token); - // 请求方式是 GET 代表获取数据 - HttpMethod method = HttpMethod.GET; - - System.out.println("请求地址：" + url); - System.out.println("请求方式：" + method); - System.out.println("请求Token：" + token); - - // 利用 RestUtil 请求该url - ResponseEntity result = RestUtil.request(url, method, headers, null, null, JSONObject.class); - if (result != null && result.getBody() != null) { - System.out.println("返回结果：" + result.getBody().toJSONString()); - } else { - System.out.println("查询失败"); - } - } - - private String getToken() { - String token = JwtUtil.sign(USERNAME, PASSWORD); - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, 60); - return token; - } - - private HttpHeaders getHeaders(String token) { - HttpHeaders headers = new HttpHeaders(); - String mediaType = MediaType.APPLICATION_JSON_UTF8_VALUE; - headers.setContentType(MediaType.parseMediaType(mediaType)); - headers.set("Accept", mediaType); - headers.set("X-Access-Token", token); - return headers; - } -}