外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 2f3faadab746c6415a8f53833e9a72fb3fe47e7e 1 个父辈 e65bc50e

统计学时问题修复

内嵌 并排对比
正在显示 2 个修改的文件 包含 40 行增加 和 40 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/simplewind/cmf/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/common.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -102,11 +102,11 @@ @@ -102,11 +102,11 @@
102 </provider> 102 </provider>
103 </entry> 103 </entry>
104 </file> 104 </file>
105 - <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false"> 105 + <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true">
106 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php"> 106 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
107 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
108 <state relative-caret-position="588"> 108 <state relative-caret-position="588">
109 - <caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" /> 109 + <caret line="48" column="41" lean-forward="true" selection-start-line="48" selection-start-column="41" selection-end-line="48" selection-end-column="41" />
110 </state> 110 </state>
111 </provider> 111 </provider>
112 </entry> 112 </entry>
@@ -120,11 +120,11 @@ @@ -120,11 +120,11 @@
120 </provider> 120 </provider>
121 </entry> 121 </entry>
122 </file> 122 </file>
123 - <file leaf-file-name="common.php" pinned="false" current-in-tab="true"> 123 + <file leaf-file-name="common.php" pinned="false" current-in-tab="false">
124 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 124 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
125 <provider selected="true" editor-type-id="text-editor"> 125 <provider selected="true" editor-type-id="text-editor">
126 - <state relative-caret-position="607">  
127 - <caret line="2094" column="5" selection-start-line="2094" selection-start-column="5" selection-end-line="2094" selection-end-column="5" /> 126 + <state relative-caret-position="796">
  127 + <caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
128 </state> 128 </state>
129 </provider> 129 </provider>
130 </entry> 130 </entry>
@@ -155,8 +155,8 @@ @@ -155,8 +155,8 @@
155 <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> 155 <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
156 <entry file="file://$PROJECT_DIR$/public/index.php"> 156 <entry file="file://$PROJECT_DIR$/public/index.php">
157 <provider selected="true" editor-type-id="text-editor"> 157 <provider selected="true" editor-type-id="text-editor">
158 - <state relative-caret-position="126">  
159 - <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" /> 158 + <state relative-caret-position="210">
  159 + <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
160 </state> 160 </state>
161 </provider> 161 </provider>
162 </entry> 162 </entry>
@@ -240,9 +240,9 @@ @@ -240,9 +240,9 @@
240 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" /> 240 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
241 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" /> 241 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
242 <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" /> 242 <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
  243 + <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
243 <option value="$PROJECT_DIR$/public/index.php" /> 244 <option value="$PROJECT_DIR$/public/index.php" />
244 <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" /> 245 <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
245 - <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />  
246 </list> 246 </list>
247 </option> 247 </option>
248 </component> 248 </component>
@@ -385,21 +385,7 @@ @@ -385,21 +385,7 @@
385 <workItem from="1536326693570" duration="30018000" /> 385 <workItem from="1536326693570" duration="30018000" />
386 <workItem from="1536496471879" duration="16852000" /> 386 <workItem from="1536496471879" duration="16852000" />
387 <workItem from="1536677895835" duration="7811000" /> 387 <workItem from="1536677895835" duration="7811000" />
388 - <workItem from="1536940132237" duration="5466000" />  
389 - </task>  
390 - <task id="LOCAL-00026" summary="测试获取当前时段的老师">  
391 - <created>1535561095876</created>  
392 - <option name="number" value="00026" />  
393 - <option name="presentableId" value="LOCAL-00026" />  
394 - <option name="project" value="LOCAL" />  
395 - <updated>1535561095876</updated>  
396 - </task>  
397 - <task id="LOCAL-00027" summary="我的订单详情标题">  
398 - <created>1535600080734</created>  
399 - <option name="number" value="00027" />  
400 - <option name="presentableId" value="LOCAL-00027" />  
401 - <option name="project" value="LOCAL" />  
402 - <updated>1535600080734</updated> 388 + <workItem from="1536940132237" duration="6229000" />
403 </task> 389 </task>
404 <task id="LOCAL-00028" summary="我的订单详情标题"> 390 <task id="LOCAL-00028" summary="我的订单详情标题">
405 <created>1535633219778</created> 391 <created>1535633219778</created>
@@ -730,11 +716,25 @@ @@ -730,11 +716,25 @@
730 <option name="project" value="LOCAL" /> 716 <option name="project" value="LOCAL" />
731 <updated>1536980231752</updated> 717 <updated>1536980231752</updated>
732 </task> 718 </task>
733 - <option name="localTasksCounter" value="75" /> 719 + <task id="LOCAL-00075" summary="统计学时问题修复">
  720 + <created>1536980337690</created>
  721 + <option name="number" value="00075" />
  722 + <option name="presentableId" value="LOCAL-00075" />
  723 + <option name="project" value="LOCAL" />
  724 + <updated>1536980337690</updated>
  725 + </task>
  726 + <task id="LOCAL-00076" summary="统计学时问题修复">
  727 + <created>1536980477645</created>
  728 + <option name="number" value="00076" />
  729 + <option name="presentableId" value="LOCAL-00076" />
  730 + <option name="project" value="LOCAL" />
  731 + <updated>1536980477646</updated>
  732 + </task>
  733 + <option name="localTasksCounter" value="77" />
734 <servers /> 734 <servers />
735 </component> 735 </component>
736 <component name="TimeTrackingManager"> 736 <component name="TimeTrackingManager">
737 - <option name="totallyTimeSpent" value="145048000" /> 737 + <option name="totallyTimeSpent" value="145811000" />
738 </component> 738 </component>
739 <component name="ToolWindowManager"> 739 <component name="ToolWindowManager">
740 <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" /> 740 <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
@@ -956,31 +956,31 @@ @@ -956,31 +956,31 @@
956 </state> 956 </state>
957 </provider> 957 </provider>
958 </entry> 958 </entry>
959 - <entry file="file://$PROJECT_DIR$/public/index.php"> 959 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
960 <provider selected="true" editor-type-id="text-editor"> 960 <provider selected="true" editor-type-id="text-editor">
961 - <state relative-caret-position="126">  
962 - <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" /> 961 + <state relative-caret-position="297">
  962 + <caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" />
963 </state> 963 </state>
964 </provider> 964 </provider>
965 </entry> 965 </entry>
966 - <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php"> 966 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
967 <provider selected="true" editor-type-id="text-editor"> 967 <provider selected="true" editor-type-id="text-editor">
968 - <state relative-caret-position="588">  
969 - <caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" /> 968 + <state relative-caret-position="796">
  969 + <caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
970 </state> 970 </state>
971 </provider> 971 </provider>
972 </entry> 972 </entry>
973 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"> 973 + <entry file="file://$PROJECT_DIR$/public/index.php">
974 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
975 - <state relative-caret-position="297">  
976 - <caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" /> 975 + <state relative-caret-position="210">
  976 + <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
977 </state> 977 </state>
978 </provider> 978 </provider>
979 </entry> 979 </entry>
980 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 980 + <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
981 <provider selected="true" editor-type-id="text-editor"> 981 <provider selected="true" editor-type-id="text-editor">
982 - <state relative-caret-position="607">  
983 - <caret line="2094" column="5" selection-start-line="2094" selection-start-column="5" selection-end-line="2094" selection-end-column="5" /> 982 + <state relative-caret-position="588">
  983 + <caret line="48" column="41" lean-forward="true" selection-start-line="48" selection-start-column="41" selection-end-line="48" selection-end-column="41" />
984 </state> 984 </state>
985 </provider> 985 </provider>
986 </entry> 986 </entry>
@@ -37,7 +37,7 @@ class ProfileController extends UserBaseController @@ -37,7 +37,7 @@ class ProfileController extends UserBaseController
37 ->where(['teach_id' => $uid, 'status' => 3]) 37 ->where(['teach_id' => $uid, 'status' => 3])
38 ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ') 38 ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
39 ->select()->toArray(); 39 ->select()->toArray();
40 - $yyxs = $name ? $name[0]['yyxs'] : '0'; 40 + $yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
41 $this->assign("yyxs", $yyxs); 41 $this->assign("yyxs", $yyxs);
42 return $this->fetch('percenter_coach'); 42 return $this->fetch('percenter_coach');
43 } else { 43 } else {
@@ -45,7 +45,7 @@ class ProfileController extends UserBaseController @@ -45,7 +45,7 @@ class ProfileController extends UserBaseController
45 ->where(['uid' => $uid, 'status' => 3]) 45 ->where(['uid' => $uid, 'status' => 3])
46 ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ') 46 ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
47 ->select()->toArray(); 47 ->select()->toArray();
48 - $yyxs = $name ? $name[0]['yyxs'] : '0'; 48 + $yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
49 $this->assign("yyxs", $yyxs); 49 $this->assign("yyxs", $yyxs);
50 return $this->fetch('percenter_stu'); 50 return $this->fetch('percenter_stu');
51 } 51 }