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

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

@@ -307,7 +307,7 @@ public class ReceiptApi {
      */
     @RequestMapping("queryReceiptDateByCheckDate")
     public List<Map<String, Object>> queryReceiptDateByCheckDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) {
-        return receiptService.selectReceiptDateByCheckDate(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", "")),replaceDate(endDate.replaceAll(" ", "").replaceAll(":", "")));
+        return receiptService.selectReceiptDateByCheckDate(replaceNullString(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", ""))),replaceNullString(replaceDate(endDate.replaceAll(" ", "").replaceAll(":", ""))));
     }
 
 

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

@@ -193,16 +193,18 @@ public interface ReceiptMapper {
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectTimes(@Param("groupNo") String groupNo);
 
-    @Select("select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
+    @Select("<script>" +
+            "select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
             "RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_DM,GAJG_DM.GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
             ",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME,RECEIPT_LIST.state,RECEIPT_LIST.IS_PRINT from RECEIPT_LIST  \n" +
             "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 " +
-            "<if test ='startDate !=null'> " +
+            "<if test ='startDate != null'> " +
             "and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  " +
-            "</if> " +
+            "</if>" +
+            "</script> " +
             "")
     public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 

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

@@ -152,7 +152,7 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     @Override
     public List<Map<String, Object>> selectReceiptDateByCheckDate(String stratDate,String endDate) {
-        List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate(stratDate, endDate);
+        List<Map<String, Object>> mapList = receiptMapper.selectReceiptDateByCheckDate((stratDate), (endDate));
         List<Map<String, Object>> mapList1 = formateMap(mapList);
         return  mapList1;
     }
@@ -389,4 +389,16 @@ public class ReceiptServiceImpl implements ReceiptService {
         return "";
     }
 
+    /**
+     * 字符串去除空格
+     *
+     * @param str 原始字符串
+     * @return 返回新的字符串
+     */
+    private String replaceNullString(String str) {
+        if (str == "") {
+            return null;
+        } else return str;
+    }
+
 }