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

OA推送接口日期修改/发布页面增加提醒/增加刷新/编号增加L4

Browse Source
This commit is contained in:
zhal 2023-06-01 21:01:13 +08:00
parent 88f94eac90
commit 9e2605b648
6 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

4
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java
View File

@ -203,7 +203,7 @@ public class ProcesNumberUtil {
levelFour = "00";
}
String levelnum = levelOne + "." + levelTwo + "." + levelThree;
String levelnum = levelOne + "." + levelTwo + "." + levelThree +"."+levelFour;
String updateSql = "update BO_ACT_COE_PUBLISH_C set CHANGE_NUMBER = '%s' where ID = '%s'";
rowMap = DBSql.getMap("SELECT PLVER,PLMETHODID FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID='"
@ -286,7 +286,7 @@ public class ProcesNumberUtil {
levelFour = "00";
}
String levelnum = levelOne + "." + levelTwo + "." + levelThree;
String levelnum = levelOne + "." + levelTwo + "." + levelThree +"."+levelFour;
String updateSql = "update BO_ACT_COE_PUBLISH_N set PUBLISH_NUMBER='%s' where ID = '%s'";
for (BO nowData : dataList) {

11
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
View File

@ -125,7 +125,10 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
+ processExecutionContext.getTaskInstance().getId();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Timestamp endTime = processExecutionContext.getProcessInstance().getStartTime();
//Timestamp endTime = processExecutionContext.getTaskInstance().getBeginTime();
Timestamp endTime = new Timestamp(System.currentTimeMillis());
BO boActCoePublish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true)
.addQuery("BINDID=", processExecutionContext.getProcessInstance().getId())
.addQuery("OPTIONTYPE IS NOT NULL", null).detail();
@ -763,6 +766,12 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
if ("true".equals(status)) {
JSONArray resultArray = JSONObject.parseArray(datas);
//System.out.println(processInstance.getTitle() + "待阅推送成功：" + idList.size()+"人");
//插入实时更新人数表
/* BO realTimeBO=new BO();*/
for (int j = 0; j < resultArray.size(); j++) {
JSONObject jsonObject2 = resultArray.getJSONObject(j);
String user = jsonObject2.get("user").toString();

9
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java
View File

@ -126,7 +126,10 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute
+ processExecutionContext.getTaskInstance().getId();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Timestamp endTime = processExecutionContext.getProcessInstance().getStartTime();
//Timestamp endTime = processExecutionContext.getTaskInstance().getBeginTime();
Timestamp endTime = new Timestamp(System.currentTimeMillis());
BO boActCoePublish = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH", true)
.addQuery("BINDID=", processExecutionContext.getProcessInstance().getId())
.addQuery("OPTIONTYPE IS NOT NULL", null).detail();
@ -149,10 +152,10 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute
jsonObject.put("action", "read");
jsonObject.put("title", " " + "" + boActCoePublish.getString("PROCESS_TITLE") + "");
jsonObject.put("dept", SDK.getORGAPI()
.getDepartmentByUser("10036614").getNo());// SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo()
.getDepartmentByUser(processExecutionContext.getTaskInstance().getTarget()).getNo());// SDK.getORGAPI().getDepartmentByUser(processExecutionContext.getProcessInstance().getCreateUser()).getNo()
String target = processExecutionContext.getTaskInstance().getTarget();
target = processExecutionContext.getTaskInstance().getTarget();
jsonObject.put("user", "10036614");
jsonObject.put("user", target);
// jsonObject.put("user",);//processExecutionContext.getProcessInstance().getCreateUser()
jsonObject.put("date", sdf.format(endTime));
jsonObject.put("remark", boActCoePublish.getString("PROCESS_TITLE"));

25
com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm
View File

@ -209,6 +209,9 @@
</table>
</td>
</tr>
<tr>
<td colspan="8" class="awsui-ux-title"><span style="font-size: 15px;"><span style="color: red;">提示：为落实公司经营管理纲要要求，建议识别本文件是否存在相关的流程制度，并审评估是否需要优化整合，以实现流程制度的简洁高效。</span></span></td>
</tr>
<tr id="c9e30de9_bed0_0001_f79e_19ed1b4016c9">
<td class="awsui-ux-title" style="padding: 0px; white-space: normal;" colspan="8">
<table id="table_container" class="awsui-ux table-striped new-add-grid" style="padding: 0px;"><colgroup> <col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /> <col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /> <col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /></colgroup>
@ -217,7 +220,7 @@
<td class="awsui-ux-title" style="padding: 0px; white-space: normal;" colspan="6">
<div class="bgBlock" border="0" style="width: 100%; background: #FFFFFF;">
<div class="bgBlockContent" border="0">
<div class="container_title" border="0"><span style="font-size: 14px;">业务归属</span></div>
<div class="container_title" border="0"><span style="font-size: 14px;">业务归属&nbsp; &nbsp; &nbsp;</span></div>
<div class="shadow_panel" border="0">
<table id="table_container" class="awsui-ux table-striped" style="padding: 0px;"><colgroup> <col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /> <col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /> <col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /><col class="awsui-ux-title" /><col style="width: 33.333333333333336%;" /></colgroup>
<tbody>
@ -265,7 +268,7 @@
<td class="awsui-ux-title" style="padding: 0px; white-space: normal;" colspan="8">
<div class="bgBlock" border="0" style="width: 100%; background: #ffffff; border-color: #e5e5e5; box-shadow: #dddddd 1px 1px 15px;">
<div class="bgBlockContent" border="0">
<div class="container_title" border="0"><span style="font-size: 14px;">流程/制度发布通知</span></div>
<div class="container_title" border="0"><span style="font-size: 14px;">流程/制度发布通知&nbsp;</span></div>
<div class="shadow_panel" border="0">
<table id="table_container" class="awsui-ux table-striped" style="padding: 0px;"><colgroup> <col class="gray_bg" style="width: 0px;" /> <col style="width: 100%;" /> </colgroup>
<tbody>
@ -2084,6 +2087,24 @@ var 下一页 = "下一页";
var 上一页 = "上一页";
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
// ]]></script>
<script>// <![CDATA[
var 无数据 = "无数据";
var 下一页 = "下一页";
var 上一页 = "上一页";
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
// ]]></script>
<script>// <![CDATA[
var 无数据 = "无数据";
var 下一页 = "下一页";
var 上一页 = "上一页";
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
// ]]></script>
<script>// <![CDATA[
var 无数据 = "无数据";
var 下一页 = "下一页";
var 上一页 = "上一页";
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
// ]]></script>
<script src="../commons/js/jquery/scripts/ui/awsui.pagination.js?v=1532938866000"></script>
<script type="text/javascript">// <![CDATA[
var aa = $("#COMMENT_BTN_1").text();

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

@ -1286,6 +1286,7 @@ function getNewPublishBatchResult(type) {
async : false,
data : param,
success : function(r) {
debugger;
var info = r.data.info;
var L1 = r.data.data.Process_Architecture_L1;
var L2 = r.data.data.Process_Architecture_L2;
@ -2079,7 +2080,6 @@ function saveFormData(type) {
}
});
$.simpleAlert('close');
debugger
if (false) {
var msg = '以下文件已经在其他未办理完成的表单中，不允许保存/办理';
if (tempData.length > 0) {
@ -2555,4 +2555,10 @@ function downloadReport(uuid, taskId) {
}
}
});
}
//刷新页面
function getFiles() {
AWSFormUtil.refreshPage();
}