Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
@@ -359,6 +359,7 @@ CodeClassifyVO codeClassifyVO = codeClassifyService.getObjectByClsfNamePath(clsfNamePath); return R.data(codeClassifyVO); } /** * 流水依赖生成 */ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -461,7 +461,7 @@ return engineService.gridTableDataByClassifyOid(codeClassifyOid,templateOid,queryObject.getConditionMap(),queryObject.getPageHelper()); } /*** /** * 获取分类对象 * @param redisOid * @return @@ -472,7 +472,7 @@ return R.data(codeImportTemplateVOs); } /*** /** * 从redis缓存里获取到导入正确的数据 * @param codeClassifyOid * @param redisOid @@ -483,7 +483,7 @@ return mdmIOService.gridDatas(codeClassifyOid,redisOid); } /*** /** * 从redis缓存里获取到导入行相似项的数据 * @param dataOid * @param redisOid @@ -494,7 +494,7 @@ return mdmIOService.gridRowResemble(dataOid,redisOid); } /*** /** * 从redis缓存里获取到导入具有相似项的数据 * @param codeClassifyOid * @param redisOid @@ -505,7 +505,7 @@ return mdmIOService.gridDatas(codeClassifyOid,redisOid); } /*** /** * 导入数据 * @param codeImprotSaveDatVO//数据对象 * @return @@ -515,7 +515,7 @@ return mdmIOService.batchImportData(codeImprotSaveDatVO.getCodeImprotSaveDatVOList(),codeImprotSaveDatVO.getClassifyAttr(),codeImprotSaveDatVO.getImprot()); } /*** /** * 根据数据oid从缓存中移除数据 * @param redisOid redisid * @param codeClassifyOid 存储规则的oid @@ -670,7 +670,7 @@ * @param idPath 编号的路径 * @return UI相关的信息（仅包含表单) */ // @VciUnCheckRight // @VciUnCheckRight @GetMapping("/getFormDefineByClassifyIdPath") public MdmUIInfoVO getFormDefineByClassifyIdPath(String idPath){ return engineService.getFormDefineByClassifyIdPath(idPath); @@ -858,7 +858,7 @@ // return R.status(true); } /*** /** * 集团码导入 * @param codeClassifyOid * @param file Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
@@ -102,7 +102,7 @@ treeWrapperOptions.copyFromTreeQuery(treeQueryObject); return revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyValueVO s) ->{ //可以在这里处理树节点的显示 return s.getId() + " " + (Func.isNotEmpty(s.getName()) ? s.getName():"") + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s return (Func.isNotEmpty(s.getId()) ? s.getId():"") + " " + (Func.isNotEmpty(s.getName()) ? s.getName():"") + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s .getLcStatus()) ? (" 【停用】 ") : ""); }); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -822,6 +822,9 @@ case CODE_CLASSIFY_SEC: //分类码段的，也是从前端选择了码值即可，不论码值的长度是多少 CodeClassifyValue codeClassifyValueDO= codeClassifyValueMapper.selectById(secValue); if(Func.isBlank(codeClassifyValueDO.getId())){ codeClassifyValueDO.setId(""); } if(codeClassifyValueDO!=null) { secValue = joinPreffixAndSuffix(secVO, codeClassifyValueDO.getId()); } @@ -1326,6 +1329,9 @@ case CODE_CLASSIFY_SEC: //分类码段的，也是从前端选择了码值即可，不论码值的长度是多少 CodeClassifyValue codeClassifyValueDO= codeClassifyValueMapper.selectById(secValue); if(Func.isBlank(codeClassifyValueDO.getId())){ codeClassifyValueDO.setId(""); } if(codeClassifyValueDO!=null) { secValue = joinPreffixAndSuffix(secVO, codeClassifyValueDO.getId()); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -941,29 +941,29 @@ orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码 orderDTO.setData(rowData.getFiledValue()); String code = engineService.addSaveCodeNotauthUser(orderDTO,false); /*if(StringUtils.isNotBlank(code)) { //rowData.setCode(code); StringBuffer sqlsb = new StringBuffer(); sqlsb.append(" select * from "); sqlsb.append(tableName); sqlsb.append(" where 1=1 "); sqlsb.append(" and lastr=1 and lastv=1"); sqlsb.append(" and id in ("); sqlsb.append(VciBaseUtil.toInSql(code)); sqlsb.append(")"); List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString()); if (!CollectionUtils.isEmpty(newDataMapList)) { String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID"); List<String> oidList = new ArrayList<>(); oidList.add(oid); //如果有申请就去调用申请集团码 if (isPersonApplyGroupCode) { mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue()); success.set(true); mesg = "数据保存成功，等待申请集团码"; /*if(StringUtils.isNotBlank(code)) { //rowData.setCode(code); StringBuffer sqlsb = new StringBuffer(); sqlsb.append(" select * from "); sqlsb.append(tableName); sqlsb.append(" where 1=1 "); sqlsb.append(" and lastr=1 and lastv=1"); sqlsb.append(" and id in ("); sqlsb.append(VciBaseUtil.toInSql(code)); sqlsb.append(")"); List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString()); if (!CollectionUtils.isEmpty(newDataMapList)) { String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID"); List<String> oidList = new ArrayList<>(); oidList.add(oid); //如果有申请就去调用申请集团码 if (isPersonApplyGroupCode) { mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue()); success.set(true); mesg = "数据保存成功，等待申请集团码"; } } } }*/ }*/ } catch (Exception e) { log.error( "部门数据接收失败:",e); mesg=e.getMessage();
