外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 19c58aa99c4c5f90152ed3d98db74f968d16b447 1 个父辈 c3d105d8

统计学时问题修复

内嵌 并排对比
正在显示 2 个修改的文件 包含 37 行增加 和 22 行删除
... ... @@ -124,7 +124,16 @@
<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="22" selection-start-line="2094" selection-start-column="22" selection-end-line="2094" selection-end-column="22" />
<caret line="2094" column="5" selection-start-line="2094" selection-start-column="5" selection-end-line="2094" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.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>
</provider>
</entry>
... ... @@ -376,21 +385,7 @@
<workItem from="1536326693570" duration="30018000" />
<workItem from="1536496471879" duration="16852000" />
<workItem from="1536677895835" duration="7811000" />
<workItem from="1536940132237" duration="5232000" />
</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>
<task id="LOCAL-00025" summary="测试获取当前时段的老师">
<created>1535560861762</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1535560861762</updated>
<workItem from="1536940132237" duration="5466000" />
</task>
<task id="LOCAL-00026" summary="测试获取当前时段的老师">
<created>1535561095876</created>
... ... @@ -721,11 +716,25 @@
<option name="project" value="LOCAL" />
<updated>1536980014691</updated>
</task>
<option name="localTasksCounter" value="73" />
<task id="LOCAL-00073" summary="统计学时问题修复">
<created>1536980110186</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1536980110187</updated>
</task>
<task id="LOCAL-00074" summary="统计学时问题修复">
<created>1536980231752</created>
<option name="number" value="00074" />
<option name="presentableId" value="LOCAL-00074" />
<option name="project" value="LOCAL" />
<updated>1536980231752</updated>
</task>
<option name="localTasksCounter" value="75" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="144814000" />
<option name="totallyTimeSpent" value="145048000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
... ... @@ -801,7 +810,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit [2].html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController.php" />
... ... @@ -962,10 +970,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.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>
</provider>
</entry>
<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="22" selection-start-line="2094" selection-start-column="22" selection-end-line="2094" selection-end-column="22" />
<caret line="2094" column="5" selection-start-line="2094" selection-start-column="5" selection-end-line="2094" selection-end-column="5" />
</state>
</provider>
</entry>
... ...
... ... @@ -2092,8 +2092,8 @@ function id_xueshi($id){
->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
->select()->toArray();
// return Db::name('yuyue')->getLastSql();
return json_encode($name,true) ;
$yyxs = $name ? $name['yyxs'] : 0;
// return json_encode($name,true) ;
$yyxs = $name ? $name[0]['yyxs'] : 0;
return $yyxs;
}
function tid_xueshi($id){
... ...