xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整在场车辆查询

dev
lisai17@sina.com 2021-10-22 14:24:25 +08:00
parent 85e8aaf717
commit 2279385420
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java
View File

@ -128,12 +128,13 @@ public class TransportService extends BaseService {
" select t.truck_license, t.ordercluster_id from (\n" + " select t.truck_license, t.ordercluster_id from (\n" +
" select t.truck_license, max(c.id) ordercluster_id from ordercluster_truck t\n" + " select t.truck_license, max(c.id) ordercluster_id from ordercluster_truck t\n" +
" left join ordercluster c on t.ordercluster_id = c.id\n" + " left join ordercluster c on t.ordercluster_id = c.id\n" +
" where c.start_time <= ? \n" + " where c.state < 5 \n" +
" and c.start_time <= ? \n" +
" and c.cutoff_time >= ? \n" + " and c.cutoff_time >= ? \n" +
" group by t.truck_license\n" + " group by t.truck_license\n" +
" ) t\n" + " ) t\n" +
" ) a on a.truck_license = t.truck_license\n" + " ) a on a.truck_license = t.truck_license\n" +
" left join ordercluster c on a.ordercluster_id = c.id\n" + " left join ordercluster c on a.ordercluster_id = c.id and c.state < 5 \n" +
" where t.state < 5\n" + " where t.state < 5\n" +
" and t.supermarket_id = ? \n" + " and t.supermarket_id = ? \n" +
" order by t.flag, t.out_time desc "; " order by t.flag, t.out_time desc ";

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -103,7 +103,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 = "20211016"; public static final String CLINET_VERSION = "20211022";
public static String getRootPath() { public static String getRootPath() {
return PathKit.getWebRootPath() return PathKit.getWebRootPath()