潘钊 / control_service_data_Interface · Commits

Commit 609f1d2d4105b2d168f7aa6f23a23c2ca998c615

Authored by 潘钊
1 parent fed17f3c

update...

Inline Side-by-side
Showing 4 changed files with 5 additions and 5 deletions
... ... @@ -5,7 +5,7 @@
5 5 <groupId>com.bsth</groupId>
6 6 <artifactId>control_service_data_interface</artifactId>
7 7 <version>0.0.1-SNAPSHOT</version>
8   - <packaging>war</packaging>
  8 + <packaging>jar</packaging>
9 9  
10 10 <parent>
11 11 <groupId>org.springframework.boot</groupId>
... ...
src/main/java/com/bsth/ws_server/util/ScheduleCalculator.java
  View file @609f1d2
... ... @@ -497,7 +497,7 @@ public class ScheduleCalculator {
497 497 int count = 0;
498 498  
499 499 for(ScheduleRealInfo sch : list){
500   - if(sch.getBcType().equals("venting") &&
  500 + if((sch.getBcType().equals("venting") || sch.getBcType().equals("major")) &&
501 501 sch.getStatus() != -1)
502 502 count ++;
503 503 }
... ...
src/main/java/com/bsth/ws_server/waybill/entity/NH_waybillItem.java
  View file @609f1d2
... ... @@ -32,7 +32,7 @@ public class NH_waybillItem {
32 32 private Double m_dblSJJHLC;
33 33 /** 出场里程 */
34 34 private Double m_dblCCLC;
35   - /** 进场路码 */
  35 + /** 进场里程 */
36 36 private Double m_dblJCLC;
37 37 /** 空驶公里 */
38 38 private Double m_dblKSLC;
... ...
src/main/resources/application-prod.properties
  View file @609f1d2
1   -server.port=9088
  1 +server.port=9089
2 2 management.port= 9001
3 3 management.address= 127.0.0.1
4 4  
5   -spring.jpa.hibernate.ddl-auto= none
  5 +spring.jpa.hibernate.ddl-auto= update
6 6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
7 7 #DATABASE
8 8 spring.jpa.database= MYSQL
... ...