Skip to content

T
topsun-bpm
Commit b4f984eb authored by 1650842865's avatar 1650842865
Browse files
Options

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

parent b02a52a3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 379 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp
View file @ b4f984eb
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
</button> </button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i <%-- <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>撤销 <%-- class="fa fa-reply"></i>撤销--%>
</button> <%-- </button>--%>
<c:if test="${active==1}"> <%-- <c:if test="${active==1}">--%>
<button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i--%>
class="fa fa-sitemap"></i>确认 <%-- class="fa fa-sitemap"></i>确认--%>
</button> <%-- </button>--%>
<button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>回退 <%-- class="fa fa-reply"></i>回退--%>
</button> <%-- </button>--%>
</c:if> <%-- </c:if>--%>
</div> </div>
<br/> <br/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ b4f984eb
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
</button> </button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i <%-- <button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>撤销 <%-- class="fa fa-reply"></i>撤销--%>
</button> <%-- </button>--%>
<c:if test="${active==1}"> <%-- <c:if test="${active==1}">--%>
<button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(2)" class="btn btn-gray"><i--%>
class="fa fa-sitemap"></i>确认 <%-- class="fa fa-sitemap"></i>确认--%>
</button> <%-- </button>--%>
<button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i <%-- <button id="showChart" title="" type="button" onclick="confirmForm(3)" class="btn btn-gray"><i--%>
class="fa fa-reply"></i>回退 <%-- class="fa fa-reply"></i>回退--%>
</button> <%-- </button>--%>
</c:if> <%-- </c:if>--%>
</div> </div>
<br/> <br/>
......
topsun/src/main/java/com/huigou/topsun/base/DefinitionHomepageTaskData.java
View file @ b4f984eb
...@@ -29,18 +29,18 @@ public class DefinitionHomepageTaskData extends BaseApplication { ...@@ -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())") @Around("execution(public java.util.Map<String, Object> com.huigou.uasp.bpm.engine.application.impl.WorkflowApplicationImpl.queryTrackingTasks())")
public Map<String, Object> replaceQueryTrackingTasks(){ public Map<String, Object> replaceQueryTrackingTasks(){
// 当前登录用户是否以任务发起人的身份发起过任务流程 // 当前登录用户是否以任务发起人的身份发起过任务流程
List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor(); // List<BsnMessageSponsor> messageSponsors = bsnMessageApplication.queryFinishBsnMessageSponsor();
for (BsnMessageSponsor sponsor : messageSponsors) { // for (BsnMessageSponsor sponsor : messageSponsors) {
//该流程下是否所有单位已就绪 // //该流程下是否所有单位已就绪
BsnMessageExecute systemExecute = bsnMessageApplication.isExecutesReady(sponsor.getId()); // BsnMessageExecute systemExecute = bsnMessageApplication.isExecutesReady(sponsor.getId());
//若就绪更新其中流程、流程下审批任务的状态 // //若就绪更新其中流程、流程下审批任务的状态
if(systemExecute!=null){ // if(systemExecute!=null){
systemExecute.setActive(ActiveStatus.UNFINISHED.getValue()); // systemExecute.setActive(ActiveStatus.UNFINISHED.getValue());
sponsor.setStatus(1); // sponsor.setStatus(1);
sponsor.addExecute(systemExecute); // sponsor.addExecute(systemExecute);
bsnMessageApplication.saveBsnMessageSponsor(sponsor); // bsnMessageApplication.saveBsnMessageSponsor(sponsor);
} // }
} // }
//获取任务执行人为当前用户的任务 //获取任务执行人为当前用户的任务
return this.bsnMessageApplication.queryExecuteBsnMessage(); return this.bsnMessageApplication.queryExecuteBsnMessage();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment