fix(89066): 标准解读流程--导出--sheet页名称不合理
This commit is contained in:
+4
-2
@@ -215,8 +215,10 @@ public class StandardInterpretFlowController {
|
|||||||
/**
|
/**
|
||||||
* 标准解读流程-标准解读流程-导出(标准主解读人不分发)
|
* 标准解读流程-标准解读流程-导出(标准主解读人不分发)
|
||||||
*/
|
*/
|
||||||
@AutoLog(value = "标准解读流程-标准解读流程-导出(标准主解读人不分发)", operateType = CommonConstant.OPERATE_TYPE_6)
|
@AutoLog(value = "标准解读流程-标准解读流程-导出(标准主解读人不分发/标准主解读汇总)",
|
||||||
@ApiOperation(value="标准解读流程-标准解读流程-导出(标准主解读人不分发)", notes="标准解读流程-标准解读流程-导出(标准主解读人不分发)")
|
operateType = CommonConstant.OPERATE_TYPE_6)
|
||||||
|
@ApiOperation(value="标准解读流程-标准解读流程-导出(标准主解读人不分发/标准主解读汇总)",
|
||||||
|
notes="标准解读流程-标准解读流程-导出(标准主解读人不分发/标准主解读汇总)")
|
||||||
@GetMapping(value = "/exportExcelByUnDistribute")
|
@GetMapping(value = "/exportExcelByUnDistribute")
|
||||||
public ModelAndView exportExcelByUnDistribute(HttpServletRequest request) {
|
public ModelAndView exportExcelByUnDistribute(HttpServletRequest request) {
|
||||||
return standardInterpretFlowService.exportExcelByUnDistribute(request);
|
return standardInterpretFlowService.exportExcelByUnDistribute(request);
|
||||||
|
|||||||
+10
-3
@@ -24,6 +24,7 @@ import com.jero.common.util.*;
|
|||||||
import com.jero.modules.activiti.common.ActivitiCommon;
|
import com.jero.modules.activiti.common.ActivitiCommon;
|
||||||
import com.jero.modules.activiti.entity.ProcessAll;
|
import com.jero.modules.activiti.entity.ProcessAll;
|
||||||
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
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.FinishFlagEnum;
|
||||||
import com.jero.modules.activiti.enums.ProcessStatusEnum;
|
import com.jero.modules.activiti.enums.ProcessStatusEnum;
|
||||||
import com.jero.modules.activiti.process.common.enums.ProcessType;
|
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.ProcessAllService;
|
||||||
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
|
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
|
||||||
import com.jero.modules.activiti.service.ProcessNodeLinkService;
|
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.activiti.util.ActivityCountersign;
|
||||||
import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit;
|
import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit;
|
||||||
import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper;
|
import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper;
|
||||||
@@ -164,6 +166,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
|
|||||||
private SendMessageAPI sendMessageAPI;
|
private SendMessageAPI sendMessageAPI;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ILawsTagService lawsTagService;
|
private ILawsTagService lawsTagService;
|
||||||
|
@Autowired
|
||||||
|
private ProcessNodeService processNodeService;
|
||||||
|
|
||||||
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
private final List<String> tempList = new ArrayList<>();
|
private final List<String> tempList = new ArrayList<>();
|
||||||
@@ -950,7 +954,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
|
|||||||
processApprovalRecord.setNodeId(request.getParameter("nodeId"));
|
processApprovalRecord.setNodeId(request.getParameter("nodeId"));
|
||||||
processApprovalRecord.setTaskId(request.getParameter("taskId"));
|
processApprovalRecord.setTaskId(request.getParameter("taskId"));
|
||||||
StandardInterpretDTO standardInterpretDTO = queryBusinessData(processAll, processApprovalRecord);
|
StandardInterpretDTO standardInterpretDTO = queryBusinessData(processAll, processApprovalRecord);
|
||||||
|
ProcessNode processNode = processNodeService.getOne(
|
||||||
|
new LambdaQueryWrapper<ProcessNode>()
|
||||||
|
.eq(ProcessNode::getXmlNodeId, processApprovalRecord.getNodeId())
|
||||||
|
.orderByDesc(ProcessNode::getCreateTime).last("limit 1"));
|
||||||
// Step.2 获取导出数据
|
// Step.2 获取导出数据
|
||||||
List<ProcessStandardInterpretClauseSublist> exportList =
|
List<ProcessStandardInterpretClauseSublist> exportList =
|
||||||
standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
|
standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
|
||||||
@@ -1024,13 +1031,13 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
|
|||||||
// Step.3 AutoPoi 导出Excel
|
// Step.3 AutoPoi 导出Excel
|
||||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||||
try {
|
try {
|
||||||
mv.addObject(JeroController.FILE_NAME, URLEncoder.encode("标准主解读人不分发", "UTF-8"));
|
mv.addObject(JeroController.FILE_NAME, URLEncoder.encode(processNode.getNodeName(), "UTF-8"));
|
||||||
} catch (UnsupportedEncodingException e) {
|
} catch (UnsupportedEncodingException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
mv.addObject(JeroController.CLASS, ProcessStandardInterpretClauseSublist.class);
|
mv.addObject(JeroController.CLASS, ProcessStandardInterpretClauseSublist.class);
|
||||||
//update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置--------------------
|
//update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置--------------------
|
||||||
ExportParams exportParams=new ExportParams(null, "标准主解读人不分发");
|
ExportParams exportParams=new ExportParams(null, processNode.getNodeName());
|
||||||
exportParams.setType(ExcelType.XSSF);
|
exportParams.setType(ExcelType.XSSF);
|
||||||
//update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置----------------------
|
//update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置----------------------
|
||||||
mv.addObject(JeroController.PARAMS,exportParams);
|
mv.addObject(JeroController.PARAMS,exportParams);
|
||||||
|
|||||||
Reference in New Issue
Block a user