From 1157e8e97e24ec7938deea2e3345a502644fc256 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 05 七月 2023 16:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 52 ++--------------------------------------------------
1 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 439fd53..4d6d88b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -132,8 +132,9 @@
@Override
public boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
+ // 灏咲TO杞崲涓篋O
CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
+ // 濉厖榛樿鍊�
DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
codeRule.setLctid(CODE_RULE_LC);
codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
@@ -492,60 +493,11 @@
vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
if (hasSec) {
List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid());
- // 鍒ゆ柇鏄惁涓哄紩鐢ㄧ爜娈碉紝濡傛灉鏄簲鐢ㄧ爜娈电殑璇濓紝涓轰簡閫傞厤鍓嶇缁勪欢锛岃繖閲岃瀵硅〃杩涜澶勭悊涓�涓嬶紝鎸夌収浠ュ墠鐨勫弬鐓ф牸寮忚繘琛岃浆鎹�
- codeBasicSecVOS.stream().peek(item->{
- //寮曠敤鐮佹
- if(item.getSecType().equals(CodeSecTypeEnum.CODE_REFER_SEC) && StringUtils.isNotEmpty(item.getReferConfig())){
- item.setReferConfig(referConfigTOUIUiTable(item));
- }
- });
//鏌ヨ鐮佹
vo.setSecVOList(codeBasicSecVOS);
}
}
return vo;
}
-
- /**
- * 灏唕eferconfig杞崲涓篔SON鏍煎紡鐨刄IFormReferVO
- * @param item
- * @return
- */
- private String referConfigTOUIUiTable(CodeBasicSecVO item){
- // JSON鏍煎紡鐨勫弬鐓ч厤缃浆鎹负瀵硅薄
- CodeReferConfig codeReferConfig = JSONObject.parseObject(item.getReferConfig(), CodeReferConfig.class);
- // 鎷疯礉涓轰互鍓嶇殑鑰佸璞�
- UIFormReferVO uiFormReferVO = new UIFormReferVO();
- BeanUtil.copy(codeReferConfig,uiFormReferVO);
-
- // 琛ㄦ牸鐨勮嚜瀹氫箟瀹氫箟
- UITableCustomDefineVO uiTableCustomDefineVO = new UITableCustomDefineVO();
- uiTableCustomDefineVO.setPage(new UITablePageVO(codeReferConfig.getLimit(),1));
- // 鍒楄〃鐨勫垪鐨勪俊鎭浆鎹�
- List<UITableFieldVO> uiTableFieldVOs = new ArrayList<>();
- // 蹇�熸煡璇㈠垪
- List<UITableFieldVO> queryColumns = new ArrayList<>();
- codeReferConfig.getCodeShowFieldConfigs().stream().forEach(showField ->{
- UITableFieldVO uiTableFieldVO = new UITableFieldVO();
- BeanUtil.copy(showField,uiTableFieldVO);
- uiTableFieldVOs.add(uiTableFieldVO);
- if(showField.getIsQuery().equals("true")){
- queryColumns.add(uiTableFieldVO);
- }
- });
- // 鏄剧ず鐨勫垪
- uiTableCustomDefineVO.setCols(uiTableFieldVOs);
- // 蹇�熸煡璇㈠垪
- uiTableCustomDefineVO.setQueryColumns(queryColumns);
- // 绛涢�夋潯浠�
- HashMap<String, String> whereMap = new HashMap<>();
- codeReferConfig.getCodeSrchCondConfigs().stream().forEach(srch->{
- whereMap.put(srch.getFilterValue()+"_"+srch.getFilterType(),srch.getFilterValue());
- });
- uiFormReferVO.setWhere(whereMap);
- return JSONObject.toJSONString(uiFormReferVO);
- }
-
-
}
--
Gitblit v1.9.3