合并分支 'develop' 到 'fix_foton'

Develop

查看合并请求 laws-foton-slrs/foton-wkflow-rest!3

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java

@@ -80,6 +80,7 @@ public class BussLibraryProduct7After implements TaskListener{
                     //设置下个审批节点操作人数量+通过人数量
                     delegateTask.setVariable("auditUserSize",nextUserList.size());
                     delegateTask.setVariable("auditUserThrough",0);
+                    delegateTask.setVariable("auditReject",0);
                 }else {
                     throw new ActivitiException("1#2总院标准法规部产品标准工程师/各事业部标准法规部参数不存在,请配置相关用户");
                 }

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java

@@ -82,6 +82,7 @@ public class BussLibraryProduct8After implements TaskListener{
                         //设置下个审定节点操作人数量+通过人数量
                         delegateTask.setVariable("approveUserSize",nextUserList.size());
                         delegateTask.setVariable("approveUserThrough",0);
+                        delegateTask.setVariable("approveReject",0);
                     }
 
                 }else {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -424,7 +424,7 @@ public class ProcessStep4After implements TaskListener {
             List<EsPrcRelation> esPrcRelationList = esPrcRelationService.list(object.getString("esId"));
             if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) {
                 // 修改 计划和流程关联关系
-                esPrcRelationService.modifyEsPrcRelation(object.getString("esId"), null , "0", delegateTask.getProcessInstanceId());
+                esPrcRelationService.modifyEsPrcRelation(object.getString("esId"), null , "1", delegateTask.getProcessInstanceId());
 
             } else {
                 // 新增新的 计划和流程关联关系