Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev
This commit is contained in:
commit
fccdc1f3df
@ -4,16 +4,16 @@
|
||||
<attribute key="auditor" title="审核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审核人" isRequired="false"/>
|
||||
<attribute key="reviewer" title="复核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="复核人" isRequired="false"/>
|
||||
<attribute key="approver" title="审批人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审批人" isRequired="false"/>
|
||||
<attribute key="application" title="适用范围" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="适用范围" isRequired="true"/>
|
||||
<attribute key="application" title="适用范围" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="适用范围" isRequired="true"/>
|
||||
<attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="文件编码" isRequired="false"/>
|
||||
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L1" isRequired="true"/>
|
||||
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构l2" isRequired="true"/>
|
||||
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L3" isRequired="true"/>
|
||||
<attribute key="ARIS" title="ARIS地址" type="textarea" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true" desc="ARIS地址" isRequired="false"/>
|
||||
<attribute key="ARIS" title="ARIS地址" type="textarea" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true" desc="ARIS地址" isRequired="false"/>
|
||||
<attribute key="P_versions" title="版本" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="版本" isRequired="true"/>
|
||||
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="拟制/修订人" isRequired="true"/>
|
||||
<attribute key="T_supplementary_articles" title="附则" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="附则" isRequired="false"/>
|
||||
<attribute key="goal" title="目的" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="目的" isRequired="true"/>
|
||||
<attribute key="T_supplementary_articles" title="附则" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="附则" isRequired="false"/>
|
||||
<attribute key="goal" title="目的" type="textarea" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="目的" isRequired="true"/>
|
||||
<attribute key="activity_number" title="活动序号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动序号" isRequired="false"/>
|
||||
<attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{"method":"control.kpi","type":"shape","multiple":true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="流程绩效" isRequired="false"/>
|
||||
<attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动描述" isRequired="true"/>
|
||||
@ -25,7 +25,7 @@
|
||||
<attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{"method":"org.normal","type":"shape","multiple":true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="role" title="角色" type="relation" value="" desc="角色" isRequired="false" ref="{"method":"org.role","type":"shape","multiple":false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{"firstColumn":"术语","secondColumn":"定义"}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="information_systems" title="信息系统" type="relation" value="" desc="信息系统" isRequired="false" ref="{"method":"itsystem.normal","type":"shape","multiple":false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="information_systems" title="信息系统" type="relation" value="" desc="信息系统" isRequired="false" ref="{"method":"itsystem.normal","type":"shape","multiple":true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Organizational_role" title="组织/角色与职责" type="table" value="" desc="组织/角色与职责" isRequired="false" ref="{"firstColumn":"名称","secondColumn":"职责"}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="true" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="true" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
|
||||
@ -36,5 +36,5 @@
|
||||
<attribute key="lead_process" title="前置流程" type="relation" value="" desc="前置流程" isRequired="false" ref="{"method":"process","type":"file","multiple":true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="rear_process" title="后置流程" type="relation" value="" desc="后置流程" isRequired="false" ref="{"method":"process","type":"file","multiple":true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{"method":"process","type":"file","multiple":true}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
|
||||
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>
|
||||
</attributes>
|
||||
|
||||
Binary file not shown.
@ -98,10 +98,10 @@ public class PositionExcelImportRun {
|
||||
/**
|
||||
* 执行导入
|
||||
* @param processMap Excel流程map，key：流程名称，value：Excel中该流程的活动+角色与岗位信息
|
||||
* @param arisNameMap pal的流程与aris流程名称的关系map，key：aris流程名称，value：key对应的pal流程id
|
||||
* @param palNameMap pal的流程与流程名称的关系map，key：pal流程名称，value：key对应的pal流程id
|
||||
* @param posMap pal的组织图的岗位关系map，key：pal的组织的岗位名称，value：该岗位对应的组织
|
||||
*/
|
||||
public void execute(Map<String, List<PositionValidDataModel>> processMap, Map<String, String> arisNameMap, Map<String, PalOrgPositionModel> posMap) {
|
||||
public void execute(Map<String, List<PositionValidDataModel>> processMap, Map<String, String> palNameMap, Map<String, PalOrgPositionModel> posMap) {
|
||||
DesignerShapeRelationDao relationDao = new DesignerShapeRelationDao();
|
||||
try {
|
||||
int totalCount = LogRealTimeCountCache.getCache().get(logId).getTotalCount();
|
||||
@ -117,14 +117,14 @@ public class PositionExcelImportRun {
|
||||
|
||||
LogUtil.appendLog("\n" + Constant.LOG_START + "************[执行阶段][流程匹配阶段]PAL过程链图与Excel中流程进行匹配************", simpleLogFile, fullLogFile);
|
||||
// 校验pal是否存在该流程
|
||||
if (!arisNameMap.containsKey(processName)) {
|
||||
if (!palNameMap.containsKey(processName)) {
|
||||
// Excel中的流程在PAL中不存在，当作警告处理，全部记录
|
||||
LogUtil.appendLog(Constant.LOG_WARNING + "Excel流程" + "[" + processName + "]未在PAL中找到，忽略导入", simpleLogFile, fullLogFile, warnLogFile);
|
||||
LogUtil.appendLog("[流程未找到]Excel流程" + "[" + processName + "]未在PAL中找到，忽略导入", matchErrImportFile);
|
||||
LogRealTimeCountCache.getCache().get(logId).setArisBlankCount(LogRealTimeCountCache.getCache().get(logId).getArisBlankCount() + 1);// 借用ArisBlankCount
|
||||
continue;
|
||||
}
|
||||
String palId = arisNameMap.get(processName);
|
||||
String palId = palNameMap.get(processName);
|
||||
List<DesignerShapeRelationModel> insertModels = new ArrayList<>();// 匹配上待保存的数据
|
||||
List<DesignerShapeRelationModel> delModels = new ArrayList<>();// 待删除的数据（Excel中存在代表要更新/删除）
|
||||
|
||||
|
||||
@ -285,12 +285,12 @@ public class PositionExcelImportWeb extends ActionWeb {
|
||||
}
|
||||
excelModelList = excelModelList2;
|
||||
// 校验aris流程名称是否重复
|
||||
Map<String, String> arisNameMap = ProcessUtil.getPalRepositoryArisNameMap(wsId);// 获取流程以及流程的aris名称
|
||||
ResponseObject checkRepeatArisNameRo = checkRepositoryPropArisName(arisNameMap);
|
||||
if (!checkRepeatArisNameRo.isOk()) {
|
||||
msg = Constant.LOG_ERROR + checkRepeatArisNameRo.getMsg() + "，" + Constant.IMPORT_STOP_MSG;
|
||||
Map<String, String> palNameMap = ProcessUtil.getPalRepositoryNameMap(wsId, Constant.PROCESS_EPC);// 获取流程以及流程的aris名称
|
||||
ResponseObject checkRepeatPalNameRo = checkRepositoryName(palNameMap);
|
||||
if (!checkRepeatPalNameRo.isOk()) {
|
||||
msg = Constant.LOG_ERROR + checkRepeatPalNameRo.getMsg() + "，" + Constant.IMPORT_STOP_MSG;
|
||||
updateErrLog(msg, msg);
|
||||
ro.err(checkRepeatArisNameRo.getMsg());
|
||||
ro.err(checkRepeatPalNameRo.getMsg());
|
||||
return ro.toString();
|
||||
}
|
||||
// 岗位重复校验 todo
|
||||
@ -382,9 +382,9 @@ public class PositionExcelImportWeb extends ActionWeb {
|
||||
processMap.get(model.getProcessName()).add(model);
|
||||
}
|
||||
// Aris流程名称与PALID反转
|
||||
Map<String, String> arisNameMap2 = new HashMap<>();
|
||||
for (Map.Entry<String, String> entry : arisNameMap.entrySet()) {
|
||||
arisNameMap2.put(entry.getValue(), entry.getKey());
|
||||
Map<String, String> palNameMap2 = new HashMap<>();
|
||||
for (Map.Entry<String, String> entry : palNameMap.entrySet()) {
|
||||
palNameMap2.put(entry.getValue(), entry.getKey());
|
||||
}
|
||||
|
||||
int totalCount = processMap.size();
|
||||
@ -402,7 +402,7 @@ public class PositionExcelImportWeb extends ActionWeb {
|
||||
|
||||
LogUtil.appendLog("\n" + Constant.LOG_START + "预计导入[" + fileName + "]" + I18nRes.findValue(CoEConstant.APP_ID, Constant.PROCESS_EPC + "，共[" + totalCount + "]条流程"));
|
||||
// 开始执行导入
|
||||
new Thread(()->{new PositionExcelImportRun(_uc, wsId, logId, logPath, simpleLogFile, fullLogFile, warnLogFile, this.filePath, this.fileName, startTime).execute(processMap, arisNameMap2, posMap);}) .start();
|
||||
new Thread(()->{new PositionExcelImportRun(_uc, wsId, logId, logPath, simpleLogFile, fullLogFile, warnLogFile, this.filePath, this.fileName, startTime).execute(processMap, palNameMap2, posMap);}) .start();
|
||||
|
||||
ro.put("totalCount", totalCount);
|
||||
ro.put("importingCount", LogRealTimeCountCache.getCache().get(logId).getImportingCount());
|
||||
@ -411,23 +411,23 @@ public class PositionExcelImportWeb extends ActionWeb {
|
||||
|
||||
/**
|
||||
* 校验流程Aris名称
|
||||
* @param arisNameMap
|
||||
* @param palNameMap
|
||||
* @return
|
||||
*/
|
||||
private ResponseObject checkRepositoryPropArisName(Map<String, String> arisNameMap) {
|
||||
private ResponseObject checkRepositoryName(Map<String, String> palNameMap) {
|
||||
boolean isOk = true;
|
||||
Map<String, List<String>> map = new HashMap<>();
|
||||
for (Map.Entry<String, String> entry : arisNameMap.entrySet()) {
|
||||
for (Map.Entry<String, String> entry : palNameMap.entrySet()) {
|
||||
String palId = entry.getKey();
|
||||
String arisName = entry.getValue();
|
||||
if (!map.containsKey(arisName)) {
|
||||
map.put(arisName, new ArrayList<>());
|
||||
String palName = entry.getValue();
|
||||
if (!map.containsKey(palName)) {
|
||||
map.put(palName, new ArrayList<>());
|
||||
}
|
||||
map.get(arisName).add(palId);
|
||||
map.get(palName).add(palId);
|
||||
}
|
||||
for (Map.Entry<String, List<String>> entry : map.entrySet()) {
|
||||
List<String> idList = entry.getValue();
|
||||
String arisName = entry.getKey();
|
||||
String palName = entry.getKey();
|
||||
if (idList.size() > 1) {
|
||||
isOk = false;
|
||||
List<String> nameList = new ArrayList<>();
|
||||
@ -435,11 +435,11 @@ public class PositionExcelImportWeb extends ActionWeb {
|
||||
PALRepositoryModel model = PALRepositoryCache.getCache().get(palId);
|
||||
nameList.add(model.getName());
|
||||
}
|
||||
LogUtil.appendLog(Constant.LOG_ERROR + "同一Aris流程名称[" + arisName + "]对应多个PAL流程[" + StringUtils.join(nameList, "、") + "]", simpleLogFile, fullLogFile, simpleLogFile, fullLogFile);
|
||||
LogUtil.appendLog(Constant.LOG_ERROR + "同一PAL流程名称[" + palName + "]存在多个", simpleLogFile, fullLogFile, simpleLogFile, fullLogFile);
|
||||
}
|
||||
}
|
||||
if (!isOk) {
|
||||
return ResponseObject.newErrResponse("存在同一Aris流程名称对应多个PAL流程，详情见日志");
|
||||
return ResponseObject.newErrResponse("存在同一PAL流程名称对应多个流程，详情见日志");
|
||||
}
|
||||
return ResponseObject.newOkResponse();
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -3127,11 +3127,14 @@ public class ProcessPublishWeb extends ActionWeb {
|
||||
newBo.set("PUBLISHDESC", object.getString("publishDesc"));
|
||||
newBo.set("PROCESSDEFID", processInstId);
|
||||
newBo.set("TASKID", object.getString("taskId"));
|
||||
newBo.set("PUBLISH_NUMBER",object.getString("processNumber"));
|
||||
list.add(newBo);
|
||||
}
|
||||
SDK.getBOAPI().create(newBoName, list, bindId, _uc.getUID());
|
||||
}
|
||||
|
||||
|
||||
|
||||
String changeBoName = "BO_ACT_COE_PUBLISH_C";
|
||||
SDK.getBOAPI().removeByBindId(changeBoName, bindId);// 清空
|
||||
if (!changeArray.isEmpty()) {
|
||||
@ -3187,6 +3190,28 @@ public class ProcessPublishWeb extends ActionWeb {
|
||||
return ro.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建手册
|
||||
* @param model
|
||||
* @param wsId
|
||||
* @param userId
|
||||
* @param teamId
|
||||
* @param uuid
|
||||
* @return
|
||||
*/
|
||||
private String createOutputReport(PALRepositoryModel model, String wsId, String userId, String teamId, String uuid) {
|
||||
String taskId = "";
|
||||
if (model.getMethodId().contains("process.")) {
|
||||
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, userId, teamId, uuid);
|
||||
} else if ("data.form".equals(model.getMethodId())) {
|
||||
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, userId, teamId, uuid);
|
||||
} else if ("control.policy".equals(model.getMethodId())) {
|
||||
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, userId, teamId, uuid);
|
||||
}
|
||||
return taskId;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 对未创建手册的流程进行创建流程手册
|
||||
*/
|
||||
@ -3205,7 +3230,23 @@ public class ProcessPublishWeb extends ActionWeb {
|
||||
service.execute(() -> {
|
||||
// 创建流程手册
|
||||
String publishFileId = bn.getString("PUBLISHFILEID");
|
||||
String newTaskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), "", publishFileId);
|
||||
PALRepositoryModel model = PALRepositoryCache.getCache().get(publishFileId);
|
||||
if ("default".equals(model.getMethodId())) {
|
||||
SDK.getLogAPI().consoleErr("流程发布表单[发布]提交时创建流程手册失败，processInstId=" + processInstId + ",publishFileId=" + publishFileId);
|
||||
}
|
||||
// 校验流程手册是否安装并启动
|
||||
if (model.getMethodId().contains("process.") && !SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr")) {
|
||||
SDK.getLogAPI().consoleErr("[流程手册未安装]流程手册更新失败");
|
||||
}
|
||||
if ("data.form".equals(model.getMethodId()) && !SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.bd")) {
|
||||
SDK.getLogAPI().consoleErr("[表单手册未安装]流程手册更新失败");
|
||||
}
|
||||
if ("control.policy".equals(model.getMethodId()) && !SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd")) {
|
||||
SDK.getLogAPI().consoleErr("[表单手册未安装]流程手册更新失败");
|
||||
}
|
||||
|
||||
String newTaskId = createOutputReport(model, model.getWsId(), _uc.getUID(), "", model.getId());
|
||||
|
||||
JSONObject object = JSONObject.parseObject(newTaskId);
|
||||
if ("ok".equals(object.getString("result"))) {
|
||||
newTaskId = object.getJSONObject("data").getString("taskId");
|
||||
@ -3229,7 +3270,23 @@ public class ProcessPublishWeb extends ActionWeb {
|
||||
service.execute(() -> {
|
||||
// 创建流程手册
|
||||
String changedFileIdNew = bc.getString("CHANGEDFILEIDNEW");
|
||||
String newTaskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, _uc.getUID(), "", changedFileIdNew);
|
||||
|
||||
PALRepositoryModel model = PALRepositoryCache.getCache().get(changedFileIdNew);
|
||||
if ("default".equals(model.getMethodId())) {
|
||||
SDK.getLogAPI().consoleErr("流程发布表单[发布]提交时创建流程手册失败，processInstId=" + processInstId + ",changedFileIdNew=" + changedFileIdNew);
|
||||
}
|
||||
// 校验流程手册是否安装并启动
|
||||
if (model.getMethodId().contains("process.") && !SDK.getAppAPI().isActive("com.actionsoft.apps.coe.pal.output.pr")) {
|
||||
SDK.getLogAPI().consoleErr("[流程手册未安装]流程手册更新失败");
|
||||
}
|
||||
if ("data.form".equals(model.getMethodId()) && !SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.bd")) {
|
||||
SDK.getLogAPI().consoleErr("[表单手册未安装]流程手册更新失败");
|
||||
}
|
||||
if ("control.policy".equals(model.getMethodId()) && !SDK.getAppAPI().isActive("com.awspaas.user.apps.coe.pal.output.zd")) {
|
||||
SDK.getLogAPI().consoleErr("[表单手册未安装]流程手册更新失败");
|
||||
}
|
||||
|
||||
String newTaskId = createOutputReport(model, model.getWsId(), _uc.getUID(), "", model.getId());
|
||||
JSONObject object = JSONObject.parseObject(newTaskId);
|
||||
if ("ok".equals(object.getString("result"))) {
|
||||
newTaskId = object.getJSONObject("data").getString("taskId");
|
||||
|
||||
@ -27,6 +27,7 @@ import com.actionsoft.bpms.bo.engine.BO;
|
||||
import com.actionsoft.bpms.bpmn.engine.core.delegate.ProcessExecutionContext;
|
||||
import com.actionsoft.bpms.bpmn.engine.listener.ExecuteListener;
|
||||
import com.actionsoft.bpms.bpmn.engine.listener.ExecuteListenerInterface;
|
||||
import com.actionsoft.bpms.bpmn.engine.model.run.delegate.ProcessInstance;
|
||||
import com.actionsoft.bpms.commons.database.RowMap;
|
||||
import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
|
||||
import com.actionsoft.bpms.server.UserContext;
|
||||
@ -122,6 +123,14 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme
|
||||
//绩效模型中数据模型回填流程编号
|
||||
updateProcessNumber(boN.get("PUBLISHFILEID").toString(),param.getUserContext(),bo.get("WSID").toString(),boN.getString("PUBLISH_NUMBER"));
|
||||
|
||||
|
||||
//插入绩效指标库
|
||||
insertPerformanceIndicatorLibrary(boN.get("PUBLISHFILEID").toString(),param.getUserContext(),bo.get("WSID").toString(),boN.getString("PUBLISH_NUMBER"));
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
//by bzp 测试编号生成
|
||||
//new ProcesNumberUtil().getNumber(processInstId);
|
||||
@ -583,7 +592,153 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 发布流程结束查询关联绩效模型数据，插入绩效指标库中
|
||||
* @return
|
||||
*/
|
||||
public String insertPerformanceIndicatorLibrary(String publishFileId,UserContext uc,String wsId,String processNumber){
|
||||
|
||||
//获取关联绩效模型数据
|
||||
List performanceList=new ArrayList();
|
||||
performanceList.add(0,"control.kpi");
|
||||
performanceList.add(1,publishFileId);
|
||||
|
||||
RowMap performrowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?",performanceList.toString());
|
||||
|
||||
List l1l3performanceList=new ArrayList();
|
||||
l1l3performanceList.add(0,"control.ma");
|
||||
l1l3performanceList.add(1,publishFileId);
|
||||
|
||||
RowMap l1l3performrowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?",l1l3performanceList.toString());
|
||||
|
||||
if(performrowMap!=null || l1l3performrowMap!=null){
|
||||
|
||||
PALRepositoryModel parentModel = PALRepositoryCache.getCache().get(performrowMap.getString("ID"));
|
||||
|
||||
|
||||
Map<String, Map<String, JSONObject>> methodAttrsMap = new HashMap<>();// 属性存储
|
||||
|
||||
Map<String, String> methodValueAttrsMap = new HashMap<>();// 属性存储
|
||||
|
||||
//查询对应绩效模型中数据模型进行填充数据
|
||||
BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(performrowMap.getString("ID"), 0);
|
||||
|
||||
CoeProcessLevelWeb coeProcessLevelWeb=new CoeProcessLevelWeb(uc);
|
||||
|
||||
String define = defineModel.getDefinition();
|
||||
JSONObject definition = JSONObject.parseObject(define);
|
||||
JSONObject elements = definition.getJSONObject("elements");
|
||||
|
||||
|
||||
|
||||
ProcessInstance processInst=SDK.getProcessAPI().createBOProcessInstance("obj_1ffbc1e73b99427ca64469e466f97dbe", uc.getUID(), "指标绩效数据插入");
|
||||
|
||||
//拿去流程数据填充绩效模型中数据属性
|
||||
for (String key : elements.keySet()) {
|
||||
JSONObject shape1 = elements.getJSONObject(key);
|
||||
if ("linker".equals(shape1.getString("name"))) {
|
||||
continue;
|
||||
}
|
||||
String shapeText = shape1.getString("text");
|
||||
JSONArray dataAttributes = shape1.getJSONArray("dataAttributes");
|
||||
if (!dataAttributes.isEmpty() && dataAttributes.size() > 0) {
|
||||
for (Object attribute : dataAttributes) {
|
||||
JSONObject obj = (JSONObject) attribute;
|
||||
if (obj.containsKey("attributesJsonArray")) {
|
||||
JSONArray attributesJsonArray = obj.getJSONArray("attributesJsonArray");
|
||||
BO recordBO=new BO();
|
||||
|
||||
for (int i = 0; i < attributesJsonArray.size(); i++) {
|
||||
if (attributesJsonArray.getJSONObject(i).containsKey("id")) {
|
||||
|
||||
String getid=attributesJsonArray.getJSONObject(i).getString("id");
|
||||
String value=attributesJsonArray.getJSONObject(i).getString("value");
|
||||
if(getid.equals("Process_Architecture_L1")){//L1
|
||||
recordBO.set("PROCESS_ARCHITECTURE_L1",value);
|
||||
}
|
||||
if(getid.equals("Process_Architecture_L2")){//L2
|
||||
recordBO.set("PROCESS_ARCHITECTURE_L2",value);
|
||||
}
|
||||
if(getid.equals("Process_Architecture_L3")){//L3
|
||||
recordBO.set("PROCESS_ARCHITECTURE_L3",value);
|
||||
}
|
||||
if(getid.equals("Number_of_the_associated_flow_file")){//关联流程文件编号
|
||||
recordBO.set("NUMBER_OF_THE_ASSO_FLOW_FILE",value);
|
||||
}
|
||||
if(getid.equals("Associated_process_name")){//关联流程名称
|
||||
recordBO.set("ASSOCIATED_PROCESS_NAME",value);
|
||||
}
|
||||
if(getid.equals("Associated_process_name")){//流程绩效指标名称
|
||||
recordBO.set("PERFORMANCE_INDICATOR_NAME",value);
|
||||
}
|
||||
|
||||
if(getid.equals("Index_properties")){//指标性质
|
||||
recordBO.set("INDEX_PROPERTIES",value);
|
||||
}
|
||||
if(getid.equals("ndicator_User_defined_label")){//指标自定义标签
|
||||
recordBO.set("NDICATOR_USER_DEFINED_LABEL",value);
|
||||
}
|
||||
if(getid.equals("Index_definition")){//指标定义
|
||||
recordBO.set("INDEX_DEFINITION",value);
|
||||
}
|
||||
if(getid.equals("unit_measurement")){//计量单位
|
||||
recordBO.set("UNIT_MEASUREMENT",value);
|
||||
}
|
||||
if(getid.equals("statistical_period")){//统计周期
|
||||
recordBO.set("STATISTICAL_PERIOD",value);
|
||||
}
|
||||
|
||||
if(getid.equals("computational_formula")){//计算公式
|
||||
recordBO.set("COMPUTATIONAL_FORMULA",value);
|
||||
}
|
||||
if(getid.equals("Data_fetch_logic")){//数据取数逻辑
|
||||
recordBO.set("DATA_FETCH_LOGIC",value);
|
||||
}
|
||||
if(getid.equals("Take_the_number_aperture")){//取数口径
|
||||
recordBO.set("TAKE_THE_NUMBER_APERTURE",value);
|
||||
}
|
||||
if(getid.equals("remark")){//备注
|
||||
recordBO.set("REMARK",value);
|
||||
}
|
||||
if(getid.equals("oa_process")){//OA流程
|
||||
recordBO.set("OA_PROCESS",value);
|
||||
}
|
||||
|
||||
if(getid.equals("element")){//元素
|
||||
|
||||
JSONObject getvalue = attributesJsonArray.getJSONObject(i).getJSONObject("value");
|
||||
if(getvalue!=null){
|
||||
JSONArray elejsonArray = attributesJsonArray.getJSONObject(i).getJSONObject("value").getJSONArray("table");
|
||||
for(int k=1;k<elejsonArray.size();k++){
|
||||
String name = elejsonArray.getJSONObject(k).get("name").toString();
|
||||
String desc = elejsonArray.getJSONObject(k).get("desc").toString();
|
||||
BO eleBO=new BO();
|
||||
eleBO.set("ELEMENT",name);
|
||||
eleBO.set("DATASOURCES",desc);
|
||||
SDK.getBOAPI().create("BO_EU_ELEMENT",eleBO,processInst.getId(),"");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
SDK.getBOAPI().create("BO_EU_PER_IND_LIB",recordBO,processInst.getId(),"");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta name="renderer" content="webkit">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
|
||||
<meta name="renderer" content="webkit">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<meta name="renderer" content="webkit">
|
||||
@ -30,6 +33,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
<link type='text/css' rel='stylesheet' id='themeCss' href='../apps/_bpm.platform/css/theme/theme.css' name='themeCss'/>
|
||||
</head>
|
||||
<body>
|
||||
@ -909,6 +913,18 @@ var 下一页 = "下一页";
|
||||
var 上一页 = "上一页";
|
||||
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
|
||||
// ]]></script>
|
||||
<script>// <![CDATA[
|
||||
var 无数据 = "无数据";
|
||||
var 下一页 = "下一页";
|
||||
var 上一页 = "上一页";
|
||||
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
|
||||
// ]]></script>
|
||||
<script>// <![CDATA[
|
||||
var 无数据 = "无数据";
|
||||
var 下一页 = "下一页";
|
||||
var 上一页 = "上一页";
|
||||
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
|
||||
// ]]></script>
|
||||
<script src="../commons/js/jquery/scripts/ui/awsui.pagination.js?v=1532938866000"></script>
|
||||
<script type="text/javascript">// <![CDATA[
|
||||
var isRefreshPage = true; //点击主表单保存和子表单保存按钮均会刷新主表单
|
||||
@ -947,5 +963,178 @@ function formOnload(){
|
||||
$("#c9ec08d2_4cd0_0001_358e_1de5d14ecee0").hide();
|
||||
}
|
||||
// ]]></script>
|
||||
<script id="formSave">// <![CDATA[
|
||||
// 点击办理时的校验+保存字表
|
||||
function formSave(isTransact){
|
||||
if (!editPerm) {// 只读状态不处理
|
||||
return true;
|
||||
}
|
||||
$.simpleAlert('正在保存', 'loading');
|
||||
if(isTransact) {// 点击办理进行校验
|
||||
// 判断页面是否有数据
|
||||
if ($("#publisher_new_tr").css('display') == 'none' && $("#publisher_change_tr").css('display') == 'none' && $("#publisher_stop_tr").css('display') == 'none'){
|
||||
$.simpleAlert('close');
|
||||
$.simpleAlert('发布内容不能为空', 'info');
|
||||
return false;
|
||||
}
|
||||
var index = 0;
|
||||
if (!($("#publisher_new_tr").css('display') == 'none') && newTemp.length > 0) {
|
||||
index++;
|
||||
}
|
||||
if (!($("#publisher_change_tr").css('display') == 'none') && changeTemp.length > 0) {
|
||||
index++;
|
||||
}
|
||||
if (!($("#publisher_stop_tr").css('display') == 'none') && stopTemp.length > 0) {
|
||||
index++;
|
||||
}
|
||||
if (index == 0) {
|
||||
$.simpleAlert('close');
|
||||
$.simpleAlert('发布内容不能为空', 'info');
|
||||
return false;
|
||||
}
|
||||
// 校验变更文件是否全部都有变更后文件
|
||||
if (!($("#publisher_change_tr").css('display') == 'none') && changeTemp.length > 0) {
|
||||
var flag = false;
|
||||
var msg = '以下文件没有选择变更后的文件，不允许办理';
|
||||
for (var i = 0; i < changeTemp.length; i++) {
|
||||
if (changeTemp[i].changedFileIdNew == "") {
|
||||
flag = true;
|
||||
msg += '<br>' + changeTemp[i].changeFileName + ' V' + changeTemp[i].fileVersion;
|
||||
}
|
||||
}
|
||||
if (flag) {
|
||||
var options = {
|
||||
title : "提示",
|
||||
content:msg,
|
||||
type:"alert",
|
||||
onConfirm: function(){
|
||||
}
|
||||
};
|
||||
$.simpleAlert('close');
|
||||
$.confirm(options);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 保存校验
|
||||
// 1.不显示的数据默认删除
|
||||
var newTempData = newTemp;
|
||||
var changeTempData = changeTemp;
|
||||
var stopTempData = stopTemp;
|
||||
if (($("#publisher_new_tr").css('display') == 'none')) {
|
||||
newTempData = [];
|
||||
}
|
||||
if (($("#publisher_change_tr").css('display') == 'none')) {
|
||||
changeTempData = [];
|
||||
}
|
||||
if (($("#publisher_stop_tr").css('display') == 'none')) {
|
||||
stopTempData = [];
|
||||
}
|
||||
// 2.校验变更的数据与停用的数据是否有重叠
|
||||
if(isTransact) {
|
||||
if (!($("#publisher_change_tr").css('display') == 'none') && !($("#publisher_stop_tr").css('display') == 'none')) {
|
||||
for (var i = 0; i < changeTempData.length; i ++) {
|
||||
for (var j = 0; j < stopTempData.length; j++) {
|
||||
if (changeTempData[i].changeFileId == stopTempData[j].stopFileId) {
|
||||
$.simpleAlert('close');
|
||||
$.simpleAlert(stopTempData[j].stopFileName + ' V' + stopTempData[j].fileVersion + "<br>在变更流程和停用流程中同时存在，不允许办理", 'error');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//三员管理，提交后不生成手册,更改taskId
|
||||
if (isHighSecurity){
|
||||
for (let i=0;i<newTempData.length;i++){
|
||||
let data= newTempData[i];
|
||||
if ((data.methodId == 'control.policy' || data.methodId == 'data.form' || data.methodId.indexOf('process.') > -1) && data.methodId != 'default') {
|
||||
data.taskId = "new";
|
||||
}
|
||||
}
|
||||
for (let j=0; j<changeTempData.length;j++){
|
||||
let changeData = changeTempData[j];
|
||||
changeData.taskId = "change";
|
||||
}
|
||||
}
|
||||
// 保存
|
||||
var param = {
|
||||
sid : sid,
|
||||
cmd : "com.actionsoft.apps.coe.pal.publisher_batch_save_before",
|
||||
teamId: teamId,
|
||||
wsId: wsId,
|
||||
processInstId : processInstId,
|
||||
newData: JSON.stringify(newTempData),
|
||||
changeData: JSON.stringify(changeTempData),
|
||||
stopData: JSON.stringify(stopTempData),
|
||||
isTransact : isTransact
|
||||
};
|
||||
var flag = false;
|
||||
var tempData;
|
||||
$.ajax({
|
||||
url : "./jd",
|
||||
type : "POST",
|
||||
dataType : "JSON",
|
||||
async : false,
|
||||
data : param,
|
||||
success : function(r) {
|
||||
if (r.result == 'error') {
|
||||
flag = true;
|
||||
tempData = r.data.data;
|
||||
}
|
||||
},
|
||||
error : function(XMLHttpRequest, textStatus, errorThrown) {
|
||||
$.simpleAlert("表单信息错误，请联系管理员！", 'error');
|
||||
}
|
||||
});
|
||||
$.simpleAlert('close');
|
||||
if (flag) {
|
||||
var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理';
|
||||
if (tempData.length > 0) {
|
||||
for (var i = 0; i < tempData.length; i++) {
|
||||
msg += '<br>' + tempData[i].name + ' V' + tempData[i].version;
|
||||
}
|
||||
}
|
||||
var options = {
|
||||
title : "提示",
|
||||
content:msg,
|
||||
type:"alert",
|
||||
onConfirm: function(){
|
||||
}
|
||||
};
|
||||
$.confirm(options);
|
||||
return false;
|
||||
} else {
|
||||
newTemp = newTempData;
|
||||
if (newTemp.length == 0) {
|
||||
newPageSetting = {
|
||||
pageNum:1,
|
||||
start:1
|
||||
};
|
||||
$('#new_pagination').hide();
|
||||
initPublishData(newTemp, 'new', 1, 1);
|
||||
}
|
||||
changeTemp = changeTempData;
|
||||
if (changeTemp.length == 0) {
|
||||
changePageSetting = {
|
||||
pageNum:1,
|
||||
start:1
|
||||
};
|
||||
$('#change_pagination').hide();
|
||||
initPublishData(changeTemp, 'change', 1, 1);
|
||||
}
|
||||
stopTemp = stopTempData;
|
||||
if (stopTemp.length == 0) {
|
||||
stopPageSetting = {
|
||||
pageNum:1,
|
||||
start:1
|
||||
};
|
||||
$('#stop_pagination').hide();
|
||||
initPublishData(stopTemp, 'stop', 1, 1);
|
||||
}
|
||||
$.simpleAlert('保存成功', 'ok');
|
||||
}
|
||||
}
|
||||
// ]]></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1280,7 +1280,6 @@ function getStopBatchResult(type) {
|
||||
|
||||
// 获取已有的流程手册
|
||||
function queryBatchReport(data) {
|
||||
debugger;
|
||||
var ids = [];
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
var temp = data[i];
|
||||
@ -1870,179 +1869,7 @@ function saveFormData(type) {
|
||||
}
|
||||
}
|
||||
|
||||
// 点击办理时的校验+保存字表
|
||||
function formSave(isTransact){
|
||||
if (!editPerm) {// 只读状态不处理
|
||||
return true;
|
||||
}
|
||||
$.simpleAlert('正在保存', 'loading');
|
||||
if(isTransact) {// 点击办理进行校验
|
||||
// 判断页面是否有数据
|
||||
if ($("#publisher_new_tr").css('display') == 'none' && $("#publisher_change_tr").css('display') == 'none' && $("#publisher_stop_tr").css('display') == 'none'){
|
||||
$.simpleAlert('close');
|
||||
$.simpleAlert('发布内容不能为空', 'info');
|
||||
return false;
|
||||
}
|
||||
debugger;
|
||||
var index = 0;
|
||||
if (!($("#publisher_new_tr").css('display') == 'none') && newTemp.length > 0) {
|
||||
index++;
|
||||
}
|
||||
if (!($("#publisher_change_tr").css('display') == 'none') && changeTemp.length > 0) {
|
||||
index++;
|
||||
}
|
||||
if (!($("#publisher_stop_tr").css('display') == 'none') && stopTemp.length > 0) {
|
||||
index++;
|
||||
}
|
||||
if (index == 0) {
|
||||
$.simpleAlert('close');
|
||||
$.simpleAlert('发布内容不能为空', 'info');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 校验变更文件是否全部都有变更后文件
|
||||
if (!($("#publisher_change_tr").css('display') == 'none') && changeTemp.length > 0) {
|
||||
var flag = false;
|
||||
var msg = '以下文件没有选择变更后的文件，不允许办理';
|
||||
for (var i = 0; i < changeTemp.length; i++) {
|
||||
if (changeTemp[i].changedFileIdNew == "") {
|
||||
flag = true;
|
||||
msg += '<br>' + changeTemp[i].changeFileName + ' V' + changeTemp[i].fileVersion;
|
||||
}
|
||||
}
|
||||
if (flag) {
|
||||
var options = {
|
||||
title : "提示",
|
||||
content:msg,
|
||||
type:"alert",
|
||||
onConfirm: function(){
|
||||
}
|
||||
};
|
||||
$.simpleAlert('close');
|
||||
$.confirm(options);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 保存校验
|
||||
// 1.不显示的数据默认删除
|
||||
var newTempData = newTemp;
|
||||
var changeTempData = changeTemp;
|
||||
var stopTempData = stopTemp;
|
||||
if (($("#publisher_new_tr").css('display') == 'none')) {
|
||||
newTempData = [];
|
||||
}
|
||||
if (($("#publisher_change_tr").css('display') == 'none')) {
|
||||
changeTempData = [];
|
||||
}
|
||||
if (($("#publisher_stop_tr").css('display') == 'none')) {
|
||||
stopTempData = [];
|
||||
}
|
||||
// 2.校验变更的数据与停用的数据是否有重叠
|
||||
if(isTransact) {
|
||||
if (!($("#publisher_change_tr").css('display') == 'none') && !($("#publisher_stop_tr").css('display') == 'none')) {
|
||||
for (var i = 0; i < changeTempData.length; i ++) {
|
||||
for (var j = 0; j < stopTempData.length; j++) {
|
||||
if (changeTempData[i].changeFileId == stopTempData[j].stopFileId) {
|
||||
$.simpleAlert('close');
|
||||
$.simpleAlert(stopTempData[j].stopFileName + ' V' + stopTempData[j].fileVersion + "<br>在变更流程和停用流程中同时存在，不允许办理", 'error');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//三员管理，提交后不生成手册,更改taskId
|
||||
if (isHighSecurity){
|
||||
for (let i=0;i<newTempData.length;i++){
|
||||
let data= newTempData[i];
|
||||
if ((data.methodId == 'control.policy' || data.methodId == 'data.form' || data.methodId.indexOf('process.') > -1) && data.methodId != 'default') {
|
||||
data.taskId = "new";
|
||||
}
|
||||
}
|
||||
for (let j=0; j<changeTempData.length;j++){
|
||||
let changeData = changeTempData[j];
|
||||
changeData.taskId = "change";
|
||||
}
|
||||
}
|
||||
// 保存
|
||||
var param = {
|
||||
sid : sid,
|
||||
cmd : "com.actionsoft.apps.coe.pal.publisher_batch_save_before",
|
||||
teamId: teamId,
|
||||
wsId: wsId,
|
||||
processInstId : processInstId,
|
||||
newData: JSON.stringify(newTempData),
|
||||
changeData: JSON.stringify(changeTempData),
|
||||
stopData: JSON.stringify(stopTempData),
|
||||
isTransact : isTransact
|
||||
};
|
||||
var flag = false;
|
||||
var tempData;
|
||||
$.ajax({
|
||||
url : "./jd",
|
||||
type : "POST",
|
||||
dataType : "JSON",
|
||||
async : false,
|
||||
data : param,
|
||||
success : function(r) {
|
||||
if (r.result == 'error') {
|
||||
flag = true;
|
||||
tempData = r.data.data;
|
||||
}
|
||||
},
|
||||
error : function(XMLHttpRequest, textStatus, errorThrown) {
|
||||
$.simpleAlert("表单信息错误，请联系管理员！", 'error');
|
||||
}
|
||||
});
|
||||
$.simpleAlert('close');
|
||||
if (flag) {
|
||||
var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理';
|
||||
if (tempData.length > 0) {
|
||||
for (var i = 0; i < tempData.length; i++) {
|
||||
msg += '<br>' + tempData[i].name + ' V' + tempData[i].version;
|
||||
}
|
||||
}
|
||||
var options = {
|
||||
title : "提示",
|
||||
content:msg,
|
||||
type:"alert",
|
||||
onConfirm: function(){
|
||||
}
|
||||
};
|
||||
$.confirm(options);
|
||||
return false;
|
||||
} else {
|
||||
newTemp = newTempData;
|
||||
if (newTemp.length == 0) {
|
||||
newPageSetting = {
|
||||
pageNum:1,
|
||||
start:1
|
||||
};
|
||||
$('#new_pagination').hide();
|
||||
initPublishData(newTemp, 'new', 1, 1);
|
||||
}
|
||||
changeTemp = changeTempData;
|
||||
if (changeTemp.length == 0) {
|
||||
changePageSetting = {
|
||||
pageNum:1,
|
||||
start:1
|
||||
};
|
||||
$('#change_pagination').hide();
|
||||
initPublishData(changeTemp, 'change', 1, 1);
|
||||
}
|
||||
stopTemp = stopTempData;
|
||||
if (stopTemp.length == 0) {
|
||||
stopPageSetting = {
|
||||
pageNum:1,
|
||||
start:1
|
||||
};
|
||||
$('#stop_pagination').hide();
|
||||
initPublishData(stopTemp, 'stop', 1, 1);
|
||||
}
|
||||
$.simpleAlert('保存成功', 'ok');
|
||||
}
|
||||
}
|
||||
|
||||
//办理完成后关闭页面
|
||||
AWSFormMainAPI.customCloseFormPage(function(){
|
||||
@ -2307,7 +2134,6 @@ function downloadReport(uuid, taskId) {
|
||||
uuid: uuid
|
||||
},
|
||||
success : function(r) {
|
||||
debugger;
|
||||
if (r.result == "ok") {
|
||||
debugger;
|
||||
window.open (r.data.url);
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
<item key="control.kpi">
|
||||
<cn><![CDATA[末级流程绩效]]></cn>
|
||||
<en><![CDATA[Process.Kpi]]></en>
|
||||
<big5><![CDATA[流程KPI图]]></big5>
|
||||
<big5><![CDATA[末级流程绩效]]></big5>
|
||||
</item>
|
||||
<item key="control.ma">
|
||||
<cn><![CDATA[L1-L3流程绩效指标]]></cn>
|
||||
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -24,7 +24,9 @@
|
||||
<attribute key="target_value" title="指标值" type="string" value="" desc="指标值" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="element" title="元素" type="table" value="" desc="元素" isRequired="false" ref="{"firstColumn":"元素","secondColumn":"数据来源"}" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Data_fetch_logic" title="数据取数逻辑" type="textarea" value="" desc="数据取数逻辑" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Take_the_number_aperture" title="取数路径" type="textarea" value="" desc="取数路径" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Take_the_number_aperture" title="取数口径" type="textarea" value="" desc="取数路径" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="data_sources" title="数据来源" type="textarea" value="" desc="数据来源" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="computational_formula" title="计算公式" type="textarea" value="" desc="计算公式" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="computational_formula" title="计算公式" type="textarea" value="" desc="计算公式" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Index_properties" title="指标性质" type="string" value="" desc="指标性质" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="oa_process" title="OA流程" type="string" value="" desc="OA流程" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
</attributes>
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<attributes type="customer">
|
||||
<attribute key="Purpose" title="目的" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true" desc="目的" isRequired="true"/>
|
||||
<attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="文件编码" isRequired="true"/>
|
||||
<attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="组织/角色职责" isRequired="true"/>
|
||||
<attribute key="application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
@ -15,9 +13,7 @@
|
||||
<attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{"method":"process","type":"file","multiple":true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{"method":"process","type":"shape","multiple":true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="T_supplementary_articles" title="附则" type="string" value="" desc="附则" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="related_knowledge" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="true" ref="{"scope":["department"],"multiple":false}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
@ -25,5 +21,9 @@
|
||||
<attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="true" ref="{"firstColumn":"组织","secondColumn":"职责"}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="company" title="编制单位" type="string" value="" desc="编制单位" isRequired="false" ref="" readonly="false" groupPath="organization" scope="*" isValid="true"/>
|
||||
<attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
|
||||
<attribute key="Purpose" title="目的" type="textarea" value="" desc="目的" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="application" title="适用范围" type="textarea" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
|
||||
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
<attribute key="T_supplementary_articles" title="附则" type="textarea" value="" desc="附则" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
|
||||
</attributes>
|
||||
|
||||
@ -1187,12 +1187,12 @@ public class CoEPALController {
|
||||
* @return
|
||||
*/
|
||||
@Mapping("com.actionsoft.apps.coe.pal_outputreport_output_downloadZipfile")
|
||||
public String COEPALOUTPUTREPORTOutputProcessDownloadZipFILE(UserContext me, RequestParams params) throws Exception {
|
||||
public String COEPALOUTPUTREPORTOutputProcessDownloadZipFILE(UserContext me, RequestParams params,String methodId) throws Exception {
|
||||
UpfileWeb web = new UpfileWeb(me);
|
||||
String splitId = params.get("splitId");
|
||||
String toolbarname=params.get("toolbarname");
|
||||
String taskId=params.get("taskIdParams");
|
||||
return web.readZipFileDownLoad(splitId,toolbarname,taskId);
|
||||
return web.readZipFileDownLoad(splitId,toolbarname,taskId,methodId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -453,13 +453,14 @@ public final class PublishListHistory extends DaoObject<PublishListHistoryModel>
|
||||
*/
|
||||
public String getLastPublishTaskIdByModelId(String repositoryId) {
|
||||
//String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC";
|
||||
String sql="SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID = ? ORDER BY CREATEDATE DESC";
|
||||
String sql="SELECT TASKID FROM (SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID=? ORDER BY CREATEDATE DESC) WHERE ROWNUM=1";
|
||||
String taskId = DBSql.getObject(sql, new RowMapper<String>() {
|
||||
@Override
|
||||
public String mapRow(ResultSet rs, int arg1) throws SQLException {
|
||||
return rs.getString(1);
|
||||
}
|
||||
}, new Object[] { repositoryId });
|
||||
|
||||
return taskId;
|
||||
}
|
||||
|
||||
|
||||
@ -1808,7 +1808,7 @@ public class PALRepositoryQueryAPIManager {
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
for (PALRepositoryModel model : list) {
|
||||
|
||||
if(attrId.equals("Process_performance_metrics") || attrId.equals("role")){
|
||||
if(attrId.equals("role")){
|
||||
List data=new ArrayList();
|
||||
data.add(0,model.getMethodId());
|
||||
data.add(1,uuid);
|
||||
@ -1905,10 +1905,104 @@ public class PALRepositoryQueryAPIManager {
|
||||
}
|
||||
}else if(attrId.equals("R_relevant_flies")){
|
||||
|
||||
if(!model.isPublish()){
|
||||
continue;
|
||||
}
|
||||
if(!model.isPublish()){
|
||||
continue;
|
||||
}
|
||||
|
||||
JSONObject object = new JSONObject();
|
||||
object.put("id", model.getId().trim());
|
||||
object.put("pid", model.getNewParentId().trim());
|
||||
if (removeIds != null && removeIds.contains(model.getId().trim())) {
|
||||
object.put("nocheck", true);
|
||||
} else {
|
||||
object.put("nocheck", false);
|
||||
}
|
||||
object.put("plNo", CoeProcessLevelUtil.getProcessLevelNoByUUId(model.getId(), model.getWsId()).trim());
|
||||
object.put("name", I18nRes.findValue(CoEConstant.APP_ID, context.getLanguage(), model.getName()).trim());
|
||||
object.put("wsId", model.getWsId());
|
||||
PALMethodModel methodModel = PALMethodCache.getPALMethodModelById(model.getMethodId());
|
||||
if (methodModel == null || methodModel.isFolder()) {// 没有该建模方法或者是文件夹类
|
||||
object.put("title", object.get("name"));
|
||||
} else {
|
||||
object.put("title", object.get("name") + " " + VersionUtil.getVersionStrV(model.getVersion()).trim());
|
||||
}
|
||||
//三员管理文件密级校验
|
||||
if (HighSecurityUtil.isON() && HighSecurityUtil.fileSecuritySwitch()){
|
||||
ResponseObject responseObject = new CoeProcessLevelWeb(DispatcherRequest.getUserContext()).checkFilePemission(model.getId());
|
||||
if (responseObject.isErr() && (methodModel != null && !methodModel.isFolder())){
|
||||
object.put("nocheck", true);
|
||||
}
|
||||
}
|
||||
object.put("drop", false);
|
||||
object.put("isSystemFile", model.isSystemFile());
|
||||
object.put("plMethodId", model.getMethodId().trim());
|
||||
if (methodModel == null || methodModel.isFolder()) {// 没有该建模方法或者是文件夹类
|
||||
object.put("iconFont", "");
|
||||
} else {
|
||||
object.put("iconFont", "");
|
||||
}
|
||||
List<PALRepositoryModel> children = null;
|
||||
if (isUsed) {
|
||||
children = getUsedPalRepositoryModelsByPid(model.getWsId(), model.getId());
|
||||
if (param != null && "designer".equals(param) && children != null && children.size() > 0) {// 过滤掉发布版本
|
||||
List<PALRepositoryModel> tempChildren = new ArrayList<>();
|
||||
for (PALRepositoryModel model2 : children) {
|
||||
if (!model2.isPublish()) {
|
||||
tempChildren.add(model2);
|
||||
}
|
||||
}
|
||||
children = tempChildren;
|
||||
}
|
||||
} else if (isPublished) {
|
||||
children = getPublishedPalRepositoryModelsByPid(model.getWsId(), model.getId());
|
||||
}
|
||||
if (children == null || children.size() == 0) {
|
||||
object.put("isParent", false);
|
||||
//String icon = object.getString("icon");
|
||||
object.put("leaf", true);// 叶子节点
|
||||
// object.put("icon", icon.replace("16.png", "16.leaf.png"));
|
||||
} else {
|
||||
object.put("isParent", true);
|
||||
object.put("open", false);
|
||||
}
|
||||
|
||||
object.put("plLevel", model.getLevel());
|
||||
object.put("plOrdexIndex", model.getOrderIndex());
|
||||
object.put("plDiagramUrl", model.getDiagramUrl());
|
||||
object.put("isDrops", model.isSystemFile());
|
||||
object.put("isPublish", model.isPublish());
|
||||
object.put("isStop", model.isStop());
|
||||
object.put("isApproval", model.isApproval());
|
||||
object.put("ext1", model.getExt1());
|
||||
object.put("ext2", model.getExt2());
|
||||
object.put("ext3", model.getExt3());
|
||||
object.put("ext4", model.getExt4());
|
||||
object.put("isUse", model.isUse());
|
||||
object.put("url", "./w?sid=" + context.getSessionId() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_portal_page&ruuid=" + model.getId() + "&type=1&wsid=" + model.getWsId());
|
||||
object.put("plCategory", model.getMethodCategory());
|
||||
object.put("versionId", model.getVersionId());
|
||||
object.put("orderIndex", model.getOrderIndex());
|
||||
object.put("isBottomLevel", model.isBottomLevel());
|
||||
String dutyDeptId = model.getDutyDept();
|
||||
object.put("dutyDeptId", dutyDeptId == null ? "" : dutyDeptId);
|
||||
String plDutyDeptName = dutyDeptId;
|
||||
if (!UtilString.isEmpty(dutyDeptId)) {
|
||||
if (SDK.getORGAPI().getDepartmentById(dutyDeptId) != null) {
|
||||
plDutyDeptName = SDK.getORGAPI().getDepartmentById(dutyDeptId).getName();
|
||||
}
|
||||
}
|
||||
object.put("dutyDeptName", UtilString.isEmpty(dutyDeptId) ? "" : plDutyDeptName);
|
||||
String plDutyPerson = model.getDutyUser();
|
||||
object.put("dutyPersonId", model.getDutyUser() == null ? "" : model.getDutyUser());
|
||||
object.put("dutyPersionName", UtilString.isEmpty(plDutyPerson) ? "" : SDK.getORGAPI().getUserAliasNames(plDutyPerson));
|
||||
jsonArray.add(object);
|
||||
}else if(attrId.equals("Process_performance_metrics")){
|
||||
List data=new ArrayList();
|
||||
data.add(0,model.getMethodId());
|
||||
data.add(1,uuid);
|
||||
|
||||
RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?",model.getId(),data.toString());
|
||||
if (rowMap != null || model.getName().equals("L1-L3流程绩效") || model.getName().equals("末级流程绩效")) {
|
||||
JSONObject object = new JSONObject();
|
||||
object.put("id", model.getId().trim());
|
||||
object.put("pid", model.getNewParentId().trim());
|
||||
@ -1996,6 +2090,7 @@ public class PALRepositoryQueryAPIManager {
|
||||
object.put("dutyPersonId", model.getDutyUser() == null ? "" : model.getDutyUser());
|
||||
object.put("dutyPersionName", UtilString.isEmpty(plDutyPerson) ? "" : SDK.getORGAPI().getUserAliasNames(plDutyPerson));
|
||||
jsonArray.add(object);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2004,6 +2099,7 @@ public class PALRepositoryQueryAPIManager {
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************************************************************************/
|
||||
|
||||
/**
|
||||
@ -3530,8 +3626,53 @@ public class PALRepositoryQueryAPIManager {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// 判断组织权限
|
||||
String orgPerm = bo.getString("ORGPERM");
|
||||
String postPerm = bo.getString("POSTPERM");
|
||||
String levelPerm = bo.getString("LEVELPERM");
|
||||
|
||||
// 根据发布流程选择的发布范围，获取所选组织、岗位、职级的交集进行权限控制
|
||||
|
||||
// 都不为空时
|
||||
if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm) && UtilString.isNotEmpty(levelPerm)) {
|
||||
if (getOrgPerm(orgPerm, uc) && getPostPerm(postPerm, uc) && getLevelPerm(levelPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
// 职级为空时
|
||||
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(postPerm) && UtilString.isEmpty(levelPerm)) {
|
||||
if (getOrgPerm(orgPerm, uc) && getPostPerm(postPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
// 岗位为空时
|
||||
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isNotEmpty(levelPerm) && UtilString.isEmpty(postPerm)) {
|
||||
if (getOrgPerm(orgPerm, uc) && getLevelPerm(levelPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
// 组织为空时
|
||||
} else if (UtilString.isNotEmpty(postPerm) && UtilString.isNotEmpty(levelPerm) && UtilString.isEmpty(orgPerm)) {
|
||||
if (getPostPerm(postPerm, uc) && getLevelPerm(levelPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
// 组织、岗位为空时
|
||||
} else if (UtilString.isNotEmpty(levelPerm) && UtilString.isEmpty(postPerm) && UtilString.isEmpty(orgPerm)) {
|
||||
if (getLevelPerm(levelPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
// 组织、职级为空时
|
||||
} else if (UtilString.isNotEmpty(postPerm) && UtilString.isEmpty(levelPerm) && UtilString.isEmpty(orgPerm)) {
|
||||
if (getPostPerm(postPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
// 岗位、职级为空时
|
||||
} else if (UtilString.isNotEmpty(orgPerm) && UtilString.isEmpty(levelPerm) && UtilString.isEmpty(postPerm)) {
|
||||
if (getOrgPerm(orgPerm, uc)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
//组织权限
|
||||
private boolean getOrgPerm(String orgPerm,UserContext uc) {
|
||||
if (UtilString.isNotEmpty(orgPerm)) {
|
||||
// 兼职
|
||||
Set<String> deptIdSet = new HashSet<>();
|
||||
@ -3556,8 +3697,10 @@ public class PALRepositoryQueryAPIManager {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 判断岗位权限
|
||||
String postPerm = bo.getString("POSTPERM");
|
||||
return false;
|
||||
}
|
||||
//岗位权限
|
||||
private boolean getPostPerm(String postPerm,UserContext uc) {
|
||||
if (UtilString.isNotEmpty(postPerm)) {
|
||||
String positionNo = uc.getUserModel().getPositionNo();
|
||||
String [] positionIds = postPerm.split(",");
|
||||
@ -3569,10 +3712,21 @@ public class PALRepositoryQueryAPIManager {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// 判断职级权限
|
||||
String levelPerm = bo.getString("LEVELPERM");
|
||||
return false;
|
||||
|
||||
}
|
||||
//职级权限
|
||||
private boolean getLevelPerm(String levelPerm,UserContext uc) {
|
||||
if (UtilString.isNotEmpty(levelPerm)) {
|
||||
// todo 待完善
|
||||
String userLevelPerm = uc.getUserModel().getExt2();
|
||||
String[] levelPermspArray = levelPerm.split(",");
|
||||
Set<String> levelPermspSet = new HashSet<>();
|
||||
for (int i = 0; i < levelPermspArray.length; i++) {
|
||||
levelPermspSet.add(levelPermspArray[i]);
|
||||
}
|
||||
if(levelPermspSet.contains(userLevelPerm)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -4934,6 +5088,9 @@ public class PALRepositoryQueryAPIManager {
|
||||
String attrValue = "";
|
||||
if (attrDataMap.containsKey(key)) {
|
||||
JSONObject jsonObj = attrDataMap.get(key);
|
||||
if (jsonObj == null) {
|
||||
continue;
|
||||
}
|
||||
String type = attributeModel.getType();
|
||||
if ("string".equals(type)) {
|
||||
attrValue = jsonObj.containsKey("value") ? jsonObj.getString("value") : "";
|
||||
|
||||
@ -14,6 +14,7 @@ public class EpcGraphModel {
|
||||
private int no;// 编号
|
||||
private List<String> prevShapes;// 入线
|
||||
private List<String> nextShapes;// 出线
|
||||
private int column;// 列
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
@ -78,4 +79,12 @@ public class EpcGraphModel {
|
||||
public void setHasNum(boolean hasNum) {
|
||||
this.hasNum = hasNum;
|
||||
}
|
||||
|
||||
public int getColumn() {
|
||||
return column;
|
||||
}
|
||||
|
||||
public void setColumn(int column) {
|
||||
this.column = column;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
package com.actionsoft.apps.coe.pal.pal.repository.designer.no.epc.tree;
|
||||
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.CoeDesignerShapeAPIManager;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.no.epc.model.EpcGraphModel;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryAttributeModel;
|
||||
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
|
||||
import com.actionsoft.bpms.util.UUIDGener;
|
||||
import com.actionsoft.bpms.util.UtilString;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
@ -45,6 +42,7 @@ public class EpcGraphTree {
|
||||
initHeaderData();
|
||||
// 去除环结构（有向图不能有环结构，否则无法进行拓扑排序）
|
||||
removeHoopRelation(headerShapes);
|
||||
|
||||
// test();
|
||||
// testNo();
|
||||
}
|
||||
@ -73,10 +71,19 @@ public class EpcGraphTree {
|
||||
}
|
||||
}
|
||||
|
||||
public void testColumn() {
|
||||
for (Map.Entry<String, EpcGraphModel> entry : graphShapeMap.entrySet()) {
|
||||
String shape = entry.getKey();
|
||||
EpcGraphModel model = entry.getValue();
|
||||
System.out.println("【" + model.getName() + "】的所属列是【" + model.getColumn() + "】");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化开始节点
|
||||
*/
|
||||
private void initHeaderData() {
|
||||
headerShapes.clear();
|
||||
for (Map.Entry<String, EpcGraphModel> entry : graphShapeMap.entrySet()) {
|
||||
if (entry.getValue().getNextShapes().size() > 0 && entry.getValue().getPrevShapes().size() == 0) {
|
||||
headerShapes.add(entry.getKey());
|
||||
@ -225,29 +232,92 @@ public class EpcGraphTree {
|
||||
return no <= 0 ? (no + "") : no < 10 ? ("0" + no) : (no + "");
|
||||
}
|
||||
|
||||
private void newSort() {
|
||||
String id = UUIDGener.getUUID();
|
||||
EpcGraphModel newHeader = new EpcGraphModel();
|
||||
newHeader.setId(id);
|
||||
newHeader.setShapeName("起点归并");
|
||||
newHeader.setPrevShapes(new ArrayList<>());
|
||||
newHeader.setName("起点归并");
|
||||
newHeader.setNextShapes(headerShapes);
|
||||
graphShapeMap.put(id, newHeader);
|
||||
// sort
|
||||
newSort2(newHeader, 1);
|
||||
/**
|
||||
* 新的排序
|
||||
* @return
|
||||
*/
|
||||
public JSONObject sort5() {
|
||||
int columnIndex = 1;
|
||||
sort6(headerShapes, columnIndex);
|
||||
for (Map.Entry<String, EpcGraphModel> entry : graphShapeMap.entrySet()) {
|
||||
EpcGraphModel model = entry.getValue();
|
||||
columnIndex = columnIndex > model.getColumn() ? columnIndex : model.getColumn();
|
||||
}
|
||||
int no = 1;
|
||||
for (int i = 1; i <= columnIndex; i++) {
|
||||
List<EpcGraphModel> list = new ArrayList<>();
|
||||
for (Map.Entry<String, EpcGraphModel> entry : graphShapeMap.entrySet()) {
|
||||
EpcGraphModel model = entry.getValue();
|
||||
if (model.getColumn() == i) {
|
||||
list.add(model);
|
||||
}
|
||||
}
|
||||
// 排序
|
||||
list.sort((e1, e2)-> {
|
||||
return shapeObjMap.get(e1.getId()).getJSONObject("props").getInteger("x") - shapeObjMap.get(e2.getId()).getJSONObject("props").getInteger("x");
|
||||
});
|
||||
// 赋值编号，兼具串联的处理
|
||||
for (EpcGraphModel model : list) {
|
||||
if (model.getNo() != 0) {// 编号计算过的忽略
|
||||
continue;
|
||||
}
|
||||
// 设置当前编号为no
|
||||
model.setNo(no++);
|
||||
//System.out.println("当前节点：" + model.getName());
|
||||
//System.out.println("开始查找串联节点");
|
||||
// 寻找串联特征的节点，依次进行串联编号
|
||||
if (model.getPrevShapes().size() <= 1 && model.getNextShapes().size() == 1) {
|
||||
EpcGraphModel tmp = graphShapeMap.get(model.getNextShapes().get(0));
|
||||
while (tmp != null && tmp.getPrevShapes().size() == 1 && tmp.getNextShapes().size() <= 1) {
|
||||
if (tmp.getNo() != 0) {
|
||||
break;
|
||||
}
|
||||
// System.out.println("查找到了串联节点：" + tmp.getName());
|
||||
tmp.setNo(no++);
|
||||
if (tmp.getNextShapes().size() > 0) {
|
||||
tmp = graphShapeMap.get(tmp.getNextShapes().get(0));
|
||||
} else {
|
||||
tmp = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
no = graphShapeMap.size() + 1;
|
||||
List<EpcGraphModel> list = new ArrayList<>();
|
||||
for (Map.Entry<String, EpcGraphModel> entry : graphShapeMap.entrySet()) {
|
||||
EpcGraphModel model = entry.getValue();
|
||||
if (model.getNo() == 0) {
|
||||
model.setNo(no++);
|
||||
}
|
||||
if (model.isHasNum()) {
|
||||
list.add(model);
|
||||
}
|
||||
}
|
||||
list.sort((e1, e2)-> {return e1.getNo() - e2.getNo();});
|
||||
JSONObject result = new JSONObject();
|
||||
int no2 = 1;
|
||||
for (EpcGraphModel model : list) {
|
||||
result.put(model.getId(), getNoStr(no2));
|
||||
// System.out.println("【" + model.getName() + "】的编号是【" + getNoStr(no2) + "】");
|
||||
no2++;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void newSort2(EpcGraphModel parent, int index) {
|
||||
List<String> nextList = graphShapeMap.get(parent).getNextShapes();
|
||||
|
||||
|
||||
|
||||
|
||||
private void sort6(List<String> headerShapes, int columnIndex) {
|
||||
Set<String> ids = new HashSet<>();
|
||||
for (String shape : headerShapes) {
|
||||
EpcGraphModel model = graphShapeMap.get(shape);
|
||||
model.setColumn(columnIndex);
|
||||
List<String> nextList = model.getNextShapes();
|
||||
ids.addAll(nextList);
|
||||
}
|
||||
if (ids.size() > 0) {
|
||||
sort6(new ArrayList<>(ids), ++columnIndex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 编号
|
||||
* 1.标记路径访问次数
|
||||
|
||||
@ -62,7 +62,7 @@ public class EpcGraphWeb extends ActionWeb {
|
||||
tree.initData(hasNumShapeNames, elements);
|
||||
JSONObject result = new JSONObject();
|
||||
result.put("attrId", "activity_number");
|
||||
result.put("data", tree.sort());
|
||||
result.put("data", tree.sort5());
|
||||
ResponseObject ro = ResponseObject.newOkResponse();
|
||||
ro.setData(result);
|
||||
return ro.toString();
|
||||
|
||||
@ -767,8 +767,8 @@ public class DesignerRelationShapeWeb extends ActionWeb {
|
||||
JSONArray jsonArr_new = new JSONArray();
|
||||
JSONArray objects = JSONArray.parseArray(treeJson);
|
||||
//角色图属性代码是role/绩效图属性代码为Process_performance_metrics进行判断
|
||||
if (attrId.equals("Process_performance_metrics")) {
|
||||
if (objects != null) {
|
||||
/*if (attrId.equals("Process_performance_metrics")) {
|
||||
*//*if (objects != null) {
|
||||
for (int i = 0; i < objects.size(); i++) {
|
||||
JSONObject jsonObject = objects.getJSONObject(i);
|
||||
String url = jsonObject.getString("url");
|
||||
@ -786,9 +786,54 @@ public class DesignerRelationShapeWeb extends ActionWeb {
|
||||
jsonArr_new.add(objects.getJSONObject(i));
|
||||
}
|
||||
}
|
||||
}*//*
|
||||
if (objects != null) {
|
||||
for (int i = 0; i < objects.size(); i++) {
|
||||
JSONObject jsonObject = objects.getJSONObject(i);
|
||||
String id = jsonObject.getString("id");
|
||||
String isParent = jsonObject.getString("isParent");
|
||||
|
||||
if (isParent != null) {
|
||||
if (isParent.equals("true")) {
|
||||
String title=jsonObject.getString("title");
|
||||
if(title.equals("末级流程绩效") || title.equals("L1-L3流程绩效") ){
|
||||
jsonArr_new.add(objects.getJSONObject(i));
|
||||
}else{
|
||||
List<PALRepositoryModel> coeProcessLevelModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByPid(id, wsId);
|
||||
if (coeProcessLevelModels.size() > 0) {
|
||||
for (int k = 0; k < coeProcessLevelModels.size(); k++) {
|
||||
PALRepositoryModel coeProcessLevelModel = coeProcessLevelModels.get(k);
|
||||
if (coeProcessLevelModel != null) {
|
||||
List data = new ArrayList();
|
||||
data.add(0, jsonObject.getString("plMethodId"));
|
||||
data.add(1, ruuid);
|
||||
RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", coeProcessLevelModel.getId(), data.toString());
|
||||
if (rowMap != null) {
|
||||
JSONObject json = getJSon(coeProcessLevelModel);
|
||||
jsonArr_new.add(json);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
List data = new ArrayList();
|
||||
data.add(0, jsonObject.getString("plMethodId"));
|
||||
data.add(1, ruuid);
|
||||
RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", id, data.toString());
|
||||
if (rowMap != null) {
|
||||
jsonArr_new.add(objects.getJSONObject(i));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
jsonArr_new.add(objects.getJSONObject(i));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
macroLibraries.put("treeData", jsonArr_new.toString());
|
||||
} else if (attrId.equals("role")) {
|
||||
} else*/ if (attrId.equals("role")) {
|
||||
if (objects != null) {
|
||||
for (int i = 0; i < objects.size(); i++) {
|
||||
JSONObject jsonObject = objects.getJSONObject(i);
|
||||
@ -811,13 +856,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
|
||||
data.add(1, ruuid);
|
||||
RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", coeProcessLevelModel.getId(), data.toString());
|
||||
if (rowMap != null) {
|
||||
/*showflag = false;
|
||||
if (showflag == false) {
|
||||
jsonArr_new.add(objects.getJSONObject(i));
|
||||
showflag = true;
|
||||
}*/
|
||||
JSONObject json = getJSon(coeProcessLevelModel);
|
||||
|
||||
jsonArr_new.add(json);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3144,7 +3144,7 @@ public class CoeDesignerWeb extends ActionWeb {
|
||||
|
||||
//关联文件list
|
||||
List<UpfileModel> relationUpfFileList = new ArrayList<>();
|
||||
if (relationList != null && relationList.size() > 0) {
|
||||
/*if (relationList != null && relationList.size() > 0) {
|
||||
for (int i = 0; i < relationList.size(); i++) {
|
||||
DesignerShapeRelationModel model = relationList.get(i);
|
||||
if (UtilString.isEmpty(model.getRelationShapeId())) {// 关联的模型文件
|
||||
@ -3156,7 +3156,7 @@ public class CoeDesignerWeb extends ActionWeb {
|
||||
relationUpfFileList.addAll(files);
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
if (relationUpfFileList != null && relationUpfFileList.size() > 0) {
|
||||
//三员管理，过滤关联文件密级显示
|
||||
|
||||
@ -488,7 +488,7 @@ public class UpfileWeb extends ActionWeb {
|
||||
* @return
|
||||
* @author zhaolei
|
||||
*/
|
||||
public String readZipFileDownLoad(String splitId,String toolbarname,String taskId) throws Exception {
|
||||
public String readZipFileDownLoad(String splitId,String toolbarname,String taskId,String methodId) throws Exception {
|
||||
UserContext me = super.getContext();
|
||||
ResponseObject ro = ResponseObject.newOkResponse();
|
||||
UpFileDao upfileDao = new UpFileDao();
|
||||
@ -534,6 +534,8 @@ public class UpfileWeb extends ActionWeb {
|
||||
}
|
||||
|
||||
|
||||
|
||||
//流程手册打包
|
||||
if (UtilString.isNotEmpty(taskId)) {
|
||||
|
||||
OutputTaskModel model = new OutputTask().getTaskReportById(taskId);
|
||||
@ -553,7 +555,14 @@ public class UpfileWeb extends ActionWeb {
|
||||
if (docFile == null) {
|
||||
return ResponseObject.newErrResponse("没有找到文件").toString();
|
||||
}
|
||||
String sourceAppId = "com.awspaas.user.apps.coe.pal.output.bd";
|
||||
|
||||
String sourceAppId = null;
|
||||
if (methodId.equals("data.form")) {
|
||||
sourceAppId = "com.awspaas.user.apps.coe.pal.output.bd";
|
||||
}
|
||||
if (methodId.indexOf("process.") > -1) {
|
||||
sourceAppId="com.actionsoft.apps.coe.pal.output.pr";
|
||||
}
|
||||
String filename = docFile.getName();
|
||||
DCContext sourceDc = new DCContext(_uc, DCProfileManager.getDCProfile(sourceAppId, "output"), sourceAppId, model.getWsId(), taskId, filename);
|
||||
|
||||
|
||||
@ -2372,7 +2372,7 @@ public class CoeProcessLevelUtil {
|
||||
*/
|
||||
public static String getLastPublishTaskIdByModelId(String repositoryId) {
|
||||
//String sql = "SELECT pl.TASKID FROM APP_ACT_COE_PAL_PUBLISH p, APP_ACT_COE_PAL_PUBLISH_LIST pl WHERE pl.pid = p.id AND pl.palrepositoryid = ? ORDER BY publishdate DESC";
|
||||
String sql="SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID = ? ORDER BY CREATEDATE DESC";
|
||||
String sql="SELECT TASKID FROM (SELECT TASKID FROM BO_ACT_COE_PUBLISH_N WHERE PUBLISHFILEID=? ORDER BY CREATEDATE DESC) WHERE ROWNUM=1";
|
||||
String taskId = DBSql.getObject(sql, new RowMapper<String>() {
|
||||
@Override
|
||||
public String mapRow(ResultSet rs, int arg1) throws SQLException {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
var notificationSoundTips = false; // 是否开启消息到达声音提醒
|
||||
var notificationMsgLoadFrequency = 60; // 通知消息检查频率
|
||||
var isSecurityPwdChange = <#isSecurityPwdChange>; // 是否允许用户修改口令
|
||||
var forceChangePwd = false; // 默认口令验证，是否强制修改默认密码
|
||||
var forceChangePwd = <#forceChangePwd>; // 默认口令验证，是否强制修改默认密码
|
||||
var isSecurityPwdComplexity = <#isSecurityPwdComplexity>; // 密码强度
|
||||
var securityMinPwdLength = <#securityMinPwdLength>; // 允许账户口令最小长度，0表示无限制
|
||||
var securityMaxPwdLength = <#securityMaxPwdLength>; // 允许账户口令最大长度，最多32位长度
|
||||
@ -13,4 +13,4 @@
|
||||
var mainType = "<#mainType>";
|
||||
var uid = "<#uid>";
|
||||
var wHref = "./w";
|
||||
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-03c6285a.7d5e2b5a.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0df035f6.e83dbaa2.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-21453108.a3fd01d3.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-23a660f0.0ecc4095.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-7724392c.344e9a6d.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-79148172.dc3e7967.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-7f2e89b2.e0cd2ccf.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-b158b92a.fe2f3f84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-03c6285a.529dedd5.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0df035f6.52f9d178.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.61269ead.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.1efa21de.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.fd29d082.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.f290866f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d212b99.1061dc70.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.9f4d92b1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.c12b6728.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.9b69a5bc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.97e80de1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7724392c.5c05c1db.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.25989b20.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7f2e89b2.e179f783.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.02ee2c83.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.8fc67a6c.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.bfa365b8.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.335bcbdd.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.335bcbdd.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.bfa365b8.js></script></body></html>
|
||||
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1d6af543.b0292b3d.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-632a23b2.5118bec3.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1d6af543.e67e6332.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-632a23b2.ffa525a8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.018f7940.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.018f7940.js></script></body></html>
|
||||
@ -1021,21 +1021,6 @@ function openRelationDialog(obj, callback) {
|
||||
id: "relationDialog",
|
||||
|
||||
buttons: [
|
||||
{
|
||||
text : '跳转模型',
|
||||
cls : "blue",
|
||||
handler : function() {
|
||||
var clickNodeId=parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.getClickNodeId();
|
||||
if(clickNodeId==''){
|
||||
$.simpleAlert("请选择需要打开的流程", 'warning');
|
||||
}else{
|
||||
var url="./w?uuid=" +clickNodeId+"&teamId="+getteamId
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val());
|
||||
window.open(url);
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
{
|
||||
text: '确定', cls: "blue", handler: function () {
|
||||
var attrId = obj.attr("id");
|
||||
@ -1109,20 +1094,6 @@ function openRelationDialog(obj, callback) {
|
||||
// 刷新页面
|
||||
parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.location.reload(true);
|
||||
}
|
||||
},{
|
||||
text : '跳转模型',
|
||||
cls : "blue",
|
||||
handler : function() {
|
||||
var clickNodeId=parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.getClickNodeId();
|
||||
if(clickNodeId==''){
|
||||
$.simpleAlert("请选择需要打开的流程", 'warning');
|
||||
}else{
|
||||
var url="./w?uuid=" +clickNodeId+"&teamId="+getteamId
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val());
|
||||
window.open(url);
|
||||
}
|
||||
|
||||
}
|
||||
}, {
|
||||
text: methodName,
|
||||
cls: "green",
|
||||
|
||||
@ -3580,7 +3580,6 @@ function openRelationDig(obj,value) {
|
||||
if (msg.data.result == "ok") {
|
||||
window.top.$.simpleAlert("请勿重复新建角色模型!!!");
|
||||
}else{
|
||||
|
||||
//跳转角色
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
@ -3643,14 +3642,6 @@ function openRelationDig(obj,value) {
|
||||
}else{
|
||||
$("#attr_dialog_normal_relevance_shapes_div").dialog({
|
||||
buttons : [
|
||||
{
|
||||
text : '跳转模型',
|
||||
cls : "blue",
|
||||
handler : function() {
|
||||
// 刷新页面
|
||||
document.getElementById("attr_content_iframe_relevance_shapes").contentWindow.location.reload(true);
|
||||
}
|
||||
},
|
||||
{
|
||||
text : '确定',
|
||||
cls : "blue",
|
||||
|
||||
@ -1623,8 +1623,6 @@ function ProcessManual(obj) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function openOutputFile(taskId) {
|
||||
// 打开流程手册
|
||||
$.simpleAlert('正在打开', 'loading');
|
||||
@ -1682,7 +1680,8 @@ function downloadZipFile(splitId,toolbarname) {
|
||||
data : {
|
||||
splitId : splitId,
|
||||
toolbarname:toolbarname,
|
||||
taskIdParams:taskId
|
||||
taskIdParams:taskId,
|
||||
methodId:methodId
|
||||
},
|
||||
success : function(msg) {
|
||||
if (msg.result == "ok") {
|
||||
@ -1702,6 +1701,7 @@ function initUpfileData(obj) {
|
||||
var t = '';
|
||||
var splitId='';
|
||||
var processFile = upfileData['file'];
|
||||
debugger;
|
||||
if(processFile.length > 0) {
|
||||
t += '<table name="file" class="awsui-table">';
|
||||
t += '<tr><td>';
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
||||
#commonRepository[data-v-5a94998a] .el-dialog__body,#commonRepository[data-v-5a94998a] .el-main{padding:0 20px}#commonRepository[data-v-5a94998a] .el-footer{padding:0}#commonRepository[data-v-5a94998a] .el-table__row .operate-icon-display{display:none}#commonRepository[data-v-5a94998a] .el-table__row:hover .operate-icon-display{display:inline-block}
|
||||
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
#commonRepository[data-v-c633f5ea] .el-dialog__body,#commonRepository[data-v-c633f5ea] .el-main{padding:0 20px}#commonRepository[data-v-c633f5ea] .el-footer{padding:0}#commonRepository[data-v-c633f5ea] .el-table__row .operate-icon-display{display:none}#commonRepository[data-v-c633f5ea] .el-table__row:hover .operate-icon-display{display:inline-block}
|
||||
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 158 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a._self._c;return t("div",{staticStyle:{width:"100%",height:"100%"}},[t("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},s=[],n={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=n,c=e("2877"),p=Object(c["a"])(r,i,s,!1,null,"56fd105e",null);t["default"]=p.exports}}]);
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a._self._c;return t("div",{staticStyle:{width:"100%",height:"100%"}},[t("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},s=[],n={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=n,c=e("0b56"),p=Object(c["a"])(r,i,s,!1,null,"56fd105e",null);t["default"]=p.exports}}]);
|
||||
@ -1,4 +1,4 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d212b99"],{aa47:function(t,e,n){"use strict";
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b25b0"],{2480:function(t,e,n){"use strict";
|
||||
/**!
|
||||
* Sortable 1.10.2
|
||||
* @author RubaXa <trash@rubaxa.org>
|
||||
@ -1 +1 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],r={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},a=r,o=i("2877"),h=Object(o["a"])(a,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],r={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},a=r,o=i("0b56"),h=Object(o["a"])(a,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);
|
||||
@ -1 +1 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("2877"),c=Object(r["a"])(o,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("0b56"),c=Object(r["a"])(o,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);
|
||||
@ -1 +1 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("2877"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("0b56"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);
|
||||
@ -1 +1 @@
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("2877"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);
|
||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("0b56"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user