From b28da4c353e50fc2491c733889fef5f79e5926f2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 16:19:00 +0800
Subject: [PATCH] 关于集成配置需求更改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 16 ++
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java | 8
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TransmitTreeObject.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchDialog.java | 7
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java | 15 +-
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/SectionObject.java | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java | 20 +--
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchMainPanel.java | 5
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UserObject.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/TokenUserObject.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java | 11 -
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelActionListener.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java | 11 -
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/enums/CodeReferConfigTypeEnum.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ReferTreObject.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java | 15 +-
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/AttrRangObjectWarper.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefers.java | 2
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeLibTreeCellRenderer.java | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ClassifyLevel.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/DataGrid.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeDataObject.java | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeFixedValue.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/MdmEngineConstant.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/IntegerTextField.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassify.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/RMDataTransmitObject.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java | 12 ++
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410DialogActionListener.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/R.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CommonActionListener.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefer.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/RealTextField.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient3.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java | 9
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CoderefersecSearchVO.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/httpClient4.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 28 +++-
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialog.java | 10 -
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/BaseModel.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/DescViewDialog.java | 3
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/VCIJComboxBox.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ConfigUtils.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410TreePanel.java | 14 +-
/dev/null | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 8
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java | 10
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java | 11 +
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java | 14 +-
58 files changed, 174 insertions(+), 143 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
index 5aeab8e..a7a6898 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/AttarSearchPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
@@ -1,10 +1,10 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.vci.base.ui.swing.components.VCIJLabel;
import com.vci.base.ui.swing.components.VCIJPanel;
import com.vci.base.ui.swing.components.VCIJTextField;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
-import com.vci.ubcs.codeapply.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
import org.apache.commons.collections4.CollectionUtils;
import java.awt.*;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410Dialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410Dialog.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
index 69d7a80..e8b5abb 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410Dialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
@@ -7,10 +7,10 @@
import com.vci.base.ui.swing.components.VCIJButton;
import com.vci.base.ui.swing.components.VCIJDialog;
import com.vci.base.ui.swing.components.VCIJPanel;
-import com.vci.ubcs.codeapply.object.TokenUserObject;
-import com.vci.ubcs.codeapply.object.UserObject;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import javax.swing.*;
import java.awt.*;
import java.util.HashMap;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410DialogActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410DialogActionListener.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410DialogActionListener.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410DialogActionListener.java
index ffdd7bb..649db64 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410DialogActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410DialogActionListener.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
index 3161b07..c648cc4 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410MainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
@@ -1,25 +1,21 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
-import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.components.*;
import com.vci.base.ui.tree.VCIBaseTreeNode;
-import com.vci.corba.common.VCIError;
+import com.vci.rmip.code.client.codeapply.Apply410.object.*;
import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.ubcs.codeapply.object.*;
-import com.vci.ubcs.codeapply.swing.IntegerTextField;
-import com.vci.ubcs.codeapply.swing.RealTextField;
-import com.vci.ubcs.codeapply.swing.VCIJComboxBox;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.swing.IntegerTextField;
+import com.vci.rmip.code.client.codeapply.Apply410.swing.RealTextField;
+import com.vci.rmip.code.client.codeapply.Apply410.swing.VCIJComboxBox;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.system.user.entity.User;
-import io.swagger.models.auth.In;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -71,7 +67,7 @@
private int maxStringLength = 100;
private int levelPositon = -1;
private TransmitTreeObject transTreeObject = new TransmitTreeObject();
- private TokenUserObject tokenUserObject;
+ private TokenUserObject tokenUserObject;
private String deptName;
//瀛樺偍姣忎釜瀹為檯 鐮佹鍒楀搴旂殑鐮佹瀵硅薄
protected Map<Integer,CodeBasicSecVO> columnSecMap = new LinkedHashMap<Integer,CodeBasicSecVO>();
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchDialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchDialog.java
similarity index 95%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchDialog.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchDialog.java
index fdfd4bd..7f112e8 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchDialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchDialog.java
@@ -1,8 +1,7 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.BorderLayout;
import java.awt.Dimension;
-import java.awt.FlowLayout;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -16,9 +15,7 @@
import com.vci.base.ui.swing.VCISwingUtil;
import com.vci.base.ui.swing.components.*;
import com.vci.base.ui.swing.components.table.VCIJTablePanel;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.codeapply.object.BaseModel;
-import com.vci.ubcs.codeapply.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
public class CodeApplyFor410SearchDialog extends VCIJDialog {
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchMainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchMainPanel.java
similarity index 95%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchMainPanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchMainPanel.java
index 34c0ac4..eff3b3a 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchMainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchMainPanel.java
@@ -1,10 +1,9 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
-import com.vci.base.ui.swing.VCISwingUtil;
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.rmip.code.client.codeapply.Apply410.object.BaseModel;
import java.awt.*;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
similarity index 87%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchProvider.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
index 297ad47..ad3d323 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410SearchProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.util.*;
import com.alibaba.cloud.commons.lang.StringUtils;
@@ -7,11 +7,14 @@
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
import com.vci.base.ui.swing.components.table.VCIJTableNode;
+import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.DataGrid;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ListUtil;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.codeapply.object.*;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
-import com.vci.ubcs.codeapply.utils.ListUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.commons.collections4.CollectionUtils;
@@ -106,7 +109,7 @@
List<BaseModel> hostInfos=new ArrayList<>();
//List<BaseModel> hostInfos= ListUtil.listMapParseListObj(dataList, BaseModel.class);
dataList.stream().forEach(map->{
- BaseModel baseModel=ListUtil.mapParseJavaBean(map,BaseModel.class);
+ BaseModel baseModel= ListUtil.mapParseJavaBean(map,BaseModel.class);
baseModel.setData(map);
hostInfos.add(baseModel);
});
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410TreePanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410TreePanel.java
similarity index 95%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410TreePanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410TreePanel.java
index 6025fe6..81c9580 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyFor410TreePanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410TreePanel.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,12 +7,12 @@
import com.vci.base.ui.tree.VCIBaseTree;
import com.vci.base.ui.tree.VCIBaseTreeModel;
import com.vci.base.ui.tree.VCIBaseTreeNode;
-import com.vci.ubcs.codeapply.object.CodeClassify;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.object.TokenUserObject;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
-import com.vci.ubcs.system.user.entity.User;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
+
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
import javax.swing.event.TreeSelectionEvent;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
similarity index 96%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
index ef66b57..5e0fa87 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,14 +8,13 @@
import com.vci.base.ui.tree.VCIBaseTree;
import com.vci.base.ui.tree.VCIBaseTreeModel;
import com.vci.base.ui.tree.VCIBaseTreeNode;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.codeapply.object.CodeClassify;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.object.TokenUserObject;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
-import com.vci.ubcs.system.user.entity.User;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -69,7 +68,7 @@
private TransmitTreeObject transmitTreeObject = new TransmitTreeObject();
- private String url=ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
+ private String url= ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
/***
*
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
similarity index 95%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
index db1ae5c..d262684 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
@@ -1,23 +1,22 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.components.VCIJComboBox;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import com.vci.ubcs.codeapply.object.CodeClassify;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import org.apache.commons.collections4.CollectionUtils;
import javax.swing.*;
import javax.swing.text.JTextComponent;
-import javax.swing.tree.TreePath;
import java.awt.event.ActionEvent;
import java.util.*;
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/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java
index 9585c59..d506aba 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/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java
@@ -1,13 +1,13 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.vci.base.ui.swing.VCISwingUtil;
import com.vci.base.ui.swing.components.VCIJButton;
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 com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
+import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
import java.awt.*;
import java.util.HashMap;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelActionListener.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelActionListener.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelActionListener.java
index d25a798..d0f6aeb 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelActionListener.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
similarity index 90%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
index 1c0b245..23c6a08 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeDataMainPanelDataProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
@@ -1,20 +1,20 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
import com.vci.base.ui.swing.components.table.VCIJTableNode;
-import com.vci.ubcs.codeapply.object.BaseModel;
-import com.vci.ubcs.codeapply.object.Page;
+import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
+import com.vci.rmip.code.client.codeapply.Apply410.object.Page;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeSrchCondConfigVO;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.object.UIFormRefer;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeLibTreeCellRenderer.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeLibTreeCellRenderer.java
similarity index 90%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeLibTreeCellRenderer.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeLibTreeCellRenderer.java
index 1f6333a..dbb03db 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeLibTreeCellRenderer.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeLibTreeCellRenderer.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.vci.base.ui.image.bundle.BundleImage;
import com.vci.base.ui.tree.VCIBaseTreeNode;
-import com.vci.ubcs.codeapply.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
import javax.swing.*;
import javax.swing.tree.DefaultTreeCellRenderer;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java
similarity index 93%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java
index a16885b..8094ad7 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -8,9 +8,12 @@
import com.vci.base.ui.tree.VCIBaseTree;
import com.vci.base.ui.tree.VCIBaseTreeModel;
import com.vci.base.ui.tree.VCIBaseTreeNode;
-import com.vci.ubcs.codeapply.object.*;
-import com.vci.ubcs.codeapply.utils.ConfigUtils;
-import com.vci.ubcs.codeapply.utils.HttpUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ReferTreObject;
+import com.vci.rmip.code.client.codeapply.Apply410.object.TokenUserObject;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CommonActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CommonActionListener.java
similarity index 89%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CommonActionListener.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CommonActionListener.java
index 5b1057b..2cbd19e 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CommonActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CommonActionListener.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/DescViewDialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/DescViewDialog.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/DescViewDialog.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/DescViewDialog.java
index a88b24b..5a02384 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/DescViewDialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/DescViewDialog.java
@@ -1,8 +1,7 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.BorderLayout;
import java.awt.Dimension;
-import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialog.java
similarity index 95%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialog.java
index 87e90fd..cde0382 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialog.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.BorderLayout;
import java.awt.Dimension;
@@ -13,15 +13,11 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.VCISwingUtil;
import com.vci.base.ui.swing.components.*;
-import com.vci.base.ui.swing.components.table.VCIJTablePanel;
import com.vci.base.ui.tree.VCIBaseTree;
import com.vci.base.ui.tree.VCIBaseTreeModel;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.codeapply.enums.CodeReferConfigTypeEnum;
-import com.vci.ubcs.codeapply.object.UIFormRefer;
-import com.vci.ubcs.codeapply.object.UIFormRefers;
+import com.vci.rmip.code.client.codeapply.Apply410.enums.CodeReferConfigTypeEnum;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
-import org.apache.poi.ss.formula.functions.T;
public class RMDataReferTempDialog extends VCIJDialog {
private CodeApplyFor410MainPanel owner;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialogActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
similarity index 92%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialogActionListener.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
index 1395887..96e4caa 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/RMDataReferTempDialogActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
@@ -1,18 +1,17 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.components.VCIJDialog.DialogResult;
import com.vci.base.ui.tree.VCIBaseTreeNode;
-import com.vci.ubcs.codeapply.enums.CodeReferConfigTypeEnum;
-import com.vci.ubcs.codeapply.object.BaseModel;
-import com.vci.ubcs.codeapply.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
+import com.vci.rmip.code.client.codeapply.Apply410.enums.CodeReferConfigTypeEnum;
+import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/SectionObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/SectionObject.java
new file mode 100644
index 0000000..5944675
--- /dev/null
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/SectionObject.java
@@ -0,0 +1,4 @@
+package com.vci.rmip.code.client.codeapply.Apply410;
+
+public class SectionObject {
+}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/TestIntegrateFrame.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java
similarity index 91%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/TestIntegrateFrame.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java
index 9fe2faa..e7d1dc0 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/TestIntegrateFrame.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import javax.swing.*;
import java.awt.*;
@@ -36,7 +36,7 @@
CodeApplyFor410Dialog dialog = new CodeApplyFor410Dialog(j, clsfName,deptName);
String code = dialog.getCodeValue();
dialog.getAttributeValue("mi");
- text.setText(code + "_" + dialog.getAttributeValue("MIDU"));
+ text.setText(code + "_" + dialog.getAttributeValue("name"));
System.out.println("code:---"+code+"---");
}
});
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/TransmitTreeObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TransmitTreeObject.java
similarity index 96%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/TransmitTreeObject.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TransmitTreeObject.java
index e37044b..531b27c 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/TransmitTreeObject.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TransmitTreeObject.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply;
+package com.vci.rmip.code.client.codeapply.Apply410;
import com.vci.base.ui.tree.VCIBaseTree;
import com.vci.base.ui.tree.VCIBaseTreeModel;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/enums/CodeReferConfigTypeEnum.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/enums/CodeReferConfigTypeEnum.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/enums/CodeReferConfigTypeEnum.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/enums/CodeReferConfigTypeEnum.java
index c5fa41f..41f9274 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/enums/CodeReferConfigTypeEnum.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/enums/CodeReferConfigTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.enums;
+package com.vci.rmip.code.client.codeapply.Apply410.enums;
import com.vci.ubcs.starter.web.enumpck.BaseEnum;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/AttrRangObjectWarper.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/AttrRangObjectWarper.java
similarity index 93%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/AttrRangObjectWarper.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/AttrRangObjectWarper.java
index aca1d28..1e7e665 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/AttrRangObjectWarper.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/AttrRangObjectWarper.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/BaseModel.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/BaseModel.java
index a54c3e5..8bb7f6e 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/BaseModel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/BaseModel.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/ClassifyLevel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ClassifyLevel.java
similarity index 93%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/ClassifyLevel.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ClassifyLevel.java
index 6e5aa95..07ed5bb 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/ClassifyLevel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ClassifyLevel.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
public class ClassifyLevel {
/***
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeClassify.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassify.java
similarity index 74%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeClassify.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassify.java
index 6249213..adb4cbe 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeClassify.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassify.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeClassifyValue.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java
similarity index 76%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeClassifyValue.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java
index 363a753..f738598 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeClassifyValue.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeDataObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeDataObject.java
new file mode 100644
index 0000000..802040e
--- /dev/null
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeDataObject.java
@@ -0,0 +1,4 @@
+package com.vci.rmip.code.client.codeapply.Apply410.object;
+
+public class CodeDataObject {
+}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeFixedValue.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeFixedValue.java
similarity index 74%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeFixedValue.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeFixedValue.java
index 968e6cc..5b180e7 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeFixedValue.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeFixedValue.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
public class CodeFixedValue extends CodeFixedValueVO {
@Override
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CoderefersecSearchVO.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CoderefersecSearchVO.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CoderefersecSearchVO.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CoderefersecSearchVO.java
index af7196c..59c4f14 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CoderefersecSearchVO.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CoderefersecSearchVO.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeSrchCondConfigVO;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/DataGrid.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/DataGrid.java
similarity index 96%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/DataGrid.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/DataGrid.java
index 6a1ab47..f396e3a 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/DataGrid.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/DataGrid.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/IPage.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java
similarity index 95%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/IPage.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java
index dcec401..9a6cdfc 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/IPage.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import java.io.Serializable;
import java.util.List;
import java.util.function.Function;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/OrderItem.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/OrderItem.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
index 4037100..2a35b8f 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/OrderItem.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/Page.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/Page.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java
index 2b6ba8b..0f2d41b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/Page.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/R.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/R.java
similarity index 91%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/R.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/R.java
index a652e03..93122f3 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/R.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/R.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
public class R<T> {
private int code;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/RMDataTransmitObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/RMDataTransmitObject.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/RMDataTransmitObject.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/RMDataTransmitObject.java
index 7e13d93..367403e 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/RMDataTransmitObject.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/RMDataTransmitObject.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/ReferTreObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ReferTreObject.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/ReferTreObject.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ReferTreObject.java
index a932dba..0423a4d 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/ReferTreObject.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ReferTreObject.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.starter.web.pagemodel.Tree;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/TokenUserObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/TokenUserObject.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/TokenUserObject.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/TokenUserObject.java
index 726f2df..c77120b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/TokenUserObject.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/TokenUserObject.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
public class TokenUserObject {
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UIFormRefer.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefer.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UIFormRefer.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefer.java
index 04a3023..9bfae73 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UIFormRefer.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefer.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeSrchCondConfigVO;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UIFormRefers.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefers.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UIFormRefers.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefers.java
index 34bf5a8..7d98407 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UIFormRefers.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefers.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
import com.vci.ubcs.code.vo.pagemodel.UIFieldSortVO;
import com.vci.ubcs.code.vo.pagemodel.UITableCustomDefineVO;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UserObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UserObject.java
similarity index 91%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UserObject.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UserObject.java
index 9d72b42..8e47249 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/UserObject.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UserObject.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.object;
+package com.vci.rmip.code.client.codeapply.Apply410.object;
public class UserObject {
private String grant_type; // password;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/IntegerTextField.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/IntegerTextField.java
similarity index 89%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/IntegerTextField.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/IntegerTextField.java
index 5cd2260..d50e406 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/IntegerTextField.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/IntegerTextField.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.swing;
+package com.vci.rmip.code.client.codeapply.Apply410.swing;
import java.io.Serializable;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/RealTextField.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/RealTextField.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/RealTextField.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/RealTextField.java
index 80268bf..f6c01fb 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/RealTextField.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/RealTextField.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.swing;
+package com.vci.rmip.code.client.codeapply.Apply410.swing;
import com.vci.base.ui.swing.components.NumberPlainDocument;
import com.vci.base.ui.swing.components.VCIJTextField;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/VCIJComboxBox.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/VCIJComboxBox.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/VCIJComboxBox.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/VCIJComboxBox.java
index dbb855f..2b73b3d 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/swing/VCIJComboxBox.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/VCIJComboxBox.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.swing;
+package com.vci.rmip.code.client.codeapply.Apply410.swing;
import java.awt.BorderLayout;
import java.awt.Dimension;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/ConfigUtils.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ConfigUtils.java
similarity index 94%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/ConfigUtils.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ConfigUtils.java
index 5cc8f65..1eda3fa 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/ConfigUtils.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ConfigUtils.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import com.vci.base.common.resource.CommonProperties;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpClient.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpClient.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient.java
index 66acf81..219e3d7 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpClient.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpClient3.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient3.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpClient3.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient3.java
index 601f5fb..7774242 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpClient3.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient3.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
similarity index 96%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpUtil.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
index 193cf20..5c41c1c 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/HttpUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
@@ -1,11 +1,8 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
-import com.vci.ubcs.code.vo.webserviceModel.apply.InterParameterVO;
-import com.vci.ubcs.codeapply.object.R;
-import com.vci.ubcs.codeapply.object.TokenUserObject;
-import org.apache.commons.collections4.CollectionUtils;
+import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import org.apache.http.*;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -18,10 +15,8 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
-import org.apache.poi.ss.formula.functions.T;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -69,7 +64,7 @@
* @param params
* @return
*/
- public static R sendGet(String url, Map<String, String> params,Map<String,String> headers) {
+ public static R sendGet(String url, Map<String, String> params, Map<String,String> headers) {
R r=new R();
// 鑾峰彇杩炴帴瀹㈡埛绔伐鍏�
CloseableHttpClient httpClient = HttpClients.createDefault();
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/ListUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/ListUtil.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
index dbcad67..d988cf1 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/ListUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/MdmEngineConstant.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/MdmEngineConstant.java
similarity index 97%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/MdmEngineConstant.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/MdmEngineConstant.java
index 9dc2c11..3da2ce8 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/MdmEngineConstant.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/MdmEngineConstant.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import java.util.ArrayList;
import java.util.Date;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/httpClient4.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/httpClient4.java
similarity index 98%
rename from Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/httpClient4.java
rename to Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/httpClient4.java
index b559dd9..6e4f798 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/utils/httpClient4.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/httpClient4.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.codeapply.utils;
+package com.vci.rmip.code.client.codeapply.Apply410.utils;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/SectionObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/SectionObject.java
deleted file mode 100644
index beff9dc..0000000
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/SectionObject.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.vci.ubcs.codeapply;
-
-public class SectionObject {
-}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeDataObject.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeDataObject.java
deleted file mode 100644
index 9c2e9c5..0000000
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeDataObject.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.vci.ubcs.codeapply.object;
-
-public class CodeDataObject {
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
index 9592564..4fe6901 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
@@ -31,6 +31,10 @@
*/
private Set<String> keyAttrRepeatRowIndexList = new HashSet<>();
/***
+ * 鍏抽敭灞炴�х浉鍚岀殑灞炴�id涓庡叾閲嶅鐨勬暟鎹畂id
+ */
+ private Map<String,List<String>> keyAttrOkOidTORepeatOidMap=new HashMap<>();
+ /***
* 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
*/
private Map<String, List<BaseModel>> indexTODataMap=new HashMap<>();
@@ -101,6 +105,14 @@
public void setIndexTODataMap(Map<String, List<BaseModel>> indexTODataMap) {
this.indexTODataMap = indexTODataMap;
}
+
+ public Map<String, List<String>> getKeyAttrOkOidTORepeatOidMap() {
+ return keyAttrOkOidTORepeatOidMap;
+ }
+
+ public void setKeyAttrOkOidTORepeatOidMap(Map<String, List<String>> keyAttrOkOidTORepeatOidMap) {
+ this.keyAttrOkOidTORepeatOidMap = keyAttrOkOidTORepeatOidMap;
+ }
/*public Map<String,List<ClientBusinessObject>> getIndexTODataMap() {
return indexTODataMap;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index edacf34..6970d64 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -190,7 +190,21 @@
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
-
+ /***
+ * 鏇存柊闆嗗洟缂栫爜鏁版嵁
+ * @return
+ */
+ @PostMapping( "/receiveEditApply")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
+ public R receiveEditApply(String oids,String btmName){
+ List<BaseModelVO> BaseModelVOs=new ArrayList<>();
+ try {
+ return groupMdmInterService.receiveEditApply(oids,btmName);
+ }catch (Throwable e){
+ return R.fail("闆嗗洟鐮佹洿鏂板け璐ワ細"+e.getMessage());
+ }
+ }
/***
* 鍚屾闆嗗洟妯″瀷瑙嗗浘
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 6afa76d..7bd34db 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -202,7 +202,7 @@
}
return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
}catch (VciBaseException e){
- return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛"+e);
+ return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触"+e);
}
}
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 192f270..6b46856 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
@@ -665,7 +665,11 @@
}
final String[] sql = {"select count(*) from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
conditionMap.forEach((key, value) -> {
- sql[0] += " and " + key + " = " + value;
+ if(StringUtils.isBlank(value)||value.equals(QueryOptionConstant.ISNULL)) {
+ sql[0] += " and " + key + " is null";
+ }else{
+ sql[0] += " and " + key + " = " + value;
+ }
});
if (StringUtils.isNotBlank(orderDTO.getOid())) {
//淇敼鐨勬椂鍊欙紝闇�瑕佹帓闄よ嚜宸�
@@ -686,8 +690,6 @@
/**
* 鏍￠獙鍏抽敭灞炴��
*
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
* @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
*/
public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index f1c8341..dd16e4d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -2083,7 +2083,7 @@
XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
if(isCodeOrGroupCode) {
if(StringUtils.isBlank(groupCode)){
- mes+="锛涚瓑寰呴泦鍥㈢紪鐮佽祴鍊�";
+ mes+="锛涚敵璇风殑缂栫爜绫诲瀷涓洪泦鍥㈢爜锛岀瓑寰呴泦鍥㈢紪鐮佽祴鍊�";
}
resultDataObjectDetailDO.setCode(groupCode);
}else{
@@ -2136,15 +2136,26 @@
// if(!isProcess){
dataCBOList.stream().forEach(needSaveCbo->{
XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode(needSaveCbo.getId());
+ String code=needSaveCbo.getId();
+ String groupCode=needSaveCbo.getData().getOrDefault("GROUPCODE","");
+ //resultDataObjectDetailDO.setCode(needSaveCbo.getId());
+ String msg="鐢宠缂栫爜鎴愬姛";
String oid=needSaveCbo.getOid();
String sourceOid=oid;
if(codeOidToSystemOidMap.containsKey(oid)){
sourceOid=codeOidToSystemOidMap.get(oid);
}
+ if(isCodeOrGroupCode) {
+ if(StringUtils.isBlank(groupCode)){
+ msg="鐢宠鐨勭紪鐮佺被鍨嬩负闆嗗洟鐮侊紝绛夊緟闆嗗洟缂栫爜璧嬪��";
+ }
+ resultDataObjectDetailDO.setCode(groupCode);
+ }else{
+ resultDataObjectDetailDO.setCode(code);
+ }
resultDataObjectDetailDO.setId(sourceOid);
resultDataObjectDetailDO.setErrorid("0");
- resultDataObjectDetailDO.setMsg("鐢宠缂栫爜鎴愬姛");
+ resultDataObjectDetailDO.setMsg(msg);
resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
});
/* }else{
@@ -3663,7 +3674,8 @@
CodeImportResultVO resultVO = new CodeImportResultVO();
resultVO.setKeyAttrRuleInfo(String.format(keyRuleVO ==null?"":"鏌ヨ瑙勫垯锛氬幓闄ょ┖鏍�--{0},蹇界暐澶у皬鍐�--{1},蹇界暐鍏ㄥ崐瑙�--{2},蹇界暐鍏ㄩ儴绌烘牸--{3}",
new String[]{trim?"鏄�":"鍚�",ignoreCase?"鏄�":"鍚�",ignoreWidth?"鏄�":"鍚�",trimAll?"鏄�":"鍚�"}));
- resultVO.setSelfRepeatRowIndexList(getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO));
+ //resultVO.setSelfRepeatRowIndexList(getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO));
+ getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO,resultVO);
if(!CollectionUtils.isEmpty(resultVO.getSelfRepeatRowIndexList())){
//鎴戜滑绉婚櫎鏈韩閲嶅鐨勬暟鎹�
cboList = cboList.stream().filter(s->!resultVO.getSelfRepeatRowIndexList().contains(s.getAttributeValue(IMPORT_ROW_INDEX))).collect(Collectors.toList());
@@ -3822,9 +3834,10 @@
* @param keyRuleVO 鍏抽敭灞炴�ф帶鍒惰鍒�
* @return 閲嶅鐨勮鍙�
*/
- private Set<String> getSelfRepeatRowIndex(Map<String/**灞炴�х殑缂栧彿**/, CodeClassifyTemplateAttrVO> ketAttrMap,
- List<ClientBusinessObject> dataList,CodeKeyAttrRepeatVO keyRuleVO){
+ private void getSelfRepeatRowIndex(Map<String/**灞炴�х殑缂栧彿**/, CodeClassifyTemplateAttrVO> ketAttrMap,
+ List<ClientBusinessObject> dataList,CodeKeyAttrRepeatVO keyRuleVO,CodeImportResultVO resultVO){
Set<String> selfRepeatRowIndexList = new CopyOnWriteArraySet<>();
+ Map<String,List<String>> keyAttrOkOidTORepeatOidMap=new HashMap<>();
boolean trimAll =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
//鍏ㄩ儴鍘荤┖鐨勪紭鍏堢骇澶т簬鍘荤┖
boolean trim =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
@@ -3865,7 +3878,8 @@
}
});
//鍥犱负鍙槸鍏抽敭灞炴�ч噸澶嶏紝鎵�浠ユ垜浠笉鑳介噸澶嶇殑澶氭潯閫変竴鏉℃潵鎶ラ敊
- return selfRepeatRowIndexList;
+ resultVO.setKeyAttrRepeatRowIndexList(selfRepeatRowIndexList);
+ resultVO.setKeyAttrOkOidTORepeatOidMap(keyAttrOkOidTORepeatOidMap);
}
/**
* excel鐨勬爣棰樹笂鑾峰彇瀛楁鎵�鍦ㄧ殑浣嶇疆
--
Gitblit v1.9.3