From 5a95da1a62d685d77b9c28bc23464db3601305d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 26 Aug 2024 15:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E7=AD=89=E7=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AppArtificerIntegralServiceImpl.java          | 2 +-
 .../com/sqx/modules/task/service/impl/AllTaskServiceImpl.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java
index c42a1e7..9bf18ed 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java
@@ -261,7 +261,7 @@ public class AppArtificerIntegralServiceImpl implements AppArtificerIntegralServ
             }
             //差的等级
             subtractDj = item.getGrade();
-            ultimately = "上周期等级：" + artificer.getGrade() + "；本周期等级：" + grade + "；还差";
+            ultimately = "上周期等级：" + artificer.getGrade() + "；本周期到达等级：" + grade + "；还差";
             if(subtractSc.compareTo(BigDecimal.ZERO) >0){
                 ultimately = ultimately + subtractSc + "小时在线时长，";
             }
diff --git a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
index e9ba9b3..adeaee7 100644
--- a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
+++ b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
@@ -91,8 +91,9 @@ public class AllTaskServiceImpl implements AllTaskSercice {
             for(Artificer artificer : xsList){
                 String createTime = artificer.getCreateTime();
                 Date date = DateUtils.stringToDate(createTime,DateUtils.DATE_TIME_PATTERN);
+                date = DateUtils.addDateDays(date,7);
                 Date current = calendar.getTime();
-                if(date.getTime()>=current.getTime()){
+                if(current.getTime()>=date.getTime()){
                     artificer.setGrade(jsdj.getGrade());
                     QueryWrapper<BlArtificerZqhz> zqhzQuery = new QueryWrapper<BlArtificerZqhz>();
                     sjgzQuery.eq("artificer_id",artificer.getArtificerId());