提交钢材订单的后台代码

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

@@ -245,8 +245,6 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         List<Map<String, Object>> saleOrderList = amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
-
-
     }
 
     /**

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

@@ -496,10 +496,44 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
+        //调整列宽
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            if (i==0){
+                columnData.put("min-width","155px");
+            }else if (i==1){
+                columnData.put("min-width","127px");
+            }else if (i==2){
+                columnData.put("min-width","88px");
+            }else if (i==3){
+                columnData.put("min-width","98px");
+            }
+            columnData.put("filters", setListMap(amsSaleOrder1, columnData.get("prop").toString()));
+            i++;
+        }
+        PageListAdd pageList = new PageListAdd(amsSaleOrder1);
+        pageList.setColumnData(columnDataList);
+        //PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
+    //列宽调整条件
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
@@ -578,7 +612,26 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompanyes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,saleOrderList);
+        //调整列宽
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            if (i==0){
+                columnData.put("min-width","155px");
+            }else if (i==1){
+                columnData.put("min-width","127px");
+            }else if (i==2){
+                columnData.put("min-width","88px");
+            }else if (i==3){
+                columnData.put("min-width","96px");
+            }
+            columnData.put("filters", setListMap(saleOrderList, columnData.get("prop").toString()));
+            i++;
+        }
+        PageListAdd pageList = new PageListAdd(saleOrderList);
+        pageList.setColumnData(columnDataList);
+        //PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,saleOrderList);
         return success(pageList);
     }