From e94cb6da040c03cbb33d96c0fb438c76bc20c6ac Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 14 八月 2023 17:11:45 +0800
Subject: [PATCH] 优化拉流列表和协议
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 13 +++++++++----
1 files changed, 9 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 b9ff8f1..ecd6d16 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
@@ -364,10 +364,15 @@
String toDay = ardAppPatrolpointRecordParam.getToDay();
String planId = ardAppPatrolpointRecordParam.getPlanId();
String userId = ardAppPatrolpointRecordParam.getUserId();
+ String planName = ardAppPatrolpointRecordParam.getPlanName();
+ String userName = ardAppPatrolpointRecordParam.getUserName();
QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("plan_id", planId).eq("user_id",userId).like("record_time", toDay);
//褰撳墠璁″垝閫変腑鏃堕棿閲屾鐢ㄦ埛鐨勬墦鍗¤褰�
List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
+ if(list.size()==0){
+
+ }
for (ArdAppPatrolpointRecord appPatrolpointRecord : list) {
QueryWrapper<ArdAppPatrolpointRecordImg> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("app_patrolponit_record_id", appPatrolpointRecord.getId());
@@ -394,11 +399,11 @@
ardAppPatrolpointRecord.setAppPatrolpointsId(well);
ardAppPatrolpointRecord.setAppPatrolpointsName(ardAlarmpointsWell.getWellId());
ardAppPatrolpointRecord.setPlanId(planId);
- ardAppPatrolpointRecord.setPlanName(list.get(0).getPlanName());
+ ardAppPatrolpointRecord.setPlanName(planName);
ardAppPatrolpointRecord.setUserId(userId);
- ardAppPatrolpointRecord.setUserName(list.get(0).getUserName());
- ardAppPatrolpointRecord.setLatitude(ardAlarmpointsWell.getLatitude().toString());
- ardAppPatrolpointRecord.setLongitude(ardAlarmpointsWell.getLongitude().toString());
+ ardAppPatrolpointRecord.setUserName(userName);
+ ardAppPatrolpointRecord.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
+ ardAppPatrolpointRecord.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
list.add(ardAppPatrolpointRecord);
}
}
--
Gitblit v1.9.3