c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-03-27 11:47:21 +08:00
parent d8912211e4
commit c6761703f9
2 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/export/ProposalExportComprehensiveController.java
+29 -2
View File
@@ -53,8 +53,32 @@ public class ProposalExportComprehensiveController {
ins.variable instanceVariable, ins.variable instanceVariable,
ins.processDefineId instanceProcessDefineId, ins.processDefineId instanceProcessDefineId,
t.displayName curTaskName, t.displayName curTaskName,
GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName, COALESCE(
GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames NULLIF(GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END), ''),
NULLIF(
REPLACE(
REPLACE(
REPLACE(MAX(committeeTask.variable->>'$.tf_masterUnitName'), '[', ''),
']', ''
),
'"', ''
),
''
)
) AS masterUnitName,
COALESCE(
NULLIF(GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END), ''),
NULLIF(
REPLACE(
REPLACE(
REPLACE(MAX(committeeTask.variable->>'$.tf_slaveUnitNames'), '[', ''),
']', ''
),
'"', ''
),
''
)
) AS slaveUnitNames
FROM FROM
proposal_info info proposal_info info
LEFT JOIN proposal_type type on type.id = info.typeId LEFT JOIN proposal_type type on type.id = info.typeId
@@ -64,6 +88,9 @@ public class ProposalExportComprehensiveController {
LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
LEFT JOIN wf_process_task committeeTask ON committeeTask.processInstanceId = ins.id
AND committeeTask.taskState = 20
AND committeeTask.taskName = 'committee'
LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id
$condition $condition
"""); """);
src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java
+30 -2
View File
@@ -555,8 +555,32 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
tcs.c, tcs.c,
tcs.fullName AS sessionName, tcs.fullName AS sessionName,
tcd.`name` AS delegationName, tcd.`name` AS delegationName,
GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END) AS masterUnitName, COALESCE(
GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END) AS slaveUnitNames NULLIF(GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 1 THEN pru.unitName END), ''),
NULLIF(
REPLACE(
REPLACE(
REPLACE(MAX(committeeTask.variable->>'$.tf_masterUnitName'), '[', ''),
']', ''
),
'"', ''
),
''
)
) AS masterUnitName,
COALESCE(
NULLIF(GROUP_CONCAT(DISTINCT CASE WHEN pru.isMaster = 0 THEN pru.unitName END), ''),
NULLIF(
REPLACE(
REPLACE(
REPLACE(MAX(committeeTask.variable->>'$.tf_slaveUnitNames'), '[', ''),
']', ''
),
'"', ''
),
''
)
) AS slaveUnitNames
FROM FROM
proposal_info info proposal_info info
LEFT JOIN proposal_type type on type.id = info.typeId LEFT JOIN proposal_type type on type.id = info.typeId
@@ -564,6 +588,10 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId LEFT JOIN teacher_congress_session tcs on tcs.id = info.sessionId
LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName LEFT JOIN teacher_congress_delegate tcde on tcde.loginName = info.createUserLoginName
LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
LEFT JOIN wf_process_task committeeTask ON committeeTask.processInstanceId = ins.id
AND committeeTask.taskState = 20
AND committeeTask.taskName = 'committee'
LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id LEFT JOIN proposal_reply_unit pru ON pru.proposalId = info.id
$condition $condition
"""); """);