统计学时问题修复

xiaohu thinkpad
.idea/workspace.xml
simplewind/cmf/common.php
--- a/.idea/workspace.xml
查看文件 @c661e57
+++ b/.idea/workspace.xml
查看文件 @c661e57
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <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/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/simplewind/cmf/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/common.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -103,11 +102,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
+            <state relative-caret-position="588">
+              <caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
             </state>
           </provider>
         </entry>
@@ -121,11 +120,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="common.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="775">
-              <caret line="2102" column="30" selection-start-line="2102" selection-start-column="30" selection-end-line="2102" selection-end-column="30" />
+            <state relative-caret-position="607">
+              <caret line="2094" column="22" selection-start-line="2094" selection-start-column="22" selection-end-line="2094" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -233,8 +232,8 @@
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
         <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
         <option value="$PROJECT_DIR$/public/index.php" />
-        <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
         <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
+        <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
       </list>
     </option>
   </component>
@@ -377,21 +376,7 @@
       <workItem from="1536326693570" duration="30018000" />
       <workItem from="1536496471879" duration="16852000" />
       <workItem from="1536677895835" duration="7811000" />
-      <workItem from="1536940132237" duration="4988000" />
-    </task>
-    <task id="LOCAL-00022" summary="测试获取当前时段的老师">
-      <created>1535559978125</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1535559978125</updated>
-    </task>
-    <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>
+      <workItem from="1536940132237" duration="5232000" />
     </task>
     <task id="LOCAL-00024" summary="测试获取当前时段的老师">
       <created>1535560747816</created>
@@ -722,11 +707,25 @@
       <option name="project" value="LOCAL" />
       <updated>1536979616129</updated>
     </task>
-    <option name="localTasksCounter" value="71" />
+    <task id="LOCAL-00071" summary="统计学时问题修复">
+      <created>1536979859742</created>
+      <option name="number" value="00071" />
+      <option name="presentableId" value="LOCAL-00071" />
+      <option name="project" value="LOCAL" />
+      <updated>1536979859742</updated>
+    </task>
+    <task id="LOCAL-00072" summary="统计学时问题修复">
+      <created>1536980014690</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1536980014691</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="144570000" />
+    <option name="totallyTimeSpent" value="144814000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
@@ -956,17 +955,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
+    <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="775">
-          <caret line="2102" column="30" selection-start-line="2102" selection-start-column="30" selection-end-line="2102" selection-end-column="30" />
+        <state relative-caret-position="588">
+          <caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
+    <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
+        <state relative-caret-position="607">
+          <caret line="2094" column="22" selection-start-line="2094" selection-start-column="22" selection-end-line="2094" selection-end-column="22" />
         </state>
       </provider>
     </entry>
--- a/simplewind/cmf/common.php
查看文件 @c661e57
+++ b/simplewind/cmf/common.php
查看文件 @c661e57
@@ -2092,7 +2092,7 @@ function id_xueshi($id){
         ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
         ->select()->toArray();
 //    return Db::name('yuyue')->getLastSql();
-    return $name ;
+    return json($name) ;
     $yyxs = $name ? $name['yyxs'] : 0;
     return $yyxs;
 }