From 2bfad65f3f4ed0282f53e3ae01fc10c879a734bc Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 09 十一月 2023 10:03:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java index 2147bf2..e1332d8 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java @@ -1,5 +1,6 @@ package com.vci.ubcs.code.service; +import com.vci.ubcs.code.dto.CodeExportAttrDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO; @@ -25,7 +26,6 @@ * @return excel鐨勬枃浠跺湴鍧� */ String createImportExcel(String codeClassifyOid,boolean isHistory); - /** * 鐢熸垚瀵煎叆鐨勬枃浠� @@ -58,7 +58,8 @@ * @param file excel鏂囦欢鐨勪俊鎭� * @return 鏈夐敊璇俊鎭殑excel */ - CodeImProtRusultVO batchImportHistoryData(String codeClassifyOid,String classifyAttr, File file); + CodeImProtRusultVO batchImportHistoryData(String codeClassifyOid,String classifyAttr, File file) throws Throwable; + /*** * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鐨勬暟鎹� * @param codeClassifyOid @@ -75,6 +76,12 @@ */ DataGrid<Map<String, String>> gridRowResemble(String dataOid, String redisOid); + /** + * 瀵煎嚭涓婚搴撶殑鏁版嵁 + * @param exportAttrDTO 瀵煎嚭鐩稿叧鐨勯厤缃紝蹇呴』瑕佹湁涓婚搴撳垎绫荤殑涓婚敭 + * @return 瀵煎嚭鐨別xcel鐨勬枃浠� + */ + String exportCode(CodeExportAttrDTO exportAttrDTO); /** * 鎵归噺鐢宠 @@ -94,7 +101,7 @@ R deleteDatas(String redisOid, String codeClassifyOid, String dataOids); - void batchSyncEditDatas(CodeClassifyVO codeClassifyVO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs); + void batchSyncEditDatas(CodeClassifyVO codeClassifyVO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode); /** * 闆嗘垚鎵归噺鐢宠鏁版嵁 @@ -103,5 +110,13 @@ * @param resultDataObjectDetailDOs 閿欒淇℃伅 * @return 鏈夐敊璇俊鎭殑excel */ - void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs); + void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode); + + /*** + * 鐢宠闆嗗洟鐮佹帴鍙� + * @param idList 鏁版嵁oid + * @param btmName 涓氬姟绫诲瀷 + * @param operationType + */ + void sendApplyGroupcode(List<String> idList,String btmName,String operationType); } -- Gitblit v1.9.3