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

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

@@ -161,7 +161,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库)
-     *（下发、数据核验）
+     *（下发、膜打印）
      * @param process 工序
      * @param resp
      * @return

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

@@ -542,6 +542,21 @@ public interface TaskListMapper {
             "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process2") long process2);
 
+    /**
+     * 循环单查询
+     *  辅助库 废证
+     *  膜打印
+     * @param
+     * @return
+     */
+    @Select("select DISTINCT task.submit_date, FAILED_CARD.FAILED_CARD_ID task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,task.COUNTY_CODE,\n" +
+            "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO group_No,\n" +
+            "0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
+            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
+            "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
+            "where FAILED_CARD.state = 0  and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_failed_mu();
+
 
     /**
      * 任务单查询历史

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

@@ -261,12 +261,19 @@ public class TaskListServiceImpl implements TaskListService {
         //查询余证组号列表 在辅助库中
         List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process,process-2);
         //查询废证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process-2);
+        List<Map<String, Object>> mapList_failed = new ArrayList<>();
+        if (process==0){
+
+        }else {
+            mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed_mu();
+        }
         List list = new ArrayList();
         list = formateMap(mapList_common);
         list.addAll(formateMap(mapList_fast));
         list.addAll(formateMap(mapList_remaind));
-        list.addAll(formateMap(mapList_failed));
+        if (mapList_failed.size()>0){
+            list.addAll(formateMap(mapList_failed));
+        }
         return list;
     }
 

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

@@ -69,6 +69,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 HttpService.uploadPackage(fd,function (data) {
                     if(data){
                         MessageService.showAlert("上传成功")
+                        $scope.getXmlPackage();
                     }
                 })
             }
@@ -106,7 +107,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     $scope.importDate =uploadDate;
                     $scope.confirmDelete = function () {
                         HttpService.deleteProdDataByFileId(uploadDate, function (data) {
-                            MessageService.showAlert(data.msg);
+                            if(data){
+                                MessageService.showAlert("删除成功");
+                            }
                             $scope.closeThisDialog();
                             reGet();
                         })