yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程属性~相关代码

Browse Source
This commit is contained in:
chengli 2022-07-04 21:02:19 +08:00
parent bac9094b84
commit 9b170725e4
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
View File

@ -857,11 +857,12 @@ public class DesignerRelationShapeWeb extends ActionWeb {
/**
* 获取第二级及其以下目录
* by bzp 增加method方法 判断
*
* @param pid
* @return
*/
public String getTwoNodeJson(String pid, String wsId,String method, String ruuid) {
public String getTwoNodeJson(String pid, String wsId, String method, String ruuid) {
List<PALRepositoryModel> coeProcessLevelModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByPid(pid, wsId);
JSONArray jsonArray = new JSONArray();
for (int i = 0; i < coeProcessLevelModels.size(); i++) {
@ -901,7 +902,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
if ("control.kpi".equals(methodId) && methodScope.equals(methodId)) {
//根据ID去查 是否有关联管流程
String tmpId = node.getString("id");
String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='lcjx' and RELATIONFILEID='%s'";
String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='Process_performance_metrics' and RELATIONFILEID='%s'";
String reId = DBSql.getString(String.format(sql, tmpId));
//还要判断是不是当前流程
if (!reId.isEmpty() && !ruuid.equals(reId)) {
@ -1097,7 +1098,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
if ("control.kpi".equals(methodId) && methodScope.equals(methodId)) {
//根据ID去查 是否有关联管流程
String tmpId = node.getString("id");
String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='lcjx' and RELATIONFILEID='%s'";
String sql = "select FILEID from APP_ACT_COE_PAL_SHAPE_RLAT where ATTRID='Process_performance_metrics' and RELATIONFILEID='%s'";
String reId = DBSql.getString(String.format(sql, tmpId));
//还要判断是不是当前流程
if (!reId.isEmpty() && !ruuid.equals(reId)) {

7
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -700,6 +700,13 @@ public class CoeProcessLevelUtil {
DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(olduuid);
for (DesignerShapeRelationModel oldModel : oldModelList) {
//bybzp 如果图形是过程链图和BPMN图 则不复制流程绩效和角色
PALRepositoryModel model = PALRepositoryCache.getCache().get(uuId);
String methodId = model.getMethodId();
if("process.bpmn2,process.epc".contains(methodId) && "Process_performance_metrics,role".contains(oldModel.getAttrId())){
continue;
}
//by bzp end
if (mapNewUUID.containsKey(oldModel.getShapeId())) {
DesignerShapeRelationModel newModel = new DesignerShapeRelationModel();
newModel.setId(UUIDGener.getUUID());

12
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -8226,7 +8226,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
return ro.toString();
}
/**
* 获取最近的文件和收藏的文件
* @param wsId
@ -8788,6 +8787,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
return ro.toString();
}
/**
* by bzp
*
@ -8802,8 +8802,8 @@ public class CoeProcessLevelWeb extends ActionWeb {
String L3 = null;
JSONArray pathArray = CoeProcessLevelUtil.getRepositoryPath(targetId);
String updateSql = "update APP_ACT_COE_PAL_PROP set PROPERTYVALUE ='%s' where PLID ='%s' and PROPERTYID='%s'";
String queryKpiSql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID ='%s' and PROPERTYID='lcjx'";
String querySql = "SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='lcjx'";
String queryKpiSql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID ='%s' and PROPERTYID='Process_performance_metrics'";
String querySql = "SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='Process_performance_metrics'";
for (int i = 1; i < pathArray.size(); i++) {
JSONObject tmp = pathArray.getJSONObject(i);
String name = tmp.getString("name");
@ -8821,13 +8821,13 @@ public class CoeProcessLevelWeb extends ActionWeb {
for (PALRepositoryModel palRepositoryModel : sourceList) {
String id = palRepositoryModel.getId();
if (L1 != null) {
DBSql.update(String.format(updateSql, L1, id, "L1"));
DBSql.update(String.format(updateSql, L1, id, "Process_Architecture_L1"));
}
if (L2 != null) {
DBSql.update(String.format(updateSql, L2, id, "L2"));
DBSql.update(String.format(updateSql, L2, id, "Process_Architecture_L2"));
}
if (L3 != null) {
DBSql.update(String.format(updateSql, L3, id, "L3"));
DBSql.update(String.format(updateSql, L3, id, "Process_Architecture_L3"));
}
/**
* 查看改流程是否关联流程绩效

20
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
View File

@ -3665,6 +3665,26 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName,
relationShapeModelObject[shapeIdAttrId] = temp.relationShapeText;
}
}
//by bzp 校验角色和岗位不能同时选择
if(objId == 'role' || objId == 'post'){
if(objId == 'role'){
//判断岗位
var tmp = $("input[objid='post']").val();
if(tmp.length > 0){
$.simpleAlert("不能同时选择岗位和角色");
return;
}
}
if(objId == 'post'){
//判断角色
var tmp = $("input[objid='role']").val();
if(tmp.length > 0){
$.simpleAlert("不能同时选择岗位和角色");
return;
}
}
}
//by bzp end
var ref = $("input[objid_shapeId='" + objId + "']").attr("ref");
$.ajax({
type : "POST",