luobang 2 gadi atpakaļ
vecāks
revīzija
8d0ae0de76

+ 5 - 1
src/main/java/com/steerinfo/dil/controller/RmsLineController.java

@@ -73,13 +73,17 @@ public class RmsLineController extends BaseRESTfulController {
                                         Integer pageNum,
                                         Integer pageSize,
                                         Integer apiId,
-                                        String con){
+                                        String con,
+                                        Integer lineType){
 
         if(con != null){
             if(!"".equals(con) && !"null".equals(con)){
                 mapValue.put("index", con);
             }
         }
+        if(lineType != null&&lineType == 1){
+            mapValue.put("lineType",1);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsLineMapper.getAllLineDesk(mapValue);

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsLineMapper.xml

@@ -583,6 +583,9 @@
         <if test="index != null">
           and instr(RL.LINE_NAME, #{index}) > 0
         </if>
+        <if test="lineType != null and lineType == 1">
+          and RL.LINE_TYPE = 1
+        </if>
         )
     <where>
       <if test="lineNo != null">