From 25c18d63f3310b5d762b88c750b8007045c2a44d Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 12 三月 2026 10:34:14 +0800
Subject: [PATCH] 出入库配置查询，显示调整
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java
index b69c986..350b2a6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PledgeContractService.java
@@ -7,7 +7,6 @@
import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.mapper.PledgeContractMapper;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -50,6 +49,18 @@
queryWrapper.orderByDesc("update_time");
return pledgeContractMapper.selectList(queryWrapper);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ
+ * @param id
+ * @return
+ */
+ public PledgeContract getOne(String id) {
+
+ QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", id);
+ return pledgeContractMapper.selectOne(queryWrapper);
}
@@ -96,7 +107,7 @@
* @param curTime
* @return
*/
- public List<PledgeContract> getContractByPledge(Date curTime) {
+ public List<PledgeContract> getContractByPledge(Date curTime, String bankId) {
QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", ContextUtil.getCompanyId());
@@ -104,8 +115,11 @@
queryWrapper.like("status", Constant.YN_N);
//璐ㄦ娂鏈熼棿
- queryWrapper.ge("pledge_start", curTime);
- queryWrapper.le("pledge_end", curTime);
+ queryWrapper.le("pledge_start", curTime);
+ queryWrapper.ge("pledge_end", curTime);
+ if (StringUtils.isNotBlank(bankId)) {
+ queryWrapper.eq("pledge_bank", bankId);
+ }
queryWrapper.orderByDesc("update_time");
--
Gitblit v1.9.3