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 { + 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(); - 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(); 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 @@ + + + + + + + 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') <= date_format(concat(#{endDay},' ',#{endTime}),'%Y-%m-%d %H:%i') + + + \ No newline at end of file