From b5bb69ff301470233bf193959f1a1c4553aaf86b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 23 一月 2024 09:20:51 +0800
Subject: [PATCH] app指挥端查看指挥端位置及车辆位置审批加入nickName提交
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
index 5ca3909..b04585d 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
@@ -661,14 +661,14 @@
int planNum = dayNum+onceNum;
//杩欏ぉ鎬诲叴瓒ｇ偣鏁�
int wellNum = dayWell+onceWell;
- QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id",userId).like("record_time",ymd);
- List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
//宸叉墦鍗℃�绘潯鏁�
+ QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id",userId).like("record_time",ymd).isNull("del");
+ List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
int num = list.size();
//搴旀墦鍗℃�绘潯鏁�
int record = planNum*wellNum;
- if(num==record){
+ if(num>=record){
recordBoolean = true;
}
}
--
Gitblit v1.9.3