考勤

src/main/java/com/gogirl/domain/order/pay/OrderIncomeFlow.java

 package com.gogirl.domain.order.pay;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,6 +28,9 @@ public class OrderIncomeFlow implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
     private BigDecimal amount;
 
     @ApiModelProperty(value = "1-微信 2-pos机 3-现金")

src/main/java/com/gogirl/infrastructure/mapper/store/oa/TakeLeaveEventMapper.java

@@ -9,5 +9,12 @@ import java.util.List;
 
 public interface TakeLeaveEventMapper extends BaseMapper<TakeLeaveEvent> {
 
+    /**
+     *
+     * @param applyTechnicianId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
     List<TakeLeaveEvent> appliedList(@Param("applyTechnicianId") Integer applyTechnicianId, @Param("startTime") long startTime, @Param("endTime") long endTime);
 }

src/main/resources/mapper/store/TakeLeaveEventMapper.xml

 <?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.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper">
+
     <select id="appliedList" resultType="com.gogirl.domain.store.oa.TakeLeaveEvent">
         SELECT *
         from take_leave_event
-        where ((start_time &lt;= #{endTime} and end_time &gt;= #{endTime})
-            or (start_time &lt;= #{startTime} and start_time &gt;= #{startTime})
-            or (start_time &gt;= #{startTime} and end_time &lt;= #{endTime}))
+        where ((start_time &lt; #{endTime} and end_time &gt; #{endTime})
+            or (start_time &lt; #{startTime} and start_time &gt; #{startTime})
+            or (start_time &gt; #{startTime} and end_time &lt; #{endTime}))
           and apply_technician_id = #{applyTechnicianId}
           and `status` != 3
     </select>
+
 </mapper>
\ No newline at end of file