diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java index 6422f90e..e3f18e43 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java @@ -1,6 +1,5 @@ package com.actionsoft.apps.coe.pal.datamigration.aris.web; -import com.actionsoft.apps.coe.pal.batch.cache.BatchCache; import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.datamigration.aris.constant.ArisConstant; import com.actionsoft.apps.coe.pal.datamigration.aris.model.*; diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index 1e8627d3..6ff9bd54 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -874,24 +874,6 @@ public class DesignerRelationShapeWeb extends ActionWeb { } return jsonArray.toString(); } - /** - * 获取第二级及其以下目录 - * - * @param pid - * @return - */ - public String getTwoNodeJson(String pid, String wsId,String method, String ruuid) { - List coeProcessLevelModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByPid(pid, wsId); - JSONArray jsonArray = new JSONArray(); - for (int i = 0; i < coeProcessLevelModels.size(); i++) { - PALRepositoryModel coeProcessLevelModel = coeProcessLevelModels.get(i); - if (coeProcessLevelModel != null) { - JSONObject json = getJSon(coeProcessLevelModel); - jsonArray.add(json); - } - } - return jsonArray.toString(); - } protected String getRootJson(String wsuuid, String category, String type, String methodScope,String ruuid) { JSONArray jsonArray = new JSONArray(); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 79a3b125..66a7091e 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -8278,8 +8278,10 @@ public class CoeProcessLevelWeb extends ActionWeb { propertys.sort((p1, p2) -> (sortAttrMap.containsKey(p1.getPropertyId()) ? sortAttrMap.get(p1.getPropertyId()) : 0) - (sortAttrMap.containsKey(p2.getPropertyId()) ? sortAttrMap.get(p2.getPropertyId()) : 0)); + Boolean flag1=false; + Boolean flag2=false; StringBuilder sb = new StringBuilder(); - sb.append("文件属性
"); + sb.append("质量校验
"); for (PALRepositoryPropertyModel property : propertys) { String id = property.getPropertyId(); if (!attributeModelMap.containsKey(id) || !attributeModelMap.get(id).getUse()) { @@ -8392,16 +8394,17 @@ public class CoeProcessLevelWeb extends ActionWeb { if (isRequired) { if(UtilString.isEmpty(inputValue)){ - sb.append(attributeModel.getTitle()+"必填项为空,请检查必填字段!
"); + sb.append(attributeModel.getTitle()).append(","); + flag1=true; } } } + StringBuffer sb2=new StringBuffer(); /***************************************************数据属性校验*************************************************/ - sb2.append("数据属性
"); JSONObject elementJsonobject=JSONObject.parseObject(obj).getJSONObject("elements"); Iterator sIterator = elementJsonobject.keySet().iterator(); @@ -8425,7 +8428,8 @@ public class CoeProcessLevelWeb extends ActionWeb { if(Boolean.parseBoolean(isRequired)==true){ String inputvalue = attributesJsonArray.getJSONObject(k).getString("value"); if(UtilString.isEmpty(inputvalue)){ - sb2.append(attributesJsonArray.getJSONObject(k).getString("name")+"必填项为空,请检查必填字段!
"); + sb.append(attributesJsonArray.getJSONObject(k).getString("name")).append(","); + flag2=true; } } @@ -8437,13 +8441,12 @@ public class CoeProcessLevelWeb extends ActionWeb { } } - int sb2index=sb2.indexOf("必填项为空"); - if(sb2index!=-1){ - sb.append(sb2); + if(flag1==true || flag2==true){ + sb.append("未填写,请检查!"); } - int sb1indexOf=sb.indexOf("必填项为空"); - if(sb1indexOf==-1 && sb2index==-1){ + int sb1indexOf=sb.indexOf("未填写"); + if(sb1indexOf==-1 ){ ro.put("result","ok"); }else{ ro.put("result","error");