From ddc374613a8926aabc5221fe907393ab5d1a6fc9 Mon Sep 17 00:00:00 2001
From: JyuHsin <729757837@qq.com>
Date: Mon, 21 Apr 2025 14:12:46 +0800
Subject: [PATCH] commit

---
 .../controller/preAuditManageController.java  |  2 +-
 .../controller/preAuditQueryController.java   | 11 ++-
 .../controller/preAuditSchoolController.java  |  7 +-
 .../platform/reimbursementPreAudit/audit.html | 73 +++++++++++-------
 .../platform/reimbursementPreAudit/query.html | 77 +++++++++++--------
 .../views/platform/sys/union/unionMange.html  |  4 +-
 6 files changed, 108 insertions(+), 66 deletions(-)

diff --git a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditManageController.java b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditManageController.java
index 8c37984..0eb4c87 100644
--- a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditManageController.java
+++ b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditManageController.java
@@ -50,7 +50,7 @@ public class preAuditManageController {
                 SELECT * FROM `reimbursement_pre_audit` $condition
                 """);
         cnd.andEX("YEAR(applyDate)", "=", year);
-        cnd.andEX("userId", "=", ShiroUtil.getUserId());
+        cnd.andEX("unionId", "=", Vi.getUnionId());
         cnd.desc("applyDate").desc("opAt");
         if (StrUtil.isNotEmpty(notes)) {
             cnd.andEX("notes", "like", "%" + notes + "%");
diff --git a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java
index d592174..e1576b2 100644
--- a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java
+++ b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java
@@ -37,23 +37,26 @@ public class preAuditQueryController {
     @At
     @ViReturn
     @RequiresPermissions("reimbursementPreAudit.manage")
-    public Object pageData(PageForm pageForm, String startDate, String endDate, String notes,String unitId,String unionId) {
+    public Object pageData(PageForm pageForm, String startDate, String endDate, String notes, String unitId, String unionId) {
         Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT * FROM `reimbursement_pre_audit` $condition
                 """);
         cnd.andEX("applyDate", ">=", startDate);
         cnd.andEX("applyDate", "<=", endDate);
-        cnd.andEX("userId", "=", ShiroUtil.getUserId());
-        cnd.andEX("auditState", "=", 3);
+        cnd.andEX("auditState", ">=", 3);
         cnd.andEX("unitId", "=", unitId);
         cnd.andEX("unionId", "=", unionId);
-        cnd.desc("applyDate").desc("opAt");
         if (StrUtil.isNotEmpty(notes)) {
             cnd.andEX("notes", "like", "%" + notes + "%");
         }
+        if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword()));
+        }
         if (StrUtil.isAllNotEmpty(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.orderBy(pageForm.getPageOrderName(), pageForm.getPageOrderBy());
+        }else{
+            cnd.desc("applyDate").desc("opAt");
         }
         sql.setCondition(cnd);
         return baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
diff --git a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java
index 5d2a391..7e10542 100644
--- a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java
+++ b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java
@@ -57,11 +57,14 @@ public class preAuditSchoolController {
         if (StrUtil.isNotEmpty(notes)) {
             cnd.andEX("notes", "like", "%" + notes + "%");
         }
-        cnd.andEX("userId", "=", ShiroUtil.getUserId());
-        cnd.desc("applyDate").desc("opAt");
 
+        if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) {
+            cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword()));
+        }
         if (StrUtil.isAllNotEmpty(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.orderBy(pageForm.getPageOrderName(), pageForm.getPageOrderBy());
+        }else{
+            cnd.desc("applyDate").desc("opAt");
         }
         sql.setCondition(cnd);
         return baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
diff --git a/src/main/resources/views/platform/reimbursementPreAudit/audit.html b/src/main/resources/views/platform/reimbursementPreAudit/audit.html
index 5e9a36f..91064e5 100644
--- a/src/main/resources/views/platform/reimbursementPreAudit/audit.html
+++ b/src/main/resources/views/platform/reimbursementPreAudit/audit.html
@@ -16,22 +16,40 @@ layout("/layouts/platform.html"){
                     <div class="search-item-label">年&emsp;&emsp;度：</div>
                     <div class="search-item-option">
                         <el-date-picker
-                            placeholder="选择年"
-                            style="width: 100%"
-                            type="year" v-model="pageForm.year"
-                            value-format="yyyy">
+                                placeholder="选择年"
+                                style="width: 100%"
+                                type="year" v-model="pageForm.year"
+                                value-format="yyyy">
                         </el-date-picker>
                     </div>
                 </div>
 
                 <div class="search-item">
-                    <div class="search-item-label">事由：</div>
+                    <div class="search-item-label">姓名/工号：</div>
                     <div class="search-item-option">
-                        <el-input v-model="pageForm.notes" placeholder="请选择或输入摘要" clearable>
+                        <el-input @keyup.enter.native="doSearch" clearable
+                                  placeholder="请输入内容"
+                                  v-model="pageForm.searchKeyword">
+                            <el-select clearable placeholder="查询类型"
+                                       slot="prepend"
+                                       style="width: 100px;"
+                                       v-model="pageForm.searchName">
+                                <el-option label="姓名" value="userName"></el-option>
+                                <el-option label="工号" value="loginName"></el-option>
+                            </el-select>
                         </el-input>
                     </div>
                 </div>
 
+                <div class="search-item">
+                    <div class="search-item-label">摘要：</div>
+                    <div class="search-item-option">
+                        <el-input v-model="pageForm.notes" placeholder="请输入摘要" clearable>
+                        </el-input>
+                    </div>
+                </div>
+
+
                 <div class="search-item">
                     <div class="search-item-label">所属工会：</div>
                     <div class="search-item-option">
@@ -82,12 +100,12 @@ layout("/layouts/platform.html"){
                                  type="index"
                                  width="80px"></el-table-column>
                 <el-table-column
-                    :label="column.label"
-                    :prop="column.prop"
-                    :sortable="column.sortable"
-                    align="center"
-                    header-align="center"
-                    v-for="column in tableColumns">
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        v-for="column in tableColumns">
                     <template scope="{row}" v-if="column.prop==='auditState'">
                         <el-tag v-if="row.auditState===0" type="info">保存中</el-tag>
                         <el-tag v-if="row.auditState===1" type="info">待审核</el-tag>
@@ -112,10 +130,10 @@ layout("/layouts/platform.html"){
     </guava>
 
     <el-dialog
-        title="预审材料信息"
-        :visible.sync="dialogVisible"
-        width="40%"
-        :close-on-click-modal="false"
+            title="预审材料信息"
+            :visible.sync="dialogVisible"
+            width="40%"
+            :close-on-click-modal="false"
     >
         <info ref="auditInfo">
             <template #handle>
@@ -155,10 +173,10 @@ layout("/layouts/platform.html"){
     </el-dialog>
 
     <el-dialog
-        title="预审材料信息"
-        :visible.sync="viewDialogVisible"
-        width="50%"
-        :close-on-click-modal="false">
+            title="预审材料信息"
+            :visible.sync="viewDialogVisible"
+            width="50%"
+            :close-on-click-modal="false">
         <info ref="info"></info>
         <span slot="footer" class="dialog-footer">
     <el-button @click="viewDialogVisible = false" type="primary">关 闭</el-button>
@@ -176,16 +194,17 @@ layout("/layouts/platform.html"){
                 unions: [],
                 pageForm: {
                     auditState: 0,
+                    searchName: "userName",
                     year: new Date().getFullYear() + ""
                 },
                 tableColumns: [
-                    { prop: "loginName", label: "工号" },
-                    { prop: "userName", label: "姓名" },
-                    { prop: "unitName", label: "单位" },
-                    { prop: "unionName", label: "工会" },
-                    { prop: "notes", label: "事由" },
-                    { prop: "applyDate", label: "填写时间" },
-                    { prop: "auditState", label: "状态" }
+                    {prop: "loginName", label: "工号"},
+                    {prop: "userName", label: "姓名"},
+                    {prop: "unitName", label: "单位"},
+                    {prop: "unionName", label: "工会"},
+                    {prop: "notes", label: "事由"},
+                    {prop: "applyDate", label: "填写时间"},
+                    {prop: "auditState", label: "状态"}
                 ],
                 formRules: {},
                 dialogVisible: false,
diff --git a/src/main/resources/views/platform/reimbursementPreAudit/query.html b/src/main/resources/views/platform/reimbursementPreAudit/query.html
index e9e7888..be9af6b 100644
--- a/src/main/resources/views/platform/reimbursementPreAudit/query.html
+++ b/src/main/resources/views/platform/reimbursementPreAudit/query.html
@@ -16,25 +16,42 @@ layout("/layouts/platform.html"){
                     <div class="search-item-label">时间段：</div>
                     <div class="search-item-option">
                         <el-date-picker
-                            v-model="pageForm.date"
-                            type="daterange"
-                            @change="dateChange"
-                            align="right"
-                            unlink-panels
-                            value-format="yyyy-MM-dd"
-                            style="width: 100%"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                            :picker-options="pickerOptions">
+                                v-model="pageForm.date"
+                                type="daterange"
+                                @change="dateChange"
+                                align="right"
+                                unlink-panels
+                                value-format="yyyy-MM-dd"
+                                style="width: 100%"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                :picker-options="pickerOptions">
                         </el-date-picker>
                     </div>
                 </div>
 
                 <div class="search-item">
-                    <div class="search-item-label">事由：</div>
+                    <div class="search-item-label">姓名/工号：</div>
                     <div class="search-item-option">
-                        <el-input v-model="pageForm.notes" placeholder="请选择或输入摘要" clearable>
+                        <el-input @keyup.enter.native="doSearch" clearable
+                                  placeholder="请输入内容"
+                                  v-model="pageForm.searchKeyword">
+                            <el-select clearable placeholder="查询类型"
+                                       slot="prepend"
+                                       style="width: 100px;"
+                                       v-model="pageForm.searchName">
+                                <el-option label="姓名" value="userName"></el-option>
+                                <el-option label="工号" value="loginName"></el-option>
+                            </el-select>
+                        </el-input>
+                    </div>
+                </div>
+
+                <div class="search-item">
+                    <div class="search-item-label">摘要：</div>
+                    <div class="search-item-option">
+                        <el-input v-model="pageForm.notes" placeholder="请输入摘要" clearable>
                         </el-input>
                     </div>
                 </div>
@@ -85,12 +102,12 @@ layout("/layouts/platform.html"){
                                  type="index"
                                  width="80px"></el-table-column>
                 <el-table-column
-                    :label="column.label"
-                    :prop="column.prop"
-                    :sortable="column.sortable"
-                    align="center"
-                    header-align="center"
-                    v-for="column in tableColumns">
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        v-for="column in tableColumns">
                     <template scope="{row}" v-if="column.prop==='auditState'">
                         <el-tag v-if="row.auditState===0" type="info">保存中</el-tag>
                         <el-tag v-if="row.auditState===1" type="info">待审核</el-tag>
@@ -112,10 +129,10 @@ layout("/layouts/platform.html"){
     </guava>
 
     <el-dialog
-        title="预审材料信息"
-        :visible.sync="viewDialogVisible"
-        width="40%"
-        :close-on-click-modal="false">
+            title="预审材料信息"
+            :visible.sync="viewDialogVisible"
+            width="40%"
+            :close-on-click-modal="false">
         <info ref="info"></info>
         <span slot="footer" class="dialog-footer">
     <el-button @click="viewDialogVisible = false" type="primary">关 闭</el-button>
@@ -136,13 +153,13 @@ layout("/layouts/platform.html"){
                     year: new Date().getFullYear() + ""
                 },
                 tableColumns: [
-                    { prop: "loginName", label: "工号" },
-                    { prop: "userName", label: "姓名" },
-                    { prop: "unitName", label: "单位" },
-                    { prop: "unionName", label: "工会" },
-                    { prop: "notes", label: "事由" },
-                    { prop: "applyDate", label: "填写时间" },
-                    { prop: "auditState", label: "状态" }
+                    {prop: "loginName", label: "工号"},
+                    {prop: "userName", label: "姓名"},
+                    {prop: "unitName", label: "单位"},
+                    {prop: "unionName", label: "工会"},
+                    {prop: "notes", label: "事由"},
+                    {prop: "applyDate", label: "填写时间"},
+                    {prop: "auditState", label: "状态"}
                 ],
                 formRules: {},
                 viewDialogVisible: false,
diff --git a/src/main/resources/views/platform/sys/union/unionMange.html b/src/main/resources/views/platform/sys/union/unionMange.html
index 343e74b..e136343 100644
--- a/src/main/resources/views/platform/sys/union/unionMange.html
+++ b/src/main/resources/views/platform/sys/union/unionMange.html
@@ -126,7 +126,7 @@ layout("/layouts/platform.html"){
                                                    @click="doExport">导出
                                         </el-button>
                                         <el-button size="medium"
-                                                   @click="$refs.guava.view()">
+                                                   @click="$refs.guava.view();$refs.unionCadreAudit.pageData()">
                                             <i
                                                     class="el-icon-s-check"></i>
                                             基层干部审核
@@ -938,7 +938,7 @@ layout("/layouts/platform.html"){
 
 
         <template #view>
-            <union-cadre-audit :key="time"></union-cadre-audit>
+            <union-cadre-audit :key="time" ref="unionCadreAudit"></union-cadre-audit>
 
         </template>