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

发布历史过滤/MA隐藏发布手册/发布打包

Browse Source
This commit is contained in:
zhal 2022-09-21 11:28:11 +08:00
parent b8bd989205
commit 00d5b8a776
4 changed files with 21 additions and 19 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.

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

@ -158,7 +158,7 @@ public class PublisherController {
@Mapping("com.actionsoft.apps.coe.pal.publisher_processlist_new")
public String getNewProcessInstanceList(UserContext me, int start, int size, String search) {
ProcessPublishWeb web = new ProcessPublishWeb(me);
return web.getNewProcessInstanceList(start, size, search);
return web.getNewProcessInstanceList(me,start, size, search);
}
//流程发布-催办发送消息处理

11
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -20,6 +20,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import com.alipay.remoting.config.switches.Switch;
import org.apache.commons.lang.StringUtils;
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
@ -472,12 +473,12 @@ public class ProcessPublishWeb extends ActionWeb {
* @param size
* @return
*/
public String getNewProcessInstanceList(int start, int size, String search) {
public String getNewProcessInstanceList(UserContext me,int start, int size, String search) {
ResponseObject res = ResponseObject.newOkResponse();
//声明数据集合
List<ProcessPublishHistoryDTO> processPublishHistoryDTOList = Lists.newArrayList();
//获取所有流程数据
List<ProcessInstance> totalList = SDK.getProcessQueryAPI().processGroupId(PublisherConstant.PROCESSGROUPID).list();
//获取所有流程数据 修改为根据当前账户进行过滤 by zhaolei
List<ProcessInstance> totalList = SDK.getProcessQueryAPI().processGroupId(PublisherConstant.PROCESSGROUPID).addQuery("CREATEUSER=",me.getUID()).list();
boolean flag = false;
String searchValue = "";
if (StringUtils.isNotBlank(search)) {
@ -2165,9 +2166,9 @@ public class ProcessPublishWeb extends ActionWeb {
if(qas==true){
wsId="7d3ca852-a0bd-42e6-80b1-3dcea6f55083";
}
return wsId;
ro.put("wsId", wsId);
return ro.toString();
}
/**
* 单个文件发布查询当前已发布文件
*

27
com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js
View File

@ -184,6 +184,7 @@ function initOptButton() {
// 初始化自定义内容，不能写到html 文件中，表单会被平台自动调整的不成样子
function initHtml() {
var dialogHtml = '';
dialogHtml += '<!-- 新增模态窗 -->';
dialogHtml += '<div class="awsui-size-x-large awsui-hide" id="publisher_dialog">';
@ -209,7 +210,7 @@ function initHtml() {
//非三员管理显示创建
if (!isHighSecurity){
dialogHtml += '<div id="reportType" class="awsui-row">';
/*dialogHtml += '<div id="reportType" class="awsui-row">';
dialogHtml += '<div class="awsui-col-xs-2 awsui-col-sm-2 awsui-col-md-2 awsui-col-lg-2 awsui-text required">创建手册</div>';
dialogHtml += '<div style="position: relative;left: -40px;" class="awsui-col-xs-9 awsui-col-sm-9 awsui-col-md-9 awsui-col-lg-9 awsui-form-parent">';
dialogHtml += '<input class="awsui-radio" name="radiox1" id="radio1" value="newReport" type="radio" >';
@ -227,7 +228,7 @@ function initHtml() {
dialogHtml += '<b>立即</b>:点击确定后需等待创建流程手册完成后才可以进行下一步操作，一次性选择的流程数量较多时耗费时间长；<br><b>提交(办理)时</b>:表单进行提交时进行流程手册的创建，<b>若一次性选择流程数量较多，建议选择此项</b>';
dialogHtml += '</div>';
dialogHtml += '</div>';
dialogHtml += '</div>';
dialogHtml += '</div>';*/
}
dialogHtml += '<div id="loadingImg" style="width:100px;height:100px;text-align:center;vertical-align: middle;margin: auto;display:none;" class="awsui-code-demo"></div>';
@ -267,8 +268,8 @@ function initHtml() {
newHtml += '<th style="background-color:#fff;" class="width_5"><input name="checkAll" id="new_check_all" type="checkbox" class="awsui-checkbox"></th>';
newHtml += '<th style="background-color:#fff;" class="width_5">序号</th>';
newHtml += '<th style="background-color:#fff;" class="width_30">流程制度</th>';
newHtml += '<th style="background-color:#fff;" class="width_25">文件文本</th>';
newHtml += '<th style="background-color:#fff;" class="width_35">文件编号</th>';
/* newHtml += '<th style="background-color:#fff;" class="width_25">文件文本</th>';
newHtml += '<th style="background-color:#fff;" class="width_35">文件编号</th>';*/
newHtml += '</tr>';
newHtml += '</thead>';
newHtml += '<tbody id="publish_new_tbody"></tbody>';
@ -297,8 +298,8 @@ function initHtml() {
changeHtml += '<th style="background-color:#fff;" class="width_5">序号</th>';
changeHtml += '<th style="background-color:#fff;" class="width_25">流程制度</th>';
changeHtml += '<th style="background-color:#fff;" class="width_20">变更后流程制度</th>';
changeHtml += '<th style="background-color:#fff;" class="width_20">文件文本</th>';
changeHtml += '<th style="background-color:#fff;" class="width_25">文件编号</th>';
/*changeHtml += '<th style="background-color:#fff;" class="width_20">文件文本</th>';
changeHtml += '<th style="background-color:#fff;" class="width_25">文件编号</th>';*/
changeHtml += '</tr>';
changeHtml += '</thead>';
changeHtml += '<tbody id="publish_change_tbody"></tbody>';
@ -327,8 +328,8 @@ function initHtml() {
stopHtml += '<th style="background-color:#fff;" class="width_5"><input name="checkAll" id="stop_check_all" type="checkbox" class="awsui-checkbox"></th>';
stopHtml += '<th style="background-color:#fff;" class="width_5">序号</th>';
stopHtml += '<th style="background-color:#fff;" class="width_30">流程制度</th>';
stopHtml += '<th style="background-color:#fff;" class="width_25">文件文本</th>';
stopHtml += '<th style="background-color:#fff;" class="width_35">文件编号</th>';
/*stopHtml += '<th style="background-color:#fff;" class="width_25">文件文本</th>';
stopHtml += '<th style="background-color:#fff;" class="width_35">文件编号</th>';*/
stopHtml += '</tr>';
stopHtml += '</thead>';
stopHtml += '<tbody id="publish_stop_tbody"></tbody>';
@ -565,10 +566,10 @@ function showlist(data, type, pageNumber, start){
html += '<tr>';
html += '<td ' + tableTdCss + '><input name="check" ' + checkboxPerm + ' class="awsui-checkbox" data-id="' + curr.publishFileId + '" type="checkbox" type="awsui-checkbox"></td>';
html += '<td ' + tableTdCss + '>' + s + '</td>';
html += '<td ' + tableTdCss + '><a href="javascript:void(0);" onclick="openPortalPage(\'' + curr.publishFileId + '\', \'' + curr.taskId + '\')">' + fileName + '</a></td>';
html += '<td ' + tableTdCss + '>' + reportName + '</td>';
html += '<td ' + tableTdCss + '><a href="javascript:void(0);">' + fileName + '</a></td>';
/*html += '<td ' + tableTdCss + '>' + reportName + '</td>';*/
//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 += '<td style="padding:1px;"><span>'+ processNumber +'</span></td>';*/
html += '</tr>';
}
}
@ -774,10 +775,10 @@ function addProcess(type) {
return;
} else {
//三员管理隐藏手册创建时间
if (!checkCreateReportTime() && !isHighSecurity) {
/*if (!checkCreateReportTime() && !isHighSecurity) {
$.simpleAlert('请选择创建流程手册的时间', 'info');
return;
}
}*/
disabledButton();
setTimeout(function() {
// 获取说明内容