From a3d274cc185968709ff240cd77a11a31df045183 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 27 五月 2024 14:25:29 +0800
Subject: [PATCH] 设备健康获取某油井一段时间的测量趋势修改提交
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..ff81864 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;
}
}
@@ -768,7 +768,7 @@
SysUser user = sysUserMapper.selectById(userId);
String userName = user.getNickName();
//鏌ヨ璇ヨ鍒掔殑鎵�鏈夊叴瓒ｇ偣
- ArdAlarmpointsWell ardAlarmpointsWell = wellMapper.selectById(wellId);
+ ArdAlarmpointsWell ardAlarmpointsWell = wellMapper.getWellById(wellId);
//娌℃墦鍗＄殑鏁版嵁
ArdAppPatrolpointRecord record1 = new ArdAppPatrolpointRecord();
record1.setAppPatrolpointsId(ardAlarmpointsWell.getId());
--
Gitblit v1.9.3