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

src/main/java/com/uas/eis/task/ElecInvoiceTask.java

@@ -247,7 +247,7 @@ public class ElecInvoiceTask {
                 m.put("taxnum",taxnum);
                 logger.info("ElecI-redPdfUrlUpdate: master: {} Begin ",master);
                 SpObserver.putSp(master);
-                List<String> serialNosAll = baseDao.queryForList("select ei_redsid from ElecInvoice left join InvoiceOrder on ei_ioid = io_id where io_ordertype=1 and EI_RELATIVEREFNO is not null and ei_redpdfurl is null and nvl(EI_BILLSTATUS,' ') in ('01','04')",String.class);
+                List<String> serialNosAll = baseDao.queryForList("select ei_redsid from ElecInvoice left join InvoiceOrder on ei_ioid = io_id where io_ordertype=1 and EI_RELATIVEREFNO is not null and ei_redpdfurl is null and nvl(EI_BILLSTATUS,' ') in (' ','01','04')",String.class);
                 if (serialNosAll == null){
                     logger.info("ElecI-redPdfUrlUpdate: master: {} size: {} ",master,0);
                 }else {