外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 215d9e764b0472ebe18010d0d0b01f95d898b389 1 个父辈 ea679cb3

统计学时问题修复

内嵌 并排对比
正在显示 2 个修改的文件 包含 30 行增加 和 30 行删除
... ... @@ -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$/public/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.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" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -120,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="17" selection-start-line="2102" selection-start-column="17" selection-end-line="2102" selection-end-column="17" />
<state relative-caret-position="565">
<caret line="2092" column="19" lean-forward="true" selection-start-line="2092" selection-start-column="19" selection-end-line="2092" selection-end-column="19" />
</state>
</provider>
</entry>
... ... @@ -143,7 +143,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.php" pinned="false" current-in-tab="true">
<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">
... ... @@ -232,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$/app/user/controller/ProfileController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
</list>
</option>
</component>
... ... @@ -376,21 +376,7 @@
<workItem from="1536326693570" duration="30018000" />
<workItem from="1536496471879" duration="16852000" />
<workItem from="1536677895835" duration="7811000" />
<workItem from="1536940132237" duration="3578000" />
</task>
<task id="LOCAL-00018" summary="ceshi wode jiaolian">
<created>1535548842017</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1535548842017</updated>
</task>
<task id="LOCAL-00019" summary="测试获取当前时段的老师">
<created>1535559377550</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1535559377550</updated>
<workItem from="1536940132237" duration="4396000" />
</task>
<task id="LOCAL-00020" summary="测试获取当前时段的老师">
<created>1535559508443</created>
... ... @@ -721,11 +707,25 @@
<option name="project" value="LOCAL" />
<updated>1536977008226</updated>
</task>
<option name="localTasksCounter" value="67" />
<task id="LOCAL-00067" summary="统计学时问题修复">
<created>1536977579249</created>
<option name="number" value="00067" />
<option name="presentableId" value="LOCAL-00067" />
<option name="project" value="LOCAL" />
<updated>1536977579249</updated>
</task>
<task id="LOCAL-00068" summary="统计学时问题修复">
<created>1536977777123</created>
<option name="number" value="00068" />
<option name="presentableId" value="LOCAL-00068" />
<option name="project" value="LOCAL" />
<updated>1536977777123</updated>
</task>
<option name="localTasksCounter" value="69" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="143160000" />
<option name="totallyTimeSpent" value="143978000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
... ... @@ -955,17 +955,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="2102" column="17" selection-start-line="2102" selection-start-column="17" selection-end-line="2102" selection-end-column="17" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.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="565">
<caret line="2092" column="19" lean-forward="true" selection-start-line="2092" selection-start-column="19" selection-end-line="2092" selection-end-column="19" />
</state>
</provider>
</entry>
... ...
... ... @@ -2091,7 +2091,7 @@ function id_xueshi($id){
->where(['uid'=>$id,'status'=>'3'])
->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
->select();
echo Db::name('yuyue')->getLastSql();
return Db::name('yuyue')->getLastSql();
var_dump($name);
$yyxs = $name ? $name['yyxs'] : 0;
return $yyxs;
... ...