交接单修改

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/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