From f21bdede8546a348e2b16ffc3bbe292df7eeba76 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 四月 2024 23:24:21 +0800
Subject: [PATCH] 集成相关代码修改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 166 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 116 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index c22e677..1cf91b0 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -6,14 +6,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.feign.IMdmEngineClient;
import com.vci.ubcs.code.applyjtcodeservice.entity.*;
-import com.vci.ubcs.code.applyjtcodeservice.service.IGroupMdmInterService;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.apply.InterParameterVO;
-import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.code.applyjtcodeservice.feign.MdmApplyGroupCodeProvider;
import com.vci.ubcs.code.applyjtcodeservice.mapper.DockingPreAttrMappingMapper;
@@ -50,7 +46,7 @@
private String msg="";
@Value("${docking.apply.partCode:101}")
- public String partCoe;
+ public String partCode;
@Value("${docking.apply.usedFlag:false}")
public boolean usedFlag;
@@ -61,6 +57,9 @@
@Value("${docking.apply.sysName:410-MDM}")
public String dockingApplySysName;
+ @Value("${docking.apply.personUserAccount:28201728}")
+ public String applyCodeUserAccount;
+
@Autowired(required = false)
private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;
@@ -68,36 +67,37 @@
* 闆嗗洟鍒嗙被鏈嶅姟
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreClassifyService dockingPreClassifyService;
+ private IDockingPreClassifyService dockingPreClassifyService;
/***
* 鐢宠鍗曟湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
+ private IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 妯″瀷瑙嗗浘鍗曟湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreViewModelService dockingPreViewModelService;
+ private IDockingPreViewModelService dockingPreViewModelService;
/***
* 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
*/
@Autowired(required = false)
private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+
/***
* 灞炴�у彇鍊艰寖鍥存湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
+ private IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 闆嗗洟灞炴�ф湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreMetaAttrService dockingPreMetaAttrService;
+ private IDockingPreMetaAttrService dockingPreMetaAttrService;
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
@@ -109,8 +109,8 @@
* @return 杩斿洖缁撴灉淇℃伅
* @throws Exception
*/
- @Transactional(rollbackFor = VciBaseException.class)
@Override
+ @Transactional(rollbackFor = Exception.class)
public R applyGroupCode(String oids, String btmName) throws VciBaseException {
if(usedFlag) {
try {
@@ -144,7 +144,8 @@
code = resultDataObject.getCode();
msg = resultDataObject.getMsg();
boolean res=false;
- if ("1".equals(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+ if ("1".equals(code)) {
+ //缁撴灉姝ｇ‘鐨勬儏鍐�
List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
res=true;
dataObjectVOList.stream().forEach(dataObject -> {
@@ -164,7 +165,7 @@
if (editDockingPreApplyFormMap.containsKey(applyId)) {
DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
dockingPreApplyForm.setCode(code2);
- //dockingPreApplyForm.setDescription(baseModel.getId());
+ dockingPreApplyForm.setDescription(baseModel.getId());
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
if(StringUtils.isBlank(dockingPreApplyForm.getGroupCode())) {
dockingPreApplyForm.setGroupCode(customCoding);
@@ -181,7 +182,11 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
+ baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
if (addDockingPreApplyFormMap.containsKey(applyId)) {
@@ -197,7 +202,14 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ // DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
}
//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
if (isEditDatas) {
@@ -205,13 +217,16 @@
baseModel = baseModelMap.get(applyId);
Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
/*String classOid=baseModel.getId();
- if(partCoe.equals(classOid)){
+ if(partCode.equals(classOid)){
baseModel.setId(10+customCoding);
customCoding=10+customCoding;
}*/
BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- // DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
+ baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
baseModel.getData().put("GROUPCODE",customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
}
@@ -224,14 +239,25 @@
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ Date date = new Date();
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ //DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -263,8 +289,8 @@
* @return 杩斿洖缁撴灉淇℃伅
* @throws Throwable
*/
- @Transactional(rollbackFor = VciBaseException.class)
@Override
+ @Transactional(rollbackFor = Exception.class)
public R receiveEditApply(String oids, String btmName) throws VciBaseException {
if(!usedFlag) {
log.info("鏇存柊鎺ュ彛鍔熻兘宸插叧闂紒->"+usedFlag);
@@ -322,7 +348,11 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ Date date = new Date();
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
if (addDockingPreApplyFormMap.containsKey(applyId)) {
@@ -339,7 +369,14 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
}
//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
if (isEditDatas) {
@@ -347,9 +384,13 @@
BaseModel baseModel = baseModelMap.get(applyId);
//BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
/*String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
- if(partCoe.equals(classOid)){
+ if(partCode.equals(classOid)){
baseModel.setId(10+customCoding);
}*/
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
+ baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// baseModel.setId(customCoding);
baseModel.getData().put("GROUPCODE", customCoding);
@@ -363,14 +404,25 @@
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ Date date = new Date();
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -558,6 +610,11 @@
dockingModelQueryVO.setSysName(dockingApplySysName);
DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO = mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+ if(Func.isEmpty(dockingApplyFormQueryStatusVO)){
+ log.error("鑾峰彇鐢宠鍗曚负绌猴紒");
+ return R.fail("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭紒");
+ }
+
int code=dockingApplyFormQueryStatusVO.getCode();
String mesg=dockingApplyFormQueryStatusVO.getMsg();
if(code==1){
@@ -591,7 +648,7 @@
e.printStackTrace();
//message=""+e;
log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e);
- throw new VciBaseException(e.getMessage());
+ throw new VciBaseException(e.getMessage());
}
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd");
return R.success(message);
@@ -861,10 +918,18 @@
/**
* 缁勭粐鏁版嵁
- * */
- private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
+ * @param optationtype
+ * @param codeWupins
+ * @param addDockingPreApplyFormMap
+ * @param editDockingPreApplyFormMap
+ * @param codeWupinMap
+ * @return
+ * @throws VciBaseException
+ */
+ private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
try {
- String curUserName =AuthUtil.getUser().getUserName();
+ // TODO锛氫富鏁版嵁鎺ㄩ�佽繃鏉ョ殑鏁版嵁鏄嬁涓嶅埌鍙互鐢宠闆嗗洟鐮佺殑鐢ㄦ埛淇℃伅鐨勶紝骞朵笖杩欎竴鍧楀効鐨勯�昏緫涔熻繕娌℃暡瀹氾紝鎵�浠ヨ繖鍎块噰鐢ㄩ厤缃殑鐢ㄦ埛鏉ョ敵璇烽泦鍥㈢爜
+ String curUserName = Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount();
//鐢宠鐨勬暟鎹�
List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
for (BaseModel dataBusinessObject : codeWupins) {
@@ -876,29 +941,29 @@
String oid = dataBusinessObject.getOid();
DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm();
- String dataOid = dataBusinessObject.getOid();
- Map<String, String> conditionsMap = new HashMap<String, String>();
- //List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
- // DockingPreApplyForm dockingPreApplyForm=new DockingPreApplyForm();
- String apllyCode = "";
+ // String dataOid = dataBusinessObject.getOid();
+ // Map<String, String> conditionsMap = new HashMap<String, String>();
+ // List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
+ // DockingPreApplyForm dockingPreApplyForm=new DockingPreApplyForm();
+ String applyCode = "";
/*if (!CollectionUtils.isEmpty(applyFormObjects)) {
dockingPreApplyForm = applyFormObjects.get(0);
- apllyCode = dockingPreApplyForm.getId();
- editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ applyCode = dockingPreApplyForm.getId();
+ editDockingPreApplyFormMap.put(applyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
} else {*/
- apllyCode = dockingApplyUnitCode + "-" + format;
- dockingPreApplyForm.setId(apllyCode);
+ applyCode = dockingApplyUnitCode + "-" + format;
+ dockingPreApplyForm.setId(applyCode);
dockingPreApplyForm.setName("");
dockingPreApplyForm.setOperationType(optationtype+"");
dockingPreApplyForm.setDescription(dataBusinessObject.getId());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
dockingPreApplyForm.setDataOid(oid);
dockingPreApplyForm.setDataBtmName(btmName);
- addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- // }
+ addDockingPreApplyFormMap.put(applyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ // }
- codeWupinMap.put(apllyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
- conditionsMap = new HashMap<String, String>();
- conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
+ codeWupinMap.put(applyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+ // conditionsMap = new HashMap<String, String>();
+ // conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
List<DockingPreAttrMapping> dockingPreAttrMappingList = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid));
if (CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
@@ -909,7 +974,7 @@
DockingPreClassify dockingPreClassify = dockingPreClassifyService.getById(jsourceclsfid);
DockingMainData mainData = new DockingMainData();
mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
- mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
+ mainData.setApplyId(applyCode);//鐢宠鍗曞彿
mainData.setClassName(dockingPreClassify.getNodeLinkName());//鍒嗙被鍚嶇О
mainData.setCreateBy(curUserName);//
if(optationtype==2) {
@@ -928,7 +993,7 @@
return postParameters;
} catch (Throwable e) {
// TODO Auto-generated catch block
- throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊"+e);
+ throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊锛屽師鍥狅細"+e.getMessage());
}
}
@@ -1035,14 +1100,15 @@
if(attrRangeMap.containsKey(jmetalistoid)) {
return;
}
- Map<String,String>conditionsMap=new HashMap<String, String>();
- conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
+ // Map<String,String>conditionsMap=new HashMap<String, String>();
+ // conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
List<DockingPreAttrRange> dockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, jmetalistoid));
if (CollectionUtils.isEmpty(dockingPreAttrRangeList)) {
return;
}
Map<String, DockingPreAttrRange> rangeMap = new HashMap<String, DockingPreAttrRange>();
- rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getNumTextValue(), t -> t, (o1, o2) -> o2));
+ // TODO: 杩欏効瀛樺唴閮ㄥ瓨鍌ㄥ�硷紝鏃犳硶鍦ㄥ悗缁繘琛岃浆鎹�
+ rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getTargetNumText(), t -> t, (o1, o2) -> o2));
attrRangeMap.put(jmetalistoid, rangeMap);
}
--
Gitblit v1.9.3