ubcs.git - Gitblit

			@@ -1899,7 +1899,7 @@
			* @return 有错误信息的excel
			*/
			@Override
			public void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs) {
			public void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode) {
			Map<String,String> errorMap=new HashMap<>();
			VciBaseUtil.alertNotNull(orderDTO,"编码申请相关的数据",orderDTO.getCodeClassifyOid(),"主题库分类主键");
			CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
			@@ -2019,10 +2019,15 @@
			sourceOid=codeOidToSystemOidMap.get(oid);
			}
			String code="";
			String groupCode="";
			String errorid="103";
			String mes=errorMap.get(rowIndex);
			XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
			resultDataObjectDetailDO.setCode(code);
			if(isCodeOrGroupCode){
			resultDataObjectDetailDO.setCode(groupCode);
			}else{
			resultDataObjectDetailDO.setCode(code);
			}
			resultDataObjectDetailDO.setId(sourceOid);
			resultDataObjectDetailDO.setErrorid(errorid);
			resultDataObjectDetailDO.setMsg(mes);
			@@ -2048,6 +2053,7 @@
			String oid = cbo.getOid();
			String sourceOid = oid;
			String code = "";
			String groupCode="";
			String errorid = "201";
			if(codeOidToSystemOidMap.containsKey(oid)){
			sourceOid=codeOidToSystemOidMap.get(oid);
			@@ -2058,22 +2064,35 @@
			String lcstatus =newCbo.getLcStatus();
			String newOid =newCbo.getOid();
			Date ts =newCbo.getTs();
			groupCode=newCbo.getData().get("GROUPCODE");
			code=newCbo.getId();
			String lastmodifier=newCbo.getLastModifier();
			if (!lcstatus.equals(CodeDefaultLC.RELEASED.getValue())) {
			if (lcstatus!=null&&!lcstatus.equals(CodeDefaultLC.RELEASED.getValue())) {
			newCbo.setOid(newOid);
			newCbo.setLastModifier(lastmodifier);
			newCbo.setId(code);
			/*if(isCodeOrGroupCode) {
			newCbo.setId(code);
			}else{
			newCbo.getData().put("groupcode",groupCode);
			}*/
			newCbo.setTs(ts);
			cbo.setLastModifier(cbo.getLastModifier());
			editBoList.add(newCbo);
			}
			String mes = errorKeyMap.get(rowIndex);
			XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
			resultDataObjectDetailDO.setCode(code);
			if(isCodeOrGroupCode) {
			if(StringUtils.isBlank(groupCode)){
			mes+="；申请的编码类型为集团码，等待集团编码赋值";
			}
			resultDataObjectDetailDO.setCode(groupCode);
			}else{
			resultDataObjectDetailDO.setCode(code);
			}
			resultDataObjectDetailDO.setId(sourceOid);
			resultDataObjectDetailDO.setErrorid(errorid);
			resultDataObjectDetailDO.setMsg(mes);

			resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
			}
			}
			@@ -2117,15 +2136,26 @@
			// if(!isProcess){
			dataCBOList.stream().forEach(needSaveCbo->{
			XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
			resultDataObjectDetailDO.setCode(needSaveCbo.getId());
			String code=needSaveCbo.getId();
			String groupCode=needSaveCbo.getData().getOrDefault("GROUPCODE","");
			//resultDataObjectDetailDO.setCode(needSaveCbo.getId());
			String msg="申请编码成功";
			String oid=needSaveCbo.getOid();
			String sourceOid=oid;
			if(codeOidToSystemOidMap.containsKey(oid)){
			sourceOid=codeOidToSystemOidMap.get(oid);
			}
			if(isCodeOrGroupCode) {
			if(StringUtils.isBlank(groupCode)){
			msg="申请的编码类型为集团码，等待集团编码赋值";
			}
			resultDataObjectDetailDO.setCode(groupCode);
			}else{
			resultDataObjectDetailDO.setCode(code);
			}
			resultDataObjectDetailDO.setId(sourceOid);
			resultDataObjectDetailDO.setErrorid("0");
			resultDataObjectDetailDO.setMsg("申请编码成功");
			resultDataObjectDetailDO.setMsg(msg);
			resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
			});
			/* }else{
			@@ -2164,6 +2194,7 @@
			}

			}

			/***
			* 集成批量同步更新接口
			* @param codeClassifyVO;
			@@ -2406,6 +2437,7 @@
			}
			}
			}

			/**
			* 校验属性是否为必输
			*
			@@ -2713,7 +2745,7 @@
			* @param errorMap
			* @return
			*/
			private void getCodeOrderDTOs(CodeClassifyVO codeClassifyVO,CodeClassifyTemplateVO templateVO,Map<String ,RowDatas>codeDataMap,Map<String, ClientBusinessObject> codeSystemObjectMap,List<CodeOrderDTO> codeOrderDTOList,Map<String,String> errorMap){
			private void getCodeOrderDTOs(CodeClassifyVO codeClassifyVO,CodeClassifyTemplateVO templateVO,Map<String ,RowDatas>codeDataMap,Map<String, ClientBusinessObject> codeSystemObjectMap,List<CodeOrderDTO> codeOrderDTOList,Map<String,String> errorMap){
			codeDataMap.keySet().forEach(code->{
			RowDatas rowDatas=codeDataMap.get(code);
			Map<String, String> data= rowDatas.getFiledValue();
			@@ -3644,7 +3676,8 @@
			CodeImportResultVO resultVO = new CodeImportResultVO();
			resultVO.setKeyAttrRuleInfo(String.format(keyRuleVO ==null?"":"查询规则：去除空格--{0},忽略大小写--{1},忽略全半角--{2},忽略全部空格--{3}",
			new String[]{trim?"是":"否",ignoreCase?"是":"否",ignoreWidth?"是":"否",trimAll?"是":"否"}));
			resultVO.setSelfRepeatRowIndexList(getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO));
			//resultVO.setSelfRepeatRowIndexList(getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO));
			getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO,resultVO);
			if(!CollectionUtils.isEmpty(resultVO.getSelfRepeatRowIndexList())){
			//我们移除本身重复的数据
			cboList = cboList.stream().filter(s->!resultVO.getSelfRepeatRowIndexList().contains(s.getAttributeValue(IMPORT_ROW_INDEX))).collect(Collectors.toList());
			@@ -3803,9 +3836,10 @@
			* @param keyRuleVO 关键属性控制规则
			* @return 重复的行号
			*/
			private Set<String> getSelfRepeatRowIndex(Map<String/属性的编号/, CodeClassifyTemplateAttrVO> ketAttrMap,
			List<ClientBusinessObject> dataList,CodeKeyAttrRepeatVO keyRuleVO){
			private void getSelfRepeatRowIndex(Map<String/属性的编号/, CodeClassifyTemplateAttrVO> ketAttrMap,
			List<ClientBusinessObject> dataList,CodeKeyAttrRepeatVO keyRuleVO,CodeImportResultVO resultVO){
			Set<String> selfRepeatRowIndexList = new CopyOnWriteArraySet<>();
			Map<String,List<String>> keyAttrOkOidTORepeatOidMap=new HashMap<>();
			boolean trimAll =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
			//全部去空的优先级大于去空
			boolean trim =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
			@@ -3814,8 +3848,10 @@
			//必须将属性按照顺序排序好
			List<CodeClassifyTemplateAttrVO> attrVOList = ketAttrMap.values().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
			Map<String/行号/,String/关键属性的组合内容/> rowIndexKeyStringMap = new HashMap<>();
			Map<String/关键属性的组合内容/,String/第一个关键属性的数据oid/> okOidKeyStringMap = new HashMap<>();
			dataList.parallelStream().forEach(cbo-> {
			String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
			String oid=cbo.getOid();
			StringBuilder sb = new StringBuilder();
			for (int i = 0; i < attrVOList.size(); i++) {
			CodeClassifyTemplateAttrVO attrVO = attrVOList.get(i);
			@@ -3841,12 +3877,25 @@
			String keyString = sb.toString();
			if(rowIndexKeyStringMap.containsValue(keyString) && StringUtils.isNotBlank(keyString)){
			selfRepeatRowIndexList.add(rowIndex);
			String okOid=okOidKeyStringMap.getOrDefault(keyString,"");
			if(StringUtils.isBlank(okOid)){
			List<String>newOidList=new ArrayList<>();
			newOidList.add(oid);
			if(keyAttrOkOidTORepeatOidMap.containsKey(okOid)){
			List<String> oldOidList= keyAttrOkOidTORepeatOidMap.get(okOid);
			newOidList.addAll(oldOidList);

			}
			keyAttrOkOidTORepeatOidMap.put(okOid,newOidList);
			}
			}else {
			okOidKeyStringMap.put(sb.toString(),oid);
			rowIndexKeyStringMap.put(rowIndex, sb.toString());
			}
			});
			//因为只是关键属性重复，所以我们不能重复的多条选一条来报错
			return selfRepeatRowIndexList;
			resultVO.setKeyAttrRepeatRowIndexList(selfRepeatRowIndexList);
			resultVO.setKeyAttrOkOidTORepeatOidMap(keyAttrOkOidTORepeatOidMap);
			}
			/**
			* excel的标题上获取字段所在的位置