修改

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

@@ -612,4 +612,25 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> changeSaleTransOrder(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.changeSaleTransOrder(map);
     }
+
+
+    @ApiOperation(value = "查询司机运输汇总")
+    @PostMapping("/getDriverTotalResult")
+    public Map<String, Object> getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return tmsFeign.getDriverTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+
+    @ApiOperation(value = "查询车辆运输汇总")
+    @PostMapping("/getCapacityTotalResult")
+    public Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return tmsFeign.getDriverTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
 }

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

@@ -95,7 +95,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查作业点")
     @PostMapping("/getOperationPointByLike")
     public RESTfulResult getOperationPointByLike(@RequestBody(required = false) Map<String,Object> map) {
-        System.out.println(map.get("id"));
+        //System.out.println(map.get("id"));
         List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
         return success(list);
     }

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

@@ -213,6 +213,19 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
     Map<String, Object> changeSaleTransOrder(Map<String, Object> map);
 
+
+    @PostMapping("api/v1/tms/omstransorders/getDriverTotalResult")
+    Map<String, Object> getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/omstransorders/getCapacityTotalResult")
+    Map<String, Object> getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
 }
 
 

src/main/resources/application-prod.yml

@@ -25,11 +25,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:
@@ -41,7 +41,7 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8096}
+    url: ${TMSFEIGN_URL:localhost:8096}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.214:9001}
 

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

@@ -99,6 +99,9 @@
             <if test="companyType!=null and companyType!=''">
                 AND "companyType" = #{companyType}
             </if>
+            <if test="companyId!=null and companyId!=''">
+                AND "companyId" = #{companyId}
+            </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
@@ -131,6 +134,9 @@
             <if test="remark!=null and remark!=''">
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
+            <if test="materialTypeId!=null and materialTypeId!=''">
+                AND REGEXP_LIKE("materialTypeId", #{materialTypeId})
+            </if>
            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -214,8 +220,8 @@
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
-        PERSONNEL_NAME "text"
-
+        PERSONNEL_NAME "text",
+        'personnelName' "prop"
         from RMS_PERSONNEL
         where DELETED = 0
         )
@@ -223,6 +229,9 @@
             <if test="personnelPost!=null and personnelPost!=''">
                 AND "personnelPost" = #{personnelPost}
             </if>
+            <if test="personnelId!=null and personnelId!=''">
+                AND REGEXP_LIKE("personnelId", #{personnelId})
+            </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
@@ -242,7 +251,9 @@
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
             RCA .CAPACITY_NUMBER "label",
-            RCA .CAPACITY_NUMBER "text"
+            RCA .CAPACITY_NUMBER "text",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            'capacityNumber' "prop"
             FROM RMS_CAPACITY RCA
             LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
             LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
@@ -262,6 +273,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="capacityId!=null and capacityId!=''">
+                AND REGEXP_LIKE("capacityId", #{capacityId})
+            </if>
             <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -314,6 +328,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
+            <if test="transrangeId!=null and transrangeId!=''">
+                AND REGEXP_LIKE("transrangeId", #{transrangeId})
+            </if>
             <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -368,6 +385,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(RCT.CAPACITY_TYPE_NAME, #{index})
             </if>
+            <if test="capacityTypeId!=null and capacityTypeId!=''">
+                AND REGEXP_LIKE(RCT.CAPACITY_TYPE_ID, #{capacityTypeId})
+            </if>
         </where>
         GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         FETCH NEXT 10 ROWS ONLY
@@ -425,6 +445,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label" || "points", #{index})
             </if>
+            <if test="lineId!=null and lineId!=''">
+                AND REGEXP_LIKE("lineId" , #{lineId})
+            </if>
             <if test="lineType!=null and lineType!=''">
                 AND REGEXP_LIKE("lineType" , #{lineType})
             </if>