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/MdmIOService.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 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 82dab4b..4b2e394 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.google.protobuf.ServiceException; import com.vci.ubcs.code.dto.CodeExportAttrDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; @@ -27,7 +28,6 @@ */ String createImportExcel(String codeClassifyOid,boolean isHistory); - /** * 鐢熸垚瀵煎叆鐨勬枃浠� * @param codeClassifyOid 鍒嗙被鐨勪富閿� @@ -41,7 +41,7 @@ * @param file excel鏂囦欢鐨勪俊鎭� * @return 鏈夐敊璇俊鎭殑excel */ - CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file); + CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file) throws Exception; /*** *鎵归噺鐢宠缂栫爜鏁版嵁 @@ -60,6 +60,7 @@ * @return 鏈夐敊璇俊鎭殑excel */ CodeImProtRusultVO batchImportHistoryData(String codeClassifyOid,String classifyAttr, File file) throws Throwable; + /*** * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鐨勬暟鎹� * @param codeClassifyOid @@ -101,7 +102,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); /** * 闆嗘垚鎵归噺鐢宠鏁版嵁 @@ -111,4 +112,19 @@ * @return 鏈夐敊璇俊鎭殑excel */ 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); + + /*** + * 瀵煎嚭闆嗗洟鐮佹ā鏉� + * @param classOid + * @return + */ + String exportGroupCodeExcel(String classOid) throws ServiceException; } -- Gitblit v1.9.3