培训的签到开始时间与迟到截止时间，新规则

application/admin/controller/Tongji.php

@@ -66,7 +66,7 @@ class Tongji extends Backend
 //        dump($exam_grade);
 
         //应该参加培训的人
-        $train_active = Db::name('train_active')->where('sign_endtime','BETWEEN',[$starttime,$endtime])->where('deletetime',NULL)->column('id,user_ids');
+        $train_active = Db::name('train_active')->where('starttime','BETWEEN',[$starttime,$endtime])->where('deletetime',NULL)->column('id,user_ids');
 //        dump($train_active);
         $new_train_active = [];
         foreach($train_active as $key => $val){

application/admin/lang/zh-cn/trainactive.php

@@ -28,7 +28,8 @@ return [
     'Pingjia_image'     => '评价电子签',
     'Pingjia_time'      => '评价时间',
     'Pingjia_uid'       => '评价用户ID',
-    'Sign_endtime'      => '签到截止时间',
+    'Sign_starttime'    => '签到开始时间',
+    'Sign_endtime'      => '签到迟到分界时间',
     'User_ids'          => '可参与人员',
     'Createtime'        => '发布时间',
     'Status'            => '状态',

application/admin/view/trainactive/add.html

@@ -182,6 +182,12 @@
     </div>
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_starttime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sign_starttime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_starttime]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sign_endtime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-sign_endtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_endtime]" type="text" value="{:date('Y-m-d H:i:s')}">

application/admin/view/trainactive/edit.html

@@ -195,6 +195,12 @@
     </div>
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_starttime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sign_starttime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_starttime]" type="text" value="{:$row.sign_starttime?datetime($row.sign_starttime):''}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sign_endtime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-sign_endtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_endtime]" type="text" value="{:$row.sign_endtime?datetime($row.sign_endtime):''}">

application/admin/view/trainactive/qrcode.html

@@ -61,9 +61,9 @@
             </td>
         </tr>
         <tr>
-            <td>签到截止时间</td>
+            <td>签到时间</td>
             <td>
-               {$row.sign_endtime|date="Y-m-d H:i",###}
+                {$row.sign_starttime|date="Y-m-d H:i",###} - {$row.sign_endtime|date="Y-m-d H:i",###}
             </td>
         </tr>
         <tr>

application/api/controller/Trainactive.php

@@ -115,11 +115,12 @@ class Trainactive extends Api
         }
 
         //判断
-        if(time() < $info['starttime']){
+        if(time() < $info['sign_starttime']){
             $this->error('还没到签到开始时间');
         }
         if(time() > $info['endtime']){
-            $this->error('已错过签到截止时间');
+            $this->error('培训已经结束了');
+//            $this->error('已错过签到截止时间');
         }
 
         //签到