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

@@ -71,7 +71,7 @@
   private int maxStringLength = 100;
   private int levelPositon = -1;
   private TransmitTreeObject transTreeObject = new TransmitTreeObject();
   private  User userObj;
   private  TokenUserObject tokenUserObject;
   private String deptName;
   //存储每个实际 码段列对应的码段对象
   protected Map<Integer,CodeBasicSecVO> columnSecMap = new LinkedHashMap<Integer,CodeBasicSecVO>();
@@ -115,15 +115,15 @@
   private CodeClassifyTemplateVO currentCodeClassifyTemplateVO;
   // 实际的
   private VCIJDialog realDialogInstance = null;
   public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject, User userObj, CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
   public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject, TokenUserObject tokenUserObject, CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
      this.transTreeObject = transTreeObject;
      this.userObj = userObj;
      this.tokenUserObject = tokenUserObject;
      this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
   }

   public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,User userObj,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
   public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,TokenUserObject tokenUserObject,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
      this.transTreeObject = transTreeObject;
      this.userObj = userObj;
      this.tokenUserObject = tokenUserObject;
      this.deptName = deptName;
      this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
   }
@@ -152,7 +152,9 @@
      /**系统只加载代码项  如果libName不为空，直接获取对应的代码项**/
      Map<String,String> condtionMap=new HashMap<>();
      condtionMap.put("codeClassId", rmType.getOid());
      R r= HttpUtil.sendGet(url+"/getCodeRuleByClassifyFullInfo",condtionMap,new HashMap<>());
      Map<String,String> headerMap=new HashMap<>();
      headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
      R r= HttpUtil.sendGet(url+"/getCodeRuleByClassifyFullInfo",condtionMap,headerMap);
      codeRuleVO=new CodeRuleVO();
      if(r.isSuccess()){
         Object object= r.getData();
@@ -570,7 +572,9 @@
               Map<String,String> condtionMap=new HashMap<>();
               condtionMap.put("secOid", secOid);
               condtionMap.put("parentClassifyValueOid", parentClassifyValueOid);
               R r=HttpUtil.sendGet(url+"/listCodeClassifyValueBySecOid",condtionMap,new HashMap<>());
               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();
@@ -1026,7 +1030,10 @@
      /**系统只加载代码项  如果libName不为空，直接获取对应的代码项**/
      Map<String,String> condtionMap=new HashMap<>();
      condtionMap.put("oid", attrId);
      R r=HttpUtil.sendGet(url+"/listComboboxItems",condtionMap,new HashMap<>());
      Map<String,String> headerMap=new HashMap<>();
      headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

      R r=HttpUtil.sendGet(url+"/listComboboxItems",condtionMap,headerMap);
      List<KeyValue> keyValueList=new ArrayList<>();
      if(r.isSuccess()){
         Object object= r.getData();
@@ -1169,7 +1176,10 @@
         condtionMap.put("dataMap["+key+"]",value);
      });
      condtionMap.put("componentRuleValue",tempPropObj.getComponentRule());
      R r= HttpUtil.sendGet(url+"/getValueByFormula",condtionMap,new HashMap<>());
      Map<String,String> headerMap=new HashMap<>();
      headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());

      R r= HttpUtil.sendGet(url+"/getValueByFormula",condtionMap,headerMap);
      String value="";
      if(r.isSuccess()){
         value= r.getData().toString();
@@ -1395,7 +1405,7 @@
            }
         } else if(cType.equals("coderefersec")) {//引用码段码值添加了空值，需要特殊判断一下
            KeyValue keyValue = ((AttrRangObjectWarper)((VCIJComboBox)secAndComMap.get(secObj.getId())).getSelectedItem()).getKeyValue();
            if(keyValue!=null&&("".equals(keyValue.getValue()))) {
            if(keyValue!=null&&("".equals(keyValue.getKey()))) {
               VCIOptionPane.showMessageDialog(this, "请选择码段："+secObj.getName()+" 对应的码值");
               return false;
            }
@@ -1459,7 +1469,9 @@
         codeClassify.getOid();
         Map<String,String> condtionMap=new HashMap<>();
         condtionMap.put("codeClassId", codeClassify.getOid());
         R r= HttpUtil.sendGet(url+"/countChildrenByClassifyOid",condtionMap,new HashMap<>());
         Map<String,String> headerMap=new HashMap<>();
         headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
         R r= HttpUtil.sendGet(url+"/countChildrenByClassifyOid",condtionMap,headerMap);
         if(r.isSuccess()){
            Object object= r.getData();
            count=(int)object;
@@ -1506,7 +1518,7 @@
               } else if (secType.equals("coderefersec")) {//引用码段码值
//               cVal = ((CodeValueObject)((VCIJComboBox)secAndComMap.get(secObj.getId())).getSelectedItem()).getPlcodeval();
                  KeyValue newKeyValue = ((AttrRangObjectWarper) ((VCIJComboBox) secAndComMap.get(secObj.getId())).getSelectedItem()).getKeyValue();
                  cVal=newKeyValue.getValue();
                  cVal=newKeyValue.getKey();
               /*} else if (secType == SectionConstant.SectionType.SECCHAR) {//分隔符
                  cVal = secObj.getName();*/
               } else if (secType.equals("codelevelsec")) {//层级码段
@@ -1565,7 +1577,7 @@
         } else if (compt instanceof VCIJComboBox) {
            Object objItem = ((VCIJComboBox) compt).getSelectedItem();
            if (objItem instanceof AttrRangObjectWarper) { // 属性取值范围
               value = ((AttrRangObjectWarper) objItem).getKeyValue().getValue();
               value = ((AttrRangObjectWarper) objItem).getKeyValue().getKey();
            } else if (objItem instanceof String) { // Boolean类型的会提供0\1选择
               value = (String) objItem;
            }
@@ -1730,4 +1742,12 @@
   public void setCodeRuleVO(CodeRuleVO codeRuleVO) {
      this.codeRuleVO = codeRuleVO;
   }

   public TokenUserObject getTokenUserObject() {
      return tokenUserObject;
   }

   public void setTokenUserObject(TokenUserObject tokenUserObject) {
      this.tokenUserObject = tokenUserObject;
   }
}