diff --git a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml index 44a465ef..ce7aeebc 100644 --- a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml +++ b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml @@ -22,15 +22,16 @@ - - - - - + + + + + + diff --git a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar index a79c96ce..50101ad2 100644 Binary files a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar and b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar differ diff --git a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java index 7552a155..07d717ee 100644 --- a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java +++ b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/CreateShapeExcel.java @@ -13,6 +13,7 @@ import java.util.TreeMap; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.xssf.usermodel.XSSFCell; @@ -80,7 +81,7 @@ public class CreateShapeExcel { pid = parentModel.getParentId(); } } - String key = sBuilder.append("-").append(model.getName()).append("-").append("V").append(model.getVersion()).append(".0").toString(); + String key = sBuilder.append("-").append(model.getName()).append("-").append(VersionUtil.getVersionStrV(model.getVersion())).toString(); result.put(key, model.getMethodId()); } } diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index 39c8333b..45bd0967 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 2da5511f..50af0e0b 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -202,6 +202,7 @@ public class Report1Gener { Set dangerSet = new HashSet();// 风险 Set regulateSet = new HashSet();// 控制 Set KPISet = new HashSet();// kpi + System.out.println("id======================="+repositoryId); List> repositoryFileElements = CoeDesignerUtil.getShapeMessageJson4(repositoryId); //流程文件内容 if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序 diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java index 642b0ee0..c9453674 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java @@ -28,6 +28,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyMod import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryShapeAttributeModel; import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao; import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -107,7 +108,7 @@ public class ReportRepositoryCompare { Collections.sort(versions, new Comparator() { @Override public int compare(PALRepositoryModel o1, PALRepositoryModel o2) { - return (int) (o2.getVersion() - o1.getVersion()); + return VersionUtil.compareVersionNo(o1.getVersion(),o2.getVersion(),true); } }); if (versions == null) { @@ -169,7 +170,7 @@ public class ReportRepositoryCompare { sb.append(UtilDate.yearFormat(date)).append("年").append(UtilDate.monthFormat(date)).append("月").append(UtilDate.dayFormat(date)).append("日"); object.put(REPOSITORY_NAME, model.getName()); - object.put(VERSION, "V" + model.getVersion() + ".0"); + object.put(VERSION, VersionUtil.getVersionStrV(model.getVersion())); object.put(MODIFY_USER, SDK.getORGAPI().getUser(model.getModifyUser()) == null ? "" : SDK.getORGAPI().getUser(model.getModifyUser()).getUserName()); object.put(MODIFY_DATE, sb.toString()); return object; diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 3672c45d..7f19e122 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java index 6bb4e8f1..f4786d29 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishClientWeb.java @@ -21,6 +21,7 @@ import com.actionsoft.apps.coe.pal.log.CoEOpLogConst; import com.actionsoft.apps.coe.pal.pal.manage.publish.constant.PublishConst; import com.actionsoft.apps.AppsConst; +import com.actionsoft.apps.coe.pal.pal.ws.web.VersionUtil; import com.actionsoft.apps.coe.pal.publisher.client.dao.PublisherClientDao; import com.actionsoft.apps.coe.pal.publisher.conf.PublisherConf; import com.actionsoft.apps.coe.pal.publisher.constant.PublisherConstant; @@ -1682,7 +1683,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk object.put("pDesc", pModel.getPublishDesc()); object.put("id", model.getPalRepositoryId()); object.put("name", repositoryModel.getName()); - object.put("version", repositoryModel.getVersion() + ".0"); + object.put("version", VersionUtil.getVersionStr(repositoryModel.getVersion())); object.put("isPublish", repositoryModel.isPublish() ? "1" : "0"); String taskId = model.getTaskId(); object.put("taskId", taskId == null ? "" : taskId); @@ -2901,7 +2902,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk } object2.put("id", model.getId()); object2.put("name", model.getName()); - object2.put("version", "V" + model.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(model.getVersion())); object2.put("method", model.getMethodId()); object2.put("category", model.getMethodCategory()); @@ -3070,7 +3071,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk userName = UserCache.getModel(userId).getUserName(); } object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion())); object2.put("user", userName); object2.put("name", palModel.getName()); object2.put("createDate", UtilDate.datetimeFormat(palModel.getCreateDate())); @@ -3134,7 +3135,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk String repositoryId = object.getString("repositoryId"); PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId); object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion())); String userName = ""; if (UserCache.getModel(object.getString("userId")) != null) { userName = UserCache.getModel(object.getString("userId")).getUserName(); @@ -3219,7 +3220,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk for (PALRepositoryModel palModel : list) { JSONObject object2 = new JSONObject(); object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version", VersionUtil.getVersionStrV(palModel.getVersion())); String userName = ""; String userId = palModel.getCreateUser(); if (!UtilString.isEmpty(userId) && UserCache.getModel(userId) != null) { @@ -3276,7 +3277,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk String repositoryId = object.getString("repositoryId"); PALRepositoryModel palModel = PALRepositoryCache.getCache().get(repositoryId); object2.put("id", palModel.getId()); - object2.put("version", "V" + palModel.getVersion() + ".0"); + object2.put("version",VersionUtil.getVersionStrV(palModel.getVersion())); String userName = ""; if (UserCache.getModel(object.getString("userId")) != null) { userName = UserCache.getModel(object.getString("userId")).getUserName(); @@ -3557,7 +3558,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("name", model.getName()); - object.put("version", "V" + model.getVersion() + ".0"); + object.put("version",VersionUtil.getVersionStrV(model.getVersion())); object.put("hasFile", false); object.put("method", model.getMethodId()); object.put("category", model.getMethodCategory()); @@ -3669,7 +3670,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("name", model.getName()); - object.put("version", "V" + model.getVersion() + ".0"); + object.put("version", VersionUtil.getVersionStrV(model.getVersion())); object.put("hasChild", false); object.put("childData", new JSONArray()); object.put("method", model.getMethodId()); @@ -3688,7 +3689,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject subObj = new JSONObject(); subObj.put("id", subModel.getId()); subObj.put("name", subModel.getName()); - subObj.put("version", "V" + subModel.getVersion() + ".0"); + subObj.put("version",VersionUtil.getVersionStrV(subModel.getVersion())); subObj.put("hasFile", false); subObj.put("method", subModel.getMethodId()); subObj.put("category", subModel.getMethodCategory()); @@ -4356,7 +4357,7 @@ public class ProcessPublishClientWeb extends AbstPortalSkins implements PortalSk JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("name", model.getName()); - object.put("version", "V" + model.getVersion() + ".0"); + object.put("version", VersionUtil.getVersionStrV(model.getVersion())); object.put("hasFile", false); object.put("method", model.getMethodId()); object.put("category", model.getMethodCategory()); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 6bf7515c..70cc9d68 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -1270,7 +1270,7 @@ public class ProcessPublishWeb extends ActionWeb { object.put("pDesc", pModel.getPublishDesc()); object.put("repositoryId", model.getPalRepositoryId()); object.put("repositoryName", repositoryModel.getName()); - object.put("repositoryVersion", repositoryModel.getVersion() + ".0"); + object.put("repositoryVersion", VersionUtil.getVersionStr(repositoryModel.getVersion())); object.put("isPublish", repositoryModel.isPublish() ? "1" : "0"); list.add(object); } 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 f0bb383f..2b5192a5 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/method/control.policy/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml index 2f3ee385..c051c3fd 100644 --- a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml +++ b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml @@ -4,7 +4,7 @@ - + @@ -19,12 +19,12 @@ - - - + + + diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index 1eb010d3..2f79fc32 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -2924,15 +2924,15 @@ public class CoEPALController { * @param * @return */ - @Mapping("com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createRole") - public String RelationShapeCreateRole(UserContext me,String uuid,String methodId) { + @Mapping("com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel") + public String createDialogModel(UserContext me,String uuid,String methodId,String category) { CoeProcessLevelWeb web = new CoeProcessLevelWeb(me); - return web.RelationShapeCreateRole(uuid,methodId); + return web.createDialogModel(uuid,methodId,category); } /** - * 查询是否有相同角色图数据 + * 查询是否有相同角色/绩效图数据 * @param me * @param * @return 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 ab2d500c..a65ba311 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 @@ -754,13 +754,13 @@ public class DesignerRelationShapeWeb extends ActionWeb { // macroLibraries.put("treeData", getTreeJson(wsId, "", category, type, method)); // by bzp - //根据传入uuid,进行过滤，保留当前流程的数据 String treeJson=getTreeJson(wsId, "", category, type, method,ruuid); //JSONObject jsonObject = JSONObject.parseObject(json); JSONArray jsonArr_new= new JSONArray(); JSONArray objects=JSONArray.parseArray(treeJson); - if (attrId.equals("role")) {//需要在pal写死相关文件上传的属性代码为related_files + //角色图属性代码是role/绩效图属性代码是 + if (attrId.equals("role") || attrId.equals("performance")) { if (objects != null) { for (int i = 0; i < objects.size(); i++) { JSONObject jsonObject = objects.getJSONObject(i); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java index 0b62a1c9..4bb7a24e 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java @@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONObject; import jodd.util.StringUtil; import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.usermodel.Row; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -166,7 +167,6 @@ public class SynchronousOrgJob implements IJob { public void createPostData(String uuid,String departmentId,PALRepositoryModelImpl model){ Map idRelationMap = new HashMap<>(); - BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(model.getId(), 0); if(defineModel ==null ){ defineModel = CoeDesignerUtil.createModel(model.getId(),0); @@ -198,11 +198,14 @@ public class SynchronousOrgJob implements IJob { String shapeId1 = UUIDGener.getObjectId(); //拿到基础结构 JSONObject shape1 = ShapeUtil.getProcessShapeDefinitionByName("org.normal", "position"); - String postionname=orgdepartmentList.get(i).getString("POSITION_NAME"); - if(StringUtil.isNotEmpty(postionname)){ + String roleid=orgdepartmentList.get(i).getString("ROLEID"); + + String rolename=DBSql.getString("SELECT ROLENAME FROM ORGROLE WHERE ID=? AND ROLETYPE='1' ",roleid); + + if(StringUtil.isNotEmpty(rolename)){ shape1.put("id", shapeId1); - shape1.put("text",orgdepartmentList.get(i).getString("POSITION_NAME")); + shape1.put("text",rolename); JSONObject props1 = shape1.getJSONObject("props");// 位置大小 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 527d5f5a..9831af48 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 @@ -8125,7 +8125,7 @@ public class CoeProcessLevelWeb extends ActionWeb { * @return * by zhaolei */ - public String RelationShapeCreateRole(String uuid,String methodId){ + public String createDialogModel(String uuid,String methodId,String category){ ResponseObject ro = ResponseObject.newOkResponse(); try { @@ -8140,12 +8140,22 @@ public class CoeProcessLevelWeb extends ActionWeb { String plRid = UUIDGener.getUUID(); String id = UUIDGener.getUUID(); - String parentId = "org"; - + String titleName=null; + String shapName=null; + if(methodId.equals("control.kpi")){ + titleName="绩效图"; + shapName="kpi"; + }else if(methodId.equals("org.role")){ + titleName="角色图"; + shapName="role"; + }else if(methodId.equals("data.form")){ + titleName="表单图"; + shapName="form"; + } Timestamp nowTime = new Timestamp(System.currentTimeMillis()); - PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, plRid, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", plname + "-角色图", - "", 1, "org", "org", true, 1, - id, false, "org.role", "0", 1, null, + PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, plRid, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", plname + titleName, + "", 1, shapName, category, true, 1, + id, false, methodId, "0", 1, null, null, "admin", "admin", nowTime, null, uuid, null, null, null, null, null, null, null, 1); @@ -8168,9 +8178,9 @@ public class CoeProcessLevelWeb extends ActionWeb { //拿到基础结构 - JSONObject shape = ShapeUtils.getProcessShapeDefinitionByName("org.role", "role"); + JSONObject shape = ShapeUtils.getProcessShapeDefinitionByName(methodId, shapName); shape.put("id", shapeId); - shape.put("text", "角色"); + shape.put("text", titleName); JSONObject props = shape.getJSONObject("props");// 位置大小 props.put("zindex", 0); @@ -8201,7 +8211,7 @@ public class CoeProcessLevelWeb extends ActionWeb { /** - * 查找关联角色图 + * 查找关联角色/绩效数据 * @param uuid * @return */ diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm index d19db155..0775bf7d 100644 --- a/com.actionsoft.apps.coe.pal/template/page/main.htm +++ b/com.actionsoft.apps.coe.pal/template/page/main.htm @@ -13,4 +13,4 @@ var mainType = "<#mainType>"; var uid = "<#uid>"; var wHref = "./w"; - var jdHref = "./jd";
\ No newline at end of file + var jdHref = "./jd";
\ No newline at end of file diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.create.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.create.htm index 665e832e..793ed96d 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.create.htm +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.create.htm @@ -6,6 +6,7 @@ + @@ -13,6 +14,8 @@ + + @@ -157,6 +160,7 @@
  • 附件
    • +
  • 在线编辑
+ + @@ -186,6 +192,9 @@ + + + - -