Merge remote-tracking branch 'origin/dev' into dev

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;
@@ -23,6 +24,8 @@ public class SelectApi {
      */
     @Autowired
     private SelectSerialNumberService selectSerialNumberService;
+    @Autowired
+    private GroupNoService groupNoService;
 
     @RequestMapping(value = "selectByCard")
     public  Map<String,Object> selectByCard(@RequestParam("id") String id){
@@ -46,12 +49,16 @@ public class SelectApi {
 
             //查询是否是特证，如果是，返回新的任务单信息
 
+            List<Map<String, Object>> mapList = groupNoService.selectAcceptNo(id);
+            if (mapList.size()>0){
+                id = mapList.get(0).get("ACCEPT_NO").toString();
+            }
             if (selectSerialNumberService.selectCount(id)==0){
                 List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
-                resultMap.put("workOrderDate", workOrderData);
+                resultMap.put("workOrderData", workOrderData);
             }else {
                 List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
-                resultMap.put("workOrderDate", workOrderData);
+                resultMap.put("workOrderData", workOrderData);
             }
             List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
             List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);

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

@@ -56,5 +56,13 @@ public interface GroupNoMapper {
             " ACC_GROUP_T.group_no in  (#{groupNo} ) ")
     public List<Map<String,Object>> selectGroupAtACCUByGroupNo(@Param("groupNo") String groupNo);
 
-
+    /**
+     * 查询证件的受理号
+     * @param idCard 证件信息
+     * @return
+     */
+    @Select("select ID_NO,ACCEPT_NO from ACC_CARD_T@ACCU_LINK WHERE ID_NO =#{idCard} OR ACCEPT_NO =#{idCard}\n" +
+            "UNION ALL \n" +
+            "SELECT ID_NO,ACCEPT_NO FROM PROD_CARD_T@PROD_LINK WHERE ID_NO =#{idCard} OR ACCEPT_NO =#{idCard}")
+    public List<Map<String,Object>> selectAcceptNo(String idCard);
 }

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

@@ -2,7 +2,9 @@ package com.yxproject.start.service;
 
 import com.yxproject.start.entity.GroupNoEntity;
 
+import javax.jws.Oneway;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -12,4 +14,5 @@ public interface GroupNoService {
     public boolean saveGroupNo(GroupNoEntity groupNoEntity);
     public List<GroupNoEntity> selectGroupNoEntityByGroupNo(String groupNo);
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
+    public  List<Map<String, Object>> selectAcceptNo(String cardId);
 }

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -45,4 +46,9 @@ public class GroupNoServiceImpl implements GroupNoService {
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity) {
         return groupNoMapper.updateGroupNoSpecialCount(groupNoEntity);
     }
+
+    @Override
+    public List<Map<String, Object>> selectAcceptNo(String cardId) {
+        return groupNoMapper.selectAcceptNo(cardId);
+    }
 }

src/main/resources/static/js/app.js

@@ -177,7 +177,9 @@ angular.module('AvatarCheck', [
                     }else{
                         $scope.searchResult = data;
                         console.log($scope.searchResult,"searchResult")
-                        console.log($scope.searchResult['workOrderDate'],"searchResultWorkOrderDate")
+                        console.log($scope.searchResult.workOrderData,"searchResult.workOrderData")
+                        console.log($scope.searchResult.ACCdata,"searchResult.ACCdata")
+                        console.log($scope.searchResult.PRODData,"searchResult.PRODData")
                     }
 
                 })

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

@@ -68,14 +68,14 @@
                     <tbody>
                     <tr ng-repeat="item in analyseLog">
                         <td>{{$index+1}}</td>
-                        <td>{{item.oldPackageName}}</td>
-                        <td>{{item.formStateTime}}</td>
-                        <td>{{item.formDeadline}}</td>
-                        <td>{{item.fileName}}</td>
-                        <td>{{item.parsingDate}}</td>
-                        <td>{{item.count}}</td>
-                        <td>{{item.commonCardCount}}</td>
-                        <td>{{item.postCardCount}}</td>
+                        <td>{{item.RECORD_NUMBER}}</td>
+                        <td>{{item.FORM_START_TIME | myDateFilter}}</td>
+                        <td>{{item.FORM_DEADLINE | myDateFilter}}</td>
+                        <td>{{item.FILE_NAME}}</td>
+                        <td>{{item.ANALYSIS_DATE}}</td>
+                        <td>{{item.RECORD_NUMBER}}</td>
+                        <td>{{item.PUCOUNT}}</td>
+                        <td>{{item.YOUCOUNT}}</td>
                     </tr>
 
                     </tbody>

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

@@ -63,7 +63,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
                     cache: false,
                     closeByDocument:false,
                     controller: ['$scope', function ($scope) {
-                        $scope.msgText = "解析中..."
+                        $scope.msgText = "上传中，请稍等..."
                         HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
                             if(data){
                                 $scope.closeThisDialog();

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

@@ -11,7 +11,7 @@
                 请输入要查询的受理号/身份证号/任务单编号
             </h4>
             <!--任务单-->
-            <div class="panel panel-info" ng-if="searchResult.workOrderDate.length>0">
+            <div class="panel panel-info" ng-if="searchResult.workOrderData.length>0">
                     <div class="panel-heading">
                         <h3 class="panel-title">
                             任务单
@@ -32,7 +32,7 @@
                             <th>仓库</th>
                             </thead>
                             <tbody>
-                            <tr ng-repeat="item in searchResult.workOrderDate">
+                            <tr ng-repeat="item in searchResult.workOrderData">
                                 <td>{{item.TASK_ID}}</td>
                                 <td>{{item.COUNTYNAME}}</td>
                                 <td>{{item.CARD_TYPE}}</td>

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

@@ -73,7 +73,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     cache: false,
                     closeByDocument:false,
                     controller: ['$scope', function ($scope) {
-                        $scope.msgText = "解析中..."
+                        $scope.msgText = "上传中，请稍等..."
                         HttpService.uploadPackage(fd,function (data) {
                             if(data){
                                 $scope.closeThisDialog();