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

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

Browse Source
This commit is contained in:
lihongyu 2022-09-25 23:36:36 +08:00
commit 85eb9ce15b
10 changed files with 70 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.schema.tpl
View File

@ -509,21 +509,6 @@ Schema.addGlobalCommand("method_script_task", [
Schema.addCategory({name:"process_flowchart", text:"流程图", dataAttributes:[
{name:"No.", type:"number", value:"", category:"default"},
{name:"Name", type:"string", value:"", category:"default"},
{name:"Owner", type:"string", value:"", category:"default"},
{name:"Link", type:"link", value:"", category:"default"},
{name:"Memo", type:"string", value:"", category:"default"},
{name:"Cost", type:"number", value:"", category:"default"},
{name:"Time", type:"number", value:"", category:"default"},
{name:"Manner", type:"list", value:"", category:"default"},
{name:"Department", type:"string", value:"", category:"default"},
{name:"Input", type:"string", value:"", category:"default"},
{name:"Output", type:"string", value:"", category:"default"},
{name:"Risk", type:"string", value:"", category:"default"},
{name:"Remarks", type:"string", value:"", category:"default"}
]});
Schema.addGlobalCommand("method_user_task", [ Schema.addGlobalCommand("method_user_task", [
{action:"move", x:"100*0.05+ 100/11*2*0.5-100/11*2*0.2", y:"60*0.1+ 60/55*16*0.3"}, {action:"move", x:"100*0.05+ 100/11*2*0.5-100/11*2*0.2", y:"60*0.1+ 60/55*16*0.3"},

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

Binary file not shown.

36
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java
View File

@ -503,25 +503,29 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme
* 发布明细如果关联角色、绩效图，不显示在发布界面，在流程结束后同步发布 * 发布明细如果关联角色、绩效图，不显示在发布界面，在流程结束后同步发布
*/ */
public void updateRoleAndPerformance(String publishFileId,Timestamp publishDate,String type){ public void updateRoleAndPerformance(String publishFileId,Timestamp publishDate,String type){
List roleList=new ArrayList(); try {
roleList.add(0,"org.role"); List roleList = new ArrayList();
roleList.add(1,publishFileId); roleList.add(0, "org.role");
PALRepository repositoryDao = new PALRepository(); roleList.add(1, publishFileId);
RowMap rolerowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?",roleList.toString()); PALRepository repositoryDao = new PALRepository();
RowMap rolerowMap = DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?", roleList.toString());
if(rolerowMap!=null){ if (rolerowMap != null) {
//修改流程文件的发布属性 //修改流程文件的发布属性
repositoryDao.updatePublishStatusAndDate(type, rolerowMap.getString("ID"), null, publishDate); repositoryDao.updatePublishStatusAndDate(type, rolerowMap.getString("ID"), null, publishDate);
} }
List performanceList=new ArrayList(); List performanceList = new ArrayList();
performanceList.add(0,"control.kpi"); performanceList.add(0, "control.kpi");
performanceList.add(1,publishFileId); performanceList.add(1, publishFileId);
RowMap performrowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?",performanceList.toString()); RowMap performrowMap = DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=?", performanceList.toString());
if(performrowMap!=null){ if (performrowMap != null) {
//修改流程文件的发布属性 //修改流程文件的发布属性
repositoryDao.updatePublishStatusAndDate(type, performrowMap.getString("ID"), null, publishDate); repositoryDao.updatePublishStatusAndDate(type, performrowMap.getString("ID"), null, publishDate);
}
} catch (AWSDataAccessException e) {
e.printStackTrace();
} }
} }

9
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishProcessAfterCompleteEvent.java
View File

@ -1,5 +1,6 @@
package com.actionsoft.apps.coe.pal.publisher.event; package com.actionsoft.apps.coe.pal.publisher.event;
import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishHistoryModel;
import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishListHistoryModel; import com.actionsoft.apps.coe.pal.pal.manage.publish.model.PublishListHistoryModel;
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository; import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository;
@ -38,6 +39,7 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements
@Override @Override
public void execute(ProcessExecutionContext param) throws Exception { public void execute(ProcessExecutionContext param) throws Exception {
PublishHistoryModel model = new PublishHistoryModel();
String processInstId = param.getProcessInstance().getId(); String processInstId = param.getProcessInstance().getId();
BO bo = SDK.getBOAPI().query(PublisherConstant.BOTABLENAME).detailByBindId(processInstId); BO bo = SDK.getBOAPI().query(PublisherConstant.BOTABLENAME).detailByBindId(processInstId);
List<BO> bolistN = SDK.getBOAPI().query(PublisherConstant.BOSUBTABLE_N).bindId(processInstId).list(); List<BO> bolistN = SDK.getBOAPI().query(PublisherConstant.BOSUBTABLE_N).bindId(processInstId).list();
@ -55,6 +57,13 @@ public class PublishProcessAfterCompleteEvent extends ExecuteListener implements
} }
} }
if (bolistC != null) {
for (BO boC : bolistC) {
//修改流程文件的发布属性
repositoryDao.updatePublishStatusAndDate("C", boC.get("CHANGEDFILEIDNEW").toString(), boC.get("CHANGEFILEID").toString(), model.getPublishDate());
}
}
} }

48
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.mobile.js
View File

@ -4,24 +4,14 @@ var newTemp;
var changeTemp; var changeTemp;
var stopTemp; var stopTemp;
/**
* 获取地址参数
* @param name
* @returns {*}
* @constructor
*/
function GetQueryString(name) {
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if(r!=null)return unescape(r[2]); return null;
}
/** /**
* 初始移动端明细数据 * 初始移动端明细数据
*/ */
function initMobileData() { function initMobileData() {
getWsId();
/** /**
* 获取访问地址得到参数判断 * 获取访问地址得到参数判断
* @type {*} * @type {*}
@ -37,6 +27,18 @@ function initMobileData() {
} }
} }
/**
* 获取地址参数
* @param name
* @returns {*}
* @constructor
*/
function GetQueryString(name) {
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if(r!=null)return unescape(r[2]); return null;
}
$("table[id^='AWS-MobileGrid-Zone']").empty(); $("table[id^='AWS-MobileGrid-Zone']").empty();
$("table[id^='AWS-MobileGrid-Zone']").html('<div id="contentDiv1" style="display: none;" border="0"></div><div id="contentDiv2" style="display: none;" border="0"></div><div id="contentDiv3" style="display: none;" border="0"></div>'); $("table[id^='AWS-MobileGrid-Zone']").html('<div id="contentDiv1" style="display: none;" border="0"></div><div id="contentDiv2" style="display: none;" border="0"></div><div id="contentDiv3" style="display: none;" border="0"></div>');
@ -106,6 +108,28 @@ function initMobileData() {
} }
//获取wsid
function getWsId() {
var param = {
sid : $("#sid").val(),
cmd : "com.actionsoft.apps.coe.pal.publisher_publish_getWsId"
}
$.ajax({
url : "./jd",
type : "POST",
dataType : "JSON",
data : param,
async: false,
success : function(r) {
if (r.result == 'ok') {
var wsId=$("#WSID").val();
if(wsId==""){
$("#WSID").val(r.data.wsId);
}
}
}
});
}
// 主体内容显示与隐藏 // 主体内容显示与隐藏

2
com.actionsoft.apps.coe.pal/template/page/main.htm
View File

@ -13,4 +13,4 @@
var mainType = "<#mainType>"; var mainType = "<#mainType>";
var uid = "<#uid>"; var uid = "<#uid>";
var wHref = "./w"; var wHref = "./w";
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0ae84868.f80f4181.css rel=prefetch><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-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-25c1c630.dc8349fb.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-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-0ae84868.a2781c9f.js 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-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-25c1c630.8933349a.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-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.998107bc.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.998107bc.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-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-25c1c630.dc8349fb.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-55d8affc.60f8a86c.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-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-25c1c630.8933349a.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-55d8affc.df11eb37.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-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.5522cfcc.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.5522cfcc.js></script></body></html>

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-0ae84868.f80f4181.css → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-55d8affc.60f8a86c.css
View File

File diff suppressed because one or more lines are too long

4
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.998107bc.js → com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/app.5522cfcc.js
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-0ae84868.a2781c9f.js
View File

File diff suppressed because one or more lines are too long

1
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-55d8affc.df11eb37.js Normal file
View File

File diff suppressed because one or more lines are too long