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

commit

Browse Source
This commit is contained in:
JyuHsin
2025-04-19 11:44:17 +08:00
parent cb98cde95d
commit d3524f8e8e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java
+3 -1
View File
@@ -37,7 +37,7 @@ public class preAuditQueryController {
@At @At
@ViReturn @ViReturn
@RequiresPermissions("reimbursementPreAudit.manage") @RequiresPermissions("reimbursementPreAudit.manage")
public Object pageData(PageForm pageForm, String startDate, String endDate, String notes) { public Object pageData(PageForm pageForm, String startDate, String endDate, String notes,String unitId,String unionId) {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT * FROM `reimbursement_pre_audit` $condition SELECT * FROM `reimbursement_pre_audit` $condition
@@ -46,6 +46,8 @@ public class preAuditQueryController {
cnd.andEX("applyDate", "<=", endDate); cnd.andEX("applyDate", "<=", endDate);
cnd.andEX("userId", "=", ShiroUtil.getUserId()); 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"); cnd.desc("applyDate").desc("opAt");
if (StrUtil.isNotEmpty(notes)) { if (StrUtil.isNotEmpty(notes)) {
cnd.andEX("notes", "like", "%" + notes + "%"); cnd.andEX("notes", "like", "%" + notes + "%");
src/main/resources/views/platform/member/info/GroupInfo.html
+1 -1
View File
@@ -191,7 +191,7 @@ layout("/layouts/platform.html"){
<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
style="width: 100%" style="width: 400px"
v-model="pageForm.memberJoinTime" v-model="pageForm.memberJoinTime"
type="daterange" type="daterange"
range-separator="至" range-separator="至"