统一业务系统系统
上一版本: 76d804e3 | 补丁 | 提交 | 忽略空白
xiejun
2023-07-19 a4d7993d0b44faffe2e548250a9d2bc27c77e521 
集成获取分类接口（包含编码规则码段码值信息）
已修改1个文件
7 ■■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java


@@ -1015,7 +1015,6 @@


                                            }


                                        } else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//树形


                                            Map<String, Object> condtionMap = new HashMap<>();


                                            String parentFieldName=coderefersecSearchVO.getParentFieldName();




                                            //使用传入的业务类型查询表


                                            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));


@@ -1026,6 +1025,7 @@




                                            String oidFieldName = StringUtils.isNotBlank(coderefersecSearchVO.getParentUsedField())?coderefersecSearchVO.getParentUsedField():coderefersecSearchVO.getValueField();


                                            String parentValue =coderefersecSearchVO.getParentValue();


                                            String parentFieldName =StringUtils.isBlank(coderefersecSearchVO.getParentFieldName())?"":coderefersecSearchVO.getParentFieldName();


                                            List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();


                                            List<CodeShowFieldConfigVO> codeShowFieldConfigVOS=coderefersecSearchVO.getCodeShowFieldConfigVOS();


                                            if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {


@@ -1072,7 +1072,7 @@


                                            //查询全部的信息


                                            buildSqlwhere+= " and oid  in (select oid from " +referTable + " START WITH " + coderefersecSearchVO.getParentFieldName() + " "+


                                            parentOidSql +


                                            " CONNECT BY PRIOR " + oidFieldName + " = " + coderefersecSearchVO.getParentFieldName() + ")";


                                            " CONNECT BY PRIOR " + oidFieldName + " = " + parentFieldName + ")";




                                            /*}else{


                                                if(StringUtils.isNotBlank(coderefersecSearchVO.getParentFieldName()) && StringUtils.isNotBlank(parentValue)){


@@ -1098,7 +1098,8 @@


                                                    String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();


                                                    String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();


                                                    String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();


                                                    CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);


                                                    String pid = map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();


                                                    CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);


                                                    codeSectionValueVOList.add(sectionValueVO);


                                                });


                                            }