修改查询生成交接单数据

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

@@ -199,7 +199,11 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
             "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
-            " where receipt_date is null and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  ")
+            " where receipt_date is null " +
+            "<if test ='startDate !=null'> " +
+            "and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  " +
+            "</if> " +
+            "")
     public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 
@@ -221,7 +225,7 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
             "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
-            " where to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} and receipt_date is null ")
+            " where RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} and receipt_date is null and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  ")
     public List<Map<String,Object>> selectReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("string") String string,@Param("type") long type);
 
     @Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST  LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE  where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")