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

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

@@ -79,6 +79,7 @@ public class ExportExcelApi {
             byte[] b = new byte[fis.available()];
             fis.read(b);
             fis.close();
+            response.setContentType("APPLICATION/OCTET-STREAM");
             response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xls");
             return b;
         } catch (FileNotFoundException e) {

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

@@ -199,7 +199,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,'yyyyMMdd') = #{date} and RECEIPT_LIST.POLICE_CODE in (#{string}) and CARD_TYPE_DIC.CARD_TYPE_ID=#{type} ")
+            " where to_char(CHECK_DATE,'yyyyMMdd') = ${date} and RECEIPT_LIST.POLICE_CODE in (${string}) and CARD_TYPE_DIC.CARD_TYPE_ID=${type} ")
     public List<Map<String,Object>> selectReceiptDate(@Param("date") String date,@Param("string") String string,@Param("type") long type);
 
 

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

@@ -62,7 +62,7 @@ public interface ReceiptService {
 
     public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
 
-    public List<Map<String,Object>> selectReceiptList(List<Integer> stringList,String date,long typeCode);
+    public List<Map<String,Object>> selectReceiptList(List<String> stringList,String date,long typeCode);
 
     public Map<String,Object>selectDetailedData2(String id);
 

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

@@ -155,13 +155,13 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public List<Map<String, Object>> selectReceiptList(List<Integer> stringList, String date, long typeCode) {
+    public List<Map<String, Object>> selectReceiptList(List<String> stringList, String date, long typeCode) {
         String str ="";
         for (int i =0;i<stringList.size();i++){
             if (i==stringList.size()-1){
-                str+=stringList.get(i)+"";
+                str+="'"+stringList.get(i)+"'";
             }else {
-                str+=stringList.get(i)+",";
+                str+="'"+stringList.get(i)+"',";
             }
         }
         return receiptMapper.selectReceiptDate(date,str,typeCode);