Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev
This commit is contained in:
446052889@qq.com
commit
e2ca6bcf72
@ -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"/>
|
||||
|
||||
Binary file not shown.
@ -3203,15 +3203,28 @@ public class ProcessPublishWeb extends ActionWeb {
|
||||
String taskId = "";
|
||||
if (model.getMethodId().contains("process.")) {
|
||||
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, userId, teamId, uuid);
|
||||
JSONObject object = JSONObject.parseObject(taskId);
|
||||
if ("ok".equals(object.getString("result"))) {
|
||||
taskId = object.getJSONObject("data").getString("taskId");
|
||||
}
|
||||
} else if ("data.form".equals(model.getMethodId())) {
|
||||
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, userId, teamId, uuid);
|
||||
JSONObject object = JSONObject.parseObject(taskId);
|
||||
if ("ok".equals(object.getString("result"))) {
|
||||
taskId = object.getJSONObject("data").getString("taskId");
|
||||
}
|
||||
} else if ("control.policy".equals(model.getMethodId())) {
|
||||
taskId = PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, userId, teamId, uuid);
|
||||
JSONObject object = JSONObject.parseObject(taskId);
|
||||
if ("ok".equals(object.getString("result"))) {
|
||||
taskId = object.getJSONObject("data").getString("taskId");
|
||||
}
|
||||
}
|
||||
return 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 "";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@ var stopTemp;
|
||||
var treeCheckedNewArr = [];
|
||||
var treeCheckedChangeArr = [];
|
||||
var treeCheckedStopArr = [];
|
||||
var taskArr=[];
|
||||
// 统一中文变量
|
||||
var varDutyDept = "责任部门";
|
||||
var varDutyUser = "责任人";
|
||||
@ -228,9 +229,13 @@ function initHtml() {
|
||||
newHtml += '<div id="publisher_new" border="1">';
|
||||
newHtml += '<!-- 操作按钮 -->';
|
||||
newHtml += '<div id="publish_new_button" style="padding:5px 10px 5px 10px;">';
|
||||
newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>';
|
||||
// newHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
|
||||
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'new\');">删除</button>';
|
||||
|
||||
if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518'){
|
||||
newHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'new\');">新增</button>';
|
||||
// newHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'new\');">保存</button>';
|
||||
newHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'new\');">删除</button>';
|
||||
}
|
||||
|
||||
newHtml += '</div>';
|
||||
newHtml += '<div id="publish_new_content">';
|
||||
newHtml += '<table class="awsui-table awsui-table-thin awsui-table-hover data-table">';
|
||||
@ -254,9 +259,11 @@ function initHtml() {
|
||||
changeHtml += '<div id="publisher_change" border="1">';
|
||||
changeHtml += '<!-- 操作按钮 -->';
|
||||
changeHtml += '<div id="publish_change_button" style="padding:5px 10px 5px 10px;">';
|
||||
if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518'){
|
||||
changeHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'change\');">新增</button>';
|
||||
// changeHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'change\');">保存</button>';
|
||||
changeHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'change\');">删除</button>';
|
||||
}
|
||||
changeHtml += '</div>';
|
||||
changeHtml += '<div id="publish_change_content">';
|
||||
changeHtml += '<table class="awsui-table awsui-table-thin awsui-table-hover data-table">';
|
||||
@ -282,9 +289,11 @@ function initHtml() {
|
||||
stopHtml += '<div id="publisher_stop" border="1">';
|
||||
stopHtml += '<!-- 操作按钮 -->';
|
||||
stopHtml += '<div id="publish_stop_button" style="padding:5px 10px 5px 10px;">';
|
||||
stopHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'stop\');">新增</button>';
|
||||
// stopHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'stop\');">保存</button>';
|
||||
stopHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'stop\');">删除</button>';
|
||||
if($("#userTaskDefId").val()=='obj_c9e5a2e257f00001e2a375d01f601518') {
|
||||
stopHtml += '<button name="add" type="button" class="awsui-btn awsui-btn-blue" onclick="addProcess(\'stop\');">新增</button>';
|
||||
// stopHtml += '<button name="save" type="button" class="awsui-btn" onclick="saveFormData(\'stop\');">保存</button>';
|
||||
stopHtml += '<button name="delete" type="button" class="awsui-btn awsui-btn-danger" onclick="deleteFile(\'stop\');">删除</button>';
|
||||
}
|
||||
stopHtml += '</div>';
|
||||
stopHtml += '<div id="publish_stop_content">';
|
||||
stopHtml += '<table class="awsui-table awsui-table-thin awsui-table-hover data-table">';
|
||||
@ -509,12 +518,14 @@ function showlist(data, type, pageNumber, start){
|
||||
}
|
||||
// 加载数据
|
||||
var html = '';
|
||||
//var appendTask="";
|
||||
for (var i = 0, s = start; i < pageLimit; i++, s++) {
|
||||
var curr;
|
||||
if ((curr = data[s - 1]) != undefined) {
|
||||
//appendTask+=curr.taskId+',';
|
||||
var fileName = curr.publishFileName + ' V' + curr.fileVersion;
|
||||
var outputName = getOutputName(curr.category, curr.methodId);
|
||||
var reportName = '<a href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-" + outputName + '</a><span id="download_output_' + curr.publishFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.publishFileId + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;"></i></span>';
|
||||
var reportName = '<a id="openReportFile'+curr.taskId+'" href="javascript:void(0);" onclick="openReportFile(\'' + curr.taskId + '\')">' + fileName + "-" + outputName + '</a><span id="download_output_' + curr.publishFileId + '" style="cursor: pointer;" onclick="downloadReport(\'' + curr.publishFileId + '\',\'' + curr.taskId + '\')"><i class="awsui-iconfont" style="font-size: 12px;"></i></span>';
|
||||
var quickCreate = "<a href='javascript:void(0);' onclick='quickCreateReport(" + JSON.stringify(curr) + ", $(this), \"new\")'>立即创建</a>";
|
||||
var processNumber = '';
|
||||
if(curr.processNumber != undefined){
|
||||
@ -535,9 +546,19 @@ function showlist(data, type, pageNumber, start){
|
||||
//html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'new\',\'' + curr.publishFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.publishDesc + '</textarea></td>';
|
||||
html += '<td style="padding:1px;"><span>'+ processNumber +'</span></td>';
|
||||
html += '</tr>';
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//appendTask=appendTask.substring(0,appendTask.length-1);
|
||||
$('#publish_new_tbody').empty().html(html);
|
||||
|
||||
/*var taskData=appendTask.split(",");
|
||||
for(var i=0;i<taskData.length;i++){
|
||||
taskArr.push(taskData[i]);
|
||||
}*/
|
||||
|
||||
$("#publish_new_tbody .awsui-checkbox").check();
|
||||
}
|
||||
if (type == 'change') {
|
||||
@ -680,6 +701,7 @@ function showlist(data, type, pageNumber, start){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function disabledButton() {
|
||||
$('#publisher_dialog').find('div.dlg-button').find('button:first').prop('disabled', 'disabled');
|
||||
}
|
||||
@ -2135,7 +2157,6 @@ function downloadReport(uuid, taskId) {
|
||||
},
|
||||
success : function(r) {
|
||||
if (r.result == "ok") {
|
||||
debugger;
|
||||
window.open (r.data.url);
|
||||
} else {
|
||||
|
||||
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -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"/>
|
||||
@ -26,4 +22,8 @@
|
||||
<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="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>
|
||||
|
||||
@ -2875,7 +2875,7 @@ public class CoeDesignerWeb extends ActionWeb {
|
||||
return AlertWindow.getNotFoundMessagePage("未找到文件", "该文件已被删除");
|
||||
}
|
||||
|
||||
macroLibraries.put("taskId", "");
|
||||
macroLibraries.put("taskId", taskId);
|
||||
// 增加三员管理模式taskid为new，change判断
|
||||
if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) {
|
||||
macroLibraries.put("outputFileName", plModel.getName() + ".doc");
|
||||
@ -3130,7 +3130,13 @@ public class CoeDesignerWeb extends ActionWeb {
|
||||
continue;
|
||||
}
|
||||
|
||||
upFileObject.getJSONArray(upfileModel.getShape_uuid()).add(object);
|
||||
|
||||
String filename=upfileModel.getFileName().substring(upfileModel.getFileName().lastIndexOf("."));
|
||||
|
||||
if(!filename.equals(".xml")){
|
||||
upFileObject.getJSONArray(upfileModel.getShape_uuid()).add(object);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2270,6 +2270,8 @@ public class CoeProcessLevelUtil {
|
||||
//如果是关联属性，增加链接功能
|
||||
if(attributeModel.getType().equals("relation")){
|
||||
String appUrl;
|
||||
|
||||
StringBuffer sb=new StringBuffer();
|
||||
//判断数据库用户是否注销状态
|
||||
UserModel userModel=SDK.getORGAPI().getUser(plModel.getCreateUser());
|
||||
boolean isclosed=userModel.isClosed();
|
||||
@ -2285,28 +2287,35 @@ public class CoeProcessLevelUtil {
|
||||
|
||||
String sessionId = new SSOUtil().registerClientSessionNoPassword(plModel.getCreateUser(), LoginConst.DEFAULT_LANG, "localhost", LoginConst.DEVICE_PC);
|
||||
|
||||
relationFileId = jsonValue.getJSONObject(0).get("fileId").toString();
|
||||
for(int i=0;i<jsonValue.size();i++){
|
||||
relationFileId = jsonValue.getJSONObject(i).get("fileId").toString();
|
||||
|
||||
PALRepositoryModel model = PALRepositoryCache.getCache().get(uuid);
|
||||
String taskId="";
|
||||
if (model != null) {
|
||||
if (model.isPublish() || model.isStop()) {// 停用或已发布状态查询最新流程手册
|
||||
taskId=getLastPublishTaskIdByModelId(model.getId());
|
||||
PALRepositoryModel model = PALRepositoryCache.getCache().get(uuid);
|
||||
String taskId="";
|
||||
if (model != null) {
|
||||
if (model.isPublish() || model.isStop()) {// 停用或已发布状态查询最新流程手册
|
||||
taskId=getLastPublishTaskIdByModelId(model.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="+relationFileId+""+"&sid="+sessionId+"&taskId="+taskId;
|
||||
String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid="+relationFileId+""+"&sid="+sessionId+"&taskId="+taskId;
|
||||
|
||||
//判断如果关联属性是岗位，多个岗位显示为...
|
||||
if(attributeModel.getKey().equals("post")){
|
||||
int lenth=inputValue.split(",").length-1;
|
||||
if(lenth>=2){
|
||||
int index1=inputValue.indexOf(",");
|
||||
int index2=inputValue.indexOf(",",index1+1);
|
||||
inputValue=inputValue.substring(0,index2)+"...";
|
||||
//判断如果关联属性是岗位，多个岗位显示为...
|
||||
if(attributeModel.getKey().equals("post")){
|
||||
int lenth=inputValue.split(",").length-1;
|
||||
if(lenth>=2){
|
||||
int index1=inputValue.indexOf(",");
|
||||
int index2=inputValue.indexOf(",",index1+1);
|
||||
inputValue=inputValue.substring(0,index2)+"...";
|
||||
}
|
||||
}else{
|
||||
inputValue=jsonValue.getJSONObject(i).get("name").toString();
|
||||
}
|
||||
appUrl="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
|
||||
sb.append(appUrl).append(",");
|
||||
|
||||
}
|
||||
appUrl="<a href='"+url+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
|
||||
attribute.put("value", appUrl);
|
||||
attribute.put("value", sb.substring(0, sb.length()-1));
|
||||
|
||||
|
||||
}else{
|
||||
appUrl="<a href='"+'#'+"' style='color:blue' target='_blank'>"+inputValue+"</a>";
|
||||
|
||||
@ -10510,7 +10510,7 @@ public String deleteReply(String replyid, String messageid) {
|
||||
List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(sourceId);
|
||||
for (DesignerShapeRelationModel oldModel : oldModelList) {
|
||||
|
||||
//如果关联角色图，则同步复制角色图关联关系
|
||||
//如果关联角色图，则同步复制角色图关联关系,由于角色图规定为本流程使用，所以获取一次
|
||||
String methodIds = "";
|
||||
if (oldModel.getAttrId().equals("role")) {
|
||||
PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel();
|
||||
@ -10523,8 +10523,10 @@ public String deleteReply(String replyid, String messageid) {
|
||||
SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败，" + moveRo.getString("msg"));
|
||||
return ResponseObject.newErrResponse(moveRo.getString("msg")).toString();
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -10586,6 +10588,7 @@ public String deleteReply(String replyid, String messageid) {
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -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>
|
||||
@ -1462,9 +1462,17 @@ function initProcessDesc() {
|
||||
b += '<table class="awsui-table">';
|
||||
b += '<tr class="borderbottom">';
|
||||
b += '<td class="tableContent">' + "【"+obj.name +"】"+ '</td>';
|
||||
b += '<td>' + obj.value + '</td>';
|
||||
b += '</tr>';
|
||||
b += '</table>';
|
||||
var fileArry=obj.value.split(",");
|
||||
for(var k=0;k<fileArry.length;k++){
|
||||
b += '<table class="awsui-table">';
|
||||
b += '<tr class="borderbottom">';
|
||||
b += '<td>' + fileArry[k] + '</td>';
|
||||
b += '</tr>';
|
||||
b += '</table>';
|
||||
}
|
||||
|
||||
}else{
|
||||
t += '<tr class="borderbottom">';
|
||||
t += '<td class="tableContent tableleft">' + "【"+obj.name +"】"+ '</td>';
|
||||
@ -1701,7 +1709,6 @@ 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
@ -0,0 +1,42 @@
|
||||
package com.awspaas.user.apps.integration.controller;
|
||||
|
||||
import com.actionsoft.apps.coe.pal.pal.output.OutputAPIManager;
|
||||
import com.actionsoft.apps.coe.pal.pal.output.dao.OutputTask;
|
||||
import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel;
|
||||
import com.actionsoft.bpms.server.UserContext;
|
||||
import com.actionsoft.bpms.server.bind.annotation.Controller;
|
||||
import com.actionsoft.bpms.server.bind.annotation.Mapping;
|
||||
import com.actionsoft.bpms.util.UUIDGener;
|
||||
import com.awspaas.user.apps.integration.event.OutputDCFileProcessor;
|
||||
|
||||
/*
|
||||
* 文件阅览界面下载时创建手册
|
||||
*/
|
||||
@Controller
|
||||
public class CreateFileContorller {
|
||||
@Mapping("com.awspaas.user.apps.integrates.createFileController")
|
||||
public String createFile(String sid,String taskId,String fileName) throws Exception {
|
||||
String reportDownloadURL = "";
|
||||
UserContext me = UserContext.fromSessionId(sid);
|
||||
OutputTaskModel model = new OutputTask().getTaskReportById(taskId);
|
||||
|
||||
if (model != null) {
|
||||
//三员管理，步骤横表下载重新生成手册
|
||||
String taskName = model.getTaskName();
|
||||
if ("步骤横表".equals(taskName)){
|
||||
// 重新设置生成id，与用户id
|
||||
String uuid = UUIDGener.getUUID();
|
||||
model.setUserId(me.getUID());
|
||||
|
||||
// 重新生成手册文件
|
||||
OutputAPIManager.getInstance().reGennerReport(me,model,uuid);
|
||||
|
||||
// 重新构建手册下载URL
|
||||
taskId = uuid;
|
||||
}
|
||||
|
||||
reportDownloadURL = OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), taskId, model.getProfileId(), me, fileName + model.getTaskName());
|
||||
}
|
||||
return reportDownloadURL;
|
||||
}
|
||||
}
|
||||
@ -73,7 +73,7 @@ public class CreateDataKnow implements IJob {
|
||||
if (rowMap!=null){
|
||||
System.out.println("该知识已经存在于PAL资产库中的EXT4中，并且已经在知识中");
|
||||
}else{
|
||||
CreateKnow(rowmap.getString("PLMETHODID"),rowmap.getString("PLNAME")+rowmap.getString("PLVER"),rowmap.getString("PLNAME"),rowmap.getString("PLVER"),true,true,"2099-12-31","1",USERID,"",sid);
|
||||
CreateKnow(rowmap.getString("PLMETHODID"),rowmap.getString("PLNAME")+"V"+rowmap.getString("PLVER"),rowmap.getString("PLNAME"),rowmap.getString("PLVER"),true,true,"2099-12-31","1",USERID,"",sid);
|
||||
/*Map names = new LinkedHashMap<>();
|
||||
|
||||
String plname = rowmap.getString("PLNAME");
|
||||
@ -99,7 +99,7 @@ public class CreateDataKnow implements IJob {
|
||||
}*/
|
||||
}
|
||||
}else {
|
||||
CreateKnow(rowmap.getString("PLMETHODID"),rowmap.getString("PLNAME")+rowmap.getString("PLVER"),rowmap.getString("PLNAME"),rowmap.getString("PLVER"),true,true,"2099-12-31","1",USERID,"",sid);
|
||||
CreateKnow(rowmap.getString("PLMETHODID"),rowmap.getString("PLNAME")+"V"+rowmap.getString("PLVER"),rowmap.getString("PLNAME"),rowmap.getString("PLVER"),true,true,"2099-12-31","1",USERID,"",sid);
|
||||
/*Map names = new LinkedHashMap<>();
|
||||
|
||||
|
||||
@ -217,12 +217,12 @@ public class CreateDataKnow implements IJob {
|
||||
if (StringUtils.isNotEmpty(cardId)){
|
||||
String sql_ext4 = "select * from APP_ACT_COE_PAL_REPOSITORY where EXT4 = '"+cardId+"'";
|
||||
RowMap map = DBSql.getMap(sql_ext4);
|
||||
BO bos = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_N",true).addQuery("PUBLISHFILEID = ",map.getString("ID")).detail();
|
||||
if (bos!=null){
|
||||
RowMap rowMap = DBSql.getMap("select * from (select * from BO_ACT_COE_PUBLISH_N where PUBLISHFILEID = '"+map.getString("ID")+"' order by CREATEDATE desc) where rownum = 1");
|
||||
if (rowMap!=null){
|
||||
|
||||
if (StringUtils.isNotEmpty(bos.getString("TASKID"))) {
|
||||
if (StringUtils.isNotEmpty(rowMap.getString("TASKID"))) {
|
||||
|
||||
OutputTaskModel model = new OutputTask().getTaskReportById(bos.getString("TASKID"));
|
||||
OutputTaskModel model = new OutputTask().getTaskReportById(rowMap.getString("TASKID"));
|
||||
if (model != null) {
|
||||
System.out.println("，pdel============" + model);
|
||||
System.out.println("123313123123123==========" + model.getProfileId());
|
||||
@ -234,7 +234,7 @@ public class CreateDataKnow implements IJob {
|
||||
DCPluginProfile dcProfile = SDK.getDCAPI().getDCProfile(appProfile.getAppContext().getId(), OutputConst.EXT_APP_DC_OUTPUT);
|
||||
if (dcProfile == null)
|
||||
throw new AWSException("Not Find DCProfile! repositoryName=" + OutputConst.EXT_APP_DC_OUTPUT);
|
||||
String sql_lever = "SELECT PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID = '" + bos.getString("PUBLISHFILEID") + "'";
|
||||
String sql_lever = "SELECT PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID = '" + rowMap.getString("PUBLISHFILEID") + "'";
|
||||
String lever = DBSql.getString( sql_lever);
|
||||
//lever = lever.substring(0,3);
|
||||
if(lever.length()==5&&lever.substring(4).equals("0")){
|
||||
@ -242,7 +242,7 @@ public class CreateDataKnow implements IJob {
|
||||
}else if (lever.length()==1){
|
||||
lever=lever+".0";
|
||||
}
|
||||
DCContext dcContext = new DCContext(userContext, dcProfile, appProfile.getAppContext().getId(), model.getWsId(), bos.getString("TASKID"), bos.getString("PUBLISHFILENAME") + "_" + lever + ".doc");
|
||||
DCContext dcContext = new DCContext(userContext, dcProfile, appProfile.getAppContext().getId(), model.getWsId(), rowMap.getString("TASKID"), rowMap.getString("PUBLISHFILENAME") + "_" + lever + ".doc");
|
||||
//UtilFile file = new UtilFile(dcContext.getPath());
|
||||
|
||||
|
||||
|
||||
@ -97,11 +97,12 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
JSONObject jsonObject = new JSONObject(new LinkedHashMap());
|
||||
jsonObject.put("action","read");
|
||||
jsonObject.put("title"," " +
|
||||
"["+boActCoePublish.getString("PROCESS_TITLE")+"]需要处理");
|
||||
jsonObject.put("dept",SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo());//SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo()
|
||||
String target = "";
|
||||
if (processExecutionContext.getProcessInstance().getCreateUser().length()==8&&"00".equals(processExecutionContext.getProcessInstance().getCreateUser().substring(0,2))){
|
||||
target = processExecutionContext.getProcessInstance().getCreateUser().substring(2);
|
||||
""+boActCoePublish.getString("PROCESS_TITLE")+"");
|
||||
System.out.println("部门庄户》》》》》》》"+SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getTaskInstance().getTarget()).getNo());
|
||||
jsonObject.put("dept",SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getTaskInstance().getTarget()).getNo());//SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo()
|
||||
String target = processExecutionContext.getTaskInstance().getTarget();
|
||||
if (processExecutionContext.getTaskInstance().getTarget().length()==8&&"00".equals(processExecutionContext.getTaskInstance().getTarget().substring(0,2))){
|
||||
target = processExecutionContext.getTaskInstance().getTarget().substring(2);
|
||||
}
|
||||
System.out.println("当前账户======》》》》"+target);
|
||||
BO bo_eu_oa_reson = SDK.getBOAPI().query("BO_EU_OA_RESON", true).addQuery("WORKCODE=" , target).detail();
|
||||
@ -132,7 +133,12 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
}
|
||||
} else {
|
||||
List posts_list = new ArrayList();
|
||||
String strs[] = bo_act_coe_publish1.getString("SEND_SCOPE_ORG").split(",");
|
||||
List<String> org_list = new ArrayList();
|
||||
if (StringUtils.isNotEmpty(bo_act_coe_publish1.getString("SEND_SCOPE_ORG"))){
|
||||
String strs[] = bo_act_coe_publish1.getString("SEND_SCOPE_ORG").split(",");
|
||||
org_list= Arrays.asList(strs);
|
||||
}
|
||||
|
||||
if (StringUtils.isNotEmpty(bo_act_coe_publish1.getString("SEND_SCOPE_POST"))) {
|
||||
String posts[] = bo_act_coe_publish1.getString("SEND_SCOPE_POST").split(",");
|
||||
posts_list = Arrays.asList(posts);
|
||||
@ -143,260 +149,322 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
ranks_list = Arrays.asList(ranks);
|
||||
}
|
||||
|
||||
for (String depaartid : strs
|
||||
) {
|
||||
DepartmentModel departmentModel = SDK.getORGAPI().getDepartmentById(depaartid);
|
||||
boolean existSubModelOfCache = departmentModel.isExistSubModelOfCache();
|
||||
//判断选中的是否有下级部门
|
||||
if (existSubModelOfCache) {
|
||||
List<RowMap> maps = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + depaartid + "'");
|
||||
for (RowMap row : maps
|
||||
) {
|
||||
String id = row.getString("ID");
|
||||
DepartmentModel model = SDK.getORGAPI().getDepartmentById(id);
|
||||
System.out.println("部门id》》》》》》》》》》》》》"+org_list );
|
||||
System.out.println("posts_list》》》》》》》》》》》》》"+posts_list);
|
||||
System.out.println("ranks_list》》》》》》》》》》》》》"+ranks_list);
|
||||
if (org_list.size()!=0 && org_list!=null) {
|
||||
for (String depaartid : org_list
|
||||
) {
|
||||
System.out.println("departid>>>>>>>>>>>>>" + depaartid);
|
||||
DepartmentModel departmentModel = SDK.getORGAPI().getDepartmentById(depaartid);
|
||||
boolean existSubModelOfCache = departmentModel.isExistSubModelOfCache();
|
||||
System.out.println("是否含有下级？？？？？？？？？？？？？" + existSubModelOfCache);
|
||||
//判断选中的是否有下级部门
|
||||
if (existSubModelOfCache) {
|
||||
List<RowMap> maps = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + depaartid + "'");
|
||||
for (RowMap row : maps
|
||||
) {
|
||||
String id = row.getString("ID");
|
||||
DepartmentModel model = SDK.getORGAPI().getDepartmentById(id);
|
||||
|
||||
if (model.isExistSubModelOfCache()) {
|
||||
//有下级部门的选中有下级部门
|
||||
List<RowMap> rowMapList = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + id + "'");
|
||||
for (RowMap wo :
|
||||
rowMapList) {
|
||||
String ids = wo.getString("ID");
|
||||
DepartmentModel model1 = SDK.getORGAPI().getDepartmentById(ids);
|
||||
if (model1.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapLists = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + ids + "'");
|
||||
for (RowMap wsa :
|
||||
rowMapLists) {
|
||||
String wsaString = wsa.getString("ID");
|
||||
DepartmentModel model2 = SDK.getORGAPI().getDepartmentById(wsaString);
|
||||
if (model2.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapList1 = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + wsaString + "'");
|
||||
for (RowMap rows :
|
||||
rowMapList1) {
|
||||
String rowsString = rows.getString("ID");
|
||||
DepartmentModel model3 = SDK.getORGAPI().getDepartmentById(rowsString);
|
||||
if (model3.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapList2 = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + rowsString + "'");
|
||||
for (RowMap ormap :
|
||||
rowMapList2) {
|
||||
String rowsString1 = ormap.getString("ID");
|
||||
DepartmentModel model4 = SDK.getORGAPI().getDepartmentById(rowsString1);
|
||||
if (model4.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMaps = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + rowsString1 + "'");
|
||||
for (RowMap owmapr :
|
||||
rowMaps) {
|
||||
String row_id = owmapr.getString("ID");
|
||||
DepartmentModel model5 = SDK.getORGAPI().getDepartmentById(row_id);
|
||||
if (model5.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapList3 = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + row_id + "'");
|
||||
for (RowMap owzmap :
|
||||
rowMapList3) {
|
||||
String idsa = owzmap.getString("ID");
|
||||
DepartmentModel model6 = SDK.getORGAPI().getDepartmentById(idsa);
|
||||
if (model6.isExistSubModelOfCache()) {
|
||||
if (model.isExistSubModelOfCache()) {
|
||||
//有下级部门的选中有下级部门
|
||||
List<RowMap> rowMapList = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + id + "'");
|
||||
for (RowMap wo :
|
||||
rowMapList) {
|
||||
String ids = wo.getString("ID");
|
||||
DepartmentModel model1 = SDK.getORGAPI().getDepartmentById(ids);
|
||||
if (model1.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapLists = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + ids + "'");
|
||||
for (RowMap wsa :
|
||||
rowMapLists) {
|
||||
String wsaString = wsa.getString("ID");
|
||||
DepartmentModel model2 = SDK.getORGAPI().getDepartmentById(wsaString);
|
||||
if (model2.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapList1 = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + wsaString + "'");
|
||||
for (RowMap rows :
|
||||
rowMapList1) {
|
||||
String rowsString = rows.getString("ID");
|
||||
DepartmentModel model3 = SDK.getORGAPI().getDepartmentById(rowsString);
|
||||
if (model3.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapList2 = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + rowsString + "'");
|
||||
for (RowMap ormap :
|
||||
rowMapList2) {
|
||||
String rowsString1 = ormap.getString("ID");
|
||||
DepartmentModel model4 = SDK.getORGAPI().getDepartmentById(rowsString1);
|
||||
if (model4.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMaps = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + rowsString1 + "'");
|
||||
for (RowMap owmapr :
|
||||
rowMaps) {
|
||||
String row_id = owmapr.getString("ID");
|
||||
DepartmentModel model5 = SDK.getORGAPI().getDepartmentById(row_id);
|
||||
if (model5.isExistSubModelOfCache()) {
|
||||
List<RowMap> rowMapList3 = DBSql.getMaps("SELECT * FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID = '" + row_id + "'");
|
||||
for (RowMap owzmap :
|
||||
rowMapList3) {
|
||||
String idsa = owzmap.getString("ID");
|
||||
DepartmentModel model6 = SDK.getORGAPI().getDepartmentById(idsa);
|
||||
if (model6.isExistSubModelOfCache()) {
|
||||
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(idsa);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(idsa);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(row_id);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(row_id);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(rowsString1);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(rowsString1);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(rowsString);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(rowsString);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(wsaString);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(wsaString);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(ids);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(ids);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(id);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
List<UserModel> allUsersByDepartments = SDK.getORGAPI().getAllUsersByDepartment(id);
|
||||
for (UserModel user : allUsersByDepartments
|
||||
) {
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//选中的没有下级部门
|
||||
List<UserModel> allUsersByDepartment = SDK.getORGAPI().getAllUsersByDepartment(depaartid);
|
||||
for (UserModel user : allUsersByDepartment
|
||||
) {
|
||||
if (posts_list != null && ranks_list != null) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
} else {
|
||||
//选中的没有下级部门
|
||||
List<UserModel> allUsersByDepartment = SDK.getORGAPI().getAllUsersByDepartment(depaartid);
|
||||
for (UserModel user : allUsersByDepartment
|
||||
) {
|
||||
System.out.println("user.getExt2())???????????" + user.getExt2());
|
||||
System.out.println("posts_list》》》》》》》》》das" + (posts_list.size() != 0));
|
||||
System.out.println("123123》》》》》》》》》》" + (ranks_list.size() != 0));
|
||||
if (posts_list.size() != 0 && ranks_list.size() != 0) {
|
||||
if (posts_list.contains(user.getPositionNo()) && ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() != 0 && ranks_list.size() == 0) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list.size() == 0 && ranks_list.size() != 0) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list != null && ranks_list == null) {
|
||||
if (posts_list.contains(user.getPositionNo())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else if (posts_list == null && ranks_list != null) {
|
||||
if (ranks_list.contains(user.getExt2())) {
|
||||
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
} else {
|
||||
uid += user.getUID() + ",";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if (org_list.size()==0||org_list==null){
|
||||
String posts="";
|
||||
String levels = "";
|
||||
if (posts_list.size() !=0 &&ranks_list.size()!=0){
|
||||
String[] post = bo_act_coe_publish1.getString("SEND_SCOPE_POST").split(",");
|
||||
String[] level = bo_act_coe_publish1.getString("SEND_SCOPE_LEVEL").split(",");
|
||||
if (post.length==1){
|
||||
// DBSql.getMap("select USERID from ORGUSER WHERE POSITION_NO IN ");
|
||||
posts = "'"+post[0]+"'";
|
||||
}else {
|
||||
posts = "'"+ StringUtils.join(post, "','")+"'";
|
||||
}
|
||||
if (level.length==1){
|
||||
levels = "'"+level[0]+"'";
|
||||
}else {
|
||||
levels = "'"+ StringUtils.join(level, "','")+"'";
|
||||
}
|
||||
List<RowMap> maps = DBSql.getMaps("select USERID from ORGUSER where POSITION_NO in(" + posts + ") and EXT2 in (" + levels + ")");
|
||||
for (RowMap map:maps
|
||||
) {
|
||||
uid+=map.getString("USERID")+",";
|
||||
}
|
||||
} else if (posts_list.size() !=0 &&ranks_list.size()==0) {
|
||||
String[] post = bo_act_coe_publish1.getString("SEND_SCOPE_POST").split(",");
|
||||
if (post.length==1){
|
||||
// DBSql.getMap("select USERID from ORGUSER WHERE POSITION_NO IN ");
|
||||
posts = "'"+post[0]+"'";
|
||||
}else {
|
||||
posts = "'"+ StringUtils.join(post, "','")+"'";
|
||||
}
|
||||
List<RowMap> maps = DBSql.getMaps("select USERID from ORGUSER where POSITION_NO in(" + posts + ")");
|
||||
for (RowMap map:maps
|
||||
) {
|
||||
uid+=map.getString("USERID")+",";
|
||||
}
|
||||
}else if (posts_list.size() ==0 &&ranks_list.size()!=0){
|
||||
String[] level = bo_act_coe_publish1.getString("SEND_SCOPE_LEVEL").split(",");
|
||||
|
||||
if (level.length==1){
|
||||
levels = "'"+level[0]+"'";
|
||||
}else {
|
||||
levels = "'"+ StringUtils.join(level, "','")+"'";
|
||||
}
|
||||
List<RowMap> maps = DBSql.getMaps("select USERID from ORGUSER where EXT2 in (" + levels + ")");
|
||||
for (RowMap map:maps
|
||||
) {
|
||||
uid+=map.getString("USERID")+",";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
System.out.println("userid》》》》》》》》》》》》》》》》》》》"+uid);
|
||||
if (StringUtils.isNotEmpty(uid
|
||||
)) {
|
||||
uid = uid.substring(0, uid.length() - 1);
|
||||
@ -409,14 +477,12 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
list.addAll(h);
|
||||
for (String userid:list
|
||||
) {
|
||||
if (userid.length()==8&&"00".equals(userid.substring(0,2))){
|
||||
userid = userid.substring(2);
|
||||
}
|
||||
|
||||
System.out.println("当前账户======》》》》"+userid);
|
||||
System.out.println("bo>>>>>>>>>>>>>>"+bo_eu_oa_reson);
|
||||
if (bo_eu_oa_reson!=null){
|
||||
new_uid+=bo_eu_oa_reson.getString("LOGINID")+",";
|
||||
}
|
||||
// BO boEuOaReson = SDK.getBOAPI().query("BO_EU_OA_RESON", true).addQuery("WORKCODE=", userid).detail();
|
||||
// if (boEuOaReson!=null){
|
||||
new_uid+=userid+",";
|
||||
// }
|
||||
|
||||
}
|
||||
}
|
||||
@ -427,7 +493,7 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
new_uid = new_uid.substring(0, new_uid.length() - 1);
|
||||
}
|
||||
System.out.println("new_userid ==========>>>>>>>>>"+new_uid);
|
||||
jsonObject.put("userList",new_uid);
|
||||
jsonObject.put("userList",new_uid);
|
||||
|
||||
|
||||
String xmlStr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n" +
|
||||
@ -440,7 +506,7 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
" </web:service>" +
|
||||
" </soapenv:Body>" +
|
||||
"</soapenv:Envelope>";
|
||||
|
||||
System.out.println("xmlStr>>>>>>>>"+xmlStr);
|
||||
String postSoap = UtilUrl.doPostSoap("http://10.105.1.59:80/services/service_lcglpt", xmlStr, "");
|
||||
Document document = DocumentHelper.parseText(postSoap);
|
||||
Element rootElement = document.getRootElement();
|
||||
@ -449,6 +515,8 @@ public class ProcessEndAfterEvent extends ExecuteListener {
|
||||
String resultString = result.getData().toString();
|
||||
JSONObject jsonObject1 = JSON.parseObject(resultString);
|
||||
String datas = jsonObject1.getString("data");
|
||||
String status = jsonObject1.getString("status");
|
||||
System.out.println("状态是什么》》》》》》》》》》》"+status);
|
||||
JSONArray resultArray = JSONObject.parseArray(datas);
|
||||
for (int i=0;i<resultArray.size();i++) {
|
||||
JSONObject jsonObject2 = resultArray.getJSONObject(i);
|
||||
|
||||
@ -6,6 +6,8 @@ import java.io.UnsupportedEncodingException;
|
||||
import com.actionsoft.bpms.bo.engine.BO;
|
||||
import com.actionsoft.bpms.commons.oauth.AbstractOauth;
|
||||
import com.actionsoft.bpms.server.RequestParams;
|
||||
import com.actionsoft.bpms.server.UserContext;
|
||||
import com.actionsoft.bpms.util.DBSql;
|
||||
import com.actionsoft.sdk.local.SDK;
|
||||
import com.actionsoft.sdk.local.api.LogAPI;
|
||||
import com.actionsoft.sdk.local.api.Logger;
|
||||
@ -49,25 +51,48 @@ public class OauthLogin extends AbstractOauth {
|
||||
}
|
||||
@Override
|
||||
public String validate(RequestParams params) throws IOException {
|
||||
|
||||
|
||||
BO bo = new BO();
|
||||
long begintime = System.currentTimeMillis();
|
||||
bo.set("BEGIN_TIME",begintime);
|
||||
String userid = "";
|
||||
long login_end_time = 0L;
|
||||
if (StringUtils.isNotEmpty(params.get("casaccount"))){
|
||||
BO detail = SDK.getBOAPI().query("BO_EU_OA_RESON", true).addQuery("LOGINID=", params.get("casaccount")).detail();
|
||||
String workcode = detail.getString("WORKCODE");
|
||||
if (workcode.length()!=8){
|
||||
login_end_time = System.currentTimeMillis();
|
||||
bo.set("END_TIME",login_end_time);
|
||||
bo.set("USER_ID","00"+workcode);
|
||||
UserContext userContext = UserContext.fromUID("admin");
|
||||
SDK.getBOAPI().createDataBO("BO_EU_OA_LOGIN",bo,userContext);
|
||||
return "00"+workcode;
|
||||
}else{
|
||||
login_end_time = System.currentTimeMillis();
|
||||
bo.set("END_TIME",login_end_time);
|
||||
bo.set("USER_ID",params.get("casaccount"));
|
||||
UserContext userContext = UserContext.fromUID("admin");
|
||||
SDK.getBOAPI().createDataBO("BO_EU_OA_LOGIN",bo,userContext);
|
||||
return params.get("casaccount");
|
||||
}
|
||||
}
|
||||
|
||||
if (StringUtils.isNotEmpty(params.get("usercode"))){
|
||||
|
||||
login_end_time = System.currentTimeMillis();
|
||||
bo.set("END_TIME",login_end_time);
|
||||
bo.set("USER_ID",params.get("usercode"));
|
||||
UserContext userContext = UserContext.fromUID("admin");
|
||||
SDK.getBOAPI().createDataBO("BO_EU_OA_LOGIN",bo,userContext);
|
||||
|
||||
return params.get("usercode");
|
||||
}
|
||||
|
||||
|
||||
logger.info("单点登录验证---------"+params);
|
||||
try {
|
||||
|
||||
long loginbegintime = System.currentTimeMillis();
|
||||
bo.set("BEGIN_TIME",loginbegintime);
|
||||
String redirect_uri = params.get("code");
|
||||
|
||||
if(StringUtils.isEmpty(redirect_uri)){
|
||||
@ -90,6 +115,15 @@ public class OauthLogin extends AbstractOauth {
|
||||
JSONObject json = JSONObject.parseObject(userInfo);
|
||||
System.out.println("json-=====>>>>"+json);
|
||||
if (StringUtils.isNotEmpty(json.getString("employeenumber"))){
|
||||
System.out.println("userid》》》》》》》》》》"+json.getString("employeenumber"));
|
||||
userid = json.getString("employeenumber");
|
||||
login_end_time = System.currentTimeMillis();
|
||||
bo.set("END_TIME",login_end_time);
|
||||
bo.set("SCENDTIME",(login_end_time-loginbegintime));
|
||||
bo.set("LOGIN_END_TIME",login_end_time);
|
||||
bo.set("USER_ID",userid);
|
||||
UserContext userContext = UserContext.fromUID("admin");
|
||||
SDK.getBOAPI().createDataBO("BO_EU_OA_LOGIN",bo,userContext);
|
||||
return json.getString("employeenumber");
|
||||
}
|
||||
}
|
||||
@ -97,26 +131,6 @@ public class OauthLogin extends AbstractOauth {
|
||||
}
|
||||
|
||||
|
||||
//统一身份认证
|
||||
//String result = getToken(casaccount, appaccount, appid, validcode);
|
||||
/* if("true".equals(result)) {
|
||||
// 验证账号是否存在
|
||||
if (UserCache.getModel(appaccount) != null) {
|
||||
// 身份认证成功
|
||||
return appaccount;
|
||||
}else {
|
||||
logger.error("单点登录查找用户失败！");
|
||||
return null;
|
||||
}
|
||||
}else if ("false".equals(result)){
|
||||
//身份认证失败
|
||||
logger.error("统一身份认证失败！");
|
||||
return null;
|
||||
}else {
|
||||
//身份认证失败
|
||||
logger.error("统一身份认证失败！网络连接超时，请联系管理员进行查看连接是否联通");
|
||||
return null;
|
||||
}*/
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.error("统一身份认证失败！", e);
|
||||
|
||||
@ -200,7 +200,6 @@ public class TaskController {
|
||||
String processInstId = params.get("processInstId");
|
||||
String taskInstId = params.get("taskInstId");
|
||||
String usercode = params.get("usercode");
|
||||
StringBuffer sb = new StringBuffer();
|
||||
|
||||
map.put("sid", sid);
|
||||
|
||||
@ -212,17 +211,45 @@ public class TaskController {
|
||||
|
||||
|
||||
for (BO bo : list) {
|
||||
System.out.println("开始时间》》》》》》》"+System.currentTimeMillis());
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
String is_not_publish_sql = "SELECT id,PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME ='" + bo.get("PUBLISHFILENAME") + "'";
|
||||
List<RowMap> Row_maps_is_not_publish = DBSql.getMaps(conn, is_not_publish_sql);
|
||||
String is_not_publish_sql = "SELECT id,PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID ='" + bo.get("PUBLISHFILEID") + "'";
|
||||
RowMap Row_maps_is_not_publish = DBSql.getMap(conn, is_not_publish_sql);
|
||||
/*boolean havingStartProcessPermission =SDK.getPermAPI().havingStartProcessPermission(uc.getUID(), processDefId);
|
||||
if(havingStartProcessPermission) {*/
|
||||
String id = bo.getString("TASKID");
|
||||
jsonObject.put("title",bo.get("PUBLISHFILENAME"));
|
||||
jsonObject.put("link",SDK.getPortalAPI().getPortalUrl()+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid=" + Row_maps_is_not_publish.get(0).getString("id") + "&sid=" + sid);
|
||||
jsonObject.put("link",SDK.getPortalAPI().getPortalUrl()+ "/r/w?cmd=com.actionsoft.apps.coe.pal.publisher_publish_file_open&uuid=" + Row_maps_is_not_publish.getString("id") + "&sid=" + sid);
|
||||
jsonObject.put("size","");
|
||||
<<<<<<< HEAD
|
||||
jsonObject.put("id",num);
|
||||
|
||||
jsonObject.put("taskId",id);
|
||||
// OutputTaskModel model = new OutputTask().getTaskReportById(id);
|
||||
//JSONObject json = new JSONObject();
|
||||
/*
|
||||
* if (model != null) { //三员管理，步骤横表下载重新生成手册
|
||||
*
|
||||
* String taskName = model.getTaskName();
|
||||
*
|
||||
* String str = "";
|
||||
*
|
||||
* if ("步骤横表".equals(taskName)){ // 重新设置生成id，与用户id String uuid =
|
||||
* UUIDGener.getUUID(); model.setUserId(me.getUID());
|
||||
*
|
||||
* // 重新生成手册文件 OutputAPIManager.getInstance().reGennerReport(me,model,uuid);
|
||||
*
|
||||
* // 重新构建手册下载URL id = uuid; }
|
||||
*
|
||||
* try { //jsonObject.put("url",
|
||||
* OutputDCFileProcessor.getReportDownloadURL(model.getWsId(), id,
|
||||
* model.getProfileId(), me, bo.get("PUBLISHFILENAME")+model.getTaskName()));
|
||||
* jsonObject.put("taskId",id); } catch (Exception e) {
|
||||
*
|
||||
* e.printStackTrace(); } }
|
||||
*/
|
||||
=======
|
||||
jsonObject.put("id",id);
|
||||
System.out.println("查询完成后时间》》》》》》》"+System.currentTimeMillis());
|
||||
OutputTaskModel model = new OutputTask().getTaskReportById(id);
|
||||
JSONObject json = new JSONObject();
|
||||
if (model != null) {
|
||||
@ -248,6 +275,8 @@ public class TaskController {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
System.out.println("构建表完成时间》》》》》》》"+System.currentTimeMillis());
|
||||
>>>>>>> 8f479d37933f5a19fec374d79fe5de2a45d5844c
|
||||
jsonArray.add(jsonObject);
|
||||
num++;
|
||||
|
||||
@ -266,27 +295,9 @@ public class TaskController {
|
||||
String portalUrl = SDK.getPortalAPI().getPortalUrl();
|
||||
String url = portalUrl + "/r/or?cmd=com.yili_process_page&processInstId=" + processInstId + "&taskInstId=" + taskInstId;
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
String sql = "SELECT * FROM WFC_PROCESS WHERE ID ='" + processInstId + "'";
|
||||
List<RowMap> rowMaps = DBSql.getMaps(conn, sql);
|
||||
//if (rowMaps.size()==1){
|
||||
/* for (RowMap rowmp:
|
||||
rowMaps) {
|
||||
jsonObject.put("title",rowmp.getString("PROCESSTITLE"));
|
||||
String endTime = rowmp.getString("ENDTIME");
|
||||
String time = endTime.substring(0,endTime.indexOf(" "));
|
||||
jsonObject.put("date",time);
|
||||
}*/
|
||||
|
||||
jsonObject.put("action", "read");
|
||||
// jsonObject.put("dept",UserContext.fromUID(usercode).getDepartmentModel().getNo());
|
||||
// jsonObject.put("user",usercode);
|
||||
// jsonObject.put("remark","");
|
||||
jsonObject.put("status", "1");
|
||||
// jsonObject.put("pcurl",url);
|
||||
// jsonObject.put("mobileurl",url);
|
||||
|
||||
// jsonObject.put("userList","00345531");
|
||||
HttpClientUtil httpClientUtil = new HttpClientUtil();
|
||||
// String s = httpClientUtil.SendPreview("http://10.119.22.207:80/services/service_lcglpt?wsdl", jsonObject);
|
||||
BO bo_act_coe_publish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true).addQuery("BINDID=", processInstId).detail();
|
||||
@ -295,17 +306,6 @@ public class TaskController {
|
||||
if (bo_act_dataid != null) {
|
||||
String dataid = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", processInstId).addQuery("USER_ID=",usercode).detail().getString("DATAID");
|
||||
jsonObject.put("dataid", dataid);
|
||||
} else {
|
||||
BO test = SDK.getBOAPI().query("BO_EU_TEST", true).addQuery("BINDID=", processInstId).detail();
|
||||
if (test != null) {
|
||||
String dataid = test.getString("DATAID");
|
||||
if (dataid.contains(usercode)) {
|
||||
dataid = dataid.substring(dataid.indexOf(usercode + "","dataid":"") + 40, dataid.indexOf(usercode + "","dataid":"") + 47);
|
||||
dataid = getNumberFromString(dataid);
|
||||
System.out.println("待阅dataid输出" + dataid);
|
||||
}
|
||||
jsonObject.put("dataid", dataid);
|
||||
}
|
||||
}
|
||||
|
||||
String xmlStr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:web=\"webservices.yili.weaver.com.cn\">\n" +
|
||||
@ -363,7 +363,7 @@ public class TaskController {
|
||||
String sid = me.getSessionId();
|
||||
String processInstId = params.get("processInstId");
|
||||
String taskInstId = params.get("taskInstId");
|
||||
String usercode = params.get("usercode");
|
||||
String usercode = params.get("userid");
|
||||
StringBuffer sb = new StringBuffer();
|
||||
ProcessInstance instanceById = SDK.getProcessAPI().getInstanceById(processInstId);
|
||||
String sourceAppId = instanceById.getAppId();
|
||||
@ -377,8 +377,9 @@ public class TaskController {
|
||||
|
||||
for (BO bo:list) {
|
||||
|
||||
if(StringUtils.isNotEmpty(bo.getString("TASKID"))){
|
||||
if(StringUtils.isNotEmpty(bo.getString("TASKID"))&& !bo.getString("TASKID").equals("submit_create")){
|
||||
OutputTaskModel model = new OutputTask().getTaskReportById(bo.getString("TASKID"));
|
||||
System.out.println(",odel>>>>>>>>"+bo.getString("TASKID"));
|
||||
OutputAppProfile appProfile = OutputAppManager.getProfile(model.getProfileId());
|
||||
if (appProfile==null){
|
||||
throw new AWSException("Not Find OutputAppProfile! profileId=" + "_900fde3255248317266cad1c72f157b1");
|
||||
@ -386,7 +387,7 @@ public class TaskController {
|
||||
DCPluginProfile dcProfile = SDK.getDCAPI().getDCProfile(appProfile.getAppContext().getId(), OutputConst.EXT_APP_DC_OUTPUT);
|
||||
if (dcProfile == null)
|
||||
throw new AWSException("Not Find DCProfile! repositoryName=" + OutputConst.EXT_APP_DC_OUTPUT);
|
||||
String sql_lever = "SELECT PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME = '"+bo.getString("PUBLISHFILENAME")+"'";
|
||||
String sql_lever = "SELECT PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID = '"+bo.getString("PUBLISHFILEID")+"'";
|
||||
String lever = DBSql.getString(conn, sql_lever);
|
||||
System.out.println("lever====>>>>>"+lever);
|
||||
lever = lever+".0";
|
||||
@ -425,7 +426,7 @@ public class TaskController {
|
||||
ResponseObject ro = appAPI.callASLP(appAPI.getAppContext(sourceAppId), aslp, params_preview);
|
||||
|
||||
System.out.println("ro>>>>>>>>>>>>>>>>"+ro);
|
||||
String is_not_publish_sql = "SELECT id,PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME ='"+bo.get("PUBLISHFILENAME")+"'";
|
||||
String is_not_publish_sql = "SELECT id,PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE id ='"+bo.get("PUBLISHFILEID")+"'";
|
||||
List<RowMap> Row_maps_is_not_publish = DBSql.getMaps(conn, is_not_publish_sql);
|
||||
|
||||
/*boolean havingStartProcessPermission =SDK.getPermAPI().havingStartProcessPermission(uc.getUID(), processDefId);
|
||||
@ -443,7 +444,7 @@ public class TaskController {
|
||||
|
||||
|
||||
|
||||
String sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where PLNAME= '"+bo.getString("PUBLISHFILENAME")+"'" +
|
||||
String sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+bo.getString("PUBLISHFILEID")+"'" +
|
||||
")";
|
||||
List<RowMap> maps = DBSql.getMaps(conn,sql_upfile);
|
||||
UserContext userContext = UserContext.fromSessionId(sid);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user