作者 xiaohu thinkpad

统计学时问题修复

... ... @@ -3,7 +3,7 @@
<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$/simplewind/cmf/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/common.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -102,11 +102,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<caret line="48" column="41" lean-forward="true" selection-start-line="48" selection-start-column="41" selection-end-line="48" selection-end-column="41" />
</state>
</provider>
</entry>
... ... @@ -120,11 +120,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="common.php" pinned="false" current-in-tab="true">
<file leaf-file-name="common.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="607">
<caret line="2094" column="5" selection-start-line="2094" selection-start-column="5" selection-end-line="2094" selection-end-column="5" />
<state relative-caret-position="796">
<caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
</state>
</provider>
</entry>
... ... @@ -155,8 +155,8 @@
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
<state relative-caret-position="210">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
... ... @@ -240,9 +240,9 @@
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
<option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
</list>
</option>
</component>
... ... @@ -385,21 +385,7 @@
<workItem from="1536326693570" duration="30018000" />
<workItem from="1536496471879" duration="16852000" />
<workItem from="1536677895835" duration="7811000" />
<workItem from="1536940132237" duration="5466000" />
</task>
<task id="LOCAL-00026" summary="测试获取当前时段的老师">
<created>1535561095876</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1535561095876</updated>
</task>
<task id="LOCAL-00027" summary="我的订单详情标题">
<created>1535600080734</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1535600080734</updated>
<workItem from="1536940132237" duration="6229000" />
</task>
<task id="LOCAL-00028" summary="我的订单详情标题">
<created>1535633219778</created>
... ... @@ -730,11 +716,25 @@
<option name="project" value="LOCAL" />
<updated>1536980231752</updated>
</task>
<option name="localTasksCounter" value="75" />
<task id="LOCAL-00075" summary="统计学时问题修复">
<created>1536980337690</created>
<option name="number" value="00075" />
<option name="presentableId" value="LOCAL-00075" />
<option name="project" value="LOCAL" />
<updated>1536980337690</updated>
</task>
<task id="LOCAL-00076" summary="统计学时问题修复">
<created>1536980477645</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1536980477646</updated>
</task>
<option name="localTasksCounter" value="77" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="145048000" />
<option name="totallyTimeSpent" value="145811000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
... ... @@ -956,31 +956,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
<state relative-caret-position="297">
<caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" />
</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="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 relative-caret-position="796">
<caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" />
<state relative-caret-position="210">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
</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="607">
<caret line="2094" column="5" selection-start-line="2094" selection-start-column="5" selection-end-line="2094" selection-end-column="5" />
<state relative-caret-position="588">
<caret line="48" column="41" lean-forward="true" selection-start-line="48" selection-start-column="41" selection-end-line="48" selection-end-column="41" />
</state>
</provider>
</entry>
... ...
... ... @@ -37,7 +37,7 @@ class ProfileController extends UserBaseController
->where(['teach_id' => $uid, 'status' => 3])
->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
->select()->toArray();
$yyxs = $name ? $name[0]['yyxs'] : '0';
$yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
$this->assign("yyxs", $yyxs);
return $this->fetch('percenter_coach');
} else {
... ... @@ -45,7 +45,7 @@ class ProfileController extends UserBaseController
->where(['uid' => $uid, 'status' => 3])
->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
->select()->toArray();
$yyxs = $name ? $name[0]['yyxs'] : '0';
$yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
$this->assign("yyxs", $yyxs);
return $this->fetch('percenter_stu');
}
... ...