From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入，判重兜底校验纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index b99a3f8..86a1468 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -15,9 +15,11 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -53,24 +55,26 @@
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏁版嵁
+ *
* @param page
* @param param
*/
public void pagePatrolData(Page<Patrol> page, IgdsBaseParam param) {
QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(param.getDeptId())){
+ if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.like("dept_id", param.getDeptId());
- }else {
- if(StringUtils.isNotBlank(param.getCompanyId())){
+ } else {
+ if (StringUtils.isNotBlank(param.getCompanyId())) {
queryWrapper.likeRight("dept_id", param.getCompanyId());
}
}
- if(null != param.getStart()){
+ if (null != param.getStart()) {
queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
}
- if(null != param.getEnd()){
+ if (null != param.getEnd()) {
queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
}
+ queryWrapper.orderByDesc("create_time");
patrolMapper.selectPage(page, queryWrapper);
}
@@ -78,10 +82,11 @@
/*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
/**
* 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
- * @param patrolId
+ *
+ * @param
* @return
*/
- public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
if(StringUtils.isBlank(patrolId)){
return null;
@@ -89,10 +94,37 @@
QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("patrol_id", patrolId);
+ queryWrapper.eq("user_id", userId);
+ queryWrapper.eq("conf_id", confId);
queryWrapper.orderByDesc("id");
return patrolRecordMapper.selectList(queryWrapper);
}
+ /*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
+
+ /**
+ * 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
+ *
+ * @param
+ * @return
+ */
+ public List<PatrolRecord> getRecordByPatrolId(Map<String, String> param) {
+ String patrolId = param.get("patrolId");
+
+ if (StringUtils.isBlank(patrolId)) {
+ return null;
+ }
+ String userName = param.get("name");
+
+ QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("patrol_id", patrolId);
+
+ if (userName != null) {
+ queryWrapper.eq("user_id", userName);
+ }
+ queryWrapper.orderByDesc("id");
+ return patrolRecordMapper.selectList(queryWrapper);
+ }
/*--------------------宸℃洿閰嶇疆琛ㄧ鐞�------------------*/
--
Gitblit v1.9.3