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

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

@@ -30,7 +30,7 @@ public class ReceiptApi {
      */
     @RequestMapping("createReceiptList")
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> createReceiptList(@RequestParam("id") String id) {
+    public List<Map<String, Object>> createReceiptList(@RequestParam("id") String id) {
 
         //判断是否是特证
         if (receiptService.selectSpecialCardByAcceptNo(id)==1){
@@ -87,11 +87,8 @@ public class ReceiptApi {
             int specialCardCount =receiptService.selectSpecialCard(groupNo);
             receiptService.detailedTallyDown(specialCardCount,groupNo);
         }
-        Map<String,Object> resultMap=receiptService.selectReceiptListOfSpecialCard(id);
-        if (resultMap==null){
-            resultMap= receiptService.selectReceiptList(id);
-        }
-        return resultMap;
+        List<Map<String,Object>> resultList=receiptService.selectReceiptListOfSpecialCard();
+        return resultList;
 
     }
 

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

-package com.yxproject.start.api;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RestController
-@RequestMapping("tagPrint")
-public class TagPrintApi {
-
-    @RequestMapping("selectTagPrintData")
-    public List selectTagPrintData(@RequestParam("idCard")String idCard){
-        List list = new ArrayList();
-        return list;
-    }
-}

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

@@ -64,10 +64,8 @@ public interface ReceiptMapper {
 
 
     //根据身份证号查询特证交接单
-    @Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST \n" +
-            "LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO =RECEIPT_LIST.QR_CODE\n" +
-            "WHERE PROD_CARD_T.ID_NO =#{id}")
-    public Map<String,Object>selectReceiptListOfSpecialCard (String id);
+    @Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST where state=0\n")
+    public List<Map<String,Object>>selectReceiptListOfSpecialCard ();
 
 
     //根据身份证号查询普通证交接单

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

@@ -24,7 +24,7 @@ public interface ReceiptService {
 
     public int selectSpecialCardByAcceptNo(String id);
 
-    public Map<String,Object>selectReceiptListOfSpecialCard (String id);
+    public List<Map<String,Object>>selectReceiptListOfSpecialCard ();
 
     public Map<String,Object> selectReceiptList(String id);
 

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

@@ -63,9 +63,9 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public Map<String, Object> selectReceiptListOfSpecialCard(String id) {
-        Map<String,Object> resultMap= receiptMapper.selectReceiptListOfSpecialCard(id);
-        return resultMap;
+    public List<Map<String, Object>> selectReceiptListOfSpecialCard() {
+        List<Map<String,Object>> resultList= receiptMapper.selectReceiptListOfSpecialCard();
+        return resultList;
     }
 
     @Override

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

@@ -420,9 +420,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             selectTagPrintData:function(idCard,success){
                 $http({
                     method: 'GET',
-                    url: "../tagPrint/selectTagPrintData"+urlTimeStamp(),
+                    url: "../ReceiptApi/createReceiptList"+urlTimeStamp(),
                     params:{
-                        idCard:idCard
+                        id:idCard
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

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

@@ -11,6 +11,16 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
 
     .controller('receitpCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
+        //Date picker
+        $('#datepicker').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
 
     });
\ No newline at end of file

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

-<!--<style>-->
-    <!--.table th, .table td {-->
-            <!--text-align: center;-->
-            <!--vertical-align: middle!important;-->
-        <!--}-->
-    <!--.ul li{-->
-           <!--cursor: pointer;-->
-        <!--}-->
-        <!--.page-list .pagination {float:left;}-->
-        <!--.page-list .pagination span {cursor: pointer;}-->
-        <!--.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}-->
-        <!--.page-list .pagination .separate span:hover {background: none;}-->
-        <!--.page-list .page-total {float:left; margin: 25px 20px;}-->
-        <!--.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}-->
-        <!--.page-list .page-total input {width: 40px; padding-left:3px;}-->
-        <!--.page-list .page-total select {width: 50px;}-->
-        <!--.page-list:after {-->
-            <!--display: block;-->
-            <!--clear: both;-->
-            <!--content: ""-->
-        <!--}-->
-
-        <!--.page-list{-->
-            <!--zoom: 1-->
-        <!--}-->
-<!--</style>-->
 <style>
     form input{
         border:0;
@@ -37,7 +11,7 @@
     }
 
 </style>
-<section  class="content">
+<section  class="content row">
 <div class="col-md-12 no-padding" style="margin-top:20px;">
     <div class="box box-primary ">
         <div class="box-header with-border">

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

@@ -1017,35 +1017,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                         isPrint:1,
                         isEwrite:1
                     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                 ]
             }
 
@@ -1054,6 +1025,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         $scope.searchTagPrintData = function(){
             HttpService.selectTagPrintData($scope.idCard,function(data){
                 $scope.tagPrintData =data;
+                console.log($scope.tagPrintData)
             })
         }