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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-12-31 11:14:40 +08:00
parent 34781d82b0
commit d3ecdcf83e
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
+1
View File
@@ -132,6 +132,7 @@ public class ActivityDeclareMineController {
} else { } else {
cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy()));
} }
cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); Pagination<NutMap> pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);
return Result.success().addData(pagination); return Result.success().addData(pagination);
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+1 -2
View File
@@ -332,7 +332,6 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
List<ExcelExportEntity> entities = new ArrayList<>(); List<ExcelExportEntity> entities = new ArrayList<>();
entities.add(new ExcelExportEntity("工号", "loginName", 20)); entities.add(new ExcelExportEntity("工号", "loginName", 20));
entities.add(new ExcelExportEntity("姓名", "userName", 20)); entities.add(new ExcelExportEntity("姓名", "userName", 20));
entities.add(new ExcelExportEntity("姓名", "userName", 20));
entities.add(new ExcelExportEntity("单位", "welfareUnitName", 20)); entities.add(new ExcelExportEntity("单位", "welfareUnitName", 20));
entities.add(new ExcelExportEntity("工会", "welfareUnionName", 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("电话号码", "mobile", 20));
exportEntities.add(new ExcelExportEntity("所在分工会", "welfareUnionName", 20)); exportEntities.add(new ExcelExportEntity("所在分工会", "welfareUnionName", 20));
exportEntities.add(new ExcelExportEntity("所在单位", "welfareUnitName", 20)); exportEntities.add(new ExcelExportEntity("所在单位", "welfareUnitName", 20));
exportEntities.add(new ExcelExportEntity("所在福利", "selectOptionName", 50)); exportEntities.add(new ExcelExportEntity("所选福利", "selectOptionName", 50));
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
src/main/resources/views/platform/zhgh/welfare/mine/index.html
+2 -2
View File
@@ -7,10 +7,10 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="活动时间"> <search-item label="年度">
<el-date-picker <el-date-picker
:clearable="false" :clearable="false"
placeholder="活动时间" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
+4 -4
View File
@@ -7,10 +7,10 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="活动时间"> <search-item label="年度">
<el-date-picker <el-date-picker
:clearable="false" :clearable="false"
placeholder="活动时间" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
@@ -18,8 +18,8 @@ layout("/layouts/platform.html"){
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="活动名称"> <search-item label="项目名称">
<el-input clearable placeholder="请输入活动名称" v-model="pageForm.name"></el-input> <el-input clearable placeholder="请输入项目名称" v-model="pageForm.name"></el-input>
</search-item> </search-item>
</search> </search>
</el-card> </el-card>
src/main/resources/views/platform/zhgh/welfare/select/index.html
+2 -2
View File
@@ -8,11 +8,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<div class="search"> <div class="search">
<div class="search-item"> <div class="search-item">
<div class="search-item-label">年&emsp;&emsp;度：</div> <div class="search-item-label">年度：</div>
<div class="search-item-option"> <div class="search-item-option">
<el-date-picker <el-date-picker
@change="doSearch" @change="doSearch"
placeholder="请选择" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
+2 -2
View File
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
<guava> <guava>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="所属年份"> <search-item label="年度">
<el-date-picker <el-date-picker
:clearable="false" :clearable="false"
placeholder="所属年份" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
src/main/resources/views/platform/zhgh/welfare/statistics/index.html
+2 -2
View File
@@ -7,11 +7,11 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="所属年份"> <search-item label="年度">
<el-date-picker <el-date-picker
:clearable="false" :clearable="false"
@change="getWelfareProjectList" @change="getWelfareProjectList"
placeholder="所属年份" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
src/main/resources/views/platform/zhgh/welfare/userChoose/index.html
+2 -2
View File
@@ -8,11 +8,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<div class="search"> <div class="search">
<div class="search-item"> <div class="search-item">
<div class="search-item-label">年&emsp;&emsp;度：</div> <div class="search-item-label">年度：</div>
<div class="search-item-option"> <div class="search-item-option">
<el-date-picker <el-date-picker
@change="doSearch" @change="doSearch"
placeholder="请选择" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"
src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html
+2 -2
View File
@@ -7,10 +7,10 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="所属年份"> <search-item label="年度">
<el-date-picker <el-date-picker
:clearable="false" :clearable="false"
placeholder="所属年份" placeholder="请选择年度"
style="width: 100%" style="width: 100%"
type="year" type="year"
v-model="pageForm.year" v-model="pageForm.year"