Explorar o código

Merge branch 'master' of http://210.51.45.41:3000/itcat_admin/aws_donenow

HULEI hai 2 semanas
pai
achega
f70432eba1

+ 3 - 1
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/service/InvoiceService.java

@@ -96,9 +96,11 @@ public class InvoiceService {
                 LocalDate itemDate = LocalDate.parse(ITEM_DATE, formatter);
 
                 //i) 弹出窗口输入账单起止日期,保存时需要校验所选条目是否在账单起止日期内
+                /*
                 if (itemDate.isBefore(param.getDateRangeFrom()) || itemDate.isAfter(param.getDateRangeTo())) {
                     return "所选条目计费日期必须在输入的账单起止日期内";
                 }
+                 */
 
                 //  ii) 批量选择条目:计费客户相同、状态必须为----未生成生成账单
                 if (StringUtils.isBlank(BILL_ACCOUNT_ID)) BILL_ACCOUNT_ID = row.getString("BILL_ACCOUNT_ID");
@@ -167,7 +169,7 @@ public class InvoiceService {
             }
         }
 
-        logger.info("发票ID:" + invoiceIds.toString());
+        logger.info("发票ID:" + invoiceIds);
 
         String invoiceBINDID = DBSql.getString("SELECT BINDID FROM BO_EU_DNCTT_INVOICE WHERE ID=?", new Object[]{invoiceIds.get(0)});