push

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

@@ -73,7 +73,7 @@ public class ExportExcelApi {
         String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
 //        //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
         String fout = null;
-        fout = ExportExcel.exportExcelDate(mapList);
+        fout = ExportExcel.exportReceiptExcelDate(mapList);
         String outFile = dateTime+"交接单" ;
         try {
             FileInputStream fis = new FileInputStream(new File(fout));

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

@@ -19,7 +19,7 @@ public interface DetailReceiptListMapper {
      */
     @Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
             "DETAIL_RECEIPT_LIST.sex,DETAIL_RECEIPT_LIST.CARD_ID,DETAIL_RECEIPT_LIST.POLICE_CODE,\n" +
-            "to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd'),RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER\n" +
+            "to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER\n" +
             "from DETAIL_RECEIPT_LIST left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\n" +
             "left join PERSON_POST on PERSON_POST.FIRST_WHITE = DETAIL_RECEIPT_LIST.UPLOAD_NO\n" +
             "where to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') =#{date}")

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

@@ -138,7 +138,7 @@ public interface ReceiptMapper {
     public List<Map<String,Object>> selectReceiptDateByCheckDate(@Param("date") String date);
 
     @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" +
-            "RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_DM,GAJG_DM.GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
+            "RECEIPT_LIST.FINISH_COUNT,GAJG_DM.GAJG_DM,GAJG_DM.GAJG_MC,to_char(CHECK_DATE,'yyyyMMdd') CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
             ",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME 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" +

src/main/java/com/yxproject/start/utils/ExportExcel.java

@@ -97,7 +97,7 @@ public  class ExportExcel {
             cell = row.createCell(9);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("OLD_CARD_TYPE_ID")+"")?"":mapList.get(i).get("OLD_CARD_TYPE_ID")+"");
             cell = row.createCell(10);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("CHECK_DATE")+"")?"":mapList.get(i).get("CHECK_DATE")+"");
+            cell.setCellValue(mapList.get(i).get("CHECK_DATE")+"");
             cell = row.createCell(11);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
             cell = row.createCell(12);         //设定值