From bfb8e1786bb86acc4f5d9ed984dd517997469c10 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Fri, 24 Nov 2023 14:52:52 +0800
Subject: [PATCH] 优化application-dev

---
 ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 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 de23385..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,8 +795,6 @@
         // 减少 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);
         String n = fmt.format(now);

--
Gitblit v1.9.3