commit
This commit is contained in:
+2
-1
@@ -141,7 +141,8 @@ public class ProposalUnderTakeReplyController {
|
|||||||
List<NutMap> list = pagination.getList();
|
List<NutMap> list = pagination.getList();
|
||||||
for (NutMap row : list) {
|
for (NutMap row : list) {
|
||||||
if (row.getInt("taskIsMaster") == 1) {
|
if (row.getInt("taskIsMaster") == 1) {
|
||||||
boolean b = Stream.of("master_reply", "slave_reply", "school_leader")
|
// boolean b = Stream.of("master_reply", "slave_reply", "school_leader")
|
||||||
|
boolean b = Stream.of("master_reply", "slave_reply", "feedback")
|
||||||
.anyMatch(a -> row.getString("curTaskKey").contains(a));
|
.anyMatch(a -> row.getString("curTaskKey").contains(a));
|
||||||
row.setv("canRevoke", b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
|
row.setv("canRevoke", b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+2
-1
@@ -50,8 +50,9 @@ public class ProposalCommitteeFilingServiceImpl extends BaseServiceImpl<Proposal
|
|||||||
@Aop(TransAop.READ_COMMITTED)
|
@Aop(TransAop.READ_COMMITTED)
|
||||||
public void executeTask(Dict args) {
|
public void executeTask(Dict args) {
|
||||||
Long processTaskId = args.getLong(FlowConst.PROCESS_TASK_ID_KEY);
|
Long processTaskId = args.getLong(FlowConst.PROCESS_TASK_ID_KEY);
|
||||||
flowCommonService.executeTask(args);
|
// 新流程确认立案后直接创建承办单位答复任务,任务拦截器需要先读取承办单位答复记录。
|
||||||
saveCommitteeFilingBusinessData(processTaskId, args);
|
saveCommitteeFilingBusinessData(processTaskId, args);
|
||||||
|
flowCommonService.executeTask(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user