Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1417,11 +1417,12 @@ public class AMScontroller{
     public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  Integer apiId) {
+                                                  Integer apiId,
+                                                  String consigneeSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1429,11 +1430,12 @@ public class AMScontroller{
     Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId){
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1449,11 +1451,12 @@ public class AMScontroller{
                                                               Integer apiId,
                                                               String con,
                                                               Integer shipperId,
-                                                              Integer saleType
+                                                              Integer saleType,
+                                                              String consigneeSsoId
 //                                                              String startDate,
 //                                                              String endDate
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1849,4 +1852,28 @@ public class AMScontroller{
     public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {
         return amsFeign.getAllSaleMessages(saleOrderId);
     }
-}
+
+    @ApiModelProperty(value = "修改承运商授权")
+    @PostMapping("/updateTruckNoCarrier")
+    public Map<String,Object> updateTruckNoCarrier(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateTruckNoCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "批量上传销售订单")
+    @PostMapping("/uploadSaleOrderList")
+    public Map<String,Object> uploadSaleOrderList(@RequestBody List<Map<String,Object>> saleOrderIdList) {
+        return amsFeign.uploadSaleOrderList(saleOrderIdList);
+    }
+
+    @ApiModelProperty(value = "自动匹配出最近的一个地址")
+    @PostMapping("/matchingAddressRecently")
+    public RESTfulResult matchingAddressRecently(@RequestParam Integer receiveId) {
+        return amsFeign.matchingAddressRecently(new BigDecimal(receiveId));
+    }
+
+    @ApiModelProperty(value = "自动匹配上一条运单的司机电话")
+    @PostMapping("/matchingDriverTelRecently")
+    public RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber) {
+        return amsFeign.matchingDriverTelRecently(capacityNumber);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.config.ImageFileUtils;
+import com.steerinfo.dil.feign.OtmsFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -24,15 +25,18 @@ import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/otms")
 public class OTMSController {
+
     @Autowired
-    private TmsTruckFeign tmsTruckFeign;
+    private OtmsFeign otmsFeign;
     @Autowired
     private ImageFileUtils imageFileUtils;
     @ApiOperation(value="全路径展示接口")
     @PostMapping("/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception {
-        return tmsTruckFeign.fullPath(orderNumber);
+        return otmsFeign.fullPath(orderNumber);
     }
+
+    @ApiOperation(value = "在途订单列表")
     @PostMapping("/getInTransitTransportation")
     public RESTfulResult getInTransitTransportation(@RequestBody(required=false)   Map<String,Object> mapValue,
                                                     @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
@@ -40,9 +44,10 @@ public class OTMSController {
                                                     @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     )
     {
-        return tmsTruckFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+        return otmsFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
+    @ApiOperation(value = "有异常订单列表")
     @PostMapping("/getHaveAbnormalTruckOrderInfo")
     public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody(required=false)   Map<String,Object> mapValue,
                                                     @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
@@ -50,10 +55,10 @@ public class OTMSController {
                                                     @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     )
     {
-        return tmsTruckFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+        return otmsFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
-    @ApiOperation("查询在途运输")
+    @ApiOperation("已完成订单列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
@@ -66,12 +71,13 @@ public class OTMSController {
                                                  @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
                                                  @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     ){
-        return tmsTruckFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+        return otmsFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
+    @ApiOperation(value = "获得抵达实集")
     @PostMapping(value = "/addtmstruckArrivalResult")
     public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartFile file){
-        return tmsTruckFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
+        return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
     }
 
     @PostMapping(value = "/addTmstruckReceiptResult")
@@ -79,34 +85,35 @@ public class OTMSController {
         List<MultipartFile> files = new ArrayList<>();
         files.add(request.getFile("file0"));
         files.add(request.getFile("file1"));
+        if (request.getFile("file2")!=null){
+            files.add(request.getFile("file2"));
+        }
         Map<String,Object> mapValue=new HashMap<>();
         for (int i=0;i<files.size();i++){
             MultipartFile file=files.get(i);
             String url = imageFileUtils.updateFile(file);
             mapValue.put("url"+i,url);
         }
-        return tmsTruckFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
+        return otmsFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
 
+    @ApiOperation(value="查询当前报警类型")
     @PostMapping(value = "/selectWarnSwitch")
     public RESTfulResult selectWarnSwitch(){
-        return tmsTruckFeign.selectWarnSwitch();
+        return otmsFeign.selectWarnSwitch();
     }
 
-    /**是否开启运输报警状态
-     * warnSwitchaddTmstruckTotalResult
-     * @param
-     * @returninTransitOrderMileage
-     */
+
     @ApiOperation(value="是否开启运输报警状态")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
     })
     @PostMapping(value = "/inTransitWarn")
     public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio){
-        return tmsTruckFeign.inTransitWarn(warnSwitch,radio);
+        return otmsFeign.inTransitWarn(warnSwitch,radio);
     }
 
+    @ApiOperation(value="获得异常信息")
     @PostMapping("/getTransportAbnormalInfo")
     public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
                                                   @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
@@ -115,12 +122,62 @@ public class OTMSController {
                                                   @RequestParam(name = "pageSize") Integer pageSize){
         mapValue=mapValue!=null?mapValue:new HashMap<>();
         mapValue.put("orderNumbers",orderNumbers);
-        return tmsTruckFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
+        return otmsFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
     }
 
+    @ApiOperation(value="车牌号和时间查询路径")
     @PostMapping("/fullPathVisualizationByCarNumber")
     public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception{
-        return tmsTruckFeign.fullPathVisualizationByCarNumber(mapValue);
+        return otmsFeign.fullPathVisualizationByCarNumber(mapValue);
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getArrivalResult")
+    public Map<String,Object> getArrivalResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return otmsFeign.getArrivalResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示满货箱的照片")
+    @PostMapping("/getArrivalPhoto")
+    public String getArrivalPhoto(@RequestParam String orderNumber){
+        return otmsFeign.getArrivalPhoto(orderNumber);
+    }
+
+    @ApiOperation("厂外抵达作业")
+    @PostMapping("/getReceiptResult")
+    public Map<String,Object> getReceiptResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return otmsFeign.getReceiptResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
+        Map<String,Object> map=otmsFeign.getReceivingPhotoByUrl(orderNumber);
+        if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
+            String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
+            map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
+        }
+        if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
+            map.put("resultSignedNotePhoto",resultSignedNotePhoto);
+        }
+        if(map.containsKey("resultReceiveNotePhoto") && map.get("resultReceiveNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultReceiveNotePhoto").toString());
+            map.put("resultReceiveNotePhoto",resultSignedNotePhoto);
+        }
+        return map;
     }
 
 }

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

@@ -2128,8 +2128,10 @@ public class TMSController extends BaseRESTfulController {
                                                   Integer apiId,
                                                   Integer pageNum,
                                                   Integer pageSize,
+                                                  String startTime,
+                                                  String endTime,
                                                   String con){
-        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+        return tmsTruckFeign.getCapacityByDefend(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime,con);
     }
 
     @ApiOperation("厂外抵达作业")

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

@@ -701,9 +701,6 @@ public class UniversalController extends BaseRESTfulController {
         if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
             mapValue.put("materialSpecificationText", materialSpecificationText);
         }
-        if (materialModelText != null && !materialModelText.equals("undefined") && !materialModelText.equals("null")) {
-            mapValue.put("materialModelText", materialModelText);
-        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getSteelMaterial(mapValue);

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

@@ -1349,7 +1349,8 @@ public interface AmsFeign {
     Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
-                                           @RequestParam Integer apiId);
+                                           @RequestParam Integer apiId,
+                                           @RequestParam(required = false) String consigneeSsoId);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1359,7 +1360,8 @@ public interface AmsFeign {
     Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId);
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1368,7 +1370,8 @@ public interface AmsFeign {
                                                        @RequestParam("apiId") Integer apiId,
                                                        @RequestParam("con") String con,
                                                        @RequestParam Integer shipperId,
-                                                       @RequestParam(required = false) Integer saleType
+                                                       @RequestParam(required = false) Integer saleType,
+                                                       @RequestParam(required = false) String consigneeSsoId
 //                                                       @RequestParam String startDate,
 //                                                       @RequestParam String endDate
     );
@@ -1633,4 +1636,20 @@ public interface AmsFeign {
     //查询出销售订单下的所有数据
     @PostMapping(value = "/api/v1/ams/amssaleorders/getAllSaleMessages")
     RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId);
+
+    // 修改承运商授权
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateTruckNoCarrier")
+    Map<String, Object> updateTruckNoCarrier(@RequestBody Map<String, Object> mapValue);
+
+    // 批量上传销售订单到金蝶
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrderList")
+    Map<String, Object> uploadSaleOrderList(@RequestBody List<Map<String, Object>> saleOrderIdList);
+
+    // 自动匹配出最近的一个地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingAddressRecently")
+    RESTfulResult matchingAddressRecently(@RequestParam BigDecimal receiveId);
+
+    // 自动匹配上一条运单的司机电话
+    @PostMapping(value = "/api/v1/ams/amssaleorders/matchingDriverTelRecently")
+    RESTfulResult matchingDriverTelRecently(@RequestParam String capacityNumber);
 }

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

@@ -0,0 +1,111 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+@FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
+public interface OtmsFeign {
+    //在途订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getInTransitTransportation")
+    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    //已完成订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getFinishTruckOrderInfo")
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    );
+    //有异常订单列表
+    @PostMapping("/api/v1/otms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                       @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                       @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                       @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    //车牌号和时间查询路径
+    @PostMapping("/api/v1/otms/pathDisplay/fullPathVisualizationByCarNumber")
+    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
+
+    //改变当前报警类型
+    @PostMapping(value = "/api/v1/otms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+
+    //查询当前报警类型
+    @PostMapping(value = "/api/v1/otms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    //通过运输订单号查询全路径
+    @PostMapping("/api/v1/otms/pathDisplay/fullPath")
+    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
+
+    //获得抵达列表
+//    @PostMapping("/api/v1/otms/tmstruckarrivalresults/getArrivalResultInfo")
+//    Map<String, Object> getArrivalResultInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+//                                         @RequestParam Integer apiId,
+//                                         @RequestParam Integer pageNum,
+//                                         @RequestParam Integer pageSize,
+//                                         @RequestParam String con,
+//                                         @RequestParam String startTime,
+//                                         @RequestParam String endTime
+//    );
+
+    //通过运输订单号获得抵达图片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
+    String getReceiptPhoto(@RequestParam String orderNumber);
+
+    //获取收货作业照片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+    //获得抵达实集
+    @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestPart("file") MultipartFile file);
+
+    //添加签收图片
+    @PostMapping(value = "/api/v1/otms/pathDisplay/addTmstruckReceiptResult")
+    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("num") Integer num, @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, @RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
+
+    //获得异常信息
+    @PostMapping("/api/v1/otms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
+
+    //抵达信息列表
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalResult")
+    Map<String, Object> getArrivalResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime);
+
+    //获得抵达图片
+    @PostMapping("/api/v1/otms/tmstruckreceiptresults/getArrivalPhoto")
+    String getArrivalPhoto(@RequestParam String orderNumber);
+
+    //获得签收实绩
+    @PostMapping("/api/v1/otms/pathDisplay/getReceiptResult")
+    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+}

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

@@ -519,6 +519,8 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer apiId,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime,
                                           @RequestParam String con
                                          );
 

src/main/resources/application-dev.yml

@@ -35,9 +35,11 @@ openfeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:172.16.33.162:8038}
 piction:
-  # path: /usr/share/nginx/html/image
-  #  path: /test/data/nginx/html/image
+  #path: /usr/share/nginx/html/image
+  #path: /test/data/nginx/html/image
   #path: C:\Users\24390\Desktop\work\a
   path: /shared
 

src/main/resources/application-prod.yml

@@ -36,6 +36,8 @@ openfeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image

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

@@ -833,19 +833,17 @@
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
         AND RM.MATERIAL_ID != 2533
         <if test="materialNameText != null">
-            AND (instr(RM.MATERIAL_NAME, #{materialNameText}) > 0)
+            AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
         </if>
         <if test="materialSpecificationText != null">
             AND (instr(RM.MATERIAL_SPECIFICATION, #{materialSpecificationText}) > 0)
         </if>
-        <if test="materialModelText != null">
-            AND (instr(RM.MATERIAL_MODEL, #{materialModelText}) > 0)
-        </if>
         )
         <where>
             <if test="materialName != null">