From f86cdf1a67342fb7aa78384702f4509f7f8988b0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 28 六月 2023 13:19:32 +0800
Subject: [PATCH] 提交引用码段参照配置修改
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 65 +++++++-
Source/UBCS-WEB/src/views/code/code.vue | 24 ++-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIReferConfigFormVO.java | 138 +++++++++++++++++++
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 20 +-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIFormReferVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITableConfigVO.java | 39 +++++
Source/UBCS-WEB/vue.config.js | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 49 -------
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/TableColVO.java | 35 +++++
10 files changed, 295 insertions(+), 83 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index f5bbfaf..526a329 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -594,7 +594,7 @@
this.isDisabledTabs = false;
} else if(value == 'default' || value == 'grid'){
addFrom = {
- limit: '15',
+ limit: 15,
sortField: '',
sortType: 'asc',
};
@@ -670,11 +670,11 @@
tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
tipPlacement: 'right',
span: 7,
- // rules:[{
- // validator: validateNumber,
- // message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
- // trigger: "blur",
- // }]
+ rules:[{
+ validator: validateNumber,
+ message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
+ trigger: "blur",
+ }]
},{
label: '杩囨护(绾ц仈)灞炴��',
prop: 'useFormKey',
@@ -769,7 +769,7 @@
prop: 'limit',
span: 8,
tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
- //value: 15,
+ value: 15,
tipPlacement: 'right',
},{
label: '鎺掑簭瀛楁',
@@ -955,6 +955,8 @@
this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
}
return;
+ }else {
+ this.onloadAttrData()
}
if(func.notEmpty(val.referType)){
this.form.referTypeName = val.referTypeName;
@@ -1179,8 +1181,8 @@
/** 涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content){
// 瀹炵幇鍥炴樉
- this.form.referTypeName = content.name;
- this.form.referType = content.id;
+ this.form.referTypeName = content.name || content.id;
+ this.form.referType = content.id || '';
},
/** 鎺掑簭瀛楁銆佹樉绀虹殑灞炴�с�佹煡璇㈡潯浠剁殑琛ㄦ牸琛岄�夋嫨涔嬪悗鍥炴樉 */
echoSelectedAttr(data){
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9962d0a..11a0b9a 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1113,18 +1113,18 @@
/* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺～瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
echoReferConfig(content){
// console.log(content.referTypeName);
- this.form.referBtmId = content.referType;
- this.form.referBtmName = content.referTypeName;
+ this.form.referBtmId = content.referType || '';
+ this.form.referBtmName = content.referTypeName || content.referType;
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
let submitFormJson = JSON.stringify(content);
- this.form.referConfig = submitFormJson;
- this.form.referValueInfo = submitFormJson;
+ this.form.referConfig = submitFormJson || '';
+ this.form.referValueInfo = submitFormJson || '';
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content){
// 瀹炵幇鍥炴樉
- this.form.referBtmId = content.id;
- this.form.referBtmName = content.name;
+ this.form.referBtmId = content.id || '';
+ this.form.referBtmName = content.name || content.id;
},
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
@@ -1651,7 +1651,7 @@
this.addBasicCodeSettingBox = true;
},
// 鏂板鍩虹鐮佹
- saveOrEditBasicCode(){
+ async saveOrEditBasicCode(){
if(this.selectionList[0].oid == null || this.selectionList[0].oid == ''){
this.$message.warning('缂哄け蹇呰鍙傛暟锛岃閲嶆柊閫夋嫨缂栫爜瑙勫垯鍚庡啀璇�!');
return;
@@ -1659,7 +1659,7 @@
this.form.pkCodeRule = this.selectionList[0].oid;
if(this.form.oid == '' || this.form.oid == null){
if(this.checkForm()){
- addSave(this.form).then(() => {
+ await addSave(this.form).then(() => {
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -2645,7 +2645,13 @@
this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
},
loadCodeFillSeparator(){
- this.enumParam.codeFillSeparator = this.getLocalStorageEnum("codeFillSeparator");
+ let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
+ if(enumCach == null) {
+ getDictionary("codeFillSeparator").then(res=>{
+ this.enumParam.codeFillSeparator = res.data.data;
+ localStorage.setItem(key,JSON.stringify(res.data.data));
+ })
+ }
},
loadCodeLevelType(){
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ee6c698..3738707 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- //target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
- target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
index ab1e29d..d3fb628 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
@@ -58,7 +58,7 @@
/**
* 瀛楁瀹藉害
*/
- private Long width;
+ private Integer width;
/**
* 鍒楀浐瀹氫綅缃�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/TableColVO.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/TableColVO.java
new file mode 100644
index 0000000..2cc5d9f
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/TableColVO.java
@@ -0,0 +1,35 @@
+package com.vci.ubcs.starter.web.pagemodel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ludc
+ * @date 2023/6/28 11:42
+ */
+@Data
+public class TableColVO implements Serializable {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 431728683965836559L;
+
+ private String field;
+
+ private String title;
+
+ private String fieldType;
+
+ private String fieldTypeText;
+
+ private String sort;
+
+ private String sortField;
+
+ private Integer width;
+
+ private String isQuery;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIFormReferVO.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIFormReferVO.java
index 95f365b..317be2b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIFormReferVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIFormReferVO.java
@@ -108,9 +108,7 @@
*/
private String mapFields;
-
//鍒楄〃鐨勫弬鐓�
-
/**
* 鏄剧ず鐨勫垪琛�
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIReferConfigFormVO.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIReferConfigFormVO.java
new file mode 100644
index 0000000..363f40e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UIReferConfigFormVO.java
@@ -0,0 +1,138 @@
+package com.vci.ubcs.starter.web.pagemodel;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @author ludc
+ * @date 2023/6/28 11:45
+ */
+@Data
+public class UIReferConfigFormVO implements Serializable {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 1459005348514757539L;
+
+ /**
+ * 鍙傜収鐨勭獥鍙ｇ被鍨�
+ */
+ private String type;
+
+ /**
+ * 鏄剧ず鐨勫瓧娈靛睘鎬�
+ */
+ private String textField = "name";
+
+ /**
+ * 鍊肩殑灞炴��
+ */
+ private String valueField = "oid";
+
+ /**
+ * 鏄惁澶氶��
+ */
+ private boolean muti = false;
+
+ /**
+ * 鍚庡彴鍦板潃
+ */
+ private String url;
+
+ /**
+ * 鏈嶅姟鐨勫湴鍧�
+ */
+ private String backPath;
+
+ /**
+ * 璇锋眰鍚庡彴鐨勫舰寮�
+ */
+ private String method = "GET";
+
+ /**
+ * 楂樺害
+ */
+ private Integer height;
+
+ //閫氱敤鐨勫弬鐓�
+ /**
+ * 鍙傜収鐨勪笟鍔＄被鍨�
+ */
+ private String referType;
+
+ /**
+ * 鍙傜収鐨刄I涓婁笅鏂�
+ */
+ private String referContent;
+
+ //鏍戝舰鐨勫弬鐓�
+ /**
+ * 涓婄骇瀛楁
+ */
+ private String parentFieldName;
+
+ /**
+ * 涓婄骇瀛楁鐨勫唴瀹瑰搴旂殑灞炴�х殑鍊�
+ */
+ private String parentUsedField;
+
+ /**
+ * 涓婄骇瀛楁鐨勫��
+ */
+ private String parentValue;
+
+ /**
+ * 鍔犺浇鏂瑰紡
+ */
+ private String loadType = "all";
+
+ /**
+ * 鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣
+ */
+ private boolean onlyLeaf = false;
+
+ /**
+ * 杩囨护(绾ц仈)灞炴��
+ */
+ private String useFormKey;
+
+ /**
+ * 杩囨护灞炴�ц姹傚弬鏁�
+ */
+ private String paramForFormKey;
+
+ /**
+ * 鏄犲皠鍏朵粬灞炴��
+ */
+ private String mapFields;
+
+ //鍒楄〃鐨勫弬鐓�
+ /**
+ * 鏄剧ず鐨勫垪琛�
+ */
+ private String displayTable;
+
+ /**
+ * 琛ㄦ牸鐨勮嚜瀹氫箟瀹氫箟
+ */
+ private UITableConfigVO tableConfig;
+
+ /**
+ * 绛涢�夋潯浠�
+ */
+ private Map<String,String> where;
+
+ /**
+ * 鍚庡彴鎺掑簭
+ */
+ private boolean remoteSort;
+
+ /**
+ * 鍒濆鍖栨帓搴�
+ */
+ private UIFieldSortVO initSort;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITableConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITableConfigVO.java
new file mode 100644
index 0000000..43c4c4c
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/UITableConfigVO.java
@@ -0,0 +1,39 @@
+package com.vci.ubcs.starter.web.pagemodel;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2023/6/28 11:30
+ */
+@Data
+public class UITableConfigVO implements java.io.Serializable{
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 431728683965836558L;
+
+ /**
+ * 涓婚敭
+ */
+ private String oid;
+
+ /**
+ * 鍒嗛〉鐨勫璞�
+ */
+ private UITablePageVO page;
+
+ /**
+ * 鏄剧ず鐨勫垪
+ */
+ private List<TableColVO> cols;
+
+ /**
+ * 鏌ヨ鐨勫垪
+ */
+ private List<TableColVO> queryColumns;
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index b20064a..351a817 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -9,10 +9,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
-import com.vci.ubcs.code.entity.CodeBasicSec;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.entity.CodeClassifyValue;
-import com.vci.ubcs.code.entity.CodeFixedValue;
+import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.*;
import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.mapper.CodeBasicSecMapper;
@@ -34,9 +31,7 @@
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.enumpck.NewAppConstantEnum;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
-import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.KeyValue;
-import com.vci.ubcs.starter.web.pagemodel.UIFormReferVO;
+import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
@@ -46,6 +41,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -261,7 +257,7 @@
//寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝ｇ‘
if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){
if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){
- throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸～鍐� 鍙傜収閰嶇疆 鐨勫唴瀹�");
+ throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸～鍐� 鍙傜収閰嶇疆鐨勫唴瀹�");
}
try{
//JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
@@ -271,6 +267,8 @@
throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e);
}
if(codeReferConfigVO.getIsPersistence()=="true"){
+ // 鍒ゆ柇鏄惁涓哄紩鐢ㄧ爜娈碉紝濡傛灉鏄簲鐢ㄧ爜娈电殑璇濓紝涓轰簡閫傞厤鍓嶇缁勪欢锛岃繖閲岃瀵硅〃杩涜澶勭悊涓�涓嬶紝鎸夌収浠ュ墠鐨勫弬鐓ф牸寮忚繘琛岃浆鎹�
+ codeBasicSecDO.setReferValueInfo(referConfigTOUIUiTable(codeReferConfigVO));
codeReferConfigService.insert(codeReferConfigVO);
}
}
@@ -278,14 +276,59 @@
//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){
DictBiz dictBiz = new DictBiz();
- dictBiz.setCode(MdmBtmTypeConstant.CODE_BASIC_SEC);
- dictBiz.setDictKey("codefileseparator");
+ dictBiz.setCode("codeFillSeparator");
+ dictBiz.setDictKey(codeBasicSecDO.getCodeFillSeparator());
dictBiz.setDictValue(codeBasicSecDO.getCodeFillSeparator());
//浠庡師鏉ョ殑charService锛堝彲杈撳彲閫夛級鏇存敼涓鸿皟鐢╫md涓殑鎺ュ彛鏉ュ疄鐜�
iDictBizClient.getCheck(dictBiz);
//charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo);
}
return resBoolean;
+ }
+
+ /**
+ * 灏唕eferconfig杞崲涓篔SON鏍煎紡鐨刄IFormReferVO
+ * @param codeReferConfig
+ * @return
+ */
+ private String referConfigTOUIUiTable(CodeReferConfigVO codeReferConfig){
+ // 鎷疯礉涓轰互鍓嶇殑鑰佸璞�
+ UIReferConfigFormVO uiFormReferVO = new UIReferConfigFormVO();
+ BeanUtil.copy(codeReferConfig,uiFormReferVO);
+
+ // 琛ㄦ牸鐨勮嚜瀹氫箟瀹氫箟
+ UITableConfigVO uiTableConfigVO = new UITableConfigVO();
+ uiTableConfigVO.setPage(new UITablePageVO(codeReferConfig.getLimit(),1));
+ // 鍒楄〃鐨勫垪鐨勪俊鎭浆鎹�
+ List<TableColVO> uiTableFieldVOs = new ArrayList<>();
+ // 蹇�熸煡璇㈠垪
+ List<TableColVO> queryColumns = new ArrayList<>();
+ if(!codeReferConfig.getCodeShowFieldConfigVOS().isEmpty()){
+ codeReferConfig.getCodeShowFieldConfigVOS().stream().forEach(showField ->{
+ TableColVO tableColVO = new TableColVO();
+ BeanUtil.copy(showField,tableColVO);
+ tableColVO.setSortField(showField.getAttrSortField());
+ uiTableFieldVOs.add(tableColVO);
+ if(showField.getIsQuery().equals("true")){
+ queryColumns.add(tableColVO);
+ }
+ });
+ }
+ // 鏄剧ず鐨勫垪
+ uiTableConfigVO.setCols(uiTableFieldVOs);
+ // 蹇�熸煡璇㈠垪
+ uiTableConfigVO.setQueryColumns(queryColumns);
+ //set缁欒〃鏍奸厤缃睘鎬�
+ uiFormReferVO.setTableConfig(uiTableConfigVO);
+ // 绛涢�夋潯浠�
+ HashMap<String, String> whereMap = new HashMap<>();
+ if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){
+ codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{
+ whereMap.put(srch.getFilterField()+"_"+srch.getFilterType(),srch.getFilterValue());
+ });
+ }
+ uiFormReferVO.setWhere(whereMap);
+ return JSONObject.toJSONString(uiFormReferVO);
}
/**
@@ -414,7 +457,7 @@
public R deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException {
CodeBasicSec codeBasicSecDO = selectByOid(oid);
boolean isLinked = checkIsLinked(codeBasicSecDO.getPkCodeRule(), oid);
- if (isLinked) {
+ if (!isLinked) {
return R.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�");
}
//鎵ц鍒犻櫎鎿嶄綔
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..1ff109b 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
@@ -492,60 +492,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