xiugai

.idea/workspace.xml

@@ -25,8 +25,8 @@
       <file leaf-file-name="Upgrade.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="58" column="21" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="21" />
+            <state vertical-scroll-proportion="-3.6451614">
+              <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
               <folding>
                 <element signature="e#36#62#0#PHP" expanded="true" />
               </folding>
@@ -34,11 +34,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="version1" pinned="false" current-in-tab="false">
+      <file leaf-file-name="version1" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="48" column="57" selection-start-line="48" selection-start-column="57" selection-end-line="48" selection-end-column="57" />
+            <state vertical-scroll-proportion="0.18151815">
+              <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
               <folding />
             </state>
           </provider>
@@ -47,12 +47,12 @@
       <file leaf-file-name="Registerlist.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="82" column="29" selection-start-line="82" selection-start-column="29" selection-end-line="88" selection-end-column="29" />
+            <state vertical-scroll-proportion="-30.516129">
+              <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
               <folding>
-                <marker date="1542880903331" expanded="true" signature="5485:5740" placeholder="SELECT e.id,... exams" />
-                <marker date="1542880903331" expanded="true" signature="5771:6077" placeholder="SELECT e.id,... exams" />
-                <marker date="1542880903331" expanded="true" signature="7001:7129" placeholder="SELECT count... exams" />
+                <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
+                <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
+                <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
               </folding>
             </state>
           </provider>
@@ -74,7 +74,7 @@
       <file leaf-file-name="Application.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-3.548387">
+            <state vertical-scroll-proportion="-12.064516">
               <caret line="47" column="31" selection-start-line="47" selection-start-column="31" selection-end-line="47" selection-end-column="31" />
               <folding>
                 <element signature="e#39#60#0#PHP" expanded="true" />
@@ -83,11 +83,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.3495652">
-              <caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
+            <state vertical-scroll-proportion="-4.354839">
+              <caret line="122" column="24" selection-start-line="122" selection-start-column="24" selection-end-line="122" selection-end-column="24" />
               <folding />
             </state>
           </provider>
@@ -158,14 +158,15 @@
         <option value="$PROJECT_DIR$/application/database.php" />
         <option value="$PROJECT_DIR$/application/common/controller/Version.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
-        <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
-        <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
+        <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
+        <option value="$USER_HOME$/Desktop/version.sql" />
+        <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
       </list>
     </option>
   </component>
@@ -370,7 +371,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-9" y="0" width="1382" height="744" extended-state="1" />
+    <frame x="-9" y="0" width="1382" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21522693" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -413,13 +414,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/common/controller/Backend.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-62.225807">
-          <caret line="130" column="20" selection-start-line="130" selection-start-column="20" selection-end-line="130" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/api/controller/Ems.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.22956522">
@@ -515,6 +509,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.35130435">
           <caret line="307" column="20" selection-start-line="307" selection-start-column="20" selection-end-line="307" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -692,6 +687,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -735,61 +731,69 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="58" column="21" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="21" />
+          <caret line="90" column="29" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
           <folding>
-            <element signature="e#36#62#0#PHP" expanded="true" />
+            <marker date="1542881005370" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
+            <marker date="1542881005370" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="48" column="57" selection-start-line="48" selection-start-column="57" selection-end-line="48" selection-end-column="57" />
+        <state vertical-scroll-proportion="-4.354839">
+          <caret line="122" column="24" selection-start-line="122" selection-start-column="24" selection-end-line="122" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="82" column="29" selection-start-line="82" selection-start-column="29" selection-end-line="88" selection-end-column="29" />
+        <state vertical-scroll-proportion="-12.064516">
+          <caret line="47" column="31" selection-start-line="47" selection-start-column="31" selection-end-line="47" selection-end-column="31" />
           <folding>
-            <marker date="1542880903331" expanded="true" signature="5485:5740" placeholder="SELECT e.id,... exams" />
-            <marker date="1542880903331" expanded="true" signature="5771:6077" placeholder="SELECT e.id,... exams" />
-            <marker date="1542880903331" expanded="true" signature="7001:7129" placeholder="SELECT count... exams" />
+            <element signature="e#39#60#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="90" column="29" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+        <state vertical-scroll-proportion="-3.6451614">
+          <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
           <folding>
-            <marker date="1542881005370" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
-            <marker date="1542881005370" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
+            <element signature="e#36#62#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.548387">
-          <caret line="47" column="31" selection-start-line="47" selection-start-column="31" selection-end-line="47" selection-end-column="31" />
+        <state vertical-scroll-proportion="-30.516129">
+          <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
           <folding>
-            <element signature="e#39#60#0#PHP" expanded="true" />
+            <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
+            <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
+            <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+    <entry file="file://$USER_HOME$/Desktop/version.sql">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.72">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3495652">
-          <caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.18151815">
+          <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
           <folding />
         </state>
       </provider>

application/admin/command/Upgrade.php

@@ -33,10 +33,10 @@ class Upgrade extends Command
                 if(file_exists(__DIR__."\\..\\..\\common\\versionsql\\".$name)){
                     $info = file_get_contents(__DIR__."\\..\\..\\common\\versionsql\\".$name);
                     if(empty($info)){
-                        $output->writeln("没有找到对应文件");
+                        $output->writeln("找到版本文件");
                         continue;
                     }else{
-                        $output->writeln("找到版本文件");
+                        $output->writeln("\033[31m 没有找到对应文件 \033[0m");
                     }
                     $sqlarr = explode(';',$info);
                     foreach ($sqlarr as $k => $v) {
@@ -51,14 +51,14 @@ class Upgrade extends Command
                                 $output->writeln("执行成功，版本");
                             }else{
                                 $errarr[] = $v;
-                                $output->writeln("执行失败");
+                                $output->writeln("\033[31m 执行失败 \033[0m");
                             }
                         }catch(\Exception $e){
-                            $output->writeln("SQL错误，".$e->getMessage());
+                            $output->writeln("\033[31m SQL错误，".$e->getMessage()." \033[0m");
                         }
                     }
                 }else{
-                    $output->writeln("未找到版本更新文件");
+                    $output->writeln("\033[31m 未找到版本更新文件 \033[0m");
                 }
                 $ver = $oldversion;
             }
@@ -67,7 +67,7 @@ class Upgrade extends Command
                 // 数据库版本更新
                 DB::table('version')->where('id',1)->update(['version'=>$ver]);
             }else{
-                $output->writeln($errarr);
+                $output->writeln("\033[31m $errarr \033[0m");
             }
         }
     }

application/common/versionsql/version1

@@ -1,3 +1,9 @@
+CREATE TABLE if not exists `version` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+INSERT INTO `version` VALUES ('1', '1');
 CREATE TABLE  if not exists `oss_callbacks`(
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `md5` varchar(255) NOT NULL,

application/inter/controller/Registerlist.php

@@ -83,7 +83,11 @@ class Registerlist extends Base
                             }
                             $data1 = str_replace('-', '',$v[0]);
                             $data2 = str_replace('-', '',$v[1]);
-                            $where = " and e.exam_datetime between '$data1' and '$data2'";
+                            if($data1 == $data2){
+                                $where .= " and e.exam_datetime ='$data2'";
+                            }else{
+                                $where .= " and e.exam_datetime between '$data1' and '$data2'";
+                            }
                             break;
                         case 'exam_class' :
                             if(empty($v)){