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

工程制度图修改

Browse Source
This commit is contained in:
zhal 2024-07-03 22:28:40 +08:00
parent c16a3598a8
commit ba539f9ea3
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

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

@ -2586,7 +2586,7 @@ public class CoEPALController {
if ("data.form".equals(methodId)) {
return PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, me.getUID(), teamId, fileId);
//方案手册走制度手册逻辑
} else if ("control.policy".equals(methodId) ||"process.scheme".equals(methodId)) {
} else if ("control.policy".equals(methodId) ||"process.scheme".equals(methodId) || "engineering.standard".equals(methodId)) {
return PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, me.getUID(), teamId, fileId);
}
return PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, me.getUID(), teamId, fileId);

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/method/cache/PALMethodCache.java vendored
View File

@ -70,6 +70,9 @@ public class PALMethodCache {
if (method.equals("data")) {
continue;
}
if(method.equals("engineering")){
continue;
}
//如果是控制类过滤到制度图
if (method.equals("control")) {
if (k.equals("control.policy")) {
@ -83,6 +86,7 @@ public class PALMethodCache {
if (method.equals("process")) {
list.add(pmppMap.get("data.form"));
list.add(pmppMap.get("control.policy"));
list.add(pmppMap.get("engineering.standard"));
}
temp.put(method, list);
}

5
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -612,13 +612,14 @@ public class CoeDesignerWeb extends ActionWeb {
macroLibraries.put("attrDefineObj", attrDefineObj);
macroLibraries.put("defaultAttrSort", defaultAttrSort.size() > 0 ? StringUtils.join(defaultAttrSort, "|") : "");
macroLibraries.put("importShapeStyle", "display:none");
if ("control.policy".equals(plModel.getMethodId()) || "data.form".equals(plModel.getMethodId())) {// 制度/表单活动节点导入
if ("control.policy".equals(plModel.getMethodId()) || "data.form".equals(plModel.getMethodId()) || "engineering.standard".equals(plModel.getMethodId())) {// 制度/表单活动节点导入
macroLibraries.put("importShapeStyle", "display:block");
}
boolean flag1 = "data.form".equals(plModel.getMethodId()) && SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.bd");
boolean flag2 = ("control.policy".equals(plModel.getMethodId()) && SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd")||"engineering.standard".equals(plModel.getMethodId()) && SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd") );
boolean flag3 = "process".equals(plModel.getMethodCategory()) && !"process.evc".equals(plModel.getMethodId()) && SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr");
if (outputPerm && (flag1 || flag2 || flag3) && SDK.getAppAPI().isActive("com.actionsoft.apps.addons.onlinedoc")) {
boolean flag4 = "engineering.standard".equals(plModel.getMethodId()) && SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd");
if (outputPerm && (flag1 || flag2 || flag3 || flag4) && SDK.getAppAPI().isActive("com.actionsoft.apps.addons.onlinedoc")) {
macroLibraries.put("processOutput", true);
} else {
macroLibraries.put("processOutput", false);

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

@ -8434,9 +8434,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
methodObj.put("havingCreatePerm", false);
} else if (model.getId().equals("process.framework") && !_uc.getUID().equals("admin")) {
methodObj.put("havingCreatePerm", false);
} else if(model.getId().equals("engineering.standard") && model.getSchema().contains("工程技术标准")){
methodObj.put("havingCreatePerm", true);
}else {
}else {
methodObj.put("havingCreatePerm", PALMethodManager.getInstance().havingCreateMethodPerm(category, methodId, c, model.getId()));
}
@ -8747,6 +8745,13 @@ public class CoeProcessLevelWeb extends ActionWeb {
//回填修订人
propertyDao.updatePropertyByPropertyId(model.getId(), "Drafted_and_revised_by", _uc.getUserName());
//回填版本
if(model.getMethodId().contains("process")){
propertyDao.updatePropertyByPropertyId(model.getId(), "P_versions", String.valueOf(model.getVersion()));
}else{
propertyDao.updatePropertyByPropertyId(model.getId(), "versions", String.valueOf(model.getVersion()));
}
// 小组权限设置
CoeCooperationAPIManager.getInstance().updateCooperationPerm(_uc, "新建", teamId, parentId, model.getVersionId());