Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRAIN-API

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

@@ -218,6 +218,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
         mapValue.put("wagon",wagon);
         mapValue.put("purchaseOrderNum",purchaseOrderNum);
         mapValue.put("materialName",materialName);
+
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -394,23 +395,18 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
 
 
 
-    @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @ApiOperation(value = "查询临时表中的resultType的未绑定实绩的车皮")
     @PostMapping(value = "/getResultType")
     public RESTfulResult getResultType(@RequestBody(required = false) Map<String, Object> map,
                                               Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
                                               String con
                                               ) {
 
         if (con!=null&&!"".equals(con)){
           map.put("con",con);
         }
-        //不分页筛选数据
-        PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> mes = tmstrainLoadingResultService.getResultType(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, mes);
-        return success(pageList);
+        return success(mes);
     }
 }

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

@@ -832,6 +832,7 @@
       #{id}
     </foreach>
   </delete>
+
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="getTmsWagonLoadInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">