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

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

@@ -34,7 +34,10 @@ public interface CardDetailedListMapper {
      *查询详单数据
      */
 
-    @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" +
+    @Select("select DETAIL_RECEIPT_LIST.*,RECEIPT_LIST.state,PROD_TRACE_T.DOWNLOAD_DATE,PROD_TRACE_T.ELECTRIC_WRITE_DATE,PROD_TRACE_T.CHECK_DATE from DETAIL_RECEIPT_LIST \n" +
+            "left join PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ID_NO=DETAIL_RECEIPT_LIST.CARD_ID\n" +
+            "LEFT JOIN PROD_TRACE_T@PROD_LINK ON PROD_TRACE_T.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
+            "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);