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

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

@@ -23,6 +23,8 @@ import java.util.Map;
 public class ExportExcelApi {
     @Autowired
     private DetailReceiptListService detailReceiptListService;
+    @Autowired
+    private ReceiptService receiptService;
     /**
      * 导出公安网数据
      */
@@ -59,6 +61,10 @@ public class ExportExcelApi {
         return mapList;
     }
 
+
+
+
+
     /**
      * 去除字符串中中线
      *

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

@@ -263,8 +263,9 @@ public class ReceiptApi {
      */
     @RequestMapping("queryReceiptDateByCheckDate")
     public List<Map<String,Object>> queryReceiptDateByCheckDate(@RequestParam("date")String date){
-            return receiptService.selectReceiptDateByCheckDate(replaceDate(date));
+        return receiptService.selectReceiptDateByCheckDate(replaceDate(date));
     }
+
     /**
      * 去除字符串中中线
      *

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

@@ -2,7 +2,7 @@
     确认信息
 </div>
 <div class="ui-dialog-content">
-    <table class="table table-responsive table-hover">
+    <table class="table table-hover">
         <thead>
         <th>NO.</th>
         <th>身份证号</th>

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

@@ -2,7 +2,7 @@
     确认信息
 </div>
 <div class="ui-dialog-content">
-    <table class="table table-responsive table-hover">
+    <table class="table table-hover">
         <thead>
         <th>NO.</th>
         <th>身份证号</th>

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

+<div class="ui-dialog-title">
+    确认信息
+</div>
+<div class="ui-dialog-content">
+    <table class="table table-hover">
+        <thead>
+        <th>NO.</th>
+        <th>身份证号</th>
+        <th>姓名</th>
+        <th>性别</th>
+        </thead>
+        <tbody>
+        <tr ng-repeat="item in personInfo">
+            <td>{{$index + 1}}</td>
+            <td>{{item.cardId}}</td>
+            <td>{{item.name}}</td>
+            <td ng-if="item.sex==1">男</td>
+            <td ng-if="item.sex==2">女</td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+<div class="ui-dialog-confirm">
+    <button type="submit" class="btn btn-info" ng-click="confirmAdd()">确定添加</button>
+    <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
+</div>
+

src/main/resources/static/index.html

@@ -188,5 +188,6 @@
 <script src="views/analysisLog/analysisLog.js"></script>
 <script src="views/packageLog/packageLog.js"></script>
 <script src="views/tagPrint/tagPrint.js"></script>
+<script src="views/addTag/addTag.js"></script>
 </body>
 </html>
\ No newline at end of file

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

@@ -24,6 +24,7 @@ angular.module('AvatarCheck', [
     'AvatarCheck.packageLog',
     'AvatarCheck.tagPrint',
     'tm.pagination',
+    'AvatarCheck.addTag'
 ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
         $locationProvider.hashPrefix('!');
     $routeProvider.otherwise({redirectTo: '/createTaskList'});
@@ -143,6 +144,9 @@ angular.module('AvatarCheck', [
         if ($location.path() == "/packageLog") {
             $rootScope.tab = '/packageLog';
         }
+        if ($location.path() == "/addTag") {
+            $rootScope.tab = '/addTag';
+        }
 
 
         console.log($rootScope.tab)

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

@@ -595,6 +595,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            getPersonInfoData:function(idCardArr,success){
+                var body = JSON.stringify(idCardArr);
+                $http({
+                    method: 'POST',
+                    url: "../ReceiptApi/selectDetailByAcceptNo",
+                    data: body,
+                    headers: {'Content-Type': 'application/json'}
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             addFailedCard:function(data,success){
                 var body = JSON.stringify(data);
                 $http({
@@ -764,6 +775,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 }).then(function successCallback(response) {
                     success(response.data)
                 })
+            },
+            addTagCard:function(data,success){
+                var body = JSON.stringify(data);
+                $http({
+                    method: 'POST',
+                    url: "../ReceiptApi/updateDetailNote",
+                    data: body,
+                    headers: {'Content-Type': 'application/json'}
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
             }
         }
     });
\ No newline at end of file

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

+<style>
+    .table th, .table td {
+        text-align: center;
+        vertical-align: middle!important;
+    }
+</style>
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
+    <div class="box box-primary">
+        <strong class="box-header with-border">添加详单备注</strong>
+        <div class="box-primary">
+            <form ng-submit="createInputs()" style="padding-left: 15px;">
+                <span style="font-size:20px;">证件数量:</span>
+                <input style="margin-top:20px;height: 30px;" type="text" ng-model="tagCount">
+                <input type="submit" class="btn btn-primary" value="确定">
+                <span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
+            </form>
+            <div style="padding: 15px;">
+                <table class="table table-bordered">
+                    <tr ng-repeat="item in arr">
+                        <td>{{$index+1}}</td>
+                        <td>
+                            受理号:
+                        </td>
+                        <td>
+                            <input type="text" placeholder="请填写受理号" class="{{$index}}" style="height: 34px;">
+                        </td>
+                        <td>
+                            备注信息：
+                        </td>
+                        <td>
+                            <input type="text" placeholder="请填写备注信息" class="{{$index}}"  style="height: 34px;">
+                        </td>
+                    </tr>
+                </table>
+                <div ng-if="arr.length>0" style="text-align: right;">
+                    <button class="btn btn-primary" ng-click="addTags()">添加</button>
+                    <button class="btn btn-danger" ng-click="cancelAdd()">取消</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
\ No newline at end of file

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

+'use strict';
+
+angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/addTag', {
+            templateUrl: 'views/addTag/addTag.html' + urlTimeStamp(),
+            controller: 'addTagCtrl',
+            cache: false
+        });
+    }])
+
+    .controller('addTagCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
+
+        $scope.createInputs = function(){
+            $scope.arr = [];
+            for (var i=0;i<$scope.tagCount;i++){
+                $scope.arr.push(i);
+            }
+        }
+
+
+        $scope.cancelAdd =function(){
+            $scope.arr = [];
+        }
+
+
+        $scope.addTags = function(){
+            var array = [];
+            for(var i=0;i<$scope.arr.length;i++){
+                for (var j=0;j<$("."+i).length;j++){
+                    array.push($("."+i)[j].value)
+                }
+            }
+            var result = [];
+            for (var i = 0, j = array.length; i < j; i += 2) {
+                result.push(array.slice(i, i + 2));
+            }
+            var list=[];
+            for (var i=0;i<result.length;i++){
+                var json = {};
+                json.acceptNo=result[i][0];
+                json.note=result[i][1];
+                // json.initiator = $rootScope.loginData.roleList[0].process
+                list.push(json)
+            }
+            console.log(list)
+
+            var cancel = $scope.cancelAdd;
+            ngDialog.open({
+                template: 'dialogs/confirmTagCards.html' + urlTimeStamp(),
+                width: 800,
+                cache: false,
+                closeByDocument:false,
+                controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
+                    var idCardArr =[];
+                    for(var i=0;i<list.length;i++){
+                        idCardArr.push(list[i].acceptNo);
+                    }
+                    HttpService.getPersonInfoData(idCardArr,function(data){
+                        $scope.personInfo = data;
+                        console.log($scope.personInfo)
+                    })
+                    $scope.confirmAdd = function(){
+                        HttpService.addTagCard(list,function(data){
+                            $scope.closeThisDialog();
+                            MessageService.showAlert("添加成功");
+                            cancel();
+                        })
+                    }
+                }]
+            });
+        }
+
+    });
\ No newline at end of file