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

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

@@ -65,7 +65,8 @@ public class PersonPostApi {
         String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
         JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
         String uploadDate = replaceDate(jsonObject.getString("uploadDate"));
-        int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate);
+        String emailNo = jsonObject.getString("emailNo");
+        int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,emailNo);
         return count;
     }
 
@@ -85,7 +86,8 @@ public class PersonPostApi {
         String uploadDate =replaceDate(jsonObject.getString("uploadDate"));
         String firstIndex = jsonObject.getString("firstIndex");
         String pageSize = jsonObject.getString("pageSize");
-        List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize);
+        String emailNo = jsonObject.getString("emailNo");
+        List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize,emailNo);
         return list;
     }
 
@@ -134,9 +136,9 @@ public class PersonPostApi {
     public void exportExcel(HttpServletRequest request,HttpServletResponse response,
                             @RequestParam("uploadDate") String uploadDate, @RequestParam("hasPrinted") String hasPrinted,
                             @RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh,
-                            @RequestParam("sequence")String sequence, @RequestParam("sqrxm") String sqrxm) throws Exception {
+                            @RequestParam("sequence")String sequence, @RequestParam("sqrxm") String sqrxm,@RequestParam("emailNo") String emailNo) throws Exception {
         JSONArray jsonArray = JSONArray.fromObject(djx);
-        List<PersonPostEntity> list = personPostService.downLoadReportForm(request,response,sqrxm,ddh,hasPrinted,gkxx,jsonArray,replaceDate(uploadDate));
+        List<PersonPostEntity> list = personPostService.downLoadReportForm(request,response,sqrxm,ddh,hasPrinted,gkxx,jsonArray,replaceDate(uploadDate),emailNo);
         exportExcel(request, response, list);
     }
 

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

@@ -39,6 +39,7 @@ public interface PersonPostMapper {
             " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID  " +
             " WHERE 1=1" +
             " <when test='applicantName!=\"\"'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
+            "<when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER = TO_NUMBER(#{emailNo}) </when>" +
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <if test='state== 0 '> and  PERSON_POST.print_date is null  </if>" +
             " <if test='state== 1 '> and  PERSON_POST.print_date is not null  </if>" +
@@ -50,7 +51,7 @@ public interface PersonPostMapper {
             ")"  +
             "WHERE RN BETWEEN #{pageSize} AND #{firstIndex}" +
             "</script>")
-    public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,@Param("getToCounty")String getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")long firstIndex,@Param("pageSize")long pageSize);
+    public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,@Param("getToCounty")String getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")long firstIndex,@Param("pageSize")long pageSize,@Param("emailNo")String emailNo);
 
 
     @Select("<script> " +
@@ -58,6 +59,7 @@ public interface PersonPostMapper {
             " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID  " +
             " where 1=1 " +
             " <when test='applicantName!=\"\"'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
+            " <when test='emailNo!=\"\" '> and  PERSON_POST.WAYBILL_NUMBER =TO_NUMBER(#{emailNo}) </when>" +
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <when test='state== 0 '> and  PERSON_POST.print_date is null  </when>" +
             " <when test='state== 1 '> and  PERSON_POST.print_date is not null  </when>" +
@@ -65,7 +67,7 @@ public interface PersonPostMapper {
             " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( #{getToCounty} ) </when>" +
             " <when test='uploadDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" +
             "</script>")
-    public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("uploadDate") String uploadDate);
+    public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("uploadDate") String uploadDate,@Param("emailNo")String emailNo);
 
 
 
@@ -74,6 +76,7 @@ public interface PersonPostMapper {
             " <when test='applicantName!=null'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
             " <when test='orderNumber!=null'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <when test='state!= null '> and  PERSON_POST.STATE=#{state} </when>" +
+            " <when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER = #{emailNo} </when>" +
             " <when test='latticeMouthInformation!=null'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
             " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" +
             " <when test='uploadDate!=null'> and  FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>")
@@ -109,9 +112,10 @@ public interface PersonPostMapper {
             " <when test='ddh!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{ddh} </when>" +
             " <when test='hasPrinted!=\"\"'> and  PERSON_POST.STATE=#{hasPrinted} </when>" +
             " <when test='gkxx!=\"\"'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{gkxx} </when>" +
+            " <when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER=TO_NUMBER(#{emailNo}) </when>" +
             " <when test='str!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( #{str} ) </when>" +
             " <when test='uploadDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>"+
             "</script>")
     public List<PersonPostEntity> findAllPersonalDataNoPage(@Param("sqrxm") String sqrxm, @Param("ddh")String ddh, @Param("hasPrinted")String hasPrinted,
-                                                            @Param("gkxx")String gkxx, @Param("str")String str, @Param("uploadDate")String uploadDate);
+                                                            @Param("gkxx")String gkxx, @Param("str")String str, @Param("uploadDate")String uploadDate,@Param("emailNo")String emailNo);
 }

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

@@ -231,7 +231,7 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.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" +
-            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
             "where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
 
@@ -418,9 +418,8 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.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" +
-            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  \n" +
-            "group by task_id ) fc \n" +
-            "on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  \n" +
+            "group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
             "left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
             "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
@@ -722,7 +721,7 @@ public interface TaskListMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =1 " +
-            " and POSITION_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
+            " and to_char(POSITION_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind3(@Param("date") String date);
 
 
@@ -756,7 +755,7 @@ public interface TaskListMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =1 " +
-            " and CONCORA_CRUSH_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
+            " and to_char(CONCORA_CRUSH_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date);
 
 
@@ -793,6 +792,23 @@ public interface TaskListMapper {
             " and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date);
 
+    /**
+     * 任务单查询历史
+     *  辅助库 废证
+     * @return
+     */
+    @Select("select FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
+            "FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,FAILED_CARD.POSITION_DATE POSITION_DATE,'' POSITION_NAME," +
+            " FAILED_CARD.ALLOT_DATE CONCORA_CRUSH_DATE ,FAILED_CARD.FINISH_DATE CONCORA_CRUSH_NAME,'' PUNCHING_DATE,'' PUNCHING_NAME" +
+            ",'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
+            "1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO from FAILED_CARD \n" +
+            "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  to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date);
+
+
     /**
      * 任务单查询历史
      *  辅助库 余证

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

@@ -27,7 +27,7 @@ public interface PersonPostService {
 
     public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
 
-    public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize);
+    public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo);
 
     public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate);
 
@@ -37,9 +37,9 @@ public interface PersonPostService {
 
     public boolean printPostList(int id, Date printDateTime);
 
-    public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String uploadDate);
+    public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String uploadDate, String emailNo);
 
     public int findPersonalDataCountByImportDate(String importDate);
 
-    public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate);
+    public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate,String emailNo);
 }

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

@@ -54,7 +54,7 @@ public class PersonPostServiceImpl implements PersonPostService {
         return true;
     }
     @Override
-    public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){
+    public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize,String emailNo){
         String str = null;
         long firstIndexLong= Long.valueOf(firstIndex);
         long pageSizeLong = Long.valueOf(pageSize);
@@ -65,7 +65,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str+="'"+getToCounty.get(i)+"',";
             }
         }
-       List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndexLong * pageSizeLong,(firstIndexLong - 1) * pageSizeLong + 1);
+       List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndexLong * pageSizeLong,(firstIndexLong - 1) * pageSizeLong + 1,emailNo);
         System.out.println("数据："+list);
         return list;
     }
@@ -99,7 +99,7 @@ public class PersonPostServiceImpl implements PersonPostService {
     }
 
     @Override
-    public int findPersonalDataCount(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate) {
+    public int findPersonalDataCount(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate,String emailNo) {
         String str = null;
         for (int i = 0;i<getToCounty.size();i++){
             if (i==getToCounty.size()-1){
@@ -108,7 +108,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str+="'"+getToCounty.get(i)+"',";
             }
         }
-          int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate);
+          int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,emailNo);
         return count;
     }
 
@@ -119,7 +119,7 @@ public class PersonPostServiceImpl implements PersonPostService {
     }
 
     @Override
-    public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate) {
+    public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String uploadDate,String emailNo) {
         String str = null;
         for (int i = 0;i<jsonArray.size();i++){
             if (i==jsonArray.size()-1){
@@ -128,7 +128,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str+="'"+jsonArray.get(i)+"',";
             }
         }
-        List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm,ddh,hasPrinted,gkxx,str,uploadDate);
+        List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm,ddh,hasPrinted,gkxx,str,uploadDate,emailNo);
         return list;
     }
 

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

@@ -329,13 +329,13 @@ public class TaskListServiceImpl implements TaskListService {
     @Transactional(rollbackFor = Exception.class)
     public List selectByCountyAtAuxiliary3(long process) {
         //查询普通组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-2);
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
         //查询快证组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-2);
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-1);
         //查询余证组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-2);
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-1);
         //查询余证组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-2);
+        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
         List<Map<String, Object>> list = new ArrayList<>();
         list = formateMap2(mapList_common);
         list.addAll(formateMap2(mapList_fast));
@@ -350,7 +350,7 @@ public class TaskListServiceImpl implements TaskListService {
     /**
      * 查询历史任务单详情
      * （辅助库）
-     * （下发、数据核验、预订位、平压、冲切）
+     * （下发、数据核验、预订位、平压、电写入）
      *
      * @param process 工序
      * @param date    查询时间
@@ -415,6 +415,8 @@ public class TaskListServiceImpl implements TaskListService {
                 mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date));
                 //查询历史任务单 余证
                 mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date));
+                //查询历史任务单 废证
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed5(date));
                 break;
             default:
                 break;

src/main/resources/static/dialogs/gotoDistribute.html

+<div class="ui-dialog-title">
+    提示
+</div>
+<div class="ui-dialog-content">
+    <div>已选择任务量{{cardsTotal}}，是否确认下发？</div>
+</div>
+<div class="ui-dialog-confirm">
+    <button type="submit" class="btn btn-info" ng-click="confirmGoTo()">确认</button>
+    <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
+</div>
+

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

@@ -83,7 +83,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                             $scope.personInfo = data;
                             $scope.can = false;
                             for(var i=0;i<$scope.personInfo.length;i++){
-                                if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
+                                if($scope.personInfo[i].SEX_NO==-1){
                                     $scope.can = true;
                                 }
                             }

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

@@ -76,7 +76,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
                             $scope.personInfo = data;
                             $scope.can = false;
                             for(var i=0;i<$scope.personInfo.length;i++){
-                                if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
+                                if($scope.personInfo[i].SEX_NO==-1){
                                     $scope.can = true;
                                 }
                             }

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

@@ -53,7 +53,6 @@
                                   </ul>
                               </a>
                           </li>
-                          <li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal+groupCardsTotal}}</h4></li>
                         </ul>
                   </div>
                 <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
@@ -67,18 +66,23 @@
                             <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                             <th>合格数量</th>
                             <th>不合格数量</th>
+                            <th>状态</th>
                             <th></th>
                         </tr>
                       </thead>
                       <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
                       <tr>
-                        <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
+                        <td ng-if="task.dealFlag==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
+                        <td ng-if="task.dealFlag!=3"></td>
                         <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
                         <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                         <td class="mailbox-subject">{{task.groupList.length}}</td>
                         <td class="mailbox-subject">{{task.groupNum}}</td>
                         <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                         <td class="mailbox-date">{{task.countyInvalidCount}}</td>
+                        <td ng-if="task.dealFlag==0" style="color: #9f191f">未处理</td>
+                        <td ng-if="task.dealFlag==1||groups.DEAL_FLAG==2" style="color: #0b93d5">处理中</td>
+                        <td ng-if="task.dealFlag==3">可以转出</td>
                         <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList)">组号列表</a></td>
                       </tr>
                       </tbody>
@@ -118,8 +122,10 @@
                                 <th>地区</th>
                                 <th>组数</th>
                                 <th>受理组号</th>
+                                <th>证件数量</th>
                                 <th>合格数量</th>
                                 <th>不合格数量</th>
+                                <th>特殊证件数量</th>
                                 <th></th>
                             </tr>
                           </thead>
@@ -129,9 +135,11 @@
                             <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                             <td class="mailbox-subject">{{task.groupList.length}}</td>
                             <td class="mailbox-subject">{{task.groupNum}}</td>
+                            <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                             <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                             <td class="mailbox-date">{{task.countyInvalidCount}}</td>
-                            <td class="mailbox-date"><a ng-click="getPoliceList(task.countyCode,type.typeCode)">组号列表</a></td>
+                            <td class="mailbox-date">{{task.specialCount}}</td>
+                            <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList)">组号列表</a></td>
                           </tr>
                           </tbody>
                         </table>

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

@@ -206,39 +206,50 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
         };
 
         $scope.createTaskList = function(typeCode){
-            if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
-                var arr = [];
-                for (var i=0;i<$scope.selected.length;i++){
-                    var json = {
-                        countyCode:$scope.selected[i].countyCode,
-                        typeCode:typeCode
+            var go = function () {
+                if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
+                    var arr = [];
+                    for (var i=0;i<$scope.selected.length;i++){
+                        var json = {
+                            countyCode:$scope.selected[i].countyCode,
+                            typeCode:typeCode
+                        }
+                        arr.push(json);
                     }
-                    arr.push(json);
-                }
-                var groupList = [];
-                for (var i=0;i<$scope.selectedGroup.length;i++){
-                    groupList.push($scope.selectedGroup[i].GROUP_NO)
-                }
-                var map = {
-                    date:$('#datepicker').val(),
-                    name:$rootScope.loginData.name,
-                    countyList:arr,
-                    groupList:groupList
+                    var groupList = [];
+                    for (var i=0;i<$scope.selectedGroup.length;i++){
+                        groupList.push($scope.selectedGroup[i].GROUP_NO)
+                    }
+                    var map = {
+                        date:$('#datepicker').val(),
+                        name:$rootScope.loginData.name,
+                        countyList:arr,
+                        groupList:groupList
+                    }
+                    console.log(map)
+                    HttpService.createTask(map,function(data){
+                        console.log(data)
+                        MessageService.showAlert(data.msg)
+                        console.log($scope.searchCurrent)
+                        $scope.searchCurrent();
+                        $scope.selected=[];
+                        $rootScope.selectedGroup=[];
+                        $rootScope.closeThis();
+                    })
+                }else{
+                    MessageService.showAlert("请选择创建任务单的组")
                 }
-                console.log(map)
-                HttpService.createTask(map,function(data){
-                    console.log(data)
-                    MessageService.showAlert(data.msg)
-                    console.log($scope.searchCurrent)
-                    $scope.searchCurrent();
-                    $scope.selected=[];
-                    $rootScope.selectedGroup=[];
-                    $rootScope.cardsTotal = 0;
-                })
-            }else{
-                MessageService.showAlert("请选择创建任务单的组")
             }
-
+            ngDialog.open({
+                template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
+                width: 800,
+                cache: false,
+                closeByDocument:false,
+                controller: ['$scope', 'HttpService',function ($scope) {
+                    $rootScope.closeThis=$scope.closeThisDialog;
+                    $scope.confirmGoTo = go;
+                }]
+            })
         }
 
     });

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

@@ -27,7 +27,6 @@
                               </ul>
                           </a>
                       </li>
-                      <li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
                     </ul>
                 </div>
           <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
@@ -39,9 +38,9 @@
                     <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                     <th>组数</th>
                     <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
+                    <th>证件数量</th>
                     <th>合格数量</th>
                     <th>不合格数量</th>
-                    <th>废证数量</th>
                     <th>特殊证件数量</th>
                     <th></th>
                 </tr>
@@ -53,10 +52,9 @@
                 <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                 <td class="mailbox-subject">{{task.groupList.length}}</td>
                 <td class="mailbox-subject">{{task.groupNum}}</td>
+                <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                 <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                 <td class="mailbox-date">{{task.countyInvalidCount}}</td>
-                <td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
-                <td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
                 <td class="mailbox-date">{{task.specialCount}}</td>
                 <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
               </tr>
@@ -69,7 +67,6 @@
                              <th>核验数量</th>
                              <th>证件数量</th>
                              <th>特殊证件数量</th>
-                             <th>废证数量</th>
                              <th></th>
                           </thead>
                           <tbody>
@@ -78,7 +75,6 @@
                                     <td>{{item.VALID_COUNT}}</td>
                                     <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                     <td>{{item.SPECIAL_CARD_COUNT}}</td>
-                                    <td>{{item.FAILECOUNT}}</td>
                                     <td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
                                </tr>
                           </tbody>
@@ -123,7 +119,6 @@
                             <th>受理组号</th>
                             <th>合格数量</th>
                             <th>不合格数量</th>
-                            <th>废证数量</th>
                             <th>特殊证件数量</th>
                             <th></th>
                         </tr>
@@ -136,8 +131,6 @@
                         <td class="mailbox-subject">{{task.groupNum}}</td>
                         <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                         <td class="mailbox-date">{{task.countyInvalidCount}}</td>
-                        <td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
-                        <td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
                         <td class="mailbox-date">{{task.specialCount}}</td>
                         <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
                       </tr>

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

@@ -159,32 +159,45 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
 
 
         $scope.goes = function(){
-            var checks = $(".checkOneBox:checked");
-            if(checks.length>0){
-                var arr = [];
-                var failedArr = [];
-                for (var i=0;i<checks.length;i++){
-                    if(checks[i].value.length<11){
-                        failedArr.push(checks[i].value)
-                    }else {
-                        arr.push(checks[i].value)
+            var go = function () {
+                var checks = $(".checkOneBox:checked");
+                if(checks.length>0){
+                    var arr = [];
+                    var failedArr = [];
+                    for (var i=0;i<checks.length;i++){
+                        if(checks[i].value.length<11){
+                            failedArr.push(checks[i].value)
+                        }else {
+                            arr.push(checks[i].value)
+                        }
                     }
+                    var json={
+                        process:$rootScope.loginData.roleList[0].process,
+                        name:$rootScope.loginData.name,
+                        taskIdList:arr,
+                        failedList:failedArr
+                    }
+                    console.log(json)
+                    HttpService.updateTaskListProcess(json,function(data){
+                        $scope.searchTaskList();
+                        MessageService.showAlert("下发完成")
+                        $rootScope.closeThis();
+                    })
+                }else{
+                    MessageService.showAlert("请选择下发的任务单")
                 }
-                var json={
-                    process:$rootScope.loginData.roleList[0].process,
-                    name:$rootScope.loginData.name,
-                    taskIdList:arr,
-                    failedList:failedArr
-                }
-                console.log(json)
-                HttpService.updateTaskListProcess(json,function(data){
-                    $scope.searchTaskList();
-                    MessageService.showAlert("下发完成")
-                    $rootScope.cardsTotal = 0;
-                })
-            }else{
-                MessageService.showAlert("请选择下发的任务单")
             }
+            ngDialog.open({
+                template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
+                width: 800,
+                cache: false,
+                closeByDocument:false,
+                controller: ['$scope', 'HttpService',function ($scope) {
+                    $rootScope.closeThis=$scope.closeThisDialog;
+                    $scope.confirmGoTo = go;
+                }]
+            })
+
         }
 
     });

src/main/resources/static/views/task/taskListEwriting.html

@@ -27,7 +27,6 @@
                           </ul>
                       </a>
                   </li>
-                  <li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
              </ul>
            </div>
              <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
@@ -40,7 +39,6 @@
                      <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                      <th>组数</th>
                      <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
-                     <th>核验数量</th>
                      <th>证件数量</th>
                      <th>电写入数量</th>
                      <th>特殊证件数量</th>
@@ -57,7 +55,6 @@
                        <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                        <td class="mailbox-subject">{{task.groupList.length}}</td>
                        <td class="mailbox-subject"></td>
-                       <td class="mailbox-subject">{{task.countyValidCount}}</td>
                        <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                        <td class="mailbox-subject">{{task.eWriteCount}}</td>
                        <td class="mailbox-subject">{{task.specialCount}}</td>
@@ -72,7 +69,6 @@
                                    <thead>
                                       <th>组号</th>
                                       <th>派出所名称</th>
-                                      <th>核验数量</th>
                                       <th>证件数量</th>
                                       <th>电写入数量</th>
                                       <th>特殊证件数量</th>
@@ -83,7 +79,6 @@
                                         <tr ng-repeat="item in policeList">
                                              <td>{{item.GROUP_NO}}</td>
                                              <td>{{item.GAJG_MC}}</td>
-                                             <td>{{item.VALID_COUNT}}</td>
                                              <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                              <td>{{item.E_WRITER_COUNT}}</td>
                                              <td>{{item.SPECIAL_CARD_COUNT}}</td>
@@ -131,7 +126,6 @@
                          <th>地区</th>
                          <th>组数</th>
                          <th>组号</th>
-                         <th>核验数量</th>
                          <th>证件数量</th>
                          <th>特殊证件数量</th>
                          <th>废证数量</th>
@@ -145,7 +139,6 @@
                            <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                            <td class="mailbox-subject">{{task.groupList.length}}</td>
                            <td class="mailbox-subject">{{task.groupNum}}</td>
-                           <td class="mailbox-subject">{{task.countyValidCount}}</td>
                            <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                            <td class="mailbox-attachment">{{task.specialCount}}</td>
                            <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
@@ -158,7 +151,6 @@
                                  <table class="table">
                                      <thead>
                                         <th>组号</th>
-                                        <th>核验数量</th>
                                         <th>证件数量</th>
                                         <th>特殊证件数量</th>
                                         <th>废证数量</th>
@@ -167,7 +159,6 @@
                                      <tbody>
                                           <tr ng-repeat="item in policeList">
                                                <td>{{item.GROUP_NO}}</td>
-                                               <td>{{item.VALID_COUNT}}</td>
                                                <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                                <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                                <td>{{item.FAILECOUNT}}</td>

src/main/resources/static/views/task/taskListPreLocating.html

@@ -27,7 +27,6 @@
                       </ul>
                   </a>
               </li>
-              <li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
             </ul>
           </div>
             <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
@@ -40,7 +39,6 @@
                     <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                     <th>组数</th>
                     <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
-                    <th>核验数量</th>
                     <th>证件数量</th>
                     <th>特殊证件数量</th>
                     <th>废证数量</th>
@@ -56,7 +54,6 @@
                       <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                       <td class="mailbox-subject">{{task.groupList.length}}</td>
                       <td class="mailbox-subject">{{task.groupNum}}</td>
-                      <td class="mailbox-subject">{{task.countyValidCount}}</td>
                       <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                       <td class="mailbox-attachment">{{task.specialCount}}</td>
                       <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
@@ -69,7 +66,6 @@
                             <table class="table">
                                 <thead>
                                    <th>组号</th>
-                                   <th>核验数量</th>
                                    <th>证件数量</th>
                                    <th>特殊证件数量</th>
                                    <th>废证数量</th>
@@ -78,7 +74,6 @@
                                 <tbody>
                                      <tr ng-repeat="item in policeList">
                                           <td>{{item.GROUP_NO}}</td>
-                                          <td>{{item.VALID_COUNT}}</td>
                                           <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                           <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                           <td>{{item.FAILECOUNT}}</td>
@@ -125,7 +120,6 @@
                             <th>地区</th>
                             <th>组数</th>
                             <th>组号</th>
-                            <th>核验数量</th>
                             <th>证件数量</th>
                             <th>特殊证件数量</th>
                             <th></th>
@@ -138,7 +132,6 @@
                               <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                               <td class="mailbox-subject">{{task.groupList.length}}</td>
                               <td class="mailbox-subject">{{task.groupNum}}</td>
-                              <td class="mailbox-subject">{{task.countyValidCount}}</td>
                               <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                               <td class="mailbox-attachment">{{task.specialCount}}</td>
                               <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
@@ -149,7 +142,6 @@
                                     <table class="table">
                                         <thead>
                                            <th>组号</th>
-                                           <th>核验数量</th>
                                            <th>证件数量</th>
                                            <th>特殊证件数量</th>
                                            <th></th>
@@ -157,7 +149,6 @@
                                         <tbody>
                                              <tr ng-repeat="item in policeList">
                                                   <td>{{item.GROUP_NO}}</td>
-                                                  <td>{{item.VALID_COUNT}}</td>
                                                   <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                                   <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                                   <td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>

src/main/resources/static/views/task/taskListPrint.html

@@ -95,7 +95,6 @@
                 </table>
                 <!-- /.table -->
                 <div class="box-footer">
-                    <h5 style="text-align: right;">已转出任务量：{{distributedCount}}</h5>
                     <div class="pull-right" style="margin-left: 10px;">
                         <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
                     </div>

src/main/resources/static/views/task/taskListPushing.html

@@ -27,9 +27,6 @@
                           </ul>
                       </a>
                   </li>
-                  <li style="float: right; padding-right: 20px;">
-                      <h4>任务总数:{{cardsTotal}}</h4>
-                  </li>
                 </ul>
               </div>
                 <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
@@ -42,7 +39,6 @@
                           <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                           <th>组数</th>
                           <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
-                          <th>核验数量</th>
                           <th>证件数量</th>
                           <th>特殊证件数量</th>
                           <th>废证数量</th>
@@ -58,7 +54,6 @@
                         <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                         <td class="mailbox-subject">{{task.groupList.length}}</td>
                         <td class="mailbox-subject">{{task.groupNum}}</td>
-                        <td class="mailbox-subject">{{task.countyValidCount}}</td>
                         <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                         <td class="mailbox-attachment">{{task.specialCount}}</td>
                         <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
@@ -71,7 +66,6 @@
                               <table class="table">
                                   <thead>
                                      <th>组号</th>
-                                     <th>核验数量</th>
                                      <th>证件数量</th>
                                      <th>特殊证件数量</th>
                                      <th>废证数量</th>
@@ -80,7 +74,6 @@
                                   <tbody>
                                        <tr ng-repeat="item in policeList">
                                             <td>{{item.GROUP_NO}}</td>
-                                            <td>{{item.VALID_COUNT}}</td>
                                             <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.FAILECOUNT}}</td>
@@ -127,7 +120,6 @@
                               <th>地区</th>
                               <th>组数</th>
                               <th>组号</th>
-                              <th>核验数量</th>
                               <th>证件数量</th>
                               <th>特殊证件数量</th>
                               <th></th>
@@ -140,7 +132,6 @@
                             <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                             <td class="mailbox-subject">{{task.groupList.length}}</td>
                             <td class="mailbox-subject">{{task.groupNum}}</td>
-                            <td class="mailbox-subject">{{task.countyValidCount}}</td>
                             <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                             <td class="mailbox-attachment">{{task.specialCount}}</td>
                             <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
@@ -151,7 +142,6 @@
                                   <table class="table">
                                       <thead>
                                          <th>组号</th>
-                                         <th>核验数量</th>
                                          <th>证件数量</th>
                                          <th>特殊证件数量</th>
                                          <th></th>
@@ -159,7 +149,6 @@
                                       <tbody>
                                            <tr ng-repeat="item in policeList">
                                                 <td>{{item.GROUP_NO}}</td>
-                                                <td>{{item.VALID_COUNT}}</td>
                                                 <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                                 <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                                 <td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>

src/main/resources/static/views/task/taskListSorting.html

@@ -31,9 +31,6 @@
                                     </ul>
                                 </a>
                             </li>
-                            <li style="float: right; padding-right: 20px;">
-                                <h4>任务总数:{{cardsTotal}}</h4>
-                            </li>
                         </ul>
                     </div>
                     <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages"
@@ -48,7 +45,6 @@
                                 <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                                 <th>组数</th>
                                 <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
-                                <th>核验数量</th>
                                 <th>证件数量</th>
                                 <th>电写入数量</th>
                                 <th>特殊证件数量</th>
@@ -70,8 +66,7 @@
                                 <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                                 <td class="mailbox-subject">{{task.groupList.length}}</td>
                                 <td class="mailbox-subject"></td>
-                                <td class="mailbox-subject">{{task.countyValidCount}}</td>
-                                <td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
+                                <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                                 <td class="mailbox-subject">{{task.eWriteCount}}</td>
                                 <td class="mailbox-subject">{{task.specialCount}}</td>
                                 <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">
@@ -80,7 +75,7 @@
                                 <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
                                 <td class="mailbox-subject">{{task.recheckCount}}</td>
                                 <td class="mailbox-date"><a
-                                        ng-click="getPoliceList(task.policeList,task.taskId)">派出所列表</a></td>
+                                        ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
                                 <td class="mailbox-subject">
                                     <button class="btn btn-primary">打印封条</button>
                                 </td>
@@ -92,7 +87,6 @@
                                         <thead>
                                         <th>组号</th>
                                         <th>派出所名称</th>
-                                        <th>核验数量</th>
                                         <th>证件数量</th>
                                         <th>电写入数量</th>
                                         <th>特殊证件数量</th>
@@ -103,7 +97,6 @@
                                         <tr ng-repeat="item in policeList">
                                             <td>{{item.GROUP_NO}}</td>
                                             <td>{{item.GAJG_MC}}</td>
-                                            <td>{{item.VALID_COUNT}}</td>
                                             <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.E_WRITER_COUNT}}</td>
                                             <td>{{item.SPECIAL_CARD_COUNT}}</td>
@@ -154,7 +147,6 @@
                                 <th>地区</th>
                                 <th>组数</th>
                                 <th>组号</th>
-                                <th>核验数量</th>
                                 <th>证件数量</th>
                                 <th>特殊证件数量</th>
                                 <th>复核数量</th>
@@ -169,8 +161,7 @@
                                 <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
                                 <td class="mailbox-subject">{{task.policeList.length}}</td>
                                 <td class="mailbox-subject"></td>
-                                <td class="mailbox-subject">{{task.countyValidCount}}</td>
-                                <td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
+                                <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                                 <td class="mailbox-subject">{{task.specialCount}}</td>
                                 <td class="mailbox-subject">{{task.checkCount}}</td>
                                 <td class="mailbox-date"><a
@@ -185,7 +176,6 @@
                                     <table class="table">
                                         <thead>
                                         <th>组号</th>
-                                        <th>核验数量</th>
                                         <th>证件数量</th>
                                         <th>特殊证件数量</th>
                                         <th></th>
@@ -193,7 +183,6 @@
                                         <tbody>
                                         <tr ng-repeat="item in policeList">
                                             <td>{{item.GROUP_NO}}</td>
-                                            <td>{{item.VALID_COUNT}}</td>
                                             <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                             <td>

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

@@ -38,8 +38,8 @@
                     <td><input type="text" class="form-control" ng-model="applicantName" placeholder="申请人姓名"></td>
                     <td>订单号:</td>
                     <td><input type="text" class="form-control" ng-model="orderNo" placeholder="订单号"></td>
-                    <td>序号:</td>
-                    <td><input type="text" class="form-control"  ng-model="number" placeholder="序号"></td>
+                    <td>邮件号:</td>
+                    <td><input type="text" class="form-control"  ng-model="emailNo" placeholder="邮件号"></td>
                </tr>
                <tr>
                    <td>打印状态:</td>
@@ -75,8 +75,8 @@
                    <td colspan="4">
                        <div style="float: left">
                           <button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button>
-                          <button class="btn btn-primary" style="margin-right: 7px;"ng-click="subSomething()">读卡查询</button>
-                          <button type="submit" class="btn btn-info"style="margin-right: 7px;" ng-click="downloadExcel()"> 下载Excel</button>
+                          <button class="btn btn-primary" style="margin-right: 7px;" ng-click="subSomething()">读卡查询</button>
+                          <button type="submit" class="btn btn-info" style="margin-right: 7px;" ng-click="downloadExcel()"> 下载Excel</button>
                           <button type="submit" class="btn btn-danger" ng-click="deleteRecords()"> 删除</button>
                        </div>
                    </td>

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

@@ -61,6 +61,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else {
                 json.state=$("#print").val();
             }
+            if(angular.isUndefined($scope.emailNo)){
+                json.emailNo = ''
+            }else{
+                json.emailNo =$scope.emailNo
+            }
             if (angular.isDefined($scope.gkxx)) {
                 json.latticeMouthInformation = $scope.gkxx
             }else {
@@ -97,6 +102,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else {
                 json.state=$("#print").val();
             }
+            if(angular.isUndefined($scope.emailNo)){
+                json.emailNo = ''
+            }else{
+                json.emailNo =$scope.emailNo
+            }
             if (angular.isDefined($scope.gkxx)) {
                 json.latticeMouthInformation = $scope.gkxx
             }else {
@@ -134,7 +144,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
 
 
         var getCountAndDownloadUrl = function (url) {
-
+            var date=$('#datepicker').val();
             if (angular.isDefined($scope.applicantName)) {
                 url = url + 'sqrxm=' + $scope.applicantName + '&';
             }else{
@@ -161,18 +171,19 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                 url = url + 'gkxx=&';
             }
             if ($("#county").val() != null) {
-                // for (var i = 0; i < $("#county").val().length; i++) {
-                //     url = url + 'djx=' + ($("#county").val())[i] + '&';
-                // }
                 url = url + 'djx=' + ($("#county").val()) + '&';
             }else{
                 url = url + 'djx=&';
             }
-            if ($("#datepicker").val() == '') {
-                url = url + 'uploadDate=&';
+            if(angular.isUndefined($scope.emailNo)){
+                url = url + 'emailNo=&';
+            }else{
+                url = url + 'emailNo='+$scope.emailNo+'&';
             }
-            if ($("#datepicker").val() != '') {
-                url = url + 'uploadDate=' + $("#datepicker").val() + '&';
+            if(date=='{{choseDate}}'){
+                url = url + 'uploadDate='+$scope.choseDate+'&';
+            }else {
+                url = url + 'uploadDate='+$("#datepicker").val()+'&';
             }
             return url + 't=' + Math.floor(Date.now());
         }