From 6ee1cf0a93416d1db687b7b05335ce8b5edeb858 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 20 Aug 2024 18:27:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(89066):=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B--=E5=AF=BC=E5=87=BA--sheet=E9=A1=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=90=88=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StandardInterpretFlowController.java | 6 ++++-- .../impl/StandardInterpretFlowServiceImpl.java | 13 ++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java index 9f0c1478..3c4834c6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java @@ -215,8 +215,10 @@ public class StandardInterpretFlowController { /** * 标准解读流程-标准解读流程-导出(标准主解读人不分发) */ - @AutoLog(value = "标准解读流程-标准解读流程-导出(标准主解读人不分发)", operateType = CommonConstant.OPERATE_TYPE_6) - @ApiOperation(value="标准解读流程-标准解读流程-导出(标准主解读人不分发)", notes="标准解读流程-标准解读流程-导出(标准主解读人不分发)") + @AutoLog(value = "标准解读流程-标准解读流程-导出(标准主解读人不分发/标准主解读汇总)", + operateType = CommonConstant.OPERATE_TYPE_6) + @ApiOperation(value="标准解读流程-标准解读流程-导出(标准主解读人不分发/标准主解读汇总)", + notes="标准解读流程-标准解读流程-导出(标准主解读人不分发/标准主解读汇总)") @GetMapping(value = "/exportExcelByUnDistribute") public ModelAndView exportExcelByUnDistribute(HttpServletRequest request) { return standardInterpretFlowService.exportExcelByUnDistribute(request); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index f654b858..dff66e9e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -24,6 +24,7 @@ import com.jero.common.util.*; import com.jero.modules.activiti.common.ActivitiCommon; 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.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.process.common.enums.ProcessType; @@ -47,6 +48,7 @@ import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretF 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.activiti.util.ActivityCountersign; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper; @@ -164,6 +166,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe private SendMessageAPI sendMessageAPI; @Autowired private ILawsTagService lawsTagService; + @Autowired + private ProcessNodeService processNodeService; private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); private final List tempList = new ArrayList<>(); @@ -950,7 +954,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe processApprovalRecord.setNodeId(request.getParameter("nodeId")); processApprovalRecord.setTaskId(request.getParameter("taskId")); StandardInterpretDTO standardInterpretDTO = queryBusinessData(processAll, processApprovalRecord); - + ProcessNode processNode = processNodeService.getOne( + new LambdaQueryWrapper() + .eq(ProcessNode::getXmlNodeId, processApprovalRecord.getNodeId()) + .orderByDesc(ProcessNode::getCreateTime).last("limit 1")); // Step.2 获取导出数据 List exportList = standardInterpretDTO.getProcessStandardInterpretClauseSublistList(); @@ -1024,13 +1031,13 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); try { - mv.addObject(JeroController.FILE_NAME, URLEncoder.encode("标准主解读人不分发", "UTF-8")); + mv.addObject(JeroController.FILE_NAME, URLEncoder.encode(processNode.getNodeName(), "UTF-8")); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } mv.addObject(JeroController.CLASS, ProcessStandardInterpretClauseSublist.class); //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- - ExportParams exportParams=new ExportParams(null, "标准主解读人不分发"); + ExportParams exportParams=new ExportParams(null, processNode.getNodeName()); exportParams.setType(ExcelType.XSSF); //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- mv.addObject(JeroController.PARAMS,exportParams);