修改查询所有身份证详单

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -36,14 +37,14 @@ public class CardDetailedListApi {
 
 
     /**
-     * 查询身份证详单
+     * 查询所有的身份证详单
      *通过身份证号
      * @param idCard 查询身份证详单
      * @return
      */
     @RequestMapping("findAllCardDetailedList")
-    public List<DetailReceiptListEntity> findAllCardDetailedList(@RequestParam("idCard") String idCard) {
-        List<DetailReceiptListEntity> list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard);
+    public List<Map<String,Object>> findAllCardDetailedList(@RequestParam("idCard") String idCard) {
+        List<Map<String,Object>> list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard);
         return list;
     }
 

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -33,7 +34,8 @@ public interface CardDetailedListMapper {
      *查询详单数据
      */
 
-    @Select("select * from DETAIL_RECEIPT_LIST where RECEIPT_ID in (select RECEIPT_ID from DETAIL_RECEIPT_LIST where CARD_ID =#{idCard} )")
-    public List<DetailReceiptListEntity> findAllCardDetailedListByIdCard(@Param("idCard")String idCard);
+    @Select("select DETAIL_RECEIPT_LIST.*,RECEIPT_LIST.state from DETAIL_RECEIPT_LIST left join RECEIPT_LIST on RECEIPT_LIST.id = DETAIL_RECEIPT_LIST.RECEIPT_ID\n" +
+            "where RECEIPT_ID in (select RECEIPT_ID from DETAIL_RECEIPT_LIST where CARD_ID =#{idCard} )")
+    public List<Map<String,Object>> findAllCardDetailedListByIdCard(@Param("idCard")String idCard);
 
 }

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

@@ -5,6 +5,7 @@ import com.yxproject.start.entity.DetailReceiptListEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -14,7 +15,7 @@ public interface CardDetailedListService {
 
 
     public List<DetailReceiptListEntity> findCardDetailedListByIdCard(String idCard);
-    public List<DetailReceiptListEntity> findAllCardDetailedListByIdCard(String idCard);
+    public List<Map<String,Object>> findAllCardDetailedListByIdCard(String idCard);
 
     public boolean saveCardDetailedList(String uploadNo,String policeCode,String cardId,String name);
 

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -25,8 +26,8 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
     }
 
     @Override
-    public List<DetailReceiptListEntity> findAllCardDetailedListByIdCard(String idCard) {
-        List<DetailReceiptListEntity> list  = cardDetailedListMapper.findAllCardDetailedListByIdCard(idCard);
+    public List<Map<String,Object>> findAllCardDetailedListByIdCard(String idCard) {
+        List<Map<String,Object>> list  = cardDetailedListMapper.findAllCardDetailedListByIdCard(idCard);
         return list;
     }