From fb4762049abdca953db1ed4528d128dd8d887710 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 18:53:45 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 82 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 32 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 3385b48..29ff41a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -102,7 +102,7 @@
* 妯℃澘鐨勬湇鍔�
*/
@Resource
- private CodeClstemplateServiceImpl templateService;
+ private ICodeClstemplateService templateService;
/**
* 鐢熸垚缂栫爜鐨勬湇鍔�
@@ -135,6 +135,11 @@
*/
@Resource
IEnumClient enumClient;
+ /**
+ * 鐗堟湰瑙勫垯鏈嶅姟
+ */
+ @Resource
+ private IRevisionRuleClient revisionRuleClient;
/**
* 鍏紡鐨勬湇鍔�
@@ -172,17 +177,12 @@
*/
@Autowired
private IBtmTypeClient btmTypeClient;
- /**
- * 鐗堟湰瑙勫垯鐨勬湇鍔�
- */
- @Resource
- private IRevisionRuleClient revisionRuleClient;
-//
+
/**
* 閫氱敤鏌ヨ
*/
@Resource
- CommonsMapper commonsMapper;
+ private CommonsMapper commonsMapper;
/**
* 缂栫爜瑙勫垯鐨勬湇鍔�
@@ -382,6 +382,7 @@
}
codeAllCodeService.updateBatchById(codeCbos);
}
+
/**
* 鐢宠鍗曚竴缂栫爜
*
@@ -390,7 +391,7 @@
*/
@Override
public String addSaveCode(CodeOrderDTO orderDTO) throws Exception {
- return addSaveCode(orderDTO,true);
+ return addSaveCode(orderDTO,true);
}
/***
@@ -403,6 +404,7 @@
public String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception {
return addSaveCode(orderDTO,authUser);
}
+
/**
* 鐢宠鍗曚竴缂栫爜
*
@@ -431,11 +433,11 @@
checkEnumOnOrder(templateVO, orderDTO);
//8.澶勭悊鏃堕棿鏍煎紡锛屽湪鏁版嵁搴撻噷闈笉璁烘槸瀛楃涓茶繕鏄棩鏈熸牸寮忥紝閮戒娇鐢ㄧ浉鍚岀殑鏍煎紡瀛樺偍
switchDateAttrOnOrder(templateVO, orderDTO);
- //9.鐢熸垚缂栫爜鐨勪俊鎭�
-// ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
- BaseModel cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
-// //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
-// //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
+ //9.鐢熸垚缂栫爜鐨勪俊鎭� 锛屽垵濮嬪寲涓氬姟绫诲瀷锛氱紦瀛樺厛鍙栨秷锛屽洜涓虹増鏈鍒欎細鍑虹幇鍙樺姩鐨勬儏鍐垫墍浠ユ棤娉曚娇鐢ㄧ紦瀛�
+ // BaseModel cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
+ BaseModel cbo = createBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId().trim().toLowerCase());
+ //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
+ //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
cbo.setOid(VciBaseUtil.getPk());
cbo.setRevisionOid(VciBaseUtil.getPk());
@@ -455,9 +457,9 @@
if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
}
-// //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
+ //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
-// //end -- modify by lihang @20220407
+ //end -- modify by lihang @20220407
List<BaseModel> cboList = new ArrayList<>();
//澶囨敞
@@ -513,7 +515,6 @@
});
}
}
-
/**
* 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊�
@@ -1018,22 +1019,22 @@
List<CodeClassifyTemplateAttrVO> selectAttrVOs = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getLibraryIdentification())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(selectAttrVOs)) {
-// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
+ //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
selectAttrVOs.parallelStream().forEach(attrVO -> {
List<String> valuesList = new ArrayList<>();
cboList.parallelStream().forEach(cbo -> {
-// String value = cbo.get.getAttributeValue(attrVO.getId());
+ //String value = cbo.get.getAttributeValue(attrVO.getId());
//灏哹ean杞负map,mybatis缁熶竴澶勭悊
Map<String, String> map = null;
-// baseModels.stream().forEach(model-> {
+ //baseModels.stream().forEach(model-> {
try {
map = VciBaseUtil.convertBean2Map(cbo,null);
} catch (Exception e) {
throw new VciBaseException("绫诲瀷杞崲閿欒锛�" + e.getMessage());
}
-// });
+ //});
String value = map.get(attrVO.getId());
if (StringUtils.isNotBlank(value)) {
@@ -1562,7 +1563,6 @@
conditionMap.put(queryKey, QueryOptionConstant.OR + queryValue);
}
}
-
/**
* 鏌ヨ缂栫爜鏁版嵁鐨勫垪琛�
@@ -2963,7 +2963,7 @@
wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
R<List<Map<String, String>>> result = R.data(Collections.singletonList(cbo));
//鎴戜滑瑕佺湅鏄惁涓嶆槸鍗囩増鐨勶紝鍗囩増鐨勮瘽锛岄渶瑕佸姣斾笉鐩哥瓑鐨勫睘鎬�
- String copy = cbo.get("copyfromversion");
+/* String copy = cbo.get("copyfromversion");
// if (StringUtils.isBlank(copy)) {
// copy = cbo.getAttributeValue("copyfromversion");
// }
@@ -2982,11 +2982,12 @@
Map<String, String> difFieldMap = new HashMap<>();
Map<String, String> finalOldData = oldData;
cbo.forEach((key, value) -> {
- String oldValue = finalOldData.getOrDefault(key, "");
- if (value == null) {
+ // 杩欏効oldmap涓殑鍏ㄦ槸澶у啓锛岃�宑bo涓殑鍏ㄦ槸灏忓啓鎵�浠ヤ細鎷夸笉鍒板彧锛岃繖鍎跨洿鎺ュ鐞嗘垚灏忓啓鎷夸笉鍒板氨鐢ㄥぇ鍐欐嬁
+ String oldValue = String.valueOf(finalOldData.getOrDefault(key.toUpperCase(Locale.ROOT), finalOldData.getOrDefault(key, "")));
+ if (value == null || value == "null") {
value = "";
}
- if (oldValue == null) {
+ if (oldValue == null || oldValue == "null") {
oldValue = "";
}
if (!value.equalsIgnoreCase(oldValue)) {
@@ -2997,7 +2998,7 @@
difFieldList.add(difFieldMap);
result.setData(difFieldList);
}
- }
+ }*/
return result;
}
@@ -3355,7 +3356,6 @@
return getTableDefineByTemplateVO(templateService.getObjectHasAttrByOid(templateOid));
}
-
/**
* 浣跨敤妯℃澘鏄剧ず瀵硅薄杞崲涓鸿〃鏍肩殑淇℃伅锛堝寘鍚墿灞曠殑鎸夐挳锛�
*
@@ -3452,6 +3452,7 @@
}
return uiInfoVO;
}
+
@Override
public MdmUIInfoVO getFlowUIInfoByClassifyOid(String codeClassifyOid, String functionId,String templateId,String taskId,String modelKey){
// MdmUIInfoVO uiInfoVO = getTableDefineByClassifyOid_v2(codeClassifyOid,templateId,taskId,modelKey);
@@ -3548,6 +3549,7 @@
});
return commonsMapper.insertByBaseModel(listR.getData().get(0).getTableName(), maps.get(0), maps);
}
+
/**
* 浼犲叆涓氬姟绫诲瀷浠ュ強ID鏌ヨ涓氬姟琛ㄦ暟鎹槸鍚﹂噸澶�
*
@@ -4101,6 +4103,7 @@
toBo.setNameOid(fromBo.getNameOid());
toBo.setBtmname(fromBo.getBtmname());
toBo.setLastR(String.valueOf(1));
+ // 鍗囩増灏咶irstR淇敼涓�0
toBo.setFirstR(String.valueOf(0));
toBo.setFirstV(String.valueOf(1));
toBo.setLastV(String.valueOf(1));
@@ -4111,13 +4114,28 @@
toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
toBo.setLastModifyTime(new Date());
toBo.setRevisionRule(fromBo.getRevisionRule());
- toBo.setVersionRule(fromBo.getVersionRule());R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
+ toBo.setVersionRule(fromBo.getVersionRule());
+ //鏌ヨ涓氬姟绫诲瀷淇℃伅锛屽彲浠ヨ幏鍙栧埌鐗堟湰瑙勫垯淇℃伅锛坮evisionRuleId锛�
+ R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
if (!listR.isSuccess() || listR.getData().size() == 0) {
throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
}
- Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
- toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
- toBo.setRevisionValue(nextRevision.get("REVISIONVAL").toString());
+ //Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
+ /*
+ TODO:杩欐槸涓�涓緟鍚庢湡瀹屽杽鐨勫姛鑳斤紝鐩墠瀹炵幇鏂瑰紡鏄紝鍏堟煡璇㈠嚭褰撳墠鏁版嵁鐨勫ぇ鐗堟湰瑙勫垯锛�
+ 鐒跺悗鍐嶆煡璇笟鍔¤〃浣跨敤鐨勮鍒欑殑姝ラ暱鏄灏戠劧鍚庤绠楀嚭璇ュ崌鐗堜负澶氬皯
+ */
+ Map<String, Object> nextRevision = commonsMapper.getCurrentRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
+ R<RevisionRuleVO> revisionRuleVOR = revisionRuleClient.selectById(listR.getData().get(0).getRevisionRuleId());
+ String revisionval = nextRevision.get("REVISIONVAL").toString();
+ // 鏈煡璇㈠埌鐗堟湰瑙勫垯锛岄粯璁ょ洿鎺ョ粰澶х増鏈姞涓�
+ if(!revisionRuleVOR.isSuccess() || Func.isEmpty(revisionRuleVOR.getData())){
+ revisionval = String.valueOf((Integer.parseInt(revisionval)+1));
+ }else {
+ revisionval = String.valueOf(Integer.parseInt(revisionval)+revisionRuleVOR.getData().getSerialStep());
+ }
+ toBo.setRevisionValue(revisionval);
+ toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
toBo.setVersionSeq(Integer.valueOf(nextRevision.get("VERSIONSEQ").toString()));
toBo.setVersionValue(nextRevision.get("VERSIONVAL").toString());
toBo.setLctid(fromBo.getLctid());
--
Gitblit v1.9.3