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

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

@@ -8,16 +8,14 @@
         <th>身份证号</th>
         <th>姓名</th>
         <th>性别</th>
-        <th>任务单编号</th>
         </thead>
         <tbody>
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
-            <td>{{item.idCard}}</td>
-            <td>{{item.name}}</td>
-            <td ng-if="item.sex==1">男</td>
-            <td ng-if="item.sex==2">女</td>
-            <td>{{item.taskId}}</td>
+            <td>{{item.ID_NO}}</td>
+            <td>{{item.NAME}}</td>
+            <td ng-if="item.SEX_NO==1">男</td>
+            <td ng-if="item.SEX_NO==2">女</td>
         </tr>
         </tbody>
     </table>

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

@@ -267,6 +267,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(date==""){
                     date=$filter("date")(new Date(), "yyyy-MM-dd");
                 }
+                console.log(oldPackageName,date)
                 $http({
                     method: 'GET',
                     url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
@@ -451,14 +452,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             addFailedCard:function(data,succuss){
-                var body = JSON.stringify(idCardArr);
+                var body = JSON.stringify(data);
                 $http({
                     method: 'POST',
-                    url: "../FailedCardApi/selectInfoByCardId",
+                    url: "../FailedCardApi/insertFailedCard",
                     data: body,
                     headers: {'Content-Type': 'application/json'}
                 }).then(function successCallback(response) {
-                    success(response.data)
+                    succuss(response.data)
                 })
             }
         }

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

@@ -38,9 +38,10 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
             var list=[];
             for (var i=0;i<result.length;i++){
                 var json = {};
-                json.idCard=result[i][0];
-                json.reason=result[i][1];
-                json.failedType=result[i][2];
+                json.cardId=result[i][0];
+                json.note=result[i][1];
+                json.failedCardReasonId=result[i][2];
+                json.initiator = $rootScope.loginData.roleList[0].process
                 list.push(json)
             }
             console.log(list)
@@ -52,7 +53,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                 controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
                     var idCardArr =[];
                     for(var i=0;i<list.length;i++){
-                        idCardArr.push(list[i].idCard);
+                        idCardArr.push(list[i].cardId);
                     }
                     HttpService.getPersonInfo(idCardArr,function(data){
                         $scope.personInfo = data;
@@ -62,7 +63,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                         HttpService.addFailedCard(list,function(data){
                             $scope.closeThisDialog();
                             MessageService.showAlert("添加成功");
-                            console.log($scope.cancelAdd)
+                            console.log(data)
                         })
                     }
                 }]

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

@@ -32,11 +32,10 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
 
 
         $scope.getAnalyseLog = function(){
-            // HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
-            //     $scope.paginationConf.totalItems = data;
-            //     console.log($scope.paginationConf.totalItems)
-            // })
-            console.log($scope.oldPackageName,document.getElementById("datepicker").value)
+            HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
+                $scope.paginationConf.totalItems = data;
+                console.log($scope.paginationConf.totalItems)
+            })
             HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
                 $scope.analyseLog = data;
                 console.log($scope.analyseLog)