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 | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 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 0d2b9c4..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
@@ -1,6 +1,7 @@
package com.fzzy.igds.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.PledgeContract;
@@ -22,19 +23,64 @@
private PledgeContractMapper pledgeContractMapper;
public List<PledgeContract> listAll(IgdsBaseParam param) {
+ if (null == param) param = new IgdsBaseParam();
- if (null == param)
- return pledgeContractMapper.selectList(null);
-
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("company_id", param.getCompanyId());
if (StringUtils.isNotEmpty(param.getName())) {
queryWrapper.like("name", param.getName());
}
+ if (StringUtils.isNotEmpty(param.getBankId())) {
+ queryWrapper.eq("pledge_bank", param.getBankId());
+ }
+
+ if (StringUtils.isNotEmpty(param.getDeptId())) {
+ queryWrapper.eq("pledge_dept", param.getDeptId());
+ }
+
+ //鏍规嵁浠撳簱ID鍖归厤
+ if (StringUtils.isNotEmpty(param.getDepotId())) {
+ queryWrapper.like("depot_ids", param.getDepotId());
+ }
+
+ 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);
+ }
+
+
+ /**
+ * 鏍规嵁浠撳簱ID鑾峰彇璐ㄦ娂淇℃伅
+ * @param param 鍙傛暟
+ * @return 璐ㄦ娂淇℃伅
+ */
+ public PledgeContract getByDepotId(IgdsBaseParam param) {
+ if (null == param) return null;
+
+ List<PledgeContract> list = listAll(param);
+
+ if (null == list || list.isEmpty()) return null;
+
+ return list.get(0);
+ }
+
public BaseResp addData(PledgeContract pledgeContract) {
- if(StringUtils.isEmpty(pledgeContract.getId())){
+ if (StringUtils.isEmpty(pledgeContract.getId())) {
pledgeContract.setId(ContextUtil.generateOrderId("PC"));
}
pledgeContract.setCompanyId(ContextUtil.getCompanyId());
@@ -55,4 +101,28 @@
return pledgeContractMapper.deleteById(pledgeContract) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
}
+
+ /**
+ * 鑾峰彇璐ㄦ娂鏈夋晥鏈熷唴鐨勫悎鍚屼俊鎭�
+ * @param curTime
+ * @return
+ */
+ public List<PledgeContract> getContractByPledge(Date curTime, String bankId) {
+ QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("company_id", ContextUtil.getCompanyId());
+
+ //鏈В鎶�
+ queryWrapper.like("status", Constant.YN_N);
+
+ //璐ㄦ娂鏈熼棿
+ queryWrapper.le("pledge_start", curTime);
+ queryWrapper.ge("pledge_end", curTime);
+ if (StringUtils.isNotBlank(bankId)) {
+ queryWrapper.eq("pledge_bank", bankId);
+ }
+
+ queryWrapper.orderByDesc("update_time");
+
+ return pledgeContractMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3