From d7259796b1e677c8ebba973e32d86e55b283cb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 12 Aug 2024 23:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artificer/service/impl/ArtificerServiceImpl.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
index 88cca67..7bcf24c 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
@@ -171,7 +171,8 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
                         if(oldDate.equals(date)){
                             artificer.setTime(stringBuilder.toString());
                         }else{
-                            artificer.setTime(md.format(calendar.getTime())+" "+stringBuilder.toString());
+//                            artificer.setTime(md.format(calendar.getTime())+" "+stringBuilder.toString());
+                            artificer.setTime(simpleDateFormat.format(calendar.getTime())+" "+stringBuilder.toString());
                         }
                         if(artificer.getStatus()!=null && artificer.getStatus()==2){
                             artificer.setState(3);
@@ -201,12 +202,12 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
                 }
                 //2.服务开始前及结束后预留出行时间
                 //精油往后延30 分钟，中医往后延60 分钟
-                if(artificer.getClassifyId()==95){
+//                if(artificer.getClassifyId()==95){
                     String time = artificer.getTime();
                     //在精油的基础上加30 分钟就是中医~~
                     DateTime dateTime1 = DateUtil.offsetMinute(DateUtil.parse(time), 30);
                     artificer.setTime(DateUtil.format(dateTime1,"HH:mm"));
-                }
+//                }
             }
         }else{