From 32ebe84d704f32842fdc8b5b23038dccb67234ff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 三月 2024 18:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 75dd158..c22e677 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
@@ -48,10 +48,13 @@
private String code="";
private String msg="";
+
@Value("${docking.apply.partCode:101}")
public String partCoe;
+
@Value("${docking.apply.usedFlag:false}")
public boolean usedFlag;
+
@Value("${docking.apply.unitCode:4100}")
public String dockingApplyUnitCode;
@@ -60,6 +63,7 @@
@Autowired(required = false)
private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;
+
/***
* 闆嗗洟鍒嗙被鏈嶅姟
*/
@@ -72,13 +76,11 @@
@Autowired(required = false)
private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
-
/***
* 妯″瀷瑙嗗浘鍗曟湇鍔�
*/
@Autowired(required = false)
private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreViewModelService dockingPreViewModelService;
-
/***
* 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
@@ -91,7 +93,6 @@
@Autowired(required = false)
private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
-
/***
* 闆嗗洟灞炴�ф湇鍔�
*/
@@ -100,8 +101,9 @@
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
+
/***
- * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
+ * 涓绘暟鎹悜闆嗗洟鐢宠缂栫爜
* @param oids 闇�瑕佺敵璇风殑鏁版嵁涓婚敭鏁扮粍
* @param btmName 涓氬姟绫诲瀷
* @return 杩斿洖缁撴灉淇℃伅
@@ -137,8 +139,8 @@
Object object = JSONObject.toJSON(dockingGroupDataVO);
String resultStr = object.toString();
log.info("鐢宠闆嗗洟鐮佹暟鎹牸寮�:->"+resultStr);
- DockingResultVO resultDataObject =new DockingResultVO();
- resultDataObject= mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
+ DockingResultVO resultDataObject = new DockingResultVO();
+ resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
code = resultDataObject.getCode();
msg = resultDataObject.getMsg();
boolean res=false;
@@ -202,11 +204,11 @@
if (baseModelMap.containsKey(applyId)) {
baseModel = baseModelMap.get(applyId);
Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
- String classOid=dataValueMap.getOrDefault("CODECLSFID","");
+ /*String classOid=baseModel.getId();
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
customCoding=10+customCoding;
- }
+ }*/
BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
@@ -253,6 +255,7 @@
return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
}
}
+
/***
* 涓绘暟鎹儚闆嗗洟鏇存敼缂栫爜
* @param oids 闇�瑕佷慨鏀圭殑鏁版嵁涓婚敭鏁扮粍
@@ -343,10 +346,10 @@
if (baseModelMap.containsKey(applyId)) {
BaseModel baseModel = baseModelMap.get(applyId);
//BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
- String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+ /*String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
- }
+ }*/
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// baseModel.setId(customCoding);
baseModel.getData().put("GROUPCODE", customCoding);
@@ -526,8 +529,6 @@
return R.success(message);
}
-
-
/***
* 鏌ヨ鐢宠鍗曠姸鎬�
* @param dataOids
@@ -540,7 +541,7 @@
return R.fail("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙ｅ紑鍏冲凡鍏抽棴");
}
String message="鎵ц鎴愬姛锛�";
- log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr");
+ log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tart");
try {
VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭");
VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode");
@@ -555,7 +556,7 @@
DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
dockingModelQueryVO.setSysName(dockingApplySysName);
- DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+ DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO = mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
int code=dockingApplyFormQueryStatusVO.getCode();
String mesg=dockingApplyFormQueryStatusVO.getMsg();
@@ -573,7 +574,7 @@
applyFormObject.setMsg(jmsg);
}
}
- boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ boolean res = this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
}else{
throw new Throwable("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭�");
}
@@ -737,7 +738,6 @@
}
}
-
/***
* 鑾峰彇妯″瀷瑙嗗浘灞炴��
* @throws Throwable
@@ -864,7 +864,7 @@
* */
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 ="28201728"; //AuthUtil.getUser().getUserName();
+ String curUserName =AuthUtil.getUser().getUserName();
//鐢宠鐨勬暟鎹�
List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
for (BaseModel dataBusinessObject : codeWupins) {
@@ -1028,6 +1028,7 @@
* 鑾峰彇灞炴�ф灇涓炬槧灏勯厤缃�
*/
Map<String,Map<String, DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();
+
private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{
String jmetalistoid = jmetaatter.getOid();
@@ -1045,6 +1046,7 @@
attrRangeMap.put(jmetalistoid, rangeMap);
}
+
/****
* 鍊肩被鍨嬭浆鎹�
* @param jmetaatter
@@ -1130,4 +1132,5 @@
}
return msg;
}
+
}
--
Gitblit v1.9.3