物料申请取消领导确认环节

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp

@@ -42,17 +42,17 @@
             </button>
 
 
-            <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
-                    class="fa fa-reply"></i>撤销
-            </button>
-            <c:if test="${active==1}">
-                <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i
-                        class="fa fa-sitemap"></i>确认
-                </button>
-                <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i
-                        class="fa fa-reply"></i>回退
-                </button>
-            </c:if>
+<%--            <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i--%>
+<%--                    class="fa fa-reply"></i>撤销--%>
+<%--            </button>--%>
+<%--            <c:if test="${active==1}">--%>
+<%--                <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i--%>
+<%--                        class="fa fa-sitemap"></i>确认--%>
+<%--                </button>--%>
+<%--                <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i--%>
+<%--                        class="fa fa-reply"></i>回退--%>
+<%--                </button>--%>
+<%--            </c:if>--%>
         </div>
         <br/>
 

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp

@@ -42,17 +42,17 @@
             </button>
 
 
-            <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
-                    class="fa fa-reply"></i>撤销
-            </button>
-          <c:if test="${active==1}">
-            <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i
-                    class="fa fa-sitemap"></i>确认
-            </button>
-              <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i
-                    class="fa fa-reply"></i>回退
-              </button>
-           </c:if>
+<%--            <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i--%>
+<%--                    class="fa fa-reply"></i>撤销--%>
+<%--            </button>--%>
+<%--          <c:if test="${active==1}">--%>
+<%--            <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i--%>
+<%--                    class="fa fa-sitemap"></i>确认--%>
+<%--            </button>--%>
+<%--              <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i--%>
+<%--                    class="fa fa-reply"></i>回退--%>
+<%--              </button>--%>
+<%--           </c:if>--%>
         </div>
         <br/>
 

topsun/src/main/java/com/huigou/topsun/base/DefinitionHomepageTaskData.java

@@ -29,18 +29,18 @@ public class DefinitionHomepageTaskData extends BaseApplication {
     @Around("execution(public java.util.Map<String, Object> com.huigou.uasp.bpm.engine.application.impl.WorkflowApplicationImpl.queryTrackingTasks())")
     public  Map<String, Object>  replaceQueryTrackingTasks(){
         // 当前登录用户是否以任务发起人的身份发起过任务流程
-        List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor();
-            for (BsnMessageSponsor sponsor : messageSponsors) {
-                //该流程下是否所有单位已就绪
-                BsnMessageExecute systemExecute = bsnMessageApplication.isExecutesReady(sponsor.getId());
-                //若就绪更新其中流程、流程下审批任务的状态
-                if(systemExecute!=null){
-                    systemExecute.setActive(ActiveStatus.UNFINISHED.getValue());
-                    sponsor.setStatus(1);
-                    sponsor.addExecute(systemExecute);
-                    bsnMessageApplication.saveBsnMessageSponsor(sponsor);
-                }
-        }
+//        List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor();
+//            for (BsnMessageSponsor sponsor : messageSponsors) {
+//                //该流程下是否所有单位已就绪
+//                BsnMessageExecute systemExecute = bsnMessageApplication.isExecutesReady(sponsor.getId());
+//                //若就绪更新其中流程、流程下审批任务的状态
+//                if(systemExecute!=null){
+//                    systemExecute.setActive(ActiveStatus.UNFINISHED.getValue());
+//                    sponsor.setStatus(1);
+//                    sponsor.addExecute(systemExecute);
+//                    bsnMessageApplication.saveBsnMessageSponsor(sponsor);
+//                }
+//        }
         //获取任务执行人为当前用户的任务
         return this.bsnMessageApplication.queryExecuteBsnMessage();
     }