liyg пре 2 година
родитељ
комит
b1aa63cd7f

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

@@ -52,7 +52,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查物资类型")
     @GetMapping("/getMaterialTypeByLike")
-    public RESTfulResult getMaterialTypeByLike(String index,String id) {
+    public RESTfulResult getMaterialTypeByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);
@@ -62,7 +62,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查公司单位")
     @GetMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(String index,String companyType,String id) {
+    public RESTfulResult getCompanyMesByLike(String index,String companyType,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("companyType",companyType);
@@ -74,7 +74,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查环保标准")
     @GetMapping("/getEmissionStandardByLike")
-    public RESTfulResult getEmissionStandardByLike(String index,String id) {
+    public RESTfulResult getEmissionStandardByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);
@@ -84,7 +84,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查作业点")
     @GetMapping("/getOperationPointByLike")
-    public RESTfulResult getOperationPointByLike(String index,String operationPointType,String id) {
+    public RESTfulResult getOperationPointByLike(String index,String operationPointType,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("operationPointType",operationPointType);
@@ -95,7 +95,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查人员")
     @GetMapping("/getPersonnelByLike")
-    public RESTfulResult getPersonnelByLike(String index,String id) {
+    public RESTfulResult getPersonnelByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);
@@ -105,7 +105,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输岗位信息")
     @GetMapping("/getJobInfosByLike")
-    public RESTfulResult getrmsrmsjobinfosBylike(String index,String id) {
+    public RESTfulResult getrmsrmsjobinfosBylike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);

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

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

+ 30 - 12
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -117,8 +117,11 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR "id" = #{id}
+           <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
@@ -138,8 +141,11 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR "id" = #{id}
+           <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
@@ -159,8 +165,11 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR "id" = #{id}
+           <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
@@ -184,8 +193,11 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR "id" = #{id}
+            <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
@@ -205,8 +217,11 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR "id" = #{id}
+           <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
@@ -226,8 +241,11 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR "id" = #{id}
+           <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

+ 0 - 1
src/main/resources/log4j.properties

@@ -2,7 +2,6 @@
 log4j.rootCategory=INFO,stdout,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Threshold = INFO
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n