From 29ab7773efe351a879ce9b3c29ab3ca50f4e62cb Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 15 一月 2025 21:36:08 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 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 1f8f8d7..e6798b6 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 @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.protobuf.ServiceException; import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient; @@ -1247,19 +1248,21 @@ //鎴戜滑闇�瑕佸厛鏌ヨ涓�涓嬶紝鍐呭鏄惁宸茬粡瀛樺湪 if (!CollectionUtils.isEmpty(thisCbos)) { List<String> existIds = new ArrayList<>(); + // TODO: 2024/12/3 Ludc 杩欏効鏌ヨ鍋氫簡淇敼鏀规垚缁勬垚涓�鍙ql鏌ヨ锛岃�屼笉鏄垎鎵规鏌ヨ + LambdaQueryWrapper<CodeAllCode> wrapper = Wrappers.<CodeAllCode>query().lambda() + .eq(CodeAllCode::getCodeRuleOid, ruleOid); VciBaseUtil.switchCollectionForOracleIn(thisCbos).stream().forEach(cbos -> { - List<CodeAllCode> codeAllCodeList = codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCodeRuleOid, ruleOid) - .notIn(CodeAllCode::getId, cbos.stream().map(s -> s.getId()).collect(Collectors.toSet()).toArray(new String[0])) - .notIn(CodeAllCode::getLcStatus, CodeAllCodeLC.TASK_BACK.getValue() + "','" + CodeAllCodeLC.OBSOLETED.getValue()) - ); - existIds.addAll(Optional.ofNullable(codeAllCodeList).orElseGet(() -> new ArrayList<>()).stream().map(s -> { - String id = s.getId(); - if (StringUtils.isBlank(id)) { - id = s.getId(); - } - return id; - }).collect(Collectors.toList())); + wrapper.notIn(CodeAllCode::getId, cbos.stream().map(s -> s.getId()).collect(Collectors.toSet()).toArray(new String[0])); }); + wrapper.notIn(CodeAllCode::getLcStatus, CodeAllCodeLC.TASK_BACK.getValue() + "','" + CodeAllCodeLC.OBSOLETED.getValue()); + List<CodeAllCode> codeAllCodeList = codeAllCodeService.selectByWrapper(wrapper); + existIds.addAll(Optional.ofNullable(codeAllCodeList).orElseGet(() -> new ArrayList<>()).stream().map(s -> { + String id = s.getId(); + if (StringUtils.isBlank(id)) { + id = s.getId(); + } + return id; + }).collect(Collectors.toList())); List<String> existIdCbos = thisCbos.stream().filter(s -> { String id = s.getId(); if (StringUtils.isBlank(id)) { @@ -3374,7 +3377,7 @@ codeSystemObjectMap.keySet().forEach(code -> { ClientBusinessObject sysDataObject = codeSystemObjectMap.get(code); if (isCodeOrGroupCode) { - code = sysDataObject.getAttributeValue("GROUPCODE"); + // code = sysDataObject.getAttributeValue("GROUPCODE"); if (StringUtils.isBlank(code)) { code = sysDataObject.getId(); } @@ -4118,7 +4121,8 @@ StringBuffer sb = new StringBuffer(); sb.append(" select id from "); sb.append(finalTableName); - sb.append(" where 1=1 "); + //sb.append(" where 1 = 1"); + sb.append(" where lastr = 1 and lastv = 1"); //TODO:娑夊強鍒板凡鍗囩増鐨勬暟鎹篃搴旇鎺掗櫎鎺夛紝鍚﹀垯浼氭姤閲� sb.append(" and id in ("); sb.append(VciBaseUtil.toInSql(cbos.stream().map(s -> s.getId()).collect(Collectors.toSet()).toArray(new String[0]))); sb.append(")"); @@ -4951,7 +4955,7 @@ } } - /****** + /** * 鏍规嵁缂栫爜瑙勫垯缂撳瓨鏁版嵁 * @param uuid * @param codeImprotDataVOs @@ -4995,7 +4999,7 @@ }); } - /**** + /** * 鏁版嵁鐩镐技椤规暟鎹牎楠宺edis缂撳瓨 * @param codeClassifyOid * @param templateVO -- Gitblit v1.9.3