push

src/main/java/com/yxproject/start/api/ReceiptApi.java

@@ -99,8 +99,6 @@ public class ReceiptApi {
                 if (countGroup == 0) {
                     //生成交接单
                     receiptService.createReceiptList(receiptListEntity);
-                    //todo  查询交接单对应的详单   循环遍历 是否生成对应详单   生成  不做操作   没有生成  遍历插入
-
                     for (int n = 0; n < receiptListDate.size(); n++) {
 //                            receiptService.
                         //查询这个身份证是否生成了详单

src/main/java/com/yxproject/start/api/SelectApi.java

 package com.yxproject.start.api;
 
-import com.yxproject.start.service.GroupNoService;
 import com.yxproject.start.service.SelectSerialNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java

@@ -177,14 +177,25 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     @Override
     public List<Map<String, Object>> selectReceiptListDate2(String id) {
-        List<Map<String, Object>> mapList = receiptMapper.selectReceiptListDate2(id);
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        if (id ==null){
+
+        }else {
+            mapList= receiptMapper.selectReceiptListDate2(id);
+
+        }
         return mapList;
     }
 
     @Override
     public String selectGroupNoById(String id) {
         List<Map<String, Object>> mapList = receiptMapper.selectGroupNoById(id);
-        return mapList.get(0).get("GROUPNO").toString();
+        if(mapList.size()>0){
+            return mapList.get(0).get("GROUPNO").toString();
+        }else {
+            return null;
+        }
+
     }
 
     @Override

src/main/resources/static/views/autoCheck/autoCheck.html

@@ -59,28 +59,28 @@
                         <td>{{item.NAME}}</td>
                         <td>{{item.CARD_ID}}</td>
                         <td>
-                            <span ng-if="item.downloadDate==null"
+                            <span ng-if="item.DOWNLOAD_DATE==null"
                                   style="color: red"
                                   class="glyphicon glyphicon-remove">
                             </span>
-                            <span ng-if="item.downloadDate!=null"
-                                  style="size: 6px">{{item.downloadDate | date:'MM-dd hh:mm'}}</span>
+                            <span ng-if="item.DOWNLOAD_DATE!=null"
+                                  style="size: 6px">{{item.DOWNLOAD_DATE | date:'MM-dd hh:mm'}}</span>
                         </td>
                         <td>
-                            <span ng-if="item.electricDate==null"
+                            <span ng-if="item.ELECTRIC_WRITE_DATE==null"
                                   style="color: red"
                                   class="glyphicon glyphicon-remove">
                             </span>
-                            <span ng-if="item.electricDate!=null"
-                                  style="size: 6px">{{item.electricDate| date:'MM-dd hh:mm'}}</span>
+                            <span ng-if="item.ELECTRIC_WRITE_DATE!=null"
+                                  style="size: 6px">{{item.ELECTRIC_WRITE_DATE| date:'MM-dd hh:mm'}}</span>
                         </td>
                         <td>
-                            <span ng-if="item.checkDate==null"
+                            <span ng-if="item.CHECK_DATE==null"
                                   style="color: red"
                                   class="glyphicon glyphicon-remove">
                             </span>
-                            <span ng-if="item.checkDate!=null"
-                                  style="size: 6px">{{item.checkDate| date:'MM-dd hh:mm'}}</span>
+                            <span ng-if="item.CHECK_DATE!=null"
+                                  style="size: 6px">{{item.CHECK_DATE| date:'MM-dd hh:mm'}}</span>
                         </td>
                         <td  rowspan="{{policeCardsList.length}}" ng-if="item.STATE==0&&$index==0"></td>
                         <td  class="bg-green" rowspan="{{policeCardsList.length}}" ng-if="item.STATE==1&&$index==0"></td>

src/main/resources/static/views/autoCheck/autoCheck.js

@@ -24,6 +24,7 @@ angular.module('AvatarCheck.autoCheck', ['ngRoute', 'AvatarCheck.http', 'tm.pagi
                         $scope.policeCardsList[i].styleClass='';
                     }
                 }
+                console.log($scope.policeCardsList)
             })
         }
         var emptyList = function () {