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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-11-04 16:58:56 +08:00
parent 6dcf896f14
commit d2cdc72f3c
2 changed files with 359 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+1 -1
View File
@@ -247,7 +247,7 @@ public class ActivityBasicScopeController {
COLUMN_COMMENT COLUMN_COMMENT
FROM INFORMATION_SCHEMA.COLUMNS FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = 'sys_user' WHERE TABLE_NAME = 'sys_user'
AND TABLE_SCHEMA = 'budwk_v5_mini' AND TABLE_SCHEMA = 'zhgh_njnu'
"""); """);
List<NutMap> sqlDataList = activityBasicScopeService.listMap(sql); List<NutMap> sqlDataList = activityBasicScopeService.listMap(sql);
// sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE")))); // sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE"))));
src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js
+145 -50
View File
@@ -1,7 +1,6 @@
const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
template: /*language=HTML*/ ` template: /*language=HTML*/ `
<el-card shadow="never"> <el-card shadow="never">
<div :style="{ height: rootExtend ? 'auto' : '60px', 'overflow-y': 'hidden' }">
<el-row type="flex" align="middle" class="query-row"> <el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-title">年&emsp;&emsp;度：</el-col> <el-col class="query-row-title">年&emsp;&emsp;度：</el-col>
<el-col class="query-row-content" :span="12"> <el-col class="query-row-content" :span="12">
@@ -55,7 +54,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-col> </el-col>
</el-row> </el-row>
<el-row class="query-row"> <!--<el-row class="query-row">
<el-col class="query-row-title">性别：</el-col> <el-col class="query-row-title">性别：</el-col>
<el-col class="query-row-content query-row-content-tag"> <el-col class="query-row-content query-row-content-tag">
<el-tag <el-tag
@@ -69,13 +68,66 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
{{ item.name }} {{ item.name }}
</el-tag> </el-tag>
</el-col> </el-col>
</el-row>-->
<el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-content">
<el-row>
<el-col :span="12">
<span>人员类型：</span>
<el-select placeholder="人员类型" v-model="pageForm.personTypes"
clearable multiple style="margin-left: 33px;width: 80%"
@change="doSearch()"
@clear="doSearch()"
filterable>
<el-option v-for="item in personTypeOptions" :label="item.name"
:value="item.code"></el-option>
</el-select>
</el-col>
<el-col :span="12">
<span>在职状态：</span>
<el-select placeholder="在职状态" v-model="pageForm.userStates"
clearable multiple style="margin-left: 33px;width: 80%" filterable>
<el-option v-for="item in userStateOptions" :label="item.name"
:value="item.code"></el-option>
</el-select>
</el-col>
</el-row>
</el-col>
</el-row> </el-row>
<el-row type="flex" align="middle" class="query-row query-row-tag"> <el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-content">
<el-row>
<el-col :span="12">
<span>人事编制：</span>
<el-select placeholder="人事编制" v-model="pageForm.preparedBys"
clearable multiple style="margin-left: 33px;width: 80%"
@change="doSearch()"
@clear="doSearch()"
filterable>
<el-option v-for="item in preparedByOptions" :label="item.name"
:value="item.code"></el-option>
</el-select>
</el-col>
<el-col :span="12">
<span>姓&emsp;&emsp;别：</span>
<el-select placeholder="姓别" v-model="pageForm.sexTypes"
clearable multiple style="margin-left: 33px;width: 80%"
@change="doSearch()"
@clear="doSearch()"
filterable>
<el-option v-for="item in sexTypeOptions" :label="item.name"
:value="item.name"></el-option>
</el-select>
</el-col>
</el-row>
</el-col>
</el-row>
<!--<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">人员类型：</el-col> <el-col class="query-row-title">人员类型：</el-col>
<el-col class="query-row-content query-row-content-tag" <el-col class="query-row-content query-row-content-tag">
:style="{ height: personTypeExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
>
<el-tag <el-tag
size="small" size="small"
style="cursor: pointer;margin: 0;" style="cursor: pointer;margin: 0;"
@@ -97,17 +149,9 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
type="success">全部 type="success">全部
</el-link> </el-link>
</el-col> </el-col>
<el-col style="width: 50px"> </el-row>-->
<el-link type="primary"
:underline="false"
@click="personTypeExtend = !personTypeExtend">
<span v-if="!personTypeExtend">展开<i class="el-icon-caret-bottom"></i></span>
<span v-if="personTypeExtend">收起<i class="el-icon-caret-top"></i></span>
</el-link>
</el-col>
</el-row>
<el-row type="flex" align="middle" class="query-row query-row-tag"> <!--<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">人事编制：</el-col> <el-col class="query-row-title">人事编制：</el-col>
<el-col class="query-row-content query-row-content-tag"> <el-col class="query-row-content query-row-content-tag">
<el-tag <el-tag
@@ -131,13 +175,11 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
type="success">全部 type="success">全部
</el-link> </el-link>
</el-col> </el-col>
</el-row> </el-row>-->
<el-row type="flex" align="middle" class="query-row query-row-tag"> <!--<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">在职状态：</el-col> <el-col class="query-row-title">在职状态：</el-col>
<el-col class="query-row-content query-row-content-tag" <el-col class="query-row-content query-row-content-tag">
:style="{ height: userStateExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
>
<el-tag <el-tag
size="small" size="small"
style="cursor: pointer;margin: 0;" style="cursor: pointer;margin: 0;"
@@ -159,17 +201,84 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
type="success">全部 type="success">全部
</el-link> </el-link>
</el-col> </el-col>
<el-col style="width: 50px"> </el-row>-->
<el-link type="primary"
:underline="false" <el-row type="flex" align="middle" class="query-row">
@click="userStateExtend = !userStateExtend"> <el-col class="query-row-content">
<span v-if="!userStateExtend">展开<i class="el-icon-caret-bottom"></i></span> <el-row>
<span v-if="userStateExtend">收起<i class="el-icon-caret-top"></i></span> <el-col :span="12">
</el-link> <span>入会日期：</span>
<div style="margin-left: 33px;width: 80%; display: inline-block">
<el-date-picker
style="width: 50%"
v-model="pageForm.startJoinDate"
type="date"
@change="determineStartDate"
placeholder="选择开始日期">
</el-date-picker>
<el-date-picker
style="width: 49%"
v-model="pageForm.endJoinDate"
type="date"
@change="determineEndDate"
placeholder="选择结束日期">
</el-date-picker>
</div>
</el-col>
<el-col :span="12">
<span>离会日期：</span>
<div style="margin-left: 33px;width: 80%; display: inline-block">
<el-date-picker
style="width: 50%"
v-model="pageForm.startLeaveDate"
type="date"
@change="determineStartDate"
placeholder="选择开始日期">
</el-date-picker>
<el-date-picker
style="width: 49%"
v-model="pageForm.endLeaveDate"
type="date"
@change="determineEndDate"
placeholder="选择结束日期">
</el-date-picker>
</div>
</el-col>
</el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="query-row" type="flex" align="middle"> <el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-content">
<el-row>
<el-col :span="12">
<span>出生日期：</span>
<div style="margin-left: 33px;width: 80%; display: inline-block">
<el-date-picker
style="width: 50%"
v-model="pageForm.startDate"
type="date"
@change="determineStartDate"
placeholder="选择开始日期">
</el-date-picker>
<el-date-picker
style="width: 49%"
v-model="pageForm.endDate"
type="date"
@change="determineEndDate"
placeholder="选择结束日期">
</el-date-picker>
</div>
</el-col>
<el-col :span="12">
<span>模糊查询：</span>
<member-cnd @cnd="(v)=>pageForm={...pageForm,...v}" style="margin-left: 33px;width: 80%; display: inline-block"></member-cnd>
</el-col>
</el-row>
</el-col>
</el-row>
<!--<el-row class="query-row" type="flex" align="middle">
<el-col class="query-row-title">出生日期：</el-col> <el-col class="query-row-title">出生日期：</el-col>
<el-col class="query-row-content"> <el-col class="query-row-content">
<el-date-picker <el-date-picker
@@ -185,9 +294,9 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
placeholder="选择结束日期"> placeholder="选择结束日期">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
</el-row> </el-row>-->
<el-row class="query-row" type="flex" align="middle"> <!--<el-row class="query-row" type="flex" align="middle">
<el-col class="query-row-title">入会日期：</el-col> <el-col class="query-row-title">入会日期：</el-col>
<el-col class="query-row-content"> <el-col class="query-row-content">
<el-date-picker <el-date-picker
@@ -203,9 +312,9 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
placeholder="选择结束日期"> placeholder="选择结束日期">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
</el-row> </el-row>-->
<el-row class="query-row" type="flex" align="middle"> <!--<el-row class="query-row" type="flex" align="middle">
<el-col class="query-row-title">离会日期：</el-col> <el-col class="query-row-title">离会日期：</el-col>
<el-col class="query-row-content"> <el-col class="query-row-content">
<el-date-picker <el-date-picker
@@ -221,7 +330,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
placeholder="选择结束日期"> placeholder="选择结束日期">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
</el-row> </el-row>-->
<el-row class="query-row" type="flex" align="middle"> <el-row class="query-row" type="flex" align="middle">
<el-col class="query-row-title">年龄范围：</el-col> <el-col class="query-row-title">年龄范围：</el-col>
@@ -242,12 +351,12 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" align="middle" class="query-row"> <!--<el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-title">模糊查询：</el-col> <el-col class="query-row-title">模糊查询：</el-col>
<el-col class="query-row-content"> <el-col class="query-row-content">
<member-cnd @cnd="(v)=>pageForm={...pageForm,...v}"></member-cnd> <member-cnd @cnd="(v)=>pageForm={...pageForm,...v}"></member-cnd>
</el-col> </el-col>
</el-row> </el-row>-->
<el-row class="query-row" style="justify-content: end"> <el-row class="query-row" style="justify-content: end">
<el-checkbox v-model="pageForm.reverseSelection" label="是否反选" border <el-checkbox v-model="pageForm.reverseSelection" label="是否反选" border
@@ -257,17 +366,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
</el-row> </el-row>
</div>
<div class="mt10" style="text-align: center;">
<el-link type="primary"
:underline="false"
@click="rootExtend = !rootExtend">
<span v-if="!rootExtend" style="font-weight: bold">展开<i class="el-icon-caret-bottom"></i></span>
<span v-if="rootExtend" style="font-weight: bold">收起<i class="el-icon-caret-top"></i></span>
</el-link>
</div>
<!--<search @search="doSearch"> <!--<search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
@@ -425,9 +523,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
store, store,
data() { data() {
return { return {
personTypeExtend: false,
userStateExtend: false,
rootExtend: false,
pageForm: { pageForm: {
isUnit: "", isUnit: "",
isUnion: "", isUnion: "",