Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/ReportController.java

@@ -104,4 +104,19 @@ public class ReportController {
                                               Integer pageSize){
         return reportFeign.getTransReportCarrier(mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value="型钢报表")
+    @PostMapping(value = "/getTransReportXG")
+    Map<String, Object> getTransReportXG(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return reportFeign.getTransReportXG(mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="修改运价")
+    @PostMapping(value = "/updateTransUnitPrice")
+    Map<String, Object> updateTransUnitPrice(@RequestBody(required=false) HashMap<String,Object> map){
+        return reportFeign.updateTransUnitPrice(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/ReportFeign.java

@@ -48,4 +48,13 @@ public interface ReportFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam  Integer pageNum,
                                               @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/saleReports/getTransReportXG")
+    Map<String, Object> getTransReportXG(@RequestBody(required = false) HashMap<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam  Integer pageNum,
+                                              @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/saleReports/updateTransUnitPrice")
+    Map<String, Object> updateTransUnitPrice(HashMap<String, Object> map);
 }

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 #    url: ${REPORTFEIGN_URL:localhost:8055}

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

@@ -1616,7 +1616,7 @@
             GROUP BY DRIVER_ID
             ) T ON T."driverId" = RP .PERSONNEL_ID
         </if>
-        WHERE RP.DELETED = 0
+        WHERE RP.DELETED != -1
         <if test="isNC!=null">
             AND RP.SOURCE_ID IS NOT NULL
         </if>