Merge branch 'dev' of…

Merge branch 'dev' of http://123.183.159.198:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev

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

@@ -22,11 +22,12 @@ public interface DetailReceiptListMapper {
      */
     @Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.SIGN_GOVT,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
             "DETAIL_RECEIPT_LIST.sex,DETAIL_RECEIPT_LIST.CARD_ID,DETAIL_RECEIPT_LIST.POLICE_CODE,DIC_UPLOAD_UNIT_T.UNIT_NAME POLICE_NAME,to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,\n" +
-            "RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note,RECEIPT_LIST.QR_CODE \n" +
+            "RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note,RECEIPT_LIST.QR_CODE,PROD_APPLY_INFO_T.APPLY_PHONE \n" +
             "from DETAIL_RECEIPT_LIST \n" +
             "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" +
             "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = DETAIL_RECEIPT_LIST.POLICE_CODE\n" +
+            "LEFT JOIN PROD_DBA.PROD_APPLY_INFO_T@PROD_LINK ON PROD_APPLY_INFO_T.UPLOAD_NO = DETAIL_RECEIPT_LIST.UPLOAD_NO\n"+
             "where RECEIPT_LIST.id in (${str}) order by DETAIL_RECEIPT_LIST.ACCEPT_NO ")
     public List<Map<String, Object>> selectPostDetails(@Param("str") String str);
 

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

@@ -45,6 +45,7 @@ public  class ExportExcel {
         sheet.setColumnWidth(10, 30 * 110);
         sheet.setColumnWidth(11, 30 * 110);
         sheet.setColumnWidth(12, 30 * 110);
+        sheet.setColumnWidth(13, 30 * 110);
         //第三步创建行row:添加表头0行
         HSSFRow row = sheet.createRow(0);
         HSSFCellStyle style = wb.createCellStyle();//样式
@@ -84,6 +85,8 @@ public  class ExportExcel {
         cell.setCellValue("复核人");
         cell = row.createCell(14);         //设定值
         cell.setCellValue("备注");
+        cell = row.createCell(15);         //设定值
+        cell.setCellValue("联系方式");
 
         for (int i =0;i<mapList.size();i++){
             row = sheet.createRow(i + 1);
@@ -117,6 +120,8 @@ public  class ExportExcel {
             cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
             cell = row.createCell(14);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("NOTE")+"")?"":mapList.get(i).get("NOTE")+"");
+            cell = row.createCell(15);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("APPLY_PHONE")+"")?"":mapList.get(i).get("APPLY_PHONE")+"");
 
         }