From e31c2d72f186602747e38e3ed54eba774a3aeeb2 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 05 十二月 2023 17:42:30 +0800
Subject: [PATCH] 1、数据更改的升版方法进行添加修改码值表的创建数据oid为最新数据的oid。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java |   15 +++------------
 1 files changed, 3 insertions(+), 12 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 7a4942f..9ec2f60 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
@@ -1282,6 +1282,7 @@
 	 * @param file            excel鏂囦欢鐨勪俊鎭�
 	 * @return 鏈夐敊璇俊鎭殑excel
 	 */
+	@Transactional
 	@Override
 	public CodeImProtRusultVO batchImportEdit(String codeClassifyOid, String classifyAttr,File file) throws  Throwable{
 		VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
@@ -1328,7 +1329,7 @@
 				titleRowData.remove(titleRowData.size()-1);
 				templateVO= templateVOList.get(0);
 			}catch (Throwable e){
-				throw  new VciBaseException(e.getMessage());
+				throw new ServiceException(e.getMessage());
 			}
 
 			CodeClassifyTemplateVO finalTemplateVO = templateVO;
@@ -1355,23 +1356,13 @@
 				//鎴戜滑浣跨敤鍜屼笟鍔$被鍨嬬殑鏉ユ煡璇�
 				List<Map> cbosB = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
 				if(cbosB.size() == 0){
-					throw  new ServiceException("缂栫爜锛�"+ sheetRowData.getData().get(0) + ",鏈兘鏌ヨ鍒扮浉鍏虫暟鎹��");
+					throw new ServiceException("缂栫爜锛�"+ sheetRowData.getData().get(0) + ",鏈兘鏌ヨ鍒扮浉鍏虫暟鎹��");
 				}
 				excelToCboEdit(fieldIndexMap, sheetRowData, orderDTO, cbosB.get(0));
 				orderDTO.setCopyFromVersion(orderDTO.getOid());
 				orderDTO.setOid(null);
 				try {
 					mdmEngineService.upSaveCode(orderDTO);
-					List<Map> newCbos = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
-					//瀵圭爜鍊艰〃杩涜澶勭悊鏇挎崲鍒涘缓鏁版嵁鐨刼id
-					QueryWrapper<CodeAllCode> wrapper = new QueryWrapper<>();
-					wrapper.eq("CREATECODEOID",orderDTO.getCopyFromVersion());
-					List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(wrapper);
-					codeAllCodes.get(0).setCreateCodeOid(newCbos.get(0).get("OID").toString());
-					codeAllCodes.get(0).setLastModifyTime(new Date());
-					codeAllCodes.get(0).setTs(new Date());
-					codeAllCodes.get(0).setLastModifier(AuthUtil.getUser().getUserName());
-					codeAllCodeService.updateBatchById(codeAllCodes);
 				} catch (Throwable e) {
 					log.error("鎵归噺浜х敓缂栫爜鐨勬椂鍊欏嚭閿欎簡", e);
 					errorMap.put(sheetRowData.getRowIndex(), ";绯荤粺閿欒锛屽瓨鍌ㄦ暟鎹殑鏃跺�欏嚭閿欎簡:"+e.getMessage());

--
Gitblit v1.9.3