修改标签打印获取分局名称改为用派出所代码；

修改标签打印获取详细列表改为从盈信库查询；
增加标签打印获取详细信息从连接制证库查询为空时，设置初始化值

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

@@ -277,10 +277,17 @@ public class ReceiptApi {
             for (int i=0; i < resultList.size(); i++) {
                 String acceptNo=(String) resultList.get(i).get("ACCEPT_NO");
                 Map <String, Object> map=receiptService.selectTimes(acceptNo);
-                resultList.get(i).put("downloadDate", map.get("DOWNLOADDATE"));
-                resultList.get(i).put("checkDate", map.get("CHECKDATE"));
-                resultList.get(i).put("electricDate", map.get("ELECTRICDATE"));
-                resultList.get(i).put("styleClass", "");
+                if (map==null){
+                    resultList.get(i).put("downloadDate","数据已迁移");
+                    resultList.get(i).put("checkDate", "数据已迁移");
+                    resultList.get(i).put("electricDate","数据已迁移");
+                    resultList.get(i).put("styleClass", "");
+                }else {
+                    resultList.get(i).put("downloadDate", map.get("DOWNLOADDATE"));
+                    resultList.get(i).put("checkDate", map.get("CHECKDATE"));
+                    resultList.get(i).put("electricDate", map.get("ELECTRICDATE"));
+                    resultList.get(i).put("styleClass", "");
+                }
             }
         }catch (Exception e){
             logger.error( "交接单ID：" + receiptId);

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

@@ -198,12 +198,9 @@ public interface ReceiptMapper {
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
 
-    @Select("SELECT POLICE_CODE,POLICE_NAME,COUNT(*) \n" +
-            "FROM PRODYD_DBA.PROD_CARd_T@PRODYD_LINK \n" +
-            "LEFT JOIN POLICE_DIC\n" +
-            "ON SUBSTR(PROD_CARD_T.UPLOAD_NO,0,6)=POLICE_DIC.POLICE_CODE\n" +
-            "where ACCEPT_NO like  #{policeCode} \n" +
-            "GROUP BY POLICE_CODE,POLICE_NAME" )
+    @Select("select POLICE_CODE,POLICE_NAME,COUNT(*) from POLICE_DIC\n" +
+            "where POLICE_CODE=SUBSTR( #{policeCode},0,6)\n" +
+            "GROUP BY POLICE_CODE,POLICE_NAME " )
     public List<Map<String,Object>> queryPoliceName(@Param("policeCode") String policeCode);
 
     @Select("select \n" +

src/main/java/com/yxproject/start/service/ReceiptService.java

@@ -43,7 +43,7 @@ public interface ReceiptService {
 
 //    public boolean updateFinishCount(String GROUP_NO,int count);
 
-    public List<Map<String,Object>> queryPoliceName(String qrCode);
+    public List<Map<String,Object>> queryPoliceName(String policeCode);
 
     //特证查询是否生成交接单
     public List<Map<String, Object>> selectCountById(String id,String beginDate,String expireDate);

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

@@ -139,6 +139,9 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Override
     public Map<String, Object> selectTimes(String groupNo) {
        Map<String, Object>  maps = receiptMapper.selectTimes(groupNo);
+        if(maps==null){
+            return null;
+        }
         return maps;
     }
 
@@ -242,11 +245,11 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public List<Map<String, Object>> queryPoliceName(String qrCode) {
-        if (qrCode!=null){
-            qrCode=qrCode+"%";
+    public List<Map<String, Object>> queryPoliceName(String policeCode) {
+        if (policeCode!=null){
+            policeCode=policeCode+"%";
         }
-        List<Map<String, Object>> mapList = receiptMapper.queryPoliceName(qrCode);
+        List<Map<String, Object>> mapList = receiptMapper.queryPoliceName(policeCode);
         List<Map<String,Object>> maps = new ArrayList<>();
         if (mapList.size()>0){
             maps.add(mapList.get(0));

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

@@ -273,7 +273,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
 
 
         $scope.PreviewMytableRotate = function(){
-            HttpService.getPoliceName($scope.json.QR_CODE,function(data) {
+            HttpService.getPoliceName($scope.json.policeCode,function(data) {
                 $scope.json.policeData = data[0].POLICE_NAME;
                 console.log($scope.json.policeData)
                 $timeout(function () {

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

@@ -91,7 +91,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                                 // MessageService.showAlert("解析完成")
                                 getData();
                             }else{
-                                $scope.wrongMsg = "解析失败"
+                                $scope.wrongMsg = "解析失败，请联系管理员！"
                             }
                         })
                     }