From d74e1672af99afd7e6a24327deb22b308dd5fc88 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 04 十二月 2023 08:38:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index dd8b910..e4e3328 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -312,7 +312,7 @@
s = engineService.addSaveCode(orderDTO);
saveLogUtil.operateLog("缂栫爜鐢宠",false,orderDTO.toString());
}catch (Exception e){
- saveLogUtil.operateLog("缂栫爜鐢宠",true,e.getMessage());
+ saveLogUtil.operateLog("缂栫爜鐢宠",true,e.toString());
throw e;
}
return R.success(s);
@@ -769,4 +769,26 @@
public R addSaveBZ (@RequestBody CodeBZApplyDTO codeBZApplyDTO) throws Exception {
return R.success(engineService.addSaveBZ(codeBZApplyDTO));
}
+
+ /**
+ * 涓嬭浇鎵归噺鐢宠鐨勫鍏ユā鏉�
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @param response 鍝嶅簲瀵硅薄
+ * @throws IOException 鎶涘嚭寮傚父
+ */
+ @GetMapping("/exportGroupCodeExcel")
+ @VciBusinessLog(operateName = "瀵煎嚭闆嗗洟鐮�")
+ public void exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{
+
+ try {
+ String excelName = mdmIOService.exportGroupCodeExcel(codeClassifyOid);
+ } catch (Throwable e) {
+ //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
+ String msg = LangBaseUtil.getErrorMsg(e);
+ if(StringUtils.isBlank(msg)){
+ msg = "鏈煡閿欒";
+ }
+ ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+ }
+ }
}
--
Gitblit v1.9.3