From d5a7544f32e8bd3138d0c41f10d06fd6661d81e8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 九月 2023 09:02:47 +0800
Subject: [PATCH] 集成任务 集成数据-双击赋值隐藏内容
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 135 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 111 insertions(+), 24 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 35949f6..b0163b3 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
@@ -20,6 +21,7 @@
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.UITablePageVO;
import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.code.wrapper.BaseMdodelWrapper;
import com.vci.ubcs.flow.core.dto.FlowStatusDTO;
import com.vci.ubcs.flow.core.feign.IMDMIFlowAttrClient;
import com.vci.ubcs.flow.core.vo.ProcessStageAttrVO;
@@ -435,18 +437,11 @@
//澶囨敞
cbo.setDescription(orderDTO.getDescription());
cboList.add(cbo);
-//
-// cboList.add(cbo);
+
List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);
-
-// List<String> charList = new ArrayList<>();
-// for (BaseModel baseModel : cboList) {
-// charList.add(baseModel.getId());
-// }
batchSaveSelectChar(templateVO, cboList);
return codeList.size() > 0 ? codeList.get(0) : "";
-// return null;
}
/**
@@ -560,7 +555,9 @@
} else {
//璇存槑鏄嚜琛岄厤缃殑
//鍓嶇蹇呴』瑕佷紶閫掑皬鍐欑殑灞炴��
- value = orderDTO.getData().getOrDefault(attrId, "");
+ String orDefault = orderDTO.getData().getOrDefault(attrId, "");
+ value = Func.isBlank(orDefault) ? orderDTO.getData()
+ .getOrDefault(attrId.toUpperCase(Locale.ROOT), ""):orDefault;
}
return value;
}
@@ -949,7 +946,7 @@
return (BaseModel) valueWrapper.get();
} catch (Exception e) {
logger.error("鍒涘缓涓氬姟绫诲瀷瀵硅薄", e);
- throw new VciBaseException("initBtmError", new String[]{btmName});
+ throw new ServiceException("initBtmError:"+"涓氬姟绫诲瀷锛�"+btmName+":"+e.getMessage());
}
}
@@ -1327,6 +1324,7 @@
}
fieldVO.setOptionJsMap(eventJsMap);
fieldVO.setStyle(attrVO.getTableDisplayStyle());
+ fieldVO.setTableDisplayFlag(attrVO.getTableDisplayFlag());
//鍒楄〃閲屼笉鍏佽鐩存帴缂栬緫
fieldVO.setDateFormate(attrVO.getCodeDateFormat());
return fieldVO;
@@ -2470,7 +2468,7 @@
// conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
List<BtmTypeVO> classifyData = btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)).getData();
if(Func.isEmpty(classifyData)){
- throw new ServiceException("涓氬姟绫诲瀷閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀硅嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
+ throw new ServiceException("涓氬姟绫诲瀷涓嫳鏂囧悕绉板拰鏌ヨ鏉′欢閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀逛笟鍔＄被鍨嬩腑鍒嗙被琛ㄨ嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
}
conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
classifyData.get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
@@ -2736,12 +2734,102 @@
String codeRuleOid = classifyVO.getCodeRuleOid();
if (StringUtils.isBlank(codeRuleOid)) {
//寰�涓婃壘
- CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
- return getCodeRuleByClassifyFullInfo(fullInfo);
+ CodeRuleVO classifyFullInfoCodeRule = getCodeRuleByClassifyFullInfo(classifyService.getClassifyFullInfo(codeClassifyOid));
+ return toCodeValueApplyStatus(classifyFullInfoCodeRule);
}
//鏌ヨ缂栫爜瑙勫垯
- return ruleService.getObjectHasSecByOid(codeRuleOid);
+ CodeRuleVO objectHasSecByOid = ruleService.getObjectHasSecByOid(codeRuleOid);
+ return toCodeValueApplyStatus(objectHasSecByOid);
}
+
+ /**
+ * 缂栫爜鐢宠琛ㄥ崟锛岄殣钘忋�佸彲杈撱�佸彧璇昏浆鎹�
+ * @param codeRuleVO
+ * @return
+ */
+ private CodeRuleVO toCodeValueApplyStatus(CodeRuleVO codeRuleVO){
+ if(codeRuleVO.getSecVOList().isEmpty()){
+ return codeRuleVO;
+ }
+ // 鍙緭鐮佹绫诲瀷
+ List<String> inputTypes = Arrays.asList(
+ CodeSecTypeEnum.CODE_FIXED_SEC.getValue(),
+ CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(),
+ CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(),
+ CodeSecTypeEnum.CODE_REFER_SEC.getValue()
+ );
+ // 鍙鐮佹绫诲瀷
+ List<String> readOnlyTypes = Arrays.asList(
+ CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(),
+ CodeSecTypeEnum.CODE_ATTR_SEC.getValue(),
+ CodeSecTypeEnum.CODE_DATE_SEC.getValue()
+ );
+ // 闅愯棌鐮佹绫诲瀷
+ /*List<String> hideType = Arrays.asList(
+ CodeSecTypeEnum.CODE_SERIAL_SEC.getValue()
+ );*/
+ // 褰撳墠瑙勫垯鐨勬墍鏈夌被鍨嬬爜娈�
+ List<String> secTypeList = codeRuleVO.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.toList());
+ // 鎯呭喌涓� 鍏ㄩ儴鏄彧璇荤殑鐮佹绫诲瀷
+ boolean hasAllReadOnlyType =secTypeList.stream().allMatch(item -> readOnlyTypes.stream().anyMatch(item1-> item.equals(item1)));
+ // 鍏ㄩ儴鏄彧璇荤殑鐮佹绫诲瀷
+ if(hasAllReadOnlyType){
+ List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
+ secVO.setCodeValueApplyStatus(3);
+ // 鏃ユ湡鐮佹璁剧疆榛樿鍊�
+ if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
+ try {
+ secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
+ }catch (Exception e){
+ throw new ServiceException("鏃ユ湡鐮佹鏃ユ湡鏍煎紡閰嶇疆鏈夎锛屽鑷磋浆鎹㈠嚭閿欙細"+e.getMessage());
+ }
+ }
+ return secVO;
+ }).collect(Collectors.toList());
+ codeRuleVO.setSecVOList(basicSecVOS);
+ return codeRuleVO;
+ }
+ // 鎯呭喌浜� 鍏ㄩ儴閮芥槸鍙緭鍏ョ被鍨嬬殑
+ boolean hasAllInputType = secTypeList.stream().allMatch(item -> inputTypes.stream().anyMatch(item1-> item.equals(item1)));
+ if(hasAllInputType){
+ List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
+ secVO.setCodeValueApplyStatus(1);
+ // 鏃ユ湡鐮佹璁剧疆榛樿鍊�
+ if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
+ try {
+ secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
+ }catch (Exception e){
+ throw new ServiceException("鏃ユ湡鐮佹鏃ユ湡鏍煎紡閰嶇疆鏈夎锛屽鑷磋浆鎹㈠嚭閿欙細"+e.getMessage());
+ }
+ }
+ return secVO;
+ }).collect(Collectors.toList());
+ codeRuleVO.setSecVOList(basicSecVOS);
+ return codeRuleVO;
+ }
+ // 鎯呭喌涓夊寘鍚汉涓洪�夋嫨鐨勭爜娈碉紝鍙堟湁鍙绫诲瀷鐮佹鐨勶紝鎵�鏈夌爜娈甸兘瑕佹樉绀哄嚭鏉ワ紝鍙緭璁剧疆涓�1锛屽彧璇昏缃负2锛岄殣钘忚缃负3
+ List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
+ if(inputTypes.contains(secVO.getSecType())){
+ secVO.setCodeValueApplyStatus(1);
+ }else if(readOnlyTypes.contains(secVO.getSecType())){
+ secVO.setCodeValueApplyStatus(2);
+ }else{
+ secVO.setCodeValueApplyStatus(3);
+ }
+ // 鏃ユ湡鐮佹璁剧疆榛樿鍊�
+ if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
+ try {
+ secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
+ }catch (Exception e){
+ throw new ServiceException("鏃ユ湡鐮佹鏃ユ湡鏍煎紡閰嶇疆鏈夎锛屽鑷磋浆鎹㈠嚭閿欙細"+e.getMessage());
+ }
+ }
+ return secVO;
+ }).collect(Collectors.toList());
+ codeRuleVO.setSecVOList(basicSecVOS);
+ codeRuleVO.setIsShowHideStatus(hasAllReadOnlyType ? "readOnly":(hasAllInputType ? "input":"readAndInput"));
+ return codeRuleVO;
+ }
/**
* 浣跨敤鍒嗙被鐨勫叏閮ㄤ俊鎭幏鍙栫紪鐮佽鍒�
@@ -3467,7 +3555,6 @@
return baseModels;
}
-
/**
* 鏍规嵁涓氬姟绫诲瀷鍚嶇О鍒涘缓涓氬姟鏁版嵁婧愬璞�
*
@@ -3584,7 +3671,7 @@
* @return 鍒楄〃鏁版嵁
*/
@Override
- public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
+ public IPage<BaseModelVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
//checkReferConfig(referConfigVO);
//浣跨敤涓氬姟绫诲瀷鏌ヨ
R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
@@ -3665,27 +3752,28 @@
ZonedDateTime zdt = localDateTime.atZone(zoneId);
Date date = Date.from(zdt.toInstant());
setter.invoke(obj, date);
- map.remove(property.getName().toUpperCase());
+ //map.remove(property.getName().toUpperCase());
} //oracle鐨勬暟瀛椾负BigDecimal鐨勶紝闇�瑕佽繘琛岃浆鎹㈡垚Integer锛屽惁鍒欏皢鎶ラ敊
else if (map.get(property.getName().toUpperCase()) instanceof BigDecimal
&& ("Integer").equals(setter.getParameterTypes()[0].getSimpleName())) {
setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
- map.remove(property.getName().toUpperCase());
+ //map.remove(property.getName().toUpperCase());
} else if (map.get(property.getName().toUpperCase()) != null) {
if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
setter.invoke(obj, map.get(property.getName().toUpperCase()) == null ? null:String.valueOf(map.get(property.getName().toUpperCase())));
}else{
setter.invoke(obj, map.get(property.getName().toUpperCase()));
}
- map.remove(property.getName().toUpperCase());
+ //map.remove(property.getName().toUpperCase());
}
}
}
for (Object key : map.keySet()) {
map.put(key, String.valueOf(map.get(key)));
}
-
- ((BaseModel) obj).setData(map);
+ Map<String, String> newMap = new HashMap<>();
+ map.forEach((key, value) -> newMap.put(String.valueOf(key).toLowerCase(), String.valueOf(value)));
+ ((BaseModel) obj).setData(newMap);
baseModels.add((BaseModel) obj);
}
} catch (Exception e) {
@@ -3696,10 +3784,10 @@
+ "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1 "
+ lcstatusSql + namesql + codesql
);
- IPage<BaseModel> objectDataGrid = new Page<>();
+ IPage<BaseModelVO> objectDataGrid = new Page<>();
objectDataGrid.setPages(baseQueryObject.getPage());
objectDataGrid.setCurrent(baseQueryObject.getPage());
- objectDataGrid.setRecords(baseModels);
+ objectDataGrid.setRecords(BaseMdodelWrapper.build().listVO(baseModels));
objectDataGrid.setSize(baseQueryObject.getLimit());
objectDataGrid.setTotal(total);
return objectDataGrid;
@@ -3824,7 +3912,6 @@
treeWrapperOptions.setParentOid(queryObject.getParentOid());
return revisionModelUtil.doList2Trees(codeClassifies, treeWrapperOptions, null);
}
-
@Override
public boolean checkUnAttrUnEdit(String attrName) {
--
Gitblit v1.9.3