From e0004e410f0481098210c8639dc35623a1bdf4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Fri, 30 Oct 2026 17:57:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=85=B0=E9=97=AE=E3=80=81=E5=9B=B0?= =?UTF-8?q?=E9=9A=BE=E5=B8=AE=E6=89=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialCondolenceFourthApprovalController.java | 7 +++++++ .../SpecialCondolenceSecondApprovalController.java | 7 +++++++ .../SpecialCondolenceThirdApprovalController.java | 7 +++++++ .../specialcondolence/fourthApproval/index.html | 2 +- .../specialcondolence/schoolPrincipalApproval/index.html | 2 +- .../specialcondolence/schoolUnionApproval/index.html | 2 +- .../specialcondolence/fourthApproval/index.html | 3 +-- .../specialcondolence/schoolPrincipalApproval/index.html | 3 +-- .../specialcondolence/schoolUnionApproval/index.html | 3 +-- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceFourthApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceFourthApprovalController.java index 17d7c20..26d3d95 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceFourthApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceFourthApprovalController.java @@ -70,6 +70,7 @@ public class SpecialCondolenceFourthApprovalController { Sql sql = Sqls.create(""" SELECT info.*, + COALESCE(recipientTotals.recipientCount, 0) AS recipientCount, type.name as typeName, ins.id AS instanceId, ins.businessNo, @@ -92,6 +93,12 @@ public class SpecialCondolenceFourthApprovalController { LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId LEFT JOIN special_condolence info ON info.id = ins.businessNo LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN ( + SELECT applyId, COUNT(*) AS recipientCount + FROM special_condolence_recipient + WHERE delFlag = false + GROUP BY applyId + ) recipientTotals ON recipientTotals.applyId = info.id LEFT JOIN special_condolence_type type ON info.type = type.id LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceSecondApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceSecondApprovalController.java index 1fd221a..e04a159 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceSecondApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceSecondApprovalController.java @@ -63,6 +63,7 @@ public class SpecialCondolenceSecondApprovalController { Sql sql = Sqls.create(""" SELECT info.*, + COALESCE(recipientTotals.recipientCount, 0) AS recipientCount, type.name as typeName, ins.id AS instanceId, ins.businessNo, @@ -85,6 +86,12 @@ public class SpecialCondolenceSecondApprovalController { LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId LEFT JOIN special_condolence info ON info.id = ins.businessNo LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN ( + SELECT applyId, COUNT(*) AS recipientCount + FROM special_condolence_recipient + WHERE delFlag = false + GROUP BY applyId + ) recipientTotals ON recipientTotals.applyId = info.id LEFT JOIN special_condolence_type type ON info.type = type.id LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceThirdApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceThirdApprovalController.java index 38f4c84..7e1a212 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceThirdApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceThirdApprovalController.java @@ -65,6 +65,7 @@ public class SpecialCondolenceThirdApprovalController { Sql sql = Sqls.create(""" SELECT info.*, + COALESCE(recipientTotals.recipientCount, 0) AS recipientCount, type.name as typeName, ins.id AS instanceId, ins.businessNo, @@ -87,6 +88,12 @@ public class SpecialCondolenceThirdApprovalController { LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId LEFT JOIN special_condolence info ON info.id = ins.businessNo LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN ( + SELECT applyId, COUNT(*) AS recipientCount + FROM special_condolence_recipient + WHERE delFlag = false + GROUP BY applyId + ) recipientTotals ON recipientTotals.applyId = info.id LEFT JOIN special_condolence_type type ON info.type = type.id LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html index 2b4cd75..1f8a964 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html @@ -135,11 +135,11 @@ layout("/layouts/platform.html"){ typeOptions: [], tableColumns: [ {prop: 'helpUserName', label: '慰问对象'}, - {prop: 'helpLoginName', label: '慰问对象工号'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, {prop: 'typeName', label: '慰问类型'}, + {prop: 'recipientCount', label: '慰问人数', width: 100}, {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html index 2b4cd75..1f8a964 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html @@ -135,11 +135,11 @@ layout("/layouts/platform.html"){ typeOptions: [], tableColumns: [ {prop: 'helpUserName', label: '慰问对象'}, - {prop: 'helpLoginName', label: '慰问对象工号'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, {prop: 'typeName', label: '慰问类型'}, + {prop: 'recipientCount', label: '慰问人数', width: 100}, {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html index 2b4cd75..1f8a964 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html @@ -135,11 +135,11 @@ layout("/layouts/platform.html"){ typeOptions: [], tableColumns: [ {prop: 'helpUserName', label: '慰问对象'}, - {prop: 'helpLoginName', label: '慰问对象工号'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, {prop: 'typeName', label: '慰问类型'}, + {prop: 'recipientCount', label: '慰问人数', width: 100}, {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html index 813b7ff..d529981 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html @@ -91,7 +91,6 @@ layout("/layouts/platform_h5.html"){
{{row.helpUserName || '--'}}
-
工号：{{row.helpLoginName || '--'}}
@@ -99,11 +98,11 @@ layout("/layouts/platform_h5.html"){