产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验
已修改1个文件
24 ■■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -964,6 +964,7 @@
                                }
                            }*/
                            } catch (Exception e) {
                                log.error( "部门数据接收失败:",e);
                                mesg=e.getMessage();
                                e.printStackTrace();
                                throw new ServiceException(e.getMessage());
@@ -2474,17 +2475,21 @@
                        String buildSqlwhere="";
                        List<CodeSectionValueVO> codeSectionValueVOList=new ArrayList<>();
                        if(coderefersecSearchVO!=null) {
                            Map<String, Object> condtionMap = new HashMap<>();
                            String valueField= coderefersecSearchVO.getValueField();
                            if(StringUtils.isNotBlank(valueField)){
                                condtionMap.put(valueField,sectypeValue);
                            }
                            if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.DEFAULT.getValue()) || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.GRID.getValue())) {//默认样式/列表
                                Map<String, Object> condtionMap = new HashMap<>();
                                List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
                                if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
                                    codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
                                        condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
                                    });
                                }
                                if(!CollectionUtils.isEmpty(condtionMap)) {
                                    buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
                                }
                                //使用传入的业务类型查询表
                                R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
                                if (!listR.isSuccess() || listR.getData().size() == 0) {
@@ -2499,7 +2504,7 @@
                                    sb.append(buildSqlwhere);
                                }
                                List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
                                String valueField = coderefersecSearchVO.getValueField();
                                //String valueField = coderefersecSearchVO.getValueField();
                                String textField = coderefersecSearchVO.getTextField();
                                final int[] num = {0};
                                if (!CollectionUtils.isEmpty(ListMap)) {
@@ -2514,8 +2519,6 @@
                                    });
                                }
                            }else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//树形
                                Map<String, Object> condtionMap = new HashMap<>();
                                //使用传入的业务类型查询表
                                R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
                                if (!listR.isSuccess() || listR.getData().size() == 0) {
@@ -2532,9 +2535,10 @@
                                    codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
                                        condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
                                    });
                                }
                                if(!CollectionUtils.isEmpty(condtionMap)) {
                                    buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
                                }
                                //if("all".equals(coderefersecSearchVO.getLoadType())) {
                                String parentOidSql = "";
                                if(StringUtils.isNotBlank(parentValue)){
@@ -2581,7 +2585,6 @@
                                    sb.append(buildSqlwhere);
                                }
                                List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
                                String valueField = coderefersecSearchVO.getValueField();
                                String textField = coderefersecSearchVO.getTextField();
                                final int[] num = {0};
                                if (!CollectionUtils.isEmpty(ListMap)) {
@@ -2601,11 +2604,11 @@
                        if(!CollectionUtils.isEmpty(codeSectionValueVOList)){
                            Map<String, CodeSectionValueVO> codeSectionValueVOMap = codeSectionValueVOList.stream().collect(Collectors.toMap(s -> s.getValue(), t -> t, (o1, o2) -> o2));
                            if(!codeSectionValueVOMap.containsKey(sectypeValue)){
                                message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值,在编码系统不存在";
                                message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值【"+sectypeValue+"】,在编码系统不存在";
                                errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
                            }
                        }else{
                            message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值,在编码系统不存在";
                            message="传入的编码规则码段:【"+name+"】为"+CODE_REFER_SEC.getText()+",其对应的值【"+sectypeValue+"】,在编码系统不存在";
                            errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
                        }
                    }
@@ -2728,6 +2731,7 @@
                            String dataValue = sourceKeyValueMap.get(sourceKey);
                            if (attrMapConfigMap.containsKey(sourceKey)) {
                                String targetKey = attrMapConfigMap.get(sourceKey);
                                log.info("xxxxx属性映射值:sourceKey【"+sourceKey+"】——》+targetKey"+targetKey+":"+dataValue);
                                keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
                            }
                        });