From 0e5ba7238d31dc8fb5015001661811dceab55c42 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 09:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
index 5e0fa87..c63e3ee 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
@@ -59,6 +59,10 @@
* 瀛樺偍灞炴�у拰鍊肩殑Map,key:灞炴�у悕绉帮紝value锛氬睘鎬у��
*/
private String deptName = null;
+ /**
+ * 瀛樺偍灞炴�у拰鍊肩殑Map,key,鐢ㄤ簬榛樿鍊肩殑鏄剧ず
+ */
+ private Map displayValues = new HashMap<String,String>();
private String[] libName = new String[]{};//浠ｇ爜椤瑰悕绉�
private VCIBaseTree leftTree = null;
@@ -78,7 +82,7 @@
* @param deptName
* @param libName
*/
- public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName){
+ public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName,Map displayValues){
this.tokenUserObject = tokenUserObject;
this.owner =owner;
rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,getCurrentCodeClassifyTemplateVO());
@@ -86,6 +90,7 @@
this.clsfName = clsfName;
this.deptName = deptName;
this.libName = libName;
+ this.displayValues = displayValues;
init();
initActionListener();
}
@@ -188,9 +193,9 @@
VCIOptionPane.showMessage(this,r.getMsg());
}
if(!CollectionUtils.isEmpty(codeClassifyList)){
- codeClassifyList.stream().forEach(codeClassify -> {
+ for (CodeClassify codeClassify : codeClassifyList) {
codeItemCombo.addItem(codeClassify);
- });
+ }
codeItemCombo.setSelectedIndex(0);
}
initLeftPanel();
@@ -293,7 +298,7 @@
initBtnStatus(res);
}
}
- rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
+ rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO(),displayValues);
scrollPane.setViewportView(rightMainPanel);
rightMainPanel.buildMainPanel(1);
int location = jspLeftToRight.getDividerLocation();
@@ -358,7 +363,7 @@
transmitTreeObject.setCurrentTreeNode(selectedTreeNode);
if(selectedTreeNode.isRoot() && selectedTreeNode.getObj() instanceof String) return;
scrollPane = new JScrollPane();
- rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
+ rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO(),displayValues);
scrollPane.setViewportView(rightMainPanel);
rightMainPanel.buildMainPanel(1);
VCIJPanel rightPanel = new VCIJPanel();
--
Gitblit v1.9.3