liyg 2 лет назад
Родитель
Сommit
f4a3c99c10

+ 8 - 0
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -50,6 +50,13 @@ public class UniversalController extends BaseRESTfulController {
     @Autowired
     private ImageFileUtils imageFileUtils;
 
+    @ApiModelProperty(value = "边输边查物资类型")
+    @GetMapping("/getMaterialTypeByLike")
+    public RESTfulResult getMaterialTypeByLike(String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialTypeByLike(index == null ? "" : index);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查公司单位")
     @GetMapping("/getCompanyMesByLike")
     public RESTfulResult getCompanyMesByLike(String index,String companyType) {
@@ -60,6 +67,7 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+
     @ApiModelProperty(value = "边输边查环保标准")
     @GetMapping("/getEmissionStandardByLike")
     public RESTfulResult getEmissionStandardByLike(String index) {

+ 3 - 2
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -16,10 +16,11 @@ import java.util.Map;
 @Mapper
 public interface UniversalMapper {
 
-    //边输边查发货单位
     List<Map<String, Object>> getCompanyMesByLike(Map<String, Object> map);
 
-    List<Map<String, Object>> getEmissionStandardByLike(String s);
+    List<Map<String, Object>> getMaterialTypeByLike(String index);
+
+    List<Map<String, Object>> getEmissionStandardByLike(String index);
 
     List<Map<String, Object>> getOperationPointByLike(Map<String, Object> map);
 

+ 1 - 1
src/main/resources/application-prod.yml

@@ -35,7 +35,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:

+ 14 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -122,6 +122,20 @@
         </if>
         FETCH NEXT 100 ROWS ONLY
     </select>
+    <select id="getMaterialTypeByLike" resultType="java.util.Map">
+        select
+        MATERIAL_TYPE_ID "materialTypeId",
+        MATERIAL_TYPE_NAME "materialTypeName",
+        MATERIAL_TYPE_ID "id",
+        MATERIAL_TYPE_ID "value",
+        MATERIAL_TYPE_NAME "label"
+        from RMS_MATERIAL_TYPE
+        where DELETED = 0
+        <if test="index!=null and index!=''">
+            AND   REGEXP_LIKE(MATERIAL_TYPE_NAME, #{index})
+        </if>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
     <select id="getEmissionStandardByLike" resultType="java.util.Map">
         select
             EMISSION_STANDARD_ID "emissionStandardId",