测试获取当前时段的老师

@@ -4,7 +4,6 @@
     <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/portal/controller/ToolController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/portal/controller/ToolController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -18,11 +17,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
+            <state relative-caret-position="672">
+              <caret line="84" column="9" lean-forward="true" selection-start-line="84" selection-start-column="9" selection-end-line="84" selection-end-column="9" />
               <folding>
                 <element signature="e#636#668#0#PHP" expanded="true" />
                 <element signature="e#911#990#0#PHP" />
@@ -161,11 +160,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="ToolController.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="18" column="1" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+            <state relative-caret-position="315">
+              <caret line="26" column="28" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -256,8 +255,8 @@
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
-        <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
         <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
+        <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
       </list>
     </option>
   </component>
@@ -379,7 +378,7 @@
       <workItem from="1535458114609" duration="13848000" />
       <workItem from="1535514127808" duration="727000" />
       <workItem from="1535532970259" duration="2527000" />
-      <workItem from="1535546044129" duration="10661000" />
+      <workItem from="1535546044129" duration="11262000" />
     </task>
     <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
       <created>1535458170068</created>
@@ -535,11 +534,25 @@
       <option name="project" value="LOCAL" />
       <updated>1535559978125</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="测试获取当前时段的老师">
+      <created>1535560263207</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1535560263207</updated>
+    </task>
+    <task id="LOCAL-00024" summary="测试获取当前时段的老师">
+      <created>1535560747816</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1535560747819</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44299000" />
+    <option name="totallyTimeSpent" value="44900000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -907,13 +920,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="18" column="1" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3507">
@@ -923,8 +929,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
+        <state relative-caret-position="672">
+          <caret line="84" column="9" lean-forward="true" selection-start-line="84" selection-start-column="9" selection-end-line="84" selection-end-column="9" />
           <folding>
             <element signature="e#636#668#0#PHP" expanded="true" />
             <element signature="e#911#990#0#PHP" />
@@ -1053,5 +1059,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="26" column="28" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

@@ -17,23 +17,24 @@ use think\Db;
 
 class ToolController extends HomeBaseController
 {
+
     public function isMixTime($begintime1,$endtime1,$begintime2,$endtime2)
     {
         $status = $begintime2 - $begintime1;
         if($status>0){
             $status2 = $begintime2 - $endtime1;
             if($status2>=0){
-                return true;
-            }else{
                 return false;
+            }else{
+                return true;
             }
         }else{
             $status2 = $begintime1 - $endtime2;
             if($status2>=0){
-                return true;
+                return false;
             }else{
 
-                return false;
+                return true;
             }
         }
     }