xiuagi1

src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -391,7 +391,6 @@
         on RS.SUPPLIER_ID = ASO.SHIPPER_ID
         left join TMSTRUCK_LOAD_RESULT TLR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        and TLR.MATERIAL_ID = TWR.MATERIAL_ID
         left join RMS_WAREHOUSE RW
         on RW.WAREHOUSE_ID = TLR.LOADING_ID
         left join RMS_TRUCK_CALCULATE RTCMAO

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout