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

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

@@ -874,7 +874,7 @@ public interface TaskListMapper {
             "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)" +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no  " +
-            " where SPECIAL_CARD.SPECIAL_TYPE =2  and task.TASK_STATE_ID =#{process} " +
+            " where SPECIAL_CARD.SPECIAL_TYPE =1  and task.TASK_STATE_ID =#{process} " +
             "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
             "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
@@ -882,7 +882,7 @@ public interface TaskListMapper {
 
     /**
      * 任务单查询
-     *  辅助库、制证库 余证
+     *  辅助库、制证库 余证 电写入
      * @param process 工序
      * @return
      */

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

+<div class="ui-dialog-title">
+    提示
+</div>
+<div class="ui-dialog-content">
+    <div>确认下载{{count}}条记录吗？</div>
+</div>
+<div class="ui-dialog-confirm">
+    <button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button>
+    <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
+</div>
+

src/main/resources/static/js/service.js

@@ -851,6 +851,25 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 }).then(function successCallback(response) {
                     success(response.data)
                 })
+            },
+            getDownloadCount:function (uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
+                                       typeCode,packageType,date,success) {
+                $http({
+                    method: 'GET',
+                    url: "../queryPreproPerson/queryPreproPersonCount",
+                    params:{
+                        uploadNo:uploadNo,
+                        IDCard:idCard,
+                        oldFile:oldPackageNo,
+                        newFile:newPackageNo,
+                        SSXQDM:sljg,
+                        cardType:typeCode,
+                        state:packageType,
+                        uploadDate:date
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
             }
         }
     });
\ No newline at end of file

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

@@ -55,6 +55,16 @@
                    </td>
                </tr>
                <tr>
+                    <td>制证包上传时间：</td>
+                   <td>
+                        <div class="input-group date">
+                              <div class="input-group-addon">
+                                <i class="fa fa-calendar"></i>
+                              </div>
+                              <input type="text" class="form-control pull-right" value="{{choseDate}}"  id="datepicker"  readonly/>
+                              <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
+                        </div>
+                   </td>
                     <td>禁用:</td>
                     <td style="text-align: left;">
                          <select class="form-control select2" id="packageType">
@@ -63,22 +73,11 @@
                                  <option value="1" selected>否</option>
                            </select>
                     </td>
-                    <td>制证包上传时间：</td>
-                    <td>
-                         <div class="input-group date">
-                               <div class="input-group-addon">
-                                 <i class="fa fa-calendar"></i>
-                               </div>
-                               <input type="text" class="form-control pull-right" value="{{choseDate}}"  id="datepicker"  readonly/>
-                               <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
-                         </div>
-                    </td>
                    <td></td>
                    <td><div  style="float: left;">
                        <button class="btn btn-primary" ng-click="doPackageQuery()">查询</button>
                        <button type="submit" class="btn btn-info" ng-click="downloadXml()">下载制证包</button>
                    </div></td>
-
               </tr>
            </table>
         </div>

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

@@ -133,13 +133,55 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             }
             return url + 't=' + Math.floor(Date.now());
         }
+
+        var getDownloadCount = function () {
+            var date = $("#datepicker").val();
+            var cardType = $("#cardType").val();
+            var packageType = $("#packageType").val();
+            if(angular.isUndefined($scope.uploadNo)){
+                $scope.uploadNo='';
+            }
+            if(angular.isUndefined($scope.idCard)){
+                $scope.idCard='';
+            }
+            if(angular.isUndefined($scope.oldPackageNo)){
+                $scope.oldPackageNo='';
+            }
+            if(angular.isUndefined($scope.newPackageNo)){
+                $scope.newPackageNo='';
+            }
+            if(angular.isUndefined($scope.sljg)){
+                $scope.sljg='';
+            }
+            if(packageType==''){
+                packageType=-1;
+            }
+            if(date=='{{choseDate}}'){
+                date=$scope.choseDate
+            }
+            HttpService.getDownloadCount($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
+                cardType,packageType,date,function(data) {
+                $rootScope.count = data.total;
+            })
+        }
         $scope.downloadXml = function(){
-            var url = '../exportXML/printXmlData?';
-            var a = document.createElement("a");
-            document.body.appendChild(a);
-            a.href = encodeURI(getCountAndDownloadUrl(url));
-            console.log(encodeURI(getCountAndDownloadUrl(url)))
-            a.click();
+            ngDialog.open({
+                template: 'dialogs/confirmToDownload.html' + urlTimeStamp(),
+                width: 800,
+                cache: false,
+                closeByDocument:false,
+                controller: ['$scope',function ($scope) {
+                    getDownloadCount();
+                    $scope.confirmDownload = function () {
+                        var url = '../exportXML/printXmlData?';
+                        var a = document.createElement("a");
+                        document.body.appendChild(a);
+                        a.href = encodeURI(getCountAndDownloadUrl(url));
+                        a.click();
+                    }
+                }]
+            })
+
         }
 
         var getTypeList = function(){

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

@@ -234,6 +234,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                         $scope.searchCurrent();
                         $scope.selected=[];
                         $rootScope.selectedGroup=[];
+                        $rootScope.cardsTotal = 0;
                         $rootScope.closeThis();
                     })
                 }else{

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

@@ -181,6 +181,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         MessageService.showAlert("下发完成")
+                        $rootScope.cardsTotal = 0;
                         $rootScope.closeThis();
                     })
                 }else{

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

@@ -392,6 +392,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         MessageService.showAlert("转出完成")
+                        $rootScope.cardsTotal = 0;
                         $rootScope.closeThis();
                     })
                 }else{
@@ -408,9 +409,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     $rootScope.closeThis = $scope.closeThisDialog;
                 }]
             })
-
-
-
         }
 
     })
@@ -576,6 +574,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         MessageService.showAlert("转出完成")
+                        $rootScope.cardsTotal = 0;
                         $rootScope.closeThis();
                     })
                 }else{
@@ -757,6 +756,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         MessageService.showAlert("转出完成")
+                        $rootScope.cardsTotal = 0;
                         $rootScope.closeThis();
                     })
                 }else{