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

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

@@ -844,9 +844,6 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> amsScheduleDispatchNoPage(@RequestBody HashMap<String,Object> parmas){
         return amsFeign.amsScheduleDispatchNoPage(parmas);
     }
-    @ApiOperation("多拼派车")
-    @PostMapping("/saleDispatchDuoPin")
-    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return amsFeign.saleDispatchDuoPin(map);}
 
     @ApiOperation("查询司磅地点")
     @PostMapping("/getMaterialOperation")

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

@@ -763,4 +763,8 @@ public class TMSController extends BaseRESTfulController {
     public RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map) {
         return tmsFeign.saleDispatchList(map);
     }
+
+    @ApiOperation("多拼派车")
+    @PostMapping("/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return tmsFeign.saleDispatchDuoPin(map);}
 }

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

@@ -311,8 +311,6 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amsscheduledispatchs/noPage")
     Map<String, Object> amsScheduleDispatchNoPage(@RequestBody Map<String, Object> map);
-    @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchDuoPin")
-    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getMaterialOperation")
     RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map);

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

@@ -270,6 +270,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchList")
     RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/saleDispatchDuoPin")
+    RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
 }
 
 

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

@@ -1584,13 +1584,13 @@
                 AND "personnelPost" = #{personnelPost}
             </if>
             <if test="personnelId!=null and personnelId!=''">
-                AND "personnelId" = #{personnelId})
+                AND "personnelId" = #{personnelId}
             </if>
             <if test="driverId!=null and driverId!=''">
-                AND "personnelId" = #{driverId})
+                AND "personnelId" = #{driverId}
             </if>
             <if test="driverId2!=null and driverId2!=''">
-                AND "personnelId" = #{driverId2})
+                AND "personnelId" = #{driverId2}
             </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})