关于集成配置需求更改

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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.*;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410DialogActionListener.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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>();

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchDialog.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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 {


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchMainPanel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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.*;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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);
        });

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410TreePanel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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");

    /***
     *

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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.*;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelActionListener.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeLibTreeCellRenderer.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeReferTreePanel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CommonActionListener.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/DescViewDialog.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialog.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 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 {
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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+"---");
            }
        });

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TransmitTreeObject.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/enums/CodeReferConfigTypeEnum.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/AttrRangObjectWarper.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/BaseModel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ClassifyLevel.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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 {
    /***

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassify.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 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 {
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeFixedValue.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CoderefersecSearchVO.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/DataGrid.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/R.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/RMDataTransmitObject.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ReferTreObject.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/TokenUserObject.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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 {


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefer.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UIFormRefers.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/UserObject.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/IntegerTextField.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/RealTextField.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/swing/VCIJComboxBox.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ConfigUtils.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpClient3.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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();

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/MdmEngineConstant.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/httpClient4.java

ÎļþÃû´Ó Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/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;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/SectionObject.java

ÎļþÒÑɾ³ý

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/object/CodeDataObject.java

ÎļþÒÑɾ³ý

 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<>();
    /***
     * å…³é”®å±žæ€§ç›¸åŒçš„属性oid与其重复的数据oid
     */
    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;
    }

 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());
        }
    }

    /***
     * åŒæ­¥é›†å›¢æ¨¡åž‹è§†å›¾

 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);
        }
    }


 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) {

 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的标题上获取字段所在的位置