feat: 慰问、困难帮扶优化

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

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

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

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: '流程状态'},
                 ],

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: '流程状态'},
                 ],

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: '流程状态'},
                 ],

src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html

@@ -91,7 +91,6 @@ layout("/layouts/platform_h5.html"){
             <div class="specialcondolence-card-header">
                 <div class="specialcondolence-card-heading">
                     <div class="specialcondolence-card-title">{{row.helpUserName || '--'}}</div>
-                    <div class="specialcondolence-card-code">工号：{{row.helpLoginName || '--'}}</div>
                 </div>
                 <enum-tag class="specialcondolence-card-status" v-if="row.instanceState" :value="row.instanceState"
                           name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
@@ -99,11 +98,11 @@ layout("/layouts/platform_h5.html"){
         </template>
         <template v-slot="{index,row}">
             <table-column label="慰问对象">{{row.helpUserName}}</table-column>
-            <table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
             <table-column label="申请人">{{row.applyUserName}}</table-column>
             <table-column label="所属工会">{{row.applyUnionName}}</table-column>
             <table-column label="所属单位">{{row.applyUnitName}}</table-column>
             <table-column label="慰问类型">{{row.typeName}}</table-column>
+            <table-column label="慰问人数">{{row.recipientCount}} 人</table-column>
             <table-column label="当前节点">{{row.curTaskName}}</table-column>
         </template>
         <template #actions="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html

@@ -91,7 +91,6 @@ layout("/layouts/platform_h5.html"){
             <div class="specialcondolence-card-header">
                 <div class="specialcondolence-card-heading">
                     <div class="specialcondolence-card-title">{{row.helpUserName || '--'}}</div>
-                    <div class="specialcondolence-card-code">工号：{{row.helpLoginName || '--'}}</div>
                 </div>
                 <enum-tag class="specialcondolence-card-status" v-if="row.instanceState" :value="row.instanceState"
                           name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
@@ -99,11 +98,11 @@ layout("/layouts/platform_h5.html"){
         </template>
         <template v-slot="{index,row}">
             <table-column label="慰问对象">{{row.helpUserName}}</table-column>
-            <table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
             <table-column label="申请人">{{row.applyUserName}}</table-column>
             <table-column label="所属工会">{{row.applyUnionName}}</table-column>
             <table-column label="所属单位">{{row.applyUnitName}}</table-column>
             <table-column label="慰问类型">{{row.typeName}}</table-column>
+            <table-column label="慰问人数">{{row.recipientCount}} 人</table-column>
             <table-column label="当前节点">{{row.curTaskName}}</table-column>
         </template>
         <template #actions="{index,row}">

src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/schoolUnionApproval/index.html

@@ -91,7 +91,6 @@ layout("/layouts/platform_h5.html"){
             <div class="specialcondolence-card-header">
                 <div class="specialcondolence-card-heading">
                     <div class="specialcondolence-card-title">{{row.helpUserName || '--'}}</div>
-                    <div class="specialcondolence-card-code">工号：{{row.helpLoginName || '--'}}</div>
                 </div>
                 <enum-tag class="specialcondolence-card-status" v-if="row.instanceState" :value="row.instanceState"
                           name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
@@ -99,11 +98,11 @@ layout("/layouts/platform_h5.html"){
         </template>
         <template v-slot="{index,row}">
             <table-column label="慰问对象">{{row.helpUserName}}</table-column>
-            <table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
             <table-column label="申请人">{{row.applyUserName}}</table-column>
             <table-column label="所属工会">{{row.applyUnionName}}</table-column>
             <table-column label="所属单位">{{row.applyUnitName}}</table-column>
             <table-column label="慰问类型">{{row.typeName}}</table-column>
+            <table-column label="慰问人数">{{row.recipientCount}} 人</table-column>
             <table-column label="当前节点">{{row.curTaskName}}</table-column>
         </template>
         <template #actions="{index,row}">