Commit 10cfc34e by 丁伟峰

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

2 parents 13906767 bb2f72a6
......@@ -121,7 +121,7 @@ public class BatchServiceImpl implements BatchService {
" left join order_appointment o on (a.order_id =o.order_id)\n" +
" where a.org_group_id=? and a.status='OPEN' \n" +
" and a.dt = ? " +
" and a.appointment_status = 'ASSIGNED' and o.appointment_method like 'AUTO%' \n" +
" and a.appointment_status = 'ASSIGNED' and a.appointment_method like 'AUTO%' \n" +
" and o.pre_status in ('PRE') \n" +
" order by a.expect_time_begin asc ";
int orderCountPre = jdbcTemplate.update(sqlOrderPre, batchNo, groupId, batchDay);
......
......@@ -3,7 +3,7 @@
<appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] [%-20.20c] %-5p %m%n</pattern>
<pattern>%d{HH:mm:ss.SSS} [%thread] [%-20.20c] %line %-5p %m%n </pattern>
</encoder>
</appender>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!