diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index eff3ed17..ab6339ba 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ 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 4d742198..cdb2e445 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 @@ -112,6 +112,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.text.StrBuilder; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.ss.usermodel.HorizontalAlignment; @@ -9004,9 +9005,10 @@ public class CoeProcessLevelWeb extends ActionWeb { StringBuffer sb1=new StringBuffer(); StringBuffer sb2=new StringBuffer(); StringBuffer sb3=new StringBuffer(); + StringBuffer sb4 = new StringBuffer();; sb.append("质量校验
"); sb1.append("文件属性:"); - sb2.append("节点名称:"); + //sb2.append("节点名称:"); for (PALRepositoryPropertyModel property : propertys) { String id = property.getPropertyId(); @@ -9024,9 +9026,9 @@ public class CoeProcessLevelWeb extends ActionWeb { if (list == null || list.isEmpty()) { flag1 = false; } - } /*else { + } else { flag1 = UtilString.isNotEmpty(property.getPropertyValue()); - }*/ + } if (!flag1) {// 校验不通过 sb1.append("''"+attributeModel.getTitle()+"''").append(","); flag1 = false; @@ -9050,10 +9052,15 @@ public class CoeProcessLevelWeb extends ActionWeb { String shapeCategory = o.getString("category"); JSONObject dataAttributes = o.getJSONObject("dataAttributes"); JSONArray attributesJsonArray = dataAttributes.getJSONArray("attributesJsonArray"); + for (int i = 0; i < attributesJsonArray.size(); i++) { + + + JSONObject attr = attributesJsonArray.getJSONObject(i); String attrId = attr.getString("id"); String value = attr.getString("value"); + if (!methodAttributeModelMap.containsKey(shapeName + "-" + attrId)) { List methodAttributeModels = CoeDesignerShapeAPIManager.getInstance().getValidAndUseAttributeModels(model.getWsId(), shapeCategory.replace("_", "."), shapeName, model.getMethodId()); for (PALMethodAttributeModel attributeModel : methodAttributeModels) { @@ -9068,26 +9075,38 @@ public class CoeProcessLevelWeb extends ActionWeb { } PALMethodAttributeModel attrModel = methodAttributeModelMap.get(shapeName + "-" + attrId); if (attrModel.getIsRequired()) {// 筛选必填 + sb2=new StringBuffer(); String attrType = attrModel.getType(); if ("relation".equals(attrType) || "awsorg".equals(attrType)) { List list = DesignerShapeRelationCache.getListByAttrId(model.getId(), shapeId, attrId); if (list == null || list.isEmpty()) { flag2 = false; } - } /*else { + } else { flag2 = UtilString.isNotEmpty(value); - }*/ + } if (!flag2) { - - sb2.append("【"+o.get("text")+"】"+"''"+attrModel.getNewTitle()+"''").append(","); - + JSONObject tmp = new JSONObject(); + tmp.put("shapeId", shapeId); + tmp.put("shapeName", text); + tmp.put("attrName", attrModel.getNewTitle()); + tmp.put("attrId", attrId); + resultList.add(tmp); + sb2.append("''"+attrModel.getNewTitle()+"''").append(","); } } } + if (!flag2) { + sb4.append("节点名称:"+"【"+text+"】").append(sb2).append("
"); + } } + System.out.println(resultList); + ro.setData(resultList); if( flag2==false){ - sb.append(sb2.substring(0, sb2.length()-1)); + + + sb.append(sb4.substring(0, sb4.length()-1)); sb.append("未填写，请检查！"); } @@ -9162,23 +9181,30 @@ public class CoeProcessLevelWeb extends ActionWeb { } - - + /** + * 添加评论内容 + * @param me + * @param ruuid + * @param replyContent + * @return + */ public String createReply(UserContext me,String ruuid,String replyContent){ ResponseObject result = ResponseObject.newOkResponse(); AppAPI appApi = SDK.getAppAPI(); Date now = new Date(); Timestamp replyTime = new Timestamp(now.getTime()); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-mm-dd HH:mm:ss"); try { Map paramsMap = new HashMap<>(); paramsMap.put("ID", UUIDGener.getUUID()); paramsMap.put("DATAID", ruuid); paramsMap.put("REPLYER", me.getUID()); - paramsMap.put("REPLYTIME", replyTime); + paramsMap.put("REPLYTIME", sdf.format(replyTime)); paramsMap.put("REPLYCONTENT", replyContent); paramsMap.put("REPLYERIP", me.getClientIP()); paramsMap.put("ORGID", me.getDepartmentModel().getCompanyId()); int createresult = DBSql.update(DBSql.getInsertStatement("APP_ACT_PAL_DATA_REPLY", paramsMap), paramsMap); + result.put("result","ok"); }catch (Exception e) { e.printStackTrace(); diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js index bb5fa30f..03363e3d 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js @@ -1652,7 +1652,7 @@ function ProcessManual(obj) { t += ''; t += '
'+ fileName +''; t +=''; t +='
'; @@ -1688,7 +1688,7 @@ function openOutputFile(taskId) { $.simpleAlert("close"); if (msg['data']) { var url = msg['data']['url']; - window.open(url); + window.location.href = url; } } else { $.simpleAlert("close"); @@ -1828,7 +1828,7 @@ function initUpfileData(obj) { var str=''; splitId=splitId.substring(0,splitId.length-1); str +=''; $('#dabao').html(str); }