Commit a9757024c0b9b371848def143f942e6da97a1cc8
1 parent
5a442260
工时统计表：路牌查询由模糊查询改为精确查询。
Showing
2 changed files
with
36 additions
and
36 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -3711,7 +3711,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -3711,7 +3711,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3711 | } | 3711 | } |
| 3712 | } | 3712 | } |
| 3713 | if(lp.trim().length() > 0){ | 3713 | if(lp.trim().length() > 0){ |
| 3714 | - if(!(map.get("lpName").toString().toLowerCase().contains(lp.toLowerCase()))){ | 3714 | + if(!(map.get("lpName").toString().toLowerCase().equals(lp.toLowerCase()))){ |
| 3715 | continue; | 3715 | continue; |
| 3716 | } | 3716 | } |
| 3717 | } | 3717 | } |
src/main/resources/application-test.properties
| 1 | -server.port=9088 | ||
| 2 | -management.port= 9001 | ||
| 3 | -management.address= 127.0.0.1 | ||
| 4 | - | ||
| 5 | -spring.jpa.hibernate.ddl-auto= none | ||
| 6 | -spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | ||
| 7 | -#DATABASE | ||
| 8 | -spring.jpa.database= MYSQL | ||
| 9 | -spring.jpa.show-sql= false | ||
| 10 | -spring.datasource.driver-class-name= com.mysql.jdbc.Driver | ||
| 11 | -spring.datasource.url= jdbc:mysql://192.168.168.203/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | ||
| 12 | -spring.datasource.username= root | ||
| 13 | -spring.datasource.password= root2jsp | ||
| 14 | -#DATASOURCE | ||
| 15 | -spring.datasource.max-active=100 | ||
| 16 | -spring.datasource.max-idle=8 | ||
| 17 | -spring.datasource.min-idle=8 | ||
| 18 | -spring.datasource.initial-size=5 | ||
| 19 | - | ||
| 20 | -spring.datasource.test-on-borrow=true | ||
| 21 | -spring.datasource.test-on-connect=true | ||
| 22 | -spring.datasource.test-on-return=true | ||
| 23 | -spring.datasource.test-while-idle=true | ||
| 24 | -spring.datasource.validation-query=select 1 | ||
| 25 | - | ||
| 26 | -## | ||
| 27 | -#222.66.0.204:5555 | ||
| 28 | -##\u5B9E\u65F6gps | ||
| 29 | -http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/ | ||
| 30 | -##\u6D88\u606F\u4E0B\u53D1 | ||
| 31 | -#http.send.directive = http://192.168.168.171:8080/transport_server/message/ | ||
| 32 | -## increment offset | ||
| 33 | -auto_increment_offset= -1 | ||
| 34 | -## send waybill results | ||
| 35 | -waybill.emails= 113252620@qq.com,mhkyzd@163.com | 1 | +server.port=9088 |
| 2 | +management.port= 9001 | ||
| 3 | +management.address= 127.0.0.1 | ||
| 4 | + | ||
| 5 | +spring.jpa.hibernate.ddl-auto= none | ||
| 6 | +spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | ||
| 7 | +#DATABASE | ||
| 8 | +spring.jpa.database= MYSQL | ||
| 9 | +spring.jpa.show-sql= false | ||
| 10 | +spring.datasource.driver-class-name= com.mysql.jdbc.Driver | ||
| 11 | +spring.datasource.url= jdbc:mysql://192.168.168.203/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | ||
| 12 | +spring.datasource.username= root | ||
| 13 | +spring.datasource.password= root2jsp | ||
| 14 | +#DATASOURCE | ||
| 15 | +spring.datasource.max-active=100 | ||
| 16 | +spring.datasource.max-idle=8 | ||
| 17 | +spring.datasource.min-idle=8 | ||
| 18 | +spring.datasource.initial-size=5 | ||
| 19 | + | ||
| 20 | +spring.datasource.test-on-borrow=true | ||
| 21 | +spring.datasource.test-on-connect=true | ||
| 22 | +spring.datasource.test-on-return=true | ||
| 23 | +spring.datasource.test-while-idle=true | ||
| 24 | +spring.datasource.validation-query=select 1 | ||
| 25 | + | ||
| 26 | +## | ||
| 27 | +#222.66.0.204:5555 | ||
| 28 | +##\u5B9E\u65F6gps | ||
| 29 | +http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/ | ||
| 30 | +##\u6D88\u606F\u4E0B\u53D1 | ||
| 31 | +#http.send.directive = http://192.168.168.171:8080/transport_server/message/ | ||
| 32 | +## increment offset | ||
| 33 | +auto_increment_offset= -1 | ||
| 34 | +## send waybill results | ||
| 35 | +waybill.emails= 113252620@qq.com,mhkyzd@163.com |