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/service/impl/MdmIOServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 2dc0406..dfc6153 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -4613,7 +4613,7 @@
* @return
*/
@Override
- public String exportGroupCodeExcel(String codeClassifyOid) {
+ public String exportGroupCodeExcel(String codeClassifyOid) throws ServiceException {
VciBaseUtil.alertNotNull(codeClassifyOid,"涓婚搴撳垎绫荤殑涓婚敭");
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
CodeClassifyVO codeClassifyVO= classifyFullInfo.getCurrentClassifyVO();
@@ -4624,6 +4624,9 @@
ExecGroupCodePortDataDTO execGroupCodePortDataDTO=new ExecGroupCodePortDataDTO();
createExportGroupCodeMapConfig(templateVO,execGroupCodePortDataDTO);//缁勭粐鏁版嵁
+ if(!CollectionUtils.isEmpty(execGroupCodePortDataDTO.getCodeAttrMapGroupAttrDTOS())){
+ throw new ServiceException("闆嗗洟灞炴�ф槧灏勬湭閰嶇疆");
+ }
fieldList=execGroupCodePortDataDTO.getFieldList();
List<Map<String,String>>dataList=new ArrayList<>();
getDatas(classifyFullInfo,templateVO,fieldList,dataList);
@@ -4715,8 +4718,11 @@
log.info("鏂囦欢璺緞"+excelName);
return excelName;
}
+
/***
- *
+ * 闆嗗洟瀵煎嚭妯℃澘灞炴�ф槧灏勪俊鎭幏鍙�
+ * @param templateVO
+ * @param execGroupCodePortDataDTO
*/
private void createExportGroupCodeMapConfig(CodeClassifyTemplateVO templateVO,ExecGroupCodePortDataDTO execGroupCodePortDataDTO){
String classOid=templateVO.getCodeclassifyoid();
@@ -4747,13 +4753,15 @@
execGroupCodePortDataDTO.setColName(colNameList);
}
}
+
/***
- * 鏌ヨ鏁版嵁
+ * 鏌ヨ鏈湁闆嗗洟鐮佺殑鏁版嵁
* @param classifyFullInfo
* @param templateVO
+ * @param selectFieldList
+ * @param dataList
*/
private void getDatas(CodeClassifyFullInfoBO classifyFullInfo,CodeClassifyTemplateVO templateVO,LinkedList<String> selectFieldList,List<Map<String,String>>dataList){
-
//鍏堟煡璇㈡暟鎹�
String btmTypeId = classifyFullInfo.getTopClassifyVO().getBtmTypeId();
String codeClassifyOid=classifyFullInfo.getCurrentClassifyVO().getOid();
--
Gitblit v1.9.3