修改配车重复验证的问题
parent
02caf17e1d
commit
eafc44d2de
|
|
@ -104,7 +104,7 @@ public class Config extends JFinalConfig {
|
||||||
public static DeviceThread deviceThread = new DeviceThread();
|
public static DeviceThread deviceThread = new DeviceThread();
|
||||||
public static SocketIOService socketio = null;
|
public static SocketIOService socketio = null;
|
||||||
private static boolean client_run = true;
|
private static boolean client_run = true;
|
||||||
public static final String CLINET_VERSION = "20211111";
|
public static final String CLINET_VERSION = "20220103";
|
||||||
|
|
||||||
public static String getRootPath() {
|
public static String getRootPath() {
|
||||||
return PathKit.getWebRootPath()
|
return PathKit.getWebRootPath()
|
||||||
|
|
|
||||||
|
|
@ -80,14 +80,12 @@ public class OrderclusterTruckSyncService extends BaseSyncService {
|
||||||
|
|
||||||
ts.add(0, start_time); // 加到查询参数里面
|
ts.add(0, start_time); // 加到查询参数里面
|
||||||
ts.add(0, cutoff_time); // 加到查询参数里面
|
ts.add(0, cutoff_time); // 加到查询参数里面
|
||||||
ts.add(0, ordercluster.getSaleType());
|
|
||||||
ts.add(0, ordercluster_id); // 加到查询参数里面
|
ts.add(0, ordercluster_id); // 加到查询参数里面
|
||||||
List<Record> chkduk = Db.find(
|
List<Record> chkduk = Db.find(
|
||||||
"select * from ordercluster_truck t\n" +
|
"select * from ordercluster_truck t\n" +
|
||||||
" left join ordercluster o on o.id = t.ordercluster_id\n" +
|
" left join ordercluster o on o.id = t.ordercluster_id\n" +
|
||||||
" where t.ordercluster_id <> ? \n" +
|
" where t.ordercluster_id <> ? \n" +
|
||||||
" and o.state < 5 \n" +
|
" and o.state < 5 \n" +
|
||||||
" and o.sale_type < ? \n" +
|
|
||||||
" and o.start_time <= ? \n" +
|
" and o.start_time <= ? \n" +
|
||||||
" and o.cutoff_time >= ? \n" +
|
" and o.cutoff_time >= ? \n" +
|
||||||
" and t.truck_license in (" + StrKit.join(tsql, ",") + ")", ts.toArray());
|
" and t.truck_license in (" + StrKit.join(tsql, ",") + ")", ts.toArray());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue