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

Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps

Browse Source
This commit is contained in:
anhc 2022-07-04 21:32:57 +08:00
commit 4c910646e5
5 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
View File

@ -2953,7 +2953,14 @@ public class CoEPALController {
}
/**
* 质量校验功能
* @param me
* @param sid
* @param uuid
* @param obj
* @return
*/
@Mapping("com.actionsoft.apps.coe.pal_repository_process_define_Quality_check")
public String defineQualityCheck(UserContext me,String sid,String uuid,String obj) {
CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);

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

@ -855,6 +855,25 @@ public class DesignerRelationShapeWeb extends ActionWeb {
return treeJson.toString();
}
/**
* 获取第二级及其以下目录
* by bzp 增加method方法 判断
*
* @param pid
* @return
*/
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++) {
PALRepositoryModel coeProcessLevelModel = coeProcessLevelModels.get(i);
if (coeProcessLevelModel != null) {
JSONObject json = getJSon(coeProcessLevelModel);
jsonArray.add(json);
}
}
return jsonArray.toString();
}
/**
* 获取第二级及其以下目录
*

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

@ -703,7 +703,7 @@ public class CoeProcessLevelUtil {
//bybzp 如果图形是过程链图和BPMN图 则不复制流程绩效和角色
PALRepositoryModel model = PALRepositoryCache.getCache().get(uuId);
String methodId = model.getMethodId();
if("process.bpmn2,process.epc".contains(methodId) && "lcjx,role".contains(oldModel.getAttrId())){
if("process.bpmn2,process.epc".contains(methodId) && "Process_performance_metrics,role".contains(oldModel.getAttrId())){
continue;
}
//by bzp end

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

@ -2616,12 +2616,12 @@ public class CoeProcessLevelWeb extends ActionWeb {
/****************************************判断如果添加组织架构则修改显示值 by zhaolei*******************************************************************/
String input = null;
if(attributeModel.getKey().contains("ArchitectureL")) {
if(attributeModel.getKey().contains("Process_Architecture") && repositoryPathData.size()!=index) {
String name = ((JSONObject) repositoryPathData.get(index)).getString("name");
input="<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + name + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" data-originvalue='"+ name +"' isRequired='" + isRequired + "' onblur='saveContent($(this));' readonly=true />";
index++;
}else{
input="<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" data-originvalue='"+ inputValue +"' isRequired='" + isRequired + "' onblur='saveContent($(this));'/>";
input="<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" data-originvalue='"+ inputValue +"' isRequired='" + isRequired + "' onblur='saveContent($(this));'/>";
}
//String input = "<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" data-originvalue='"+ inputValue +"' " + event + "/>";
@ -3180,7 +3180,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
public void copyAttribute(String uuid) {
DesignerShapeRelationDao relationDao = new DesignerShapeRelationDao();
PALRepositoryPropertyDao palRepositoryPropertyDao = new PALRepositoryPropertyDao();
String querySql = String.format("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='lcjx'", uuid);
String querySql = String.format("SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='Process_performance_metrics'", uuid);
List<DesignerShapeRelationModel> result = DBSql.query(querySql, relationDao.rowMapper());
Connection conn = DBSql.open();
for (DesignerShapeRelationModel designerShapeRelationModel : result) {
@ -9030,8 +9030,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");
@ -9049,13 +9049,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

@ -3663,6 +3663,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",