From 0853823c44129cd3f221d93718b6980a87c3eeda Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期五, 11 八月 2023 17:08:24 +0800 Subject: [PATCH] 1、处理流程处理查询报错问题。 2、处理流程处理批量报错报错问题。 3、处理更新时bean里面的data数据与bean字段数据冲突时，以data数据为准。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 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..897b2e7 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; @@ -58,7 +59,7 @@ * @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); /** * 鎵归噺鐢宠 -- Gitblit v1.9.3