From 19c431878bc5d3b06fbda3f3fa8ae5023790c837 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Wed, 15 Nov 2023 11:18:27 +0800
Subject: [PATCH] mqtt
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 5e97915..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;
}
}
@@ -795,12 +795,12 @@
// 减少 10 秒
LocalDateTime now = LocalDateTime.now(); // 获取当前日期时间
LocalDateTime earlier = now.minusSeconds(10); // 减少30秒
- System.out.println("当前日期时间：" + now);
- System.out.println("减少10秒后的日期时间：" + earlier);
RecordSonParam recordSonParam = new RecordSonParam();
recordSonParam.setUserId(userId);
- recordSonParam.setTime(fmt.format(now));
- recordSonParam.setBeforeTime(fmt.format(earlier));
+ String n = fmt.format(now);
+ recordSonParam.setTime(n);
+ String e = fmt.format(earlier);
+ recordSonParam.setBeforeTime(e);
//根据姓名ID为执行人获取所有对应的计划名称
List<ArdAppPatrolplan> list = patrolplanMapper.planUser(recordSonParam);
JSONArray jsonArray = new JSONArray();
--
Gitblit v1.9.3