From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java |   66 ++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
index 7edc4bf..9585c59 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
@@ -5,25 +5,30 @@
 import com.vci.base.ui.swing.components.VCIJPanel;
 import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
 import com.vci.base.ui.swing.components.table.VCIJTablePanel;
+import com.vci.ubcs.codeapply.object.BaseModel;
+import com.vci.ubcs.codeapply.object.TokenUserObject;
 import com.vci.ubcs.codeapply.object.UIFormRefer;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class CodeDataMainPanel extends VCIJPanel {
 
 	/**
 	 * 鑷畾涔夐《閮ㄦ帶浠跺尯鍩�
 	 */
-	private VCIJPanel customTopPanel = null;
+	private AttarSearchPanel customTopPanel = null;
 	private UIFormRefer uiFormRefer;
 	private CodeDataMainPanelActionListener actionListener = new CodeDataMainPanelActionListener(this);
 	private VCIJButton btnSearch = VCISwingUtil.createVCIJButton("search", "鏌ヨ", "鏌ヨ", "search.png", actionListener);
 	private VCIJButton btnClear = VCISwingUtil.createVCIJButton("clear_search", "娓呯┖鏌ヨ鏉′欢", "娓呯┖鏌ヨ鏉′欢", "clear.gif", actionListener);
-	public CodeDataMainPanel(UIFormRefer uiFormRefer) {
+	private TokenUserObject tokenUserObject=null;
+	public CodeDataMainPanel(UIFormRefer uiFormRefer, TokenUserObject tokenUserObject) {
 		this.uiFormRefer=uiFormRefer;
+		this.tokenUserObject=tokenUserObject;
 	}
-
+	private Map<String,String> customCondtionMap=new HashMap<>();
 	public void buildPanel(){
 		this.init();
 	}
@@ -39,13 +44,14 @@
 	/**
 	 * 鏍规嵁绫诲瀷鏄剧ずtable
 	 */
-	private VCIJTablePanel<T> tablePanel = null;
-	private AbstractVCIJTableDataProvider<T> dataProvider = null;
+	private VCIJTablePanel<BaseModel> tablePanel = null;
+	private AbstractVCIJTableDataProvider<BaseModel> dataProvider = null;
 	private VCIJPanel createCenterDataTablePanel() {
-		tablePanel = new VCIJTablePanel<T>(dataProvider);
+		tablePanel = new VCIJTablePanel<BaseModel>(dataProvider);
 		//tablePanel.setCustomButtons(getCombinedButtons());
-		tablePanel.setShowExport(true);
+		//tablePanel.setShowExport(true);
 		tablePanel.setShowPaging(true);
+		tablePanel.setShowProgressBar(true);
 		tablePanel.setPageButtonFlowAlign(FlowLayout.CENTER);
 		tablePanel.setCustomButtonFlowAlign(FlowLayout.CENTER);
 		tablePanel.buildTablePanel();
@@ -92,19 +98,19 @@
 		return palRes;
 	}
 
-	public VCIJPanel getCustomTopPanel() {
+	public AttarSearchPanel getCustomTopPanel() {
 		return customTopPanel;
 	}
 
-	public void setCustomTopPanel(VCIJPanel customTopPanel) {
+	public void setCustomTopPanel(AttarSearchPanel customTopPanel) {
 		this.customTopPanel = customTopPanel;
 	}
 
-	public VCIJTablePanel<T> getTablePanel() {
+	public VCIJTablePanel<BaseModel> getTablePanel() {
 		return tablePanel;
 	}
 
-	public void setTablePanel(VCIJTablePanel<T> tablePanel) {
+	public void setTablePanel(VCIJTablePanel<BaseModel> tablePanel) {
 		this.tablePanel = tablePanel;
 	}
 
@@ -117,11 +123,43 @@
 		this.uiFormRefer = uiFormRefer;
 	}
 
-	public AbstractVCIJTableDataProvider<T> getDataProvider() {
+	public TokenUserObject getTokenUserObject() {
+		return tokenUserObject;
+	}
+
+	public void setTokenUserObject(TokenUserObject tokenUserObject) {
+		this.tokenUserObject = tokenUserObject;
+	}
+
+	public AbstractVCIJTableDataProvider<BaseModel> getDataProvider() {
 		return dataProvider;
 	}
 
-	public void setDataProvider(AbstractVCIJTableDataProvider<T> dataProvider) {
+	public void setDataProvider(AbstractVCIJTableDataProvider<BaseModel> dataProvider) {
 		this.dataProvider = dataProvider;
 	}
+
+	public Map<String, String> getCustomCondtionMap() {
+		if(this.getCustomTopPanel()!=null){
+			Map<String,String> newCustomCondtionMap= this.getCustomTopPanel().getAttrSearchFilterString();
+			customCondtionMap.putAll(newCustomCondtionMap);
+		}
+		return customCondtionMap;
+	}
+
+	public void setCustomCondtionMap(Map<String, String> customCondtionMap) {
+		this.customCondtionMap = customCondtionMap;
+	}
+
+	/**
+	 * 娓呯┖鏉′欢
+	 * <p>Description: </p>
+	 *
+	 * @author liujw
+	 */
+	public void clearCustomTopPanel(){
+		customCondtionMap.clear();
+		AttarSearchPanel search = (AttarSearchPanel)getCustomTopPanel();
+		search.clear();
+	}
 }

--
Gitblit v1.9.3