From d3ecdcf83e241f1eaa97579298f51dcb5f155dff Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Wed, 31 Dec 2025 11:14:40 +0800
Subject: [PATCH] commit

---
 .../declare/controller/ActivityDeclareMineController.java | 1 +
 .../service/impl/WelfareStatisticsServiceImpl.java        | 3 +--
 .../resources/views/platform/zhgh/welfare/mine/index.html | 4 ++--
 .../views/platform/zhgh/welfare/projectMange/index.html   | 8 ++++----
 .../views/platform/zhgh/welfare/select/index.html         | 4 ++--
 .../platform/zhgh/welfare/selectionSituation/index.html   | 4 ++--
 .../views/platform/zhgh/welfare/statistics/index.html     | 4 ++--
 .../views/platform/zhgh/welfare/userChoose/index.html     | 4 ++--
 .../views/platform/zhgh/welfare/welfareUser/index.html    | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
index 442115b..62952dd 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
@@ -132,6 +132,7 @@ public class ActivityDeclareMineController {
         } else {
             cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy()));
         }
+		cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);
         return Result.success().addData(pagination);
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
index 1dbf562..476f5a8 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
@@ -332,7 +332,6 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
         List<ExcelExportEntity> entities = new ArrayList<>();
         entities.add(new ExcelExportEntity("工号", "loginName", 20));
         entities.add(new ExcelExportEntity("姓名", "userName", 20));
-        entities.add(new ExcelExportEntity("姓名", "userName", 20));
         entities.add(new ExcelExportEntity("单位", "welfareUnitName", 20));
         entities.add(new ExcelExportEntity("工会", "welfareUnionName", 20));
 
@@ -387,7 +386,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
         exportEntities.add(new ExcelExportEntity("电话号码", "mobile", 20));
         exportEntities.add(new ExcelExportEntity("所在分工会", "welfareUnionName", 20));
         exportEntities.add(new ExcelExportEntity("所在单位", "welfareUnitName", 20));
-        exportEntities.add(new ExcelExportEntity("所在福利", "selectOptionName", 50));
+        exportEntities.add(new ExcelExportEntity("所选福利", "selectOptionName", 50));
 
         Sql sql = Sqls.create("""
                 SELECT
diff --git a/src/main/resources/views/platform/zhgh/welfare/mine/index.html b/src/main/resources/views/platform/zhgh/welfare/mine/index.html
index 3e09dc4..59ab51b 100644
--- a/src/main/resources/views/platform/zhgh/welfare/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/mine/index.html
@@ -7,10 +7,10 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="活动时间">
+                    <search-item label="年度">
                         <el-date-picker
                             :clearable="false"
-                            placeholder="活动时间"
+                            placeholder="请选择年度"
                             style="width: 100%"
                             type="year"
                             v-model="pageForm.year"
diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
index c55770a..e26e98a 100644
--- a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
@@ -7,10 +7,10 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="活动时间">
+                    <search-item label="年度">
                         <el-date-picker
                             :clearable="false"
-                            placeholder="活动时间"
+                            placeholder="请选择年度"
                             style="width: 100%"
                             type="year"
                             v-model="pageForm.year"
@@ -18,8 +18,8 @@ layout("/layouts/platform.html"){
                         ></el-date-picker>
                     </search-item>
 
-                    <search-item label="活动名称">
-                        <el-input clearable placeholder="请输入活动名称" v-model="pageForm.name"></el-input>
+                    <search-item label="项目名称">
+                        <el-input clearable placeholder="请输入项目名称" v-model="pageForm.name"></el-input>
                     </search-item>
                 </search>
             </el-card>
diff --git a/src/main/resources/views/platform/zhgh/welfare/select/index.html b/src/main/resources/views/platform/zhgh/welfare/select/index.html
index 59f643b..a6cae45 100644
--- a/src/main/resources/views/platform/zhgh/welfare/select/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/select/index.html
@@ -8,11 +8,11 @@ layout("/layouts/platform.html"){
             <el-card shadow="never">
                 <div class="search">
                     <div class="search-item">
-                        <div class="search-item-label">年&emsp;&emsp;度：</div>
+                        <div class="search-item-label">年度：</div>
                         <div class="search-item-option">
                             <el-date-picker
                                 @change="doSearch"
-                                placeholder="请选择"
+                                placeholder="请选择年度"
                                 style="width: 100%"
                                 type="year"
                                 v-model="pageForm.year"
diff --git a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
index 4410c57..f79f32f 100644
--- a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
     <guava>
         <el-card shadow="never">
             <search @search="doSearch">
-                <search-item label="所属年份">
+                <search-item label="年度">
                     <el-date-picker
                         :clearable="false"
-                        placeholder="所属年份"
+                        placeholder="请选择年度"
                         style="width: 100%"
                         type="year"
                         v-model="pageForm.year"
diff --git a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html
index 17ef72d..4dc8b37 100644
--- a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html
@@ -7,11 +7,11 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="所属年份">
+                    <search-item label="年度">
                         <el-date-picker
                             :clearable="false"
                             @change="getWelfareProjectList"
-                            placeholder="所属年份"
+                            placeholder="请选择年度"
                             style="width: 100%"
                             type="year"
                             v-model="pageForm.year"
diff --git a/src/main/resources/views/platform/zhgh/welfare/userChoose/index.html b/src/main/resources/views/platform/zhgh/welfare/userChoose/index.html
index 303e135..c561109 100644
--- a/src/main/resources/views/platform/zhgh/welfare/userChoose/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/userChoose/index.html
@@ -8,11 +8,11 @@ layout("/layouts/platform.html"){
             <el-card shadow="never">
                 <div class="search">
                     <div class="search-item">
-                        <div class="search-item-label">年&emsp;&emsp;度：</div>
+                        <div class="search-item-label">年度：</div>
                         <div class="search-item-option">
                             <el-date-picker
                                 @change="doSearch"
-                                placeholder="请选择"
+                                placeholder="请选择年度"
                                 style="width: 100%"
                                 type="year"
                                 v-model="pageForm.year"
diff --git a/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html b/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html
index a06769d..b215e1b 100644
--- a/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html
@@ -7,10 +7,10 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="doSearch">
-                    <search-item label="所属年份">
+                    <search-item label="年度">
                         <el-date-picker
                             :clearable="false"
-                            placeholder="所属年份"
+                            placeholder="请选择年度"
                             style="width: 100%"
                             type="year"
                             v-model="pageForm.year"