上传修改查询交接单API

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

@@ -38,7 +38,7 @@ public class ReceiptApi {
     @Transactional(rollbackFor = Exception.class)
     public Map<String,Object> createReceiptList(String id,String name,String beginDate,String expireDate) {
         //判断是否是特证
-        if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
+        if (receiptService.selectSpecialCardByAcceptNo(id,beginDate,expireDate) == 1) {
             //查询这个受理号是否生成了交接单
             List<Map<String, Object>> mapList = receiptService.selectCountById(id,beginDate,expireDate);
             //判断是否生成了交接单

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

@@ -105,8 +105,8 @@ public interface ReceiptMapper {
     //根据身份证号查询特证表count
     @Select("select count(*) from SPECIAL_CARD \n" +
             "left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" +
-            "where prod_card_t.id_no = #{id}")
-    public int selectSpecialCardByAcceptNo(@Param("id") String id);
+            "where prod_card_t.id_no = #{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate}")
+    public int selectSpecialCardByAcceptNo(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //查询未复核交接单
     @Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0 and check_name =#{name} \n")

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

@@ -21,7 +21,7 @@ public interface ReceiptService {
 
     public List<Map<String,Object>> selectByGroupNo(String groupNo);
 
-    public int selectSpecialCardByAcceptNo(String id);
+    public int selectSpecialCardByAcceptNo(String id,String beginDate,String expireDate);
 
     public List<Map<String,Object>>selectReceiptListOfSpecialCard (String name);
 

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

@@ -53,8 +53,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public int selectSpecialCardByAcceptNo(String id) {
-        int countSpecial =receiptMapper.selectSpecialCardByAcceptNo(id);
+    public int selectSpecialCardByAcceptNo(String id,String beginDate,String expireDate) {
+        int countSpecial =receiptMapper.selectSpecialCardByAcceptNo(id,beginDate,expireDate);
         return countSpecial;
     }
 

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

@@ -504,13 +504,15 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            selectTagPrintData:function(idCard,success){
+            selectTagPrintData:function(idCard,startDate,endDate,success){
                 $http({
                     method: 'GET',
                     url: "../ReceiptApi/createReceiptList"+urlTimeStamp(),
                     params:{
                         id:idCard,
-                        name:$rootScope.loginData.name
+                        name:$rootScope.loginData.name,
+                        beginDate:startDate,
+                        expireDate:endDate
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

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

@@ -17,6 +17,9 @@
                    <td width="10%" style="text-align: center;vertical-align: middle!important;">身份证号:</td>
                    <td colspan="2" width="35%">
                        <input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
+                   </td>
+                   <td colspan="2">
+                       有效期: <input style="width:9%;" name="yxqstart" type="text" ng-model="startDate"> 至 <input style="width:15%;" name="yxqend" type="text" ng-model="endDate">
                    </td>
                     <td style="text-align: left;">
                         <button class="btn btn-primary search" ng-click="searchTagPrintData()">查询</button>

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

@@ -82,8 +82,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             idCard:''
         }
 
-        var doQueryByIdCard = function(idcard){
-            HttpService.selectTagPrintData(idcard,function(data){
+        var doQueryByIdCard = function(idcard,startDate,endDate){
+            HttpService.selectTagPrintData(idcard,startDate,endDate,function(data){
                 $(".search").removeAttr("disabled");
                 console.log(data)
                 if(data.state==1){
@@ -141,7 +141,9 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     var ret = document.getElementById("aaa").ReadCardPath("c:\\", 1);
                     if (ret == 1 || ret == 3) {
                         postParam.idCard = document.getElementById("aaa").sIDNo;
-                        doQueryByIdCard(postParam.idCard)
+                        postParam.startDate = document.getElementById("aaa").sStartDate;;
+                        postParam.endDate = document.getElementById("aaa").sEndDate;
+                        doQueryByIdCard(postParam.idCard,postParam.startDate,postParam.endDate)
                     }
                 }
                 else {