交接单打印排序

封签打印邮寄证封签可以不打

src/main/java/com/yxproject/start/mapper/ReceiptMapper.java

@@ -294,7 +294,7 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID =RECEIPT_LIST.CARD_TYPE_ID \n" +
             "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO= RECEIPT_LIST.POLICE_CODE \n" +
             "left join POLICE_DIC on RECEIPT_LIST.fjdm= POLICE_DIC.POLICE_CODE " +
-            " where RECEIPT_LIST.id in (${string})  order by RECEIPT_LIST.id " +
+            " where RECEIPT_LIST.id in (${string})  order by RECEIPT_LIST.QR_CODE " +
             "</script>")
     public List<Map<String,Object>> selectReceiptDate(@Param("string") String string);
 

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

@@ -89,7 +89,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             $scope.json.count = item.FINISH_COUNT;
             $scope.json.QR_CODE = item.QR_CODE;
             $scope.json.fjmc = item.FJMC;
-            $scope.json.CARD_TYPE = item.CARD_TYPE;
+            $scope.json.CARD_TYPE = item.CARD_TYPE_ID;
             $scope.json.isShow=item.show;
             getDetailListById(item.ID);
         };
@@ -127,7 +127,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                 if(data.state===1){
                     $scope.json.isShow=false;
                     getPoliceListDataNotChecked();
-                    getDetailListById(data.id)
+                    getDetailListById(data.id);
                     for(var i=0;i<$scope.tagPrintData.length;i++){
                         if($scope.tagPrintData[i].ID===data.id){
                             $scope.tagPrintData[i].styleClass="bg-info";
@@ -135,10 +135,13 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     }
                 }else if(data.state===2){
                  MessageService.showAlert(data.msg+"复核人："+data.checkName+" 复核时间："+data.checkDate)
-
+                    getPoliceListDataNotChecked();
+                    getDetailListById(data.id);
                 }else{
                     MessageService.showAlert("无该证件的制证记录");
                     $scope.json.isShow=false;
+                    getPoliceListDataNotChecked();
+                    getDetailListById(data.id);
                 }
             })
         }