From e72010051542b3dcaef732447f88ec3ca4dcc2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 29 Aug 2024 15:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8A=80=E5=B8=88=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/dao/ArtificerTimeDao.java    |  1 +
 .../service/impl/ArtificerTimeServiceImpl.java     |  8 +-------
 .../mapper/artificer/ArtificerTimeDao.xml          | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/mapper/artificer/ArtificerTimeDao.xml

diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerTimeDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerTimeDao.java
index 832453c..94e8c58 100644
--- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerTimeDao.java
+++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerTimeDao.java
@@ -13,5 +13,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface ArtificerTimeDao extends BaseMapper<ArtificerTime> {
 
+    void deleteTime(Long artificerId,String startDay,String startTime,String endDay,String endTime);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java
index 2b6e293..2b960c4 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java
@@ -130,13 +130,7 @@ public class ArtificerTimeServiceImpl extends ServiceImpl<ArtificerTimeDao, Arti
             String[] datetime2 = idelTimes[1].split(" ");
             String endDay = datetime2[0];
             String endTime = datetime2[1];
-            QueryWrapper qw = new QueryWrapper<ArtificerTime>();
-            qw.eq("artificer_id", artificer.getArtificerId());
-            qw.ge("artificer_date", startDay);
-            qw.le("artificer_date", endDay);
-            qw.ge("artificer_time", startTime);
-            qw.le("artificer_time", endTime);
-            baseMapper.delete(qw);
+            baseMapper.deleteTime(artificer.getArtificerId(),startDay,startTime,endDay,endTime);
 
             QueryWrapper qwi = new QueryWrapper<ArtificerTimeIdel>();
             qwi.eq("artificer_id", artificer.getArtificerId());
diff --git a/src/main/resources/mapper/artificer/ArtificerTimeDao.xml b/src/main/resources/mapper/artificer/ArtificerTimeDao.xml
new file mode 100644
index 0000000..feddd71
--- /dev/null
+++ b/src/main/resources/mapper/artificer/ArtificerTimeDao.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.sqx.modules.artificer.dao.ArtificerTimeDao">
+
+    <delete id="deleteTime">
+        delete from artificer_time
+        where classify = 2
+        and artificer_id = #{artificerId}
+        and date_format(concat(artificer_date,' ',artificer_time),'%Y-%m-%d %H:%i') >= date_format(concat(#{startDay},' ',#{startTime}),'%Y-%m-%d %H:%i')
+        and date_format(concat(artificer_date,' ',artificer_time) ,'%Y-%m-%d %H:%i') &lt;= date_format(concat(#{endDay},' ',#{endTime}),'%Y-%m-%d %H:%i')
+    </delete>
+
+</mapper>
\ No newline at end of file