From 2ee762713f93c6259bb7f1c2f357572d0923ea33 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 25 八月 2023 23:08:18 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 217 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 163 insertions(+), 54 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 7e0986d..b0e21bf 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
@@ -34,7 +34,6 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.LocalFileUtil;
-import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
@@ -53,6 +52,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -188,38 +188,40 @@
//鍙傜収鐨勮嚜琛岃緭鍏ュ悕绉�
//鍒嗙被娉ㄥ叆鐨勪笉鐢紝閮芥槸瀵煎叆鍚庤嚜鍔ㄥ鐞嗙殑
//缂栫爜锛岀姸鎬佺瓑瀛楁涓嶅鍏�
- List<CodeClassifyTemplateAttrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
- !DEFAULT_ATTR_LIST.contains(s.getId())
- && StringUtils.isBlank(s.getComponentRule())
- && StringUtils.isBlank(s.getClassifyInvokeAttr())
- && (VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
- ).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(templateAttrVOS)){
- throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
- }
- templateAttrVOS.stream().forEach(codetemplateAttr ->{
- String field=codetemplateAttr.getId();
- String name=codetemplateAttr.getName();
- CodeClassifyTemplateAttrVO codeBaseAttributeDTO=new CodeClassifyTemplateAttrVO();
- boolean res=(StringUtils.isNotBlank(codetemplateAttr.getAttributeGroup())&& codetemplateAttr.getAttributeGroup().equals(BATCHADD_EXCEPORT_ATTR_TYPE))//鍩烘湰灞炴�у瓧娈垫樉绀�
- ||(StringUtils.isNotBlank(codetemplateAttr.getKeyAttrFlag())&&Boolean.parseBoolean(codetemplateAttr.getKeyAttrFlag()))//鍏抽敭灞炴�х殑瀛樺叆
- ||(StringUtils.isNotBlank(codetemplateAttr.getSameRepeatAttrFlag())&&Boolean.parseBoolean(codetemplateAttr.getSameRepeatAttrFlag())) //鐩镐技灞炴�х殑瀛樺叆
- ||(StringUtils.isNotBlank(codetemplateAttr.getRequireFlag())&&Boolean.parseBoolean(codetemplateAttr.getRequireFlag()));
- if(allFieldToOutNameMap.containsKey(name)){//濡傛灉瀛樺湪鐨勮瘽鍒欓渶瑕佹牴鎹叿浣撶殑鍘昏祴鍊�
- codeBaseAttributeDTO= allFieldToOutNameMap.get(name);
- if(StringUtils.isNotBlank(codetemplateAttr.getKeyAttrFlag())&&Boolean.parseBoolean(codetemplateAttr.getKeyAttrFlag())){
- codeBaseAttributeDTO.setKeyAttrFlag(codetemplateAttr.getKeyAttrFlag());//灞炴�у叧閿睘鎬�
- }
- if(StringUtils.isNotBlank(codetemplateAttr.getRequireFlag())&&Boolean.parseBoolean(codetemplateAttr.getRequireFlag())){
- codeBaseAttributeDTO.setRequireFlag(codetemplateAttr.getRequireFlag());//灞炴�у繀濉」
- }
- if(StringUtils.isNotBlank(codetemplateAttr.getSameRepeatAttrFlag())&&Boolean.parseBoolean(codetemplateAttr.getSameRepeatAttrFlag())){
- codeBaseAttributeDTO.setSameRepeatAttrFlag(codetemplateAttr.getSameRepeatAttrFlag());//灞炴�х浉浼煎睘鎬�
- }
- }else if(res){
- allFieldToOutNameMap.put(name,codetemplateAttr);
+ if(!CollectionUtils.isEmpty(templateVO.getAttributes())) {
+ List<CodeClassifyTemplateAttrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
+ !DEFAULT_ATTR_LIST.contains(s.getId())
+ && StringUtils.isBlank(s.getComponentRule())
+ && StringUtils.isBlank(s.getClassifyInvokeAttr())
+ && (VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
+ ).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(templateAttrVOS)){
+ throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
}
- });
+ templateAttrVOS.stream().forEach(codetemplateAttr -> {
+ String field = codetemplateAttr.getId();
+ String name = codetemplateAttr.getName();
+ CodeClassifyTemplateAttrVO codeBaseAttributeDTO = new CodeClassifyTemplateAttrVO();
+ boolean res = (StringUtils.isNotBlank(codetemplateAttr.getAttributeGroup()) && codetemplateAttr.getAttributeGroup().equals(BATCHADD_EXCEPORT_ATTR_TYPE))//鍩烘湰灞炴�у瓧娈垫樉绀�
+ || (StringUtils.isNotBlank(codetemplateAttr.getKeyAttrFlag()) && Boolean.parseBoolean(codetemplateAttr.getKeyAttrFlag()))//鍏抽敭灞炴�х殑瀛樺叆
+ || (StringUtils.isNotBlank(codetemplateAttr.getSameRepeatAttrFlag()) && Boolean.parseBoolean(codetemplateAttr.getSameRepeatAttrFlag())) //鐩镐技灞炴�х殑瀛樺叆
+ || (StringUtils.isNotBlank(codetemplateAttr.getRequireFlag()) && Boolean.parseBoolean(codetemplateAttr.getRequireFlag()));
+ if (allFieldToOutNameMap.containsKey(name)) {//濡傛灉瀛樺湪鐨勮瘽鍒欓渶瑕佹牴鎹叿浣撶殑鍘昏祴鍊�
+ codeBaseAttributeDTO = allFieldToOutNameMap.get(name);
+ if (StringUtils.isNotBlank(codetemplateAttr.getKeyAttrFlag()) && Boolean.parseBoolean(codetemplateAttr.getKeyAttrFlag())) {
+ codeBaseAttributeDTO.setKeyAttrFlag(codetemplateAttr.getKeyAttrFlag());//灞炴�у叧閿睘鎬�
+ }
+ if (StringUtils.isNotBlank(codetemplateAttr.getRequireFlag()) && Boolean.parseBoolean(codetemplateAttr.getRequireFlag())) {
+ codeBaseAttributeDTO.setRequireFlag(codetemplateAttr.getRequireFlag());//灞炴�у繀濉」
+ }
+ if (StringUtils.isNotBlank(codetemplateAttr.getSameRepeatAttrFlag()) && Boolean.parseBoolean(codetemplateAttr.getSameRepeatAttrFlag())) {
+ codeBaseAttributeDTO.setSameRepeatAttrFlag(codetemplateAttr.getSameRepeatAttrFlag());//灞炴�х浉浼煎睘鎬�
+ }
+ } else if (res) {
+ allFieldToOutNameMap.put(name, codetemplateAttr);
+ }
+ });
+ }
});
//鏁寸悊濂芥墍鏈夋ā鏉块渶瑕佸啓鍏xecl鐨勫睘鎬т俊鎭�
Workbook workbook = new HSSFWorkbook();
@@ -1474,7 +1476,7 @@
CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(exportAttrDTO.getCodeClassifyOid());
//鍏堟煡璇㈡暟鎹�
String btmTypeId = classifyFullInfo.getTopClassifyVO().getBtmTypeId();
- Map<String, Object> conditionMap = exportAttrDTO.getConditionMap();
+ Map<String, String> conditionMap = exportAttrDTO.getConditionMap();
if(conditionMap == null){
conditionMap = new HashMap<>();
}
@@ -1490,7 +1492,20 @@
conditionMap.put("codeclsfpath","*" + exportAttrDTO.getCodeClassifyOid() + "*");
conditionMap.put("lastr", "1");
conditionMap.put("lastv", "1");
- UBCSSqlKeyword.buildSqlwhere(conditionMap);
+
+ R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Arrays.asList(btmTypeId));
+ String tableName = "";
+ if(listR.isSuccess() && !listR.getData().isEmpty()){
+ tableName = Func.isNotBlank(listR.getData().get(0).getTableName()) ? listR.getData().get(0).getTableName():VciBaseUtil.getTableName(btmTypeId);
+ }else{
+ tableName = VciBaseUtil.getTableName(btmTypeId);
+ }
+
+ String countSql = "select count(*) from " + tableName +" where 1=1" +
+ " and lastr = '1'" +
+ " and lastv='1'" +
+ " and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%'";
+
//鍏堟煡璇㈡�绘暟
int total = 0;
if(exportAttrDTO.getEndPage()!=null && exportAttrDTO.getEndPage()>0
@@ -1504,11 +1519,11 @@
thisPage.setOrder(exportAttrDTO.getOrder());
thisPage.addDefaultDesc("createTime");
- total += boService.queryCount(btmTypeId, conditionMap);
+ total += commonsMapper.queryCountBySql(countSql);
}
}else{
- total=boService.queryCount(btmTypeId, conditionMap);
+ total = commonsMapper.queryCountBySql(countSql);
}
List<String> selectFieldList = new ArrayList<>();
if(!CollectionUtils.isEmpty(exportAttrDTO.getAttrIdIndexMap())){
@@ -1581,9 +1596,6 @@
LocalFileUtil.deleteTempFile(file,true);
return zipFileName;
}
-
- private
-
/**
* 鏌ヨ鏁版嵁骞跺鍑哄埌excel
@@ -1887,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());
@@ -1950,6 +1962,7 @@
CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
+ Map<String,List<String>>keyAttrOkOidTORepeatOidMap= keyResultVO.getKeyAttrOkOidTORepeatOidMap();
if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
selfRepeatRowIndexList.stream().forEach(rowIndex->{
/* //浼犲叆鏁版嵁涔嬮棿鍏抽敭灞炴�х殑鏍￠獙
@@ -2007,10 +2020,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);
@@ -2036,6 +2054,7 @@
String oid = cbo.getOid();
String sourceOid = oid;
String code = "";
+ String groupCode="";
String errorid = "201";
if(codeOidToSystemOidMap.containsKey(oid)){
sourceOid=codeOidToSystemOidMap.get(oid);
@@ -2046,22 +2065,35 @@
String lcstatus =newCbo.getLcStatus();
String newOid =newCbo.getOid();
Date ts =newCbo.getTs();
- code=newCbo.getId();
+ code = StringUtils.isBlank(newCbo.getId())?"":newCbo.getId();
+ groupCode=newCbo.getData().getOrDefault("GROUPCODE","");
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);
}
}
@@ -2105,16 +2137,30 @@
// if(!isProcess){
dataCBOList.stream().forEach(needSaveCbo->{
XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode(needSaveCbo.getId());
+ String code=StringUtils.isBlank(needSaveCbo.getId())?" ":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);
+ //澶勭悊浼犻�佺殑鏁版嵁涓叧閿睘鎬ч噸澶嶇殑锛岀洿鎺ユ嬁鍒板凡缁忕敵璇峰埌缂栫爜鐨勬暟鎹紪鐮佺洿鎺ュ皢璧嬬粰鍏抽敭灞炴�ч噸澶嶇殑鏁版嵁
+ LinkedList<XMLResultDataObjectDetailDO> repeatDataObjectDetailDOS=handleApplyDataKeyAttrRepeat(keyAttrOkOidTORepeatOidMap,codeOidToSystemOidMap,needSaveCbo,isCodeOrGroupCode);
+ resultDataObjectDetailDOs.addAll(repeatDataObjectDetailDOS);
});
/* }else{
needSaveCboList.stream().forEach(needSaveCbo->{
@@ -2151,6 +2197,51 @@
}
}
+ }
+
+ /***
+ *缁欏悓涓�鎵圭敵璇风紪鐮佸瓨鍦ㄥ叧閿睘鎬х殑鏁版嵁璧嬩笂涓�鑷寸紪鐮�
+ * @param keyAttrOkOidTORepeatOidMap 涓�鎵圭敵璇锋暟鎹叧閿睘鎬т竴鑷寸殑閲嶅鏁版嵁鏄犲皠鍏崇郴
+ * @param codeOidToSystemOidMap
+ * @param needSaveCbo
+ * @param isCodeOrGroupCode
+ */
+ private LinkedList<XMLResultDataObjectDetailDO> handleApplyDataKeyAttrRepeat(Map<String,List<String>>keyAttrOkOidTORepeatOidMap,Map<String,String> codeOidToSystemOidMap,BaseModel needSaveCbo,boolean isCodeOrGroupCode){
+ LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>();
+ String oid=needSaveCbo.getOid();
+ if(keyAttrOkOidTORepeatOidMap.containsKey(oid)){
+ List<String> repeatOidList= keyAttrOkOidTORepeatOidMap.get(oid);
+ if(!CollectionUtils.isEmpty(repeatOidList)){
+ String sourceNewOid=needSaveCbo.getOid();
+ String sourceOid=sourceNewOid;
+ if(codeOidToSystemOidMap.containsKey(oid)){
+ sourceOid=codeOidToSystemOidMap.get(oid);
+ }
+ String code=StringUtils.isBlank(needSaveCbo.getId())?" ":needSaveCbo.getId();
+ String groupCode=needSaveCbo.getData().getOrDefault("GROUPCODE"," ");
+ String finalSourceOid = sourceOid;
+ repeatOidList.stream().forEach(repeatOid->{
+ if(codeOidToSystemOidMap.containsKey(repeatOid)){
+ XMLResultDataObjectDetailDO repeatresultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
+ String repeatSourceOid=codeOidToSystemOidMap.get(repeatOid);
+ String repeatMsg="姝ゆ暟鎹笌鐢宠鐨勭紪鐮佹暟鎹甶d涓恒��"+ finalSourceOid +"銆戠殑鍏抽敭灞炴�т竴鑷达紝鍒欏彇鐩稿悓缂栫爜";
+ if(isCodeOrGroupCode) {
+ if(StringUtils.isBlank(groupCode)){
+ repeatMsg="鐢宠鐨勭紪鐮佺被鍨嬩负闆嗗洟鐮侊紝绛夊緟闆嗗洟缂栫爜璧嬪��";
+ }
+ repeatresultDataObjectDetailDO.setCode(groupCode);
+ }else{
+ repeatresultDataObjectDetailDO.setCode(code);
+ }
+ repeatresultDataObjectDetailDO.setId(repeatSourceOid);
+ repeatresultDataObjectDetailDO.setErrorid("0");
+ repeatresultDataObjectDetailDO.setMsg(repeatMsg);
+ resultDataObjectDetailDOs.add(repeatresultDataObjectDetailDO);
+ }
+ });
+ }
+ }
+ return resultDataObjectDetailDOs;
}
/***
* 闆嗘垚鎵归噺鍚屾鏇存柊鎺ュ彛
@@ -2190,7 +2281,7 @@
String tableName ="";
try {
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
- if(r.getCode()!=200) {
+ if(!r.isSuccess()) {
throw new Throwable(r.getMsg());
}
BtmTypeVO btmTypeVO = r.getData();
@@ -2394,6 +2485,7 @@
}
}
}
+
/**
* 鏍￠獙灞炴�ф槸鍚︿负蹇呰緭
*
@@ -2701,7 +2793,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();
@@ -3298,7 +3390,7 @@
String tableName ="";
try {
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
- if(r.getCode()!=200) {
+ if(!r.isSuccess()) {
throw new Throwable(r.getMsg());
}
BtmTypeVO btmTypeVO = r.getData();
@@ -3632,7 +3724,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());
@@ -3791,9 +3884,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());
@@ -3802,8 +3896,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);
@@ -3829,12 +3925,25 @@
String keyString = sb.toString();
if(rowIndexKeyStringMap.containsValue(keyString) && StringUtils.isNotBlank(keyString)){
selfRepeatRowIndexList.add(rowIndex);
+ String okOid=okOidKeyStringMap.getOrDefault(keyString,"");
+ if(StringUtils.isNotBlank(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鐨勬爣棰樹笂鑾峰彇瀛楁鎵�鍦ㄧ殑浣嶇疆
--
Gitblit v1.9.3