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

流程结束后发送待阅，去掉表单重复文件校验

Browse Source
This commit is contained in:
lihongyu 2022-10-24 19:14:29 +08:00
parent bee7166d5b
commit 53f4f8d588
3 changed files with 9 additions and 1069 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3458,7 +3458,7 @@ public class ProcessPublishWeb extends ActionWeb {
ids.add(object.getString("publishFileId")); ids.add(object.getString("publishFileId"));
} }
JSONArray result = new JSONArray(); JSONArray result = new JSONArray();
validPublisData(ids, processInstId, wsId, result);// 校验 //validPublisData(ids, processInstId, wsId, result);// 校验
if (result.size() > 0) { if (result.size() > 0) {
ro = ResponseObject.newErrResponse(); ro = ResponseObject.newErrResponse();
ro.put("data", result); ro.put("data", result);
@ -3497,7 +3497,7 @@ public class ProcessPublishWeb extends ActionWeb {
ids.add(object.getString("changeFileId")); ids.add(object.getString("changeFileId"));
} }
JSONArray result = new JSONArray(); JSONArray result = new JSONArray();
validPublisData(ids, processInstId, wsId, result);// 校验 //validPublisData(ids, processInstId, wsId, result);// 校验
if (result.size() > 0) { if (result.size() > 0) {
ro = ResponseObject.newErrResponse(); ro = ResponseObject.newErrResponse();
ro.put("data", result); ro.put("data", result);
@ -3539,7 +3539,7 @@ public class ProcessPublishWeb extends ActionWeb {
ids.add(object.getString("stopFileId")); ids.add(object.getString("stopFileId"));
} }
JSONArray result = new JSONArray(); JSONArray result = new JSONArray();
validPublisData(ids, processInstId, wsId, result);// 校验 //validPublisData(ids, processInstId, wsId, result);// 校验
if (result.size() > 0) { if (result.size() > 0) {
ro = ResponseObject.newErrResponse(); ro = ResponseObject.newErrResponse();
ro.put("data", result); ro.put("data", result);
@ -3573,7 +3573,7 @@ public class ProcessPublishWeb extends ActionWeb {
/** /**
* 校验发布相关数据是否在其它未办理完成的表单中存在 只要有相同versionId的流程存在未办理情况，即校验不通过 * 校验发布相关数据是否在其它未办理完成的表单中存在 只要有相同versionId的流程存在未办理情况，即校验不通过
*/ */
private void validPublisData(HashSet<String> set, String processInstId, String wsId, JSONArray array) { private void validPublisData1(HashSet<String> set, String processInstId, String wsId, JSONArray array) {
if (set.isEmpty()) if (set.isEmpty())
return; return;
Set<String> filter = new HashSet<>(); Set<String> filter = new HashSet<>();
@ -3706,7 +3706,7 @@ public class ProcessPublishWeb extends ActionWeb {
validModelExist(object.getString("stopFileId"));// 校验 validModelExist(object.getString("stopFileId"));// 校验
ids.add(object.getString("stopFileId")); ids.add(object.getString("stopFileId"));
} }
validPublisData(ids, processInstId, wsId, result);// 校验 //validPublisData(ids, processInstId, wsId, result);// 校验
if (result.size() > 0) { if (result.size() > 0) {
ro = ResponseObject.newErrResponse(); ro = ResponseObject.newErrResponse();

1064
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ProcessEndAfterEvent.java
View File

File diff suppressed because it is too large Load Diff

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

@ -42,6 +42,7 @@ import com.actionsoft.exception.BPMNError;
import com.actionsoft.sdk.local.SDK; import com.actionsoft.sdk.local.SDK;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.awspaas.yili.publishevent.event.ProcessEndAfterEvent;
public class PublishExecuteListenerInterfaceImpl extends ExecuteListener implements ExecuteListenerInterface { public class PublishExecuteListenerInterfaceImpl extends ExecuteListener implements ExecuteListenerInterface {
@ -179,6 +180,9 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme
updateEffectiveDateProperty(processInstId, bo, nowTime, bolistN, bolistC); updateEffectiveDateProperty(processInstId, bo, nowTime, bolistN, bolistC);
// 流程发布范围权限单独存储 // 流程发布范围权限单独存储
savePublishScope(bo, bolistN, bolistC, bolistS); savePublishScope(bo, bolistN, bolistC, bolistS);
//发布待阅，推送知识库，推送EHSQ
new ProcessEndAfterEvent().ProcessData(param);
} }
private void updateEffectiveDateProperty(String processInstId, BO bo, Timestamp publishDate, List<BO> bolistN, List<BO> bolistC) { private void updateEffectiveDateProperty(String processInstId, BO bo, Timestamp publishDate, List<BO> bolistN, List<BO> bolistC) {