修改

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

@@ -998,4 +998,28 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.rmsexpansecategorysupdate(id,map);
     }
 
+    @ApiOperation(value = "业务类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getBusinessType")
+    public Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        return rmsFeign.getBusinessType(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="新增业务类型")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/insertBusinessType")
+    public  Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername", map.get("userName").toString());
+        return  rmsFeign.insertBusinessType(map);
+    }
+
 }

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

@@ -159,11 +159,7 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
-<<<<<<< HEAD
-    @ApiOperation(value = "计时")
-=======
     @ApiOperation(value="计时")
->>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @RequestLimit()
     @PostMapping(value = "/startend")
@@ -184,11 +180,7 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "修改计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/tmstimingresultsUpdate")
-<<<<<<< HEAD
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"修改计时"})
-=======
-    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"修改计时"})
->>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
     public Map<String, Object> tmstimingresultsUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.tmstimingresultsUpdate(map);
     }

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

@@ -181,4 +181,12 @@ public class UniversalController extends BaseRESTfulController {
     public String getWlUrl() {
         return universalMapper.getWlUrl();
     }
+
+    @ApiModelProperty(value = "边输边查业务类型")
+    @PostMapping("/getBusinessTypeLike")
+    public RESTfulResult getBusinessTypeLike(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getBusinessTypeLike(map);
+        return success(list);
+    }
+
 }

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

@@ -632,6 +632,15 @@ public interface RmsFeign {
 
     @PutMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysUpdate/{id}")
     Map<String, Object> rmsexpansecategorysupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("/api/v1/rms/dilbusinesstypes/getBusinessType")
+    Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
+    Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -74,36 +74,22 @@ public interface TmsFeign {
 
 
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsList")
-<<<<<<< HEAD
     Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize);
-=======
-    Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
-                                             @RequestParam  Integer pageNum,
-                                             @RequestParam  Integer pageSize);
 
->>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
 
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
     Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
-<<<<<<< HEAD
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize);
-
-
-=======
                                           @RequestParam  Integer apiId,
                                           @RequestParam  Integer pageNum,
                                           @RequestParam  Integer pageSize);
 
 
->>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
     Map<String, Object> syncQualityResult(Map<String, Object> map);
 
@@ -208,10 +194,7 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
     Map<String, Object> changeSaleTransOrder(Map<String, Object> map);
-<<<<<<< HEAD
 
-=======
->>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
 }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -53,4 +53,6 @@ public interface UniversalMapper {
     String getWlUrl();
 
     int checkTrainOrder(Map<String, Object> map);
+
+    List<Map<String, Object>> getBusinessTypeLike(Map<String, Object> map);
 }

src/main/resources/application-prod.yml

@@ -29,13 +29,13 @@ openfeign:
   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:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:

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

@@ -447,5 +447,37 @@
             </foreach>
         </where>
     </select>
+    <select id="getBusinessTypeLike" resultType="java.util.Map">
+        select * from(
+        select
+        DBT.BUSINESS_TYPE_ID  "businessTypeId",
+        DBT.BUSINESS_TYPE_ID  "id",
+        DBT.BUSINESS_TYPE_ID "value",
+        DBT.BUSINESS_TYPE_NAME "text",
+        DBT.BUSINESS_TYPE_NAME "businessTypeName",
+        DBT.BUSINESS_TYPE_NAME "label",
+        DBT.ALTERNATE_FIELDS1 "transportType",
+        DBT.ALTERNATE_FIELDS2 "materialTypeName"
+        from DIL_BUSINESS_TYPE DBT
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="transportType!=null and transportType!=''">
+                AND REGEXP_LIKE("transportType", #{transportType})
+            </if>
+            <if test="materialTypeName!=null and materialTypeName!=''">
+                AND REGEXP_LIKE("materialTypeName", #{materialTypeName})
+            </if>
+            <if test="id!=null and !(index!=null and index!='')">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
 
 </mapper>