atshd

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

@@ -114,9 +114,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
     })
     @PostMapping("/getQueueListByQueueUp")
     public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
                                                Integer locationId,
                                                String capacityNumber,
                                                Integer isSpelling
@@ -125,7 +122,6 @@ public class QmsQueueResultController extends BaseRESTfulController {
             mapValue.put("locationId", locationId);
         if(capacityNumber != null && !"".equals(capacityNumber))
             mapValue.put("capacityNumber", capacityNumber);
-        PageHelper.startPage(pageNum,pageSize);
         if(isSpelling == 1){
             //多拼
             return success(qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue));

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

@@ -846,7 +846,7 @@
 <!--    </select>-->
 
     <!-- 查询排队开始 -->
-    <select id="getQueueListByQueueUp" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    <select id="getQueueListByQueueUp" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT QQR.RESULT_ID        "resultId",
                QQR.RESULT_TOTAL_ID  "resultTotalId",
                QQR.RESULT_START_TIME    "resultStartTime",