commit
This commit is contained in:
+2
-1
@@ -80,7 +80,8 @@ public class ProposalCommitteeFilingController {
|
||||
t.taskParentId,
|
||||
t.variable taskVariable,
|
||||
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
|
||||
IF(rt.id IS NOT NULL OR (ins.state = 20 AND info.caseFilingResult = 'NOT'), 1, 0) AS canRevoke
|
||||
IF(rt.id IS NOT NULL OR (ins.state = 20 AND info.caseFilingResult = 'NOT'), 1, 0) AS canRevoke,
|
||||
(select count(DISTINCT seconderId) from proposal_second where proposalId = info.id and isAgree = true) as agreeCount
|
||||
FROM
|
||||
wf_process_task t
|
||||
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
|
||||
|
||||
+1
@@ -188,6 +188,7 @@ layout("/layouts/platform.html"){
|
||||
{ label: "提案名称", prop: "name", width: "200px" },
|
||||
{ label: "提案类别", prop: "typeName" },
|
||||
{ label: "届次", prop: "sessionName" },
|
||||
{ label: "附议同意数", prop: "agreeCount" },
|
||||
{ label: "立案结果", prop: "caseFilingResult" },
|
||||
{ label: "代表团", prop: "delegationName" },
|
||||
{ label: "当前节点", prop: "curTaskName" },
|
||||
|
||||
Reference in New Issue
Block a user