From 9ac3bd680a350c1cc4baad082d92cd2c5f158f3e Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期四, 23 一月 2025 11:13:49 +0800
Subject: [PATCH] 410TC集成jar源代码
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java | 6
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeRuleVO.java | 17 +
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java | 2
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/AttarSearchPanel.java | 4
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java | 1
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java | 1
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeBasicSecVO.java | 53 ++++
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java | 451 +++++++++++++++++++++++++++++--------
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyTemplateAttrVO.java | 32 ++
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java | 2
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java | 22 -
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/data.json | 66 +++++
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyVO.java | 19
14 files changed, 535 insertions(+), 143 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
index 7d59ab6..9070699 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/AttarSearchPanel.java
@@ -82,8 +82,8 @@
VCIJTextField textField = attrInerNameValMap.get(key);
String message = textField.getText().replaceAll(" ", "").trim();
if(message.equals("")) continue;
- String text = getTextQueryVal(message);
- customConditionMap.put(key,text);
+ //String text = getTextQueryVal(message);
+ customConditionMap.put(key+"_like",message);
}
return customConditionMap;
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
index 062b91f..df30239 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java
@@ -140,7 +140,7 @@
userObject.setScope("all");
Object object = JSONObject.toJSON(userObject);*/
parmarMap.put("username",userName);
- password=MD5PassWord(password);
+ //password=MD5PassWord(password);
parmarMap.put("password",password);
parmarMap.put("scope","all");
parmarMap.put("grant_type","password");
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
index b6e9a52..0fa8035 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java
@@ -17,7 +17,6 @@
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.rmip.code.client.codeapply.Apply410.utils.VciBaseUtil;
-
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonProcessingException;
@@ -47,6 +46,11 @@
private final String SPECIAL_SECTION_NAME = "Special.section.name";
private final String SPECIAL_CONTROL_SECTION_NAME = "Special.control.other.section.name";
private final String SPECIAL_SECTION_VALUE = "Special.section.val";
+
+
+ Map<String, CodeBasicSecVO> secMap = new LinkedHashMap<String, CodeBasicSecVO>();
+ Map<String, VCIJComboxBox> comMap = new LinkedHashMap<String, VCIJComboxBox>();
+ Map<String, Integer> secPositionMap = new LinkedHashMap<String, Integer>();
private final String MAX_ATTR_IN_LINE_KEY = "RMData.MaxAttrInLine";
private final String TEXTAREA_ENABLE_KEY = "RMData.TextArea.Enable";
@@ -171,13 +175,13 @@
} catch (IOException e) {
e.printStackTrace();
}
-
+
}
}else{
/* if(!r.getMsg().equals("褰撳墠涓婚搴撳垎绫伙紝浠ュ強瀹冪殑鎵�鏈夌殑涓婄骇鍒嗙被閮芥病鏈夎缃紪鐮佽鍒�")){
VCIOptionPane.showMessage(this,r.getMsg());
}*/
- }
+ }
/**鍔犺浇瑙勫垯瀵瑰簲鐨勭爜娈典俊鎭�**/
if(codeRuleVO!=null){
List<CodeBasicSecVO> codeBasicSecVOList=codeRuleVO.getSecVOList();
@@ -559,10 +563,10 @@
* @param secObjs
*/
public void initCurrentRow(CodeBasicSecVO[] secObjs,VCIJComboxBox[] secCombos) {
- SectionObject lastSecObj = null;
+ CodeBasicSecVO lastSecObj = null;
VCIJComboxBox hisCombo = null;
try {
- final Map<String, String> secValMap = getSpecialValMap(specialSecVals);
+ final Map<String, String> sOecValMap = getSpecialValMap(specialSecVals);
Map<String,List<String>> secIdTOListValueOidMap=new HashMap<>();
for(int k = 0;k < secObjs.length; k++) {
final CodeBasicSecVO secObj = secObjs[k];
@@ -573,6 +577,29 @@
if (secObj.getSecType().equals("codeclassifysec")) {// 鏄垎绫荤爜
String secOid=secObj.getOid();
String parentClassifySecOid= secObj.getParentClassifySecOid();
+
+ if(lastSecObj != null) {
+ lastSecObj = secMap.get(secObj.getParentClassifySecOid());
+ hisCombo = comMap.get(secObj.getParentClassifySecOid());
+ }
+
+ if(lastSecObj != null && lastSecObj.getSecType().equals("codeclassifysec")
+ && secObj.getParentClassifySecOid().equals(lastSecObj.getOid())) {
+
+ hisCombo.addActionListener(new NextComboAction(secPositionMap.get(secObj.getParentClassifySecOid()), comMap.get(secObj.getParentClassifySecOid()),secCombos));
+ initNextCombo(k,secCombo,(CodeClassifyValue)comMap.get(secObj.getParentClassifySecOid()).getSelectedItem(),secPositionMap.get(secObj.getParentClassifySecOid()),secCombos);
+
+ //澶氱骇鍒嗙被鐮佹鐮佸�煎姞杞介敊璇殑Bug淇
+ lastSecObj = secObj;
+ hisCombo = secCombo;
+
+ secMap.put(secObj.getOid(), secObj);
+ comMap.put(secObj.getOid(), secCombo);
+ secPositionMap.put(secObj.getOid(),k);
+ continue;
+
+ }
+
String parentClassifyValueOid="";
if(secIdTOListValueOidMap.containsKey(parentClassifySecOid)){
List<String> parentClassifyValueList= secIdTOListValueOidMap.get(parentClassifySecOid);
@@ -609,6 +636,12 @@
}
}
secIdTOListValueOidMap.put(secObj.getOid(),valueOidList);
+ lastSecObj = secObj;
+ hisCombo = secCombo;
+
+ secMap.put(secObj.getOid(), secObj);
+ comMap.put(secObj.getOid(), secCombo);
+ secPositionMap.put(secObj.getOid(),k);
/**浠ｇ爜椤逛笅鎷変簨浠�**/
secCombo.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -641,17 +674,17 @@
// 鏄浐瀹氱爜
if (secObj.getSecType() .equals("codefixedsec")) {
List<CodeFixedValueVO> fixedValueVOList=secObj.getFixedValueVOList();
- //濡傛灉鍙湁涓�涓�硷紝鍒欑郴缁熼粯璁ら�夋嫨锛屼笉鍔犵┖鍊�
- if(fixedValueVOList.size() >1) {
- secCombo.addItem(new CodeFixedValue());
- }
- for (CodeFixedValueVO codeFixedValueVO : fixedValueVOList) {
- CodeFixedValue codeFixedValue=new CodeFixedValue();
-
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueVO,codeFixedValue);
- secCombo.addItem(codeFixedValue);
- }
- /**褰撶郴缁熼�夋嫨鐨勬槸鎸囧畾鐮佹鍊兼椂锛岀粍鍒唬鍙风殑鐮佹绯荤粺涓嶆樉绀� Begin**/
+ //濡傛灉鍙湁涓�涓�硷紝鍒欑郴缁熼粯璁ら�夋嫨锛屼笉鍔犵┖鍊�
+ if(fixedValueVOList.size() >1) {
+ secCombo.addItem(new CodeFixedValue());
+ }
+ for (CodeFixedValueVO codeFixedValueVO : fixedValueVOList) {
+ CodeFixedValue codeFixedValue=new CodeFixedValue();
+
+ BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueVO,codeFixedValue);
+ secCombo.addItem(codeFixedValue);
+ }
+ /**褰撶郴缁熼�夋嫨鐨勬槸鎸囧畾鐮佹鍊兼椂锛岀粍鍒唬鍙风殑鐮佹绯荤粺涓嶆樉绀� Begin**/
/*FixCodeValObject selObj = (FixCodeValObject) secCombo.getSelectedItem();
if(isSpecialRuleFlag && (secObj.getName().equals(specialControlSecName) && secValMap.containsKey(selObj.getValue())) || secValMap.containsKey(getControlSecSelectValue())) {
setComponentStatus(false);
@@ -673,30 +706,30 @@
secCombo.setFlag(false);
secCombo.getSearchBtn().setVisible(false);
}*/
- } else
+ } else
// 鏄棩鏈熺爜娈�
- if (secObj.getSecType().equals("codedatesec")) {
- String df =secObj.getCodeDateFormatStr();
- SimpleDateFormat dateFormate = new SimpleDateFormat(df);
- String curDate = dateFormate.format(Calendar.getInstance().getTime());
- secCombo.addItem(curDate);
+ if (secObj.getSecType().equals("codedatesec")) {
+ String df =secObj.getCodeDateFormatStr();
+ SimpleDateFormat dateFormate = new SimpleDateFormat(df);
+ String curDate = dateFormate.format(Calendar.getInstance().getTime());
+ secCombo.addItem(curDate);
/*if(dateObj.getIsModify().equals("Y")){//鍙互淇敼
secCombo.setEditable(true);
}*/
- } else
- //鏄紩鐢ㄧ爜娈�
- if (secObj.getSecType().equals("coderefersec")) {
+ } else
+ //鏄紩鐢ㄧ爜娈�
+ if (secObj.getSecType().equals("coderefersec")) {
- if (!secCombo.isFlag()){
- secCombo.setFlag(true);
- secCombo.getSearchBtn().setVisible(true);
- secCombo.getSearchBtn().addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- doSearch(secCombo,secObj);
+ if (!secCombo.isFlag()){
+ secCombo.setFlag(true);
+ secCombo.getSearchBtn().setVisible(true);
+ secCombo.getSearchBtn().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doSearch(secCombo,secObj);
+ }
+ });
}
- });
- }
/*RefSecObject refObj = getRefSecObj(secObj.getId());
DefaultComboBoxModel aModel = getRefSecComboBox(refObj);
secCombo.setModel(aModel);
@@ -724,13 +757,13 @@
}
*/} else
- //灞傜骇鐮佹鐮佸�兼樉绀虹殑鏄�夋嫨鐨勪唬鐮侀」鐨勫悕绉�
- if(secObj.getSecType().equals("codelevelsec")) {
- CodeClassify rmObj = (CodeClassify) this.transTreeObject.getCurrentTreeNode().getObj();
- secCombo.addItem(rmObj);
- } else {
- secCombo.setEditable(true);
- }
+ //灞傜骇鐮佹鐮佸�兼樉绀虹殑鏄�夋嫨鐨勪唬鐮侀」鐨勫悕绉�
+ if(secObj.getSecType().equals("codelevelsec")) {
+ CodeClassify rmObj = (CodeClassify) this.transTreeObject.getCurrentTreeNode().getObj();
+ secCombo.addItem(rmObj);
+ } else {
+ secCombo.setEditable(true);
+ }
}
}catch (Exception e) {
e.printStackTrace();
@@ -828,7 +861,7 @@
lbl.setToolTipText("鐐瑰嚮姝ゅ鑾峰彇妯℃澘瀵瑰簲瑙勫垯鐨勫��");
lbl.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e){
- getComptAttrValue(attrObj,attrIdToCtrlMaps);
+ getComptAttrValue(attrObj,attrIdToCtrlMaps);
}
});
@@ -997,7 +1030,7 @@
cbx.setModel(model);
compt = cbx;
} else { // 涓嶅瓨鍦ㄥ彇鍊艰寖鍥村垯鎸夌被鍨嬬敓鎴愪笉鍚岀殑鎺т欢
- if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean.toString())) { // Boolean绫诲瀷
+ if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean.toString())) { // Boolean绫诲瀷
VCIJComboBox cbx = new VCIJComboBox();
DefaultComboBoxModel model = new DefaultComboBoxModel();
model.addElement("0");
@@ -1010,34 +1043,34 @@
}
compt = cbx;
} else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDate.toString())) { // 鏃ユ湡绫诲瀷
- VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd",
- attrObj.getRequireFlag().equals("true"), true, false);
- if(displayValues.containsKey(attrObj.getId())){
- aTrue.setDateString(displayValues.get(attrObj.getId()));
- aTrue.setEnabled(false);
- return aTrue;
- }
- compt = aTrue;
+ VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd",
+ attrObj.getRequireFlag().equals("true"), true, false);
+ if(displayValues.containsKey(attrObj.getId())){
+ aTrue.setDateString(displayValues.get(attrObj.getId()));
+ aTrue.setEnabled(false);
+ return aTrue;
+ }
+ compt = aTrue;
} else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDateTime.toString())) { // 鏃ユ湡绫诲瀷
- VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd HH:mm:ss",
- attrObj.getRequireFlag().equals("true"), true, false);
- if(displayValues.containsKey(attrObj.getId())){
- aTrue.setDateString(displayValues.get(attrObj.getId()));
- aTrue.setEnabled(false);
- return aTrue;
- }
- compt = aTrue;
- }else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTTime.toString())) { // 鏃ユ湡绫诲瀷
- VCIJCalendarPanel aTrue = new VCIJCalendarPanel("HH:mm:ss",
- attrObj.getRequireFlag().equals("true"), true, false);
- if(displayValues.containsKey(attrObj.getId())){
- aTrue.setDateString(displayValues.get(attrObj.getId()));
- aTrue.setEnabled(false);
- return aTrue;
- }
- compt = aTrue;
- }
- else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDouble.toString())||attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTLong.toString())) { // Real绫诲瀷
+ VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd HH:mm:ss",
+ attrObj.getRequireFlag().equals("true"), true, false);
+ if(displayValues.containsKey(attrObj.getId())){
+ aTrue.setDateString(displayValues.get(attrObj.getId()));
+ aTrue.setEnabled(false);
+ return aTrue;
+ }
+ compt = aTrue;
+ }else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTTime.toString())) { // 鏃ユ湡绫诲瀷
+ VCIJCalendarPanel aTrue = new VCIJCalendarPanel("HH:mm:ss",
+ attrObj.getRequireFlag().equals("true"), true, false);
+ if(displayValues.containsKey(attrObj.getId())){
+ aTrue.setDateString(displayValues.get(attrObj.getId()));
+ aTrue.setEnabled(false);
+ return aTrue;
+ }
+ compt = aTrue;
+ }
+ else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDouble.toString())||attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTLong.toString())) { // Real绫诲瀷
RealTextField txt = new RealTextField("");
txt.setRequired(attrObj.getRequireFlag().equals("true"));
if(displayValues.containsKey(attrObj.getId())){
@@ -1049,20 +1082,20 @@
IntegerTextField txt = new IntegerTextField("");
txt.setRequired(attrObj.getRequireFlag().equals("true"));
if(displayValues.containsKey(attrObj.getId())){
- txt.setText(displayValues.get(attrObj.getId()));
- txt.setEditable(false);
+ txt.setText(displayValues.get(attrObj.getId()));
+ txt.setEditable(false);
}
compt = txt;
}
- else{
- VCIJTextField txt = new VCIJTextField(this,attrObj.getRequireFlag().equals("true"));
- if(displayValues.containsKey(attrObj.getId())){
- txt.setText(displayValues.get(attrObj.getId()));
- txt.setEditable(false);
- }
- compt = txt;
- textCompts.add(txt);
- }
+ else{
+ VCIJTextField txt = new VCIJTextField(this,attrObj.getRequireFlag().equals("true"));
+ if(displayValues.containsKey(attrObj.getId())){
+ txt.setText(displayValues.get(attrObj.getId()));
+ txt.setEditable(false);
+ }
+ compt = txt;
+ textCompts.add(txt);
+ }
boolean enabled = true;
// 闆嗗洟浠ｇ爜銆侀泦鍥㈤檮鍔犵爜涓嶅彲浠ユ墜宸ュ綍鍏ユ暟鎹�
@@ -1075,6 +1108,218 @@
return compt;
}
+ /**
+ * 澶勭悊涓嬫媺妗嗙殑浜嬩欢
+ * @author Administrator
+ *
+ */
+ class NextComboAction implements ActionListener {
+ private int column = 0;
+ private VCIJComboxBox curCombo = null;
+ private VCIJComboxBox[] secCombos = null;
+
+ public NextComboAction(int column,VCIJComboxBox curCombo,VCIJComboxBox[] secCombos) {
+ this.column = column;
+ this.curCombo = curCombo;
+ this.secCombos = secCombos;
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ VCIJComboxBox nextCombo = secCombos[column+1];
+ if(curCombo.getSelectedIndex() != -1){
+ CodeClassifyValue obj = (CodeClassifyValue)curCombo.getSelectedItem();
+ initNextCombo(column+1, nextCombo, obj, column,secCombos);
+ }
+ }
+ }
+ /**
+ * 鍒濆鍖栦笅涓�涓笅鎷夊垪琛�
+ * @param column
+ * @param curCombo
+ * @param lastObj 涓婁竴涓�変腑鐨勫垎绫荤爜娈电爜鍊肩殑瀵硅薄锛堝彧閽堝鍒嗙被鐮侊級
+ */
+ public void initNextCombo(int column,VCIJComboxBox curCombo,CodeClassifyValue lastObj,int lastColumn,VCIJComboxBox[] secCombos) {
+
+ final VCIJComboxBox nextCombo = curCombo;
+ CodeBasicSecVO lastSecObj = columnSecMap.get(lastColumn);
+ final CodeBasicSecVO nextSecObj = columnSecMap.get(column);
+
+ if(nextSecObj == null) {//濡傛灉鍚庨潰娌℃湁瀵硅薄锛屽垯杩斿洖
+ return;
+ }
+
+ boolean isContinue = false;
+ if(nextSecObj.getSecType().equals("codeclassifysec")){//濡傛灉褰撳墠鏄垎绫荤爜
+ CodeBasicSecVO curObj =nextSecObj;
+ if(lastSecObj.getSecType().equals("codeclassifysec")
+ && curObj.getParentClassifySecOid().equals(lastSecObj.getOid())){
+ isContinue = true;
+ }
+ }
+ if(lastObj == null || !isContinue){//濡傛灉褰撳墠鍒楃殑涓嬫媺妗嗗凡缁忓垵濮嬭繃,骞朵笖涓婁竴鍒嗙被鐮佷笉鏄綋鍓嶅垎绫荤爜鐨勭埗
+ return;
+ }
+ VCIJComboxBox lastColumnComboxBox= secCombos[lastColumn];
+
+ if(nextSecObj.getSecType().equals("codeclassifysec")){//鍒嗙被鐮�
+ CodeClassifyValue[] clsfCodeVals = new CodeClassifyValue[]{};
+ //濡傛灉涓婁竴涓槸鍒嗙被鐮�,骞朵笖鏄綋鍓嶅垎绫荤爜鐨勭埗
+ /*if (isContinue) {
+ clsfCodeVals = clsfCodeValDel.getChildClsfCodeVal(lastObj.getOid());
+ } else {
+ clsfCodeVals = clsfCodeValDel.getSecRootClsfCodeVal(nextSecObj.getOid());//鑾峰彇璇ョ爜娈典笅鐨勬墍鏈夌爜娈电爜鍊煎璞�
+ }*/
+ String parentClassifyValueOid="";
+ if(lastColumnComboxBox!=null){
+ CodeClassifyValue selectedItem = (CodeClassifyValue)lastColumnComboxBox.getSelectedItem();
+ if(selectedItem!=null)
+ parentClassifyValueOid= selectedItem.getOid();
+
+ }
+ Map<String,String> condtionMap=new HashMap<>();
+ condtionMap.put("secOid", nextSecObj.getOid());
+ condtionMap.put("parentClassifyValueOid",parentClassifyValueOid);
+ Map<String,String> headerMap=new HashMap<>();
+ headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
+ R r=HttpUtil.sendGet(url+"/listCodeClassifyValueBySecOid",condtionMap,headerMap);
+ List<CodeClassifyValue> codeClassifyValueList=new ArrayList<>();
+ if(r.isSuccess()){
+ Object object= r.getData();
+ if(object!=null) {
+ ObjectMapper objectMapper = new ObjectMapper();
+ try {
+ codeClassifyValueList = objectMapper.readValue(object.toString(), new TypeReference<List<CodeClassifyValue>>() {});
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }else{
+ VCIOptionPane.showMessage(this,r.getMsg());
+ }
+
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ for(int i = 0;i< codeClassifyValueList.size();i++) {
+ /*if(!codeClassifyValueList.get(i).getOid().equals(nextSecObj.getOid())) {
+ continue;
+ }*/
+ model.addElement(codeClassifyValueList.get(i));
+ }
+
+ /*Map<String, String> secValMap = getSpecialValMap(specialSecVals);
+ if(isSpecialRuleFlag && (lastSecObj.getName().equals(specialControlSecName) && secValMap.containsKey(lastObj.getValue())) || secValMap.containsKey(getControlSecSelectValue())) {
+ setComponentStatus(false);
+ }else {
+ setComponentStatus(true);
+ }*/
+ /******************END************************/
+
+ nextCombo.setModel(model);
+ nextCombo.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ ((VCIJTextField)secIdToClsfIdMap.get(nextSecObj.getId())).setText(((CodeClassifyValue)nextCombo.getSelectedItem()).getName());
+ }
+ });
+
+ if(nextCombo.getSelectedItem() != null) {
+ ((VCIJTextField)secIdToClsfIdMap.get(lastSecObj.getId())).setText(lastObj.getName());
+ ((VCIJTextField)secIdToClsfIdMap.get(nextSecObj.getId())).setText(((CodeClassifyValue)nextCombo.getSelectedItem()).getName());
+ }
+
+ //淇閫夋嫨鍒嗙被鐮佹鐮佸�煎悗锛屾墍鏈夌殑瀛愬垎绫荤殑鐮佹鐮佸�间笉鑳芥洿鏂扮殑闂
+ int k = column + 1;
+ if(k < columnSecMap.size() && columnSecMap.get(k).getSecType().equals("codeclassifysec")) {
+ CodeBasicSecVO currentSecObj = columnSecMap.get(k);
+ // SortSecObject curObj = new SectionClientDelegate(userObj).fetchSortSecById(currentSecObj.getId());
+ if (secPositionMap.get(currentSecObj.getParentClassifySecOid()) != null) {
+// secCombos[column].addActionListener(new NextComboAction(secPositionMap.get(curObj.getId()), comMap.get(curObj.getId()),secCombos));
+ CodeClassifyValue nextClsfCodeValObj = (CodeClassifyValue)comMap.get(currentSecObj.getParentClassifySecOid()).getSelectedItem() == null ? new CodeClassifyValue():(CodeClassifyValue)comMap.get(currentSecObj.getParentClassifySecOid()).getSelectedItem();
+ initNextCombo(k,secCombos[k],nextClsfCodeValObj,secPositionMap.get(currentSecObj.getParentClassifySecOid()),secCombos);
+ }
+// k++;
+ }
+ /*if (nextCombo.getItemCount() > 10){
+ if (!nextCombo.isFlag()){
+ nextCombo.setFlag(true);
+ nextCombo.getSearchBtn().setVisible(true);
+ nextCombo.getSearchBtn().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doSearch(nextCombo);
+ }
+ });
+ }
+
+ }else {
+ nextCombo.setFlag(false);
+ nextCombo.getSearchBtn().setVisible(false);
+ }*/
+ }else if(nextSecObj.getSecType().equals("codefixedsec")){//鍥哄畾鐮�
+ Map<String, String> secValMap = getSpecialValMap(specialSecVals);
+ /*if(isSpecialRuleFlag && (lastSecObj.getName().equals(specialControlSecName) && secValMap.containsKey(lastObj.getValue())) || secValMap.containsKey(getControlSecSelectValue())) {
+ setComponentStatus(false);
+ }else {
+ setComponentStatus(true);
+ }*/
+ /******************END************************/
+
+ // SectionValueClientDelegate codeValDel = new SectionValueClientDelegate(userObj);
+ //FixCodeValObject[] codeValObjs = codeValDel.fetchFixCodeValBySecId(nextSecObj.getId());//鑾峰彇璇ョ爜娈典笅鐨勬墍鏈夌爜娈电爜鍊煎璞�
+ List<CodeFixedValueVO> fixedValueVOList=nextSecObj.getFixedValueVOList();
+ for(int i = 0;i< fixedValueVOList.size();i++) {
+ nextCombo.addItem(fixedValueVOList.get(i));
+ }
+ /*if (nextCombo.getItemCount() > 10){
+ if (!nextCombo.isFlag()){
+ nextCombo.setFlag(true);
+ nextCombo.getSearchBtn().setVisible(true);
+ nextCombo.getSearchBtn().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doSearch(nextCombo);
+ }
+ });
+ }
+ }else {
+ nextCombo.setFlag(false);
+ nextCombo.getSearchBtn().setVisible(false);
+ }*/
+ }else if(nextSecObj.getSecType().equals("codedatesec")){//鏃ユ湡鐮佹
+ // DateSecObject dateObj = secDel.fetchDateSecById(nextSecObj.getId());
+
+ String df =nextSecObj.getCodeDateFormatStr();
+ String CodeDateValue= nextSecObj.getCodeDateValue();
+ SimpleDateFormat dateFormate = new SimpleDateFormat(df);
+ if(StringUtils.isBlank(CodeDateValue)){
+ CodeDateValue= dateFormate.format(Calendar.getInstance().getTime());
+ }
+ nextCombo.addItem(CodeDateValue);
+ /*if(dateObj.getIsModify().equals("Y")){
+ nextCombo.setEditable(true);
+ }*/
+ }/*else if(nextSecObj.getSecType() equals("")){//鍒嗛殧绗�
+ nextCombo.addItem(nextSecObj.getId());}*/
+ else if (nextSecObj.getSecType().equals("coderefersec")) {
+ if (!nextCombo.isFlag()){
+ nextCombo.setFlag(true);
+ nextCombo.getSearchBtn().setVisible(true);
+ nextCombo.getSearchBtn().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doSearch(nextCombo,nextSecObj);
+ }
+ });
+ }
+ }else {
+ nextCombo.setEditable(true);
+ }
+ }
+
+
+
/****
* 鏍规嵁灞炴�d鑾峰彇灞炴�у彇鍊艰寖鍥寸殑鍊�
* <p>Description: </p>
@@ -1259,14 +1504,14 @@
VCIOptionPane.showMessage(this,r.getMsg());
}
}
- /**
- * 鏍规嵁寮曠敤妯℃澘鐨刬d鑾峰彇寮曠敤妯℃澘瀵硅薄鍖呭惈鐨勬暟鎹�
- * <p>Description: </p>
- *
- * @author liujw
- * @time 2012-11-29
- * @param //referTempId 寮曠敤妯℃澘id
- */
+ /**
+ * 鏍规嵁寮曠敤妯℃澘鐨刬d鑾峰彇寮曠敤妯℃澘瀵硅薄鍖呭惈鐨勬暟鎹�
+ * <p>Description: </p>
+ *
+ * @author liujw
+ * @time 2012-11-29
+ * @param //referTempId 寮曠敤妯℃澘id
+ */
private void getReferTempRMData(final CodeClassifyTemplateAttrVO tempPropObj,final LinkedHashMap<String, JComponent> attrIdToCtrlMaps,
final List<CodeClassifyTemplateAttrVO> tempPropList) {
// 鏈┖绐楀彛璋冪敤 鏈夊彲鑳芥潵鑷袱澶�
@@ -1295,8 +1540,8 @@
}*/
keyValue= dialog.getKeyValue();
//for(CodeClassifyTemplateAttrVO obj : tempPropList) {
- if(attrIdToCtrlMaps.containsKey(tempPropObj.getId())) {
- JComponent comp = attrIdToCtrlMaps.get(tempPropObj.getId());
+ if(attrIdToCtrlMaps.containsKey(tempPropObj.getId())) {
+ JComponent comp = attrIdToCtrlMaps.get(tempPropObj.getId());
/*if(comp instanceof VCIJTextField) {
int index = innnerNamesMaps.get(tempPropObj.getInternalname());
((VCIJTextField) comp).setText(datas[index]);
@@ -1304,16 +1549,16 @@
int index = innnerNamesMaps.get(tempPropObj.getInternalname());
((VCIJCalendarPanel) comp).setDateString(datas[index]);
} else */
- if (comp instanceof VCIJComboBox) {
- //DefaultComboBoxModel model = new DefaultComboBoxModel();
- if(keyValue!=null) {
- AttrRangObjectWarper wrapper = new AttrRangObjectWarper(keyValue);
- ((VCIJComboBox) comp).getModel().setSelectedItem(wrapper);
- }
- //model.addElement(wrapper);
- //((VCIJComboBox) comp).setModel(model);
+ if (comp instanceof VCIJComboBox) {
+ //DefaultComboBoxModel model = new DefaultComboBoxModel();
+ if(keyValue!=null) {
+ AttrRangObjectWarper wrapper = new AttrRangObjectWarper(keyValue);
+ ((VCIJComboBox) comp).getModel().setSelectedItem(wrapper);
}
+ //model.addElement(wrapper);
+ //((VCIJComboBox) comp).setModel(model);
}
+ }
//}
}
@@ -1402,7 +1647,7 @@
}
/**鏍￠獙涓夛細鍙彉鐮佹鐨勬牎楠�**/
} else if (cType .equals( "codevariablesec")) {
- tempStr = new StringBuffer();
+ tempStr = new StringBuffer();
String codeSecLength =secObj.getCodeSecLength();
int secLen= Integer.parseInt(codeSecLength);
//鍙栧嚭鐢ㄦ埛杈撳叆鐨勫��
@@ -1585,7 +1830,7 @@
} else if (secType.equals("codelevelsec")) {//灞傜骇鐮佹
cVal = levelRes;
} else if (secType.equals("codeserialsec")) {
- continue;
+ continue;
} else {
cVal = (String) ((VCIJComboBox) secAndComMap.get(secObj.getId())).getSelectedItem();
}
@@ -1660,8 +1905,8 @@
// 鏍￠獙闀垮害
else if ((value != null && !value.equals(""))
&& value.length() > Integer.valueOf(propObj.getControlLength())
- && !(propObj.getAttributeDataType().toUpperCase().equals(VciFieldTypeEnum.VTDate)||
- propObj.getAttributeDataType().toUpperCase().equals(VciFieldTypeEnum.VTDateTime))
+ && !(propObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDate.name())||
+ propObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDateTime.name()))
) {
isExistError = true;
compt.requestFocus();
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java
index dd2ee6b..2a4573b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanel.java
@@ -140,6 +140,7 @@
}
public Map<String, String> getCustomCondtionMap() {
+ customCondtionMap=new HashMap<>();
if(this.getCustomTopPanel()!=null){
Map<String,String> newCustomCondtionMap= this.getCustomTopPanel().getAttrSearchFilterString();
customCondtionMap.putAll(newCustomCondtionMap);
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java
index e24d172..187dfa6 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/TestIntegrateFrame.java
@@ -4,31 +4,13 @@
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
public class TestIntegrateFrame {
public static JButton apply = new JButton();
public static JTextField text = new JTextField();
public static void main(String[] args) {
-
- List<Integer> list=new ArrayList<>();
- list.add(1);
- list.add(5);
- list.add(6);
- list.add(3);
- list.add(2);
- list.add(4);
- List<Integer> classifyVOS =list.stream().sorted(((o1, o2) -> o2.compareTo(o1))).collect(Collectors.toList());
- int level=1;
-
- int tt=1;
- if (classifyVOS.size() >= level && level > 0) {
- tt = classifyVOS.get(level - 1);
- }
final JFrame j = new JFrame();
j.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JPanel p = new JPanel();
@@ -44,10 +26,6 @@
apply.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
-
-
-
-
Map<String, String> map = new HashMap<String, String>();
// map.put("鍘熸潗鏂欐浛鎹欢", "YUANCAILIAOTIHUANJIAN");
// map.put("鍘熸潗鏂欓儴浠�", "1");
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/data.json b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/data.json
new file mode 100644
index 0000000..5316e20
--- /dev/null
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/data.json
@@ -0,0 +1,66 @@
+{
+ "data" : {
+ "systemId" : "MES",
+ "classifys" : {
+ "classify" : [{
+ "classCode" : "partw",
+ "library" : "partw",
+ "objects" : {
+ "object" : [{
+ "code" : "",
+ "creator" : "19831133",
+ "id" : "",
+ "operate" : "create",
+ "prop" : [{
+ "key" : "masterManuorg",
+ "text" : "工厂号",
+ "value" : "410"
+ }, {
+ "key" : "PartNo",
+ "text" : "part编码",
+ "value" : "1234567890"
+ }, {
+ "key" : "proNo",
+ "text" : "工序号",
+ "value" : "05/10/15"
+ }],
+ "status" : "Released"
+ }, {
+ "code" : "",
+ "creator" : "19831133",
+ "id" : "",
+ "operate" : "create",
+ "prop" : [{
+ "key" : "masterManuorg",
+ "text" : "工厂号",
+ "value" : "420"
+ }, {
+ "key" : "PartNo",
+ "text" : "part编码",
+ "value" : "0123456789"
+ }, {
+ "key" : "proNo",
+ "text" : "工序号",
+ "value" : "05/20"
+ }],
+ "status" : "Released"
+ }]
+ },
+ "sections" : {
+ "section" : [{
+ "name" : "部门代码",
+ "value" : "410"
+ }, {
+ "name" : "Part码",
+ "value" : "1234567890"
+ }]
+ }
+ }]
+ },
+ "user" : {
+ "ip" : "0:0:0:0:0:0:0:1",
+ "trueName" : "19831133",
+ "userName" : "19831133"
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java
index 9882276..77d5aed 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/CodeClassifyValue.java
@@ -6,6 +6,10 @@
public class CodeClassifyValue extends CodeClassifyValueVO {
@Override
public String toString() {
- return super.getName();
+ if(super.getId()==null){
+ return super.getName();
+ }else{
+ return super.getName()+"("+super.getId()+")";
+ }
}
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java
index aa84465..e9845c1 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/config/CodeRule.java
@@ -97,4 +97,5 @@
this.basicSecTypes = basicSecTypes;
}
+
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeBasicSecVO.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeBasicSecVO.java
index 530ee7c..d747089 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeBasicSecVO.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeBasicSecVO.java
@@ -198,7 +198,15 @@
* 鑷畾涔夌殑娴佹按绠楁硶绫�
*/
private String customCodeSerialClass;
+ /**
+ * 鑷畾涔夌殑娴佹按绠楁硶绫�
+ */
+ private String customCodeSerialClassText;
+ /***
+ * 鑷畾涔夋祦姘寸被鍨�
+ */
+ private String customCodeSerialType;
/**
* 鏄惁鑷姩鍖归厤鍒嗙被鍊�
*/
@@ -248,6 +256,17 @@
* 鍥哄畾鐮佺殑鐮佸�煎唴瀹�
*/
private List<CodeFixedValueVO> fixedValueVOList;
+
+ /**
+ * 鍓嶇紑
+ */
+ private String prefixCode;
+
+ /**
+ * 鍚庣紑
+ */
+ private String suffixCode;
+
public String getSecType() {
return secType;
@@ -616,5 +635,37 @@
public void setCodeDateValue(String codeDateValue) {
this.codeDateValue = codeDateValue;
}
-
+
+ public String getPrefixCode() {
+ return prefixCode;
+ }
+
+ public void setPrefixCode(String prefixCode) {
+ this.prefixCode = prefixCode;
+ }
+
+ public String getSuffixCode() {
+ return suffixCode;
+ }
+
+ public void setSuffixCode(String suffixCode) {
+ this.suffixCode = suffixCode;
+ }
+
+ public String getCustomCodeSerialClassText() {
+ return customCodeSerialClassText;
+ }
+
+ public void setCustomCodeSerialClassText(String customCodeSerialClassText) {
+ this.customCodeSerialClassText = customCodeSerialClassText;
+ }
+
+ public String getCustomCodeSerialType() {
+ return customCodeSerialType;
+ }
+
+ public void setCustomCodeSerialType(String customCodeSerialType) {
+ this.customCodeSerialType = customCodeSerialType;
+ }
+
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyTemplateAttrVO.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyTemplateAttrVO.java
index 42b7614..d69e709 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyTemplateAttrVO.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyTemplateAttrVO.java
@@ -296,7 +296,34 @@
* 杈撳叆鎻愮ず
*/
private String inputTip;
-
+
+ /**
+ * 杩戜箟璇嶆煡璇㈣鍒�
+ */
+ private String sysonymRuleOids;
+
+ /**
+ * 杩戜箟璇嶆煡璇㈣鍒欐樉绀哄��
+ */
+ private String sysonymRuleOidsText;
+
+
+ public String getSysonymRuleOids() {
+ return sysonymRuleOids;
+ }
+
+ public void setSysonymRuleOids(String sysonymRuleOids) {
+ this.sysonymRuleOids = sysonymRuleOids;
+ }
+
+ public String getSysonymRuleOidsText() {
+ return sysonymRuleOidsText;
+ }
+
+ public void setSysonymRuleOidsText(String sysonymRuleOidsText) {
+ this.sysonymRuleOidsText = sysonymRuleOidsText;
+ }
+
public String getClassifyTemplateOid() {
return classifyTemplateOid;
}
@@ -804,6 +831,9 @@
", parentName='" + parentName + '\'' +
", inputTip='" + inputTip + '\'' +
", parentQueryAttr='" + parentQueryAttr + '\'' +
+
+ ", sysonymRuleOids='" + sysonymRuleOids + '\'' +
+ ", sysonymRuleOidsText='" + sysonymRuleOidsText + '\'' +
'}';
}
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyVO.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyVO.java
index 865cd3b..b9a1ce1 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyVO.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeClassifyVO.java
@@ -17,7 +17,10 @@
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 4615707119254063830L;
-
+ /**
+ * 鏄惁鍙備笌鏍￠獙锛�0:涓嶅弬涓�;1:鍙備笌
+ */
+ private Integer isParticipateCheck;
/**
* 灞炴�ф帓搴忓彿
*/
@@ -59,31 +62,31 @@
private String parentCodeClassifyOid;
/**
- * 鏁版嵁鎵�鍦ㄧ殑灞傜骇
+ * 閺佺増宓侀幍锟介崷銊ф畱鐏炲倻楠�
*/
private Integer dataLevel;
/**
- * 灞傜骇鐨勮矾寰�
+ * 鐏炲倻楠囬惃鍕熅瀵帮拷
*/
private String path;
/***
- * 鍚嶇О璺緞
+ * 閸氬秶袨鐠侯垰绶�
*/
private String namePath;
/***
- * 浠ｇ爜璺緞
+ * 娴狅絿鐖滅捄顖氱窞
*/
private String idPath;
/**
- * 鐩镐技鏌ヨ瑙勫垯涓婚敭
+ * 閻╅晲鎶�閺屻儴顕楃憴鍕灟娑撳鏁�
*/
private String codeResembleRuleOid;
/**
- * 鐩镐技鏌ヨ瑙勫垯鍚嶇О
+ * 閻╅晲鎶�閺屻儴顕楃憴鍕灟閸氬秶袨
*/
private String codeResembleRuleOidName;
@@ -198,6 +201,6 @@
public void setCodeResembleRuleOidName(String codeResembleRuleOidName) {
this.codeResembleRuleOidName = codeResembleRuleOidName;
}
-
+
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeRuleVO.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeRuleVO.java
index 21e23a8..758ab4e 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeRuleVO.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/ubcscode/vo/CodeRuleVO.java
@@ -36,7 +36,10 @@
* 缂栫爜鐨勭爜娈典俊鎭�
*/
private List<CodeBasicSecVO> secVOList;
-
+ /**
+ * 鎵�鏈夎�呭湪鐣岄潰鏄剧ず鍐呭锛堣处鍙凤紙鐢ㄦ埛鍚嶏級锛�
+ */
+ private String ownerText;
public String getId() {
return id;
}
@@ -68,7 +71,15 @@
public void setSecVOList(List<CodeBasicSecVO> secVOList) {
this.secVOList = secVOList;
}
-
-
+
+ public String getOwnerText() {
+ return ownerText;
+ }
+
+ public void setOwnerText(String ownerText) {
+ this.ownerText = ownerText;
+ }
+
+
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
index 3806f25..3ff0ef7 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java
@@ -346,7 +346,7 @@
return result;
}
}catch (Throwable e){
- e.printStackTrace();
+ e.printStackTrace();;
}
return result;
}
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
index 515b6b9..a9b9de8 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/ListUtil.java
@@ -5,6 +5,8 @@
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.text.ParseException;
--
Gitblit v1.9.3