|
@@ -518,7 +518,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
|
}else if (i==3){
|
|
|
columnData.put("min-width","98px");
|
|
|
}
|
|
|
- columnData.put("filters", setListMap(amsSaleOrder1, columnData.get("prop").toString()));
|
|
|
+ if (DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() != 0) {
|
|
|
+ columnData.put("filters", setListMap(amsSaleOrder1, columnData.get("prop").toString()));
|
|
|
+ }
|
|
|
+
|
|
|
i++;
|
|
|
}
|
|
|
PageListAdd pageList = new PageListAdd(amsSaleOrder1);
|
|
@@ -568,7 +571,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
|
DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
|
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
|
|
|
return success(pageList);
|
|
|
}
|
|
|
|
|
@@ -605,17 +608,6 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
|
}
|
|
|
mapValue.put("saleType",saleType);
|
|
|
DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
|
|
@@ -634,7 +626,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
|
}else if (i==3){
|
|
|
columnData.put("min-width","96px");
|
|
|
}
|
|
|
- columnData.put("filters", setListMap(saleOrderList, columnData.get("prop").toString()));
|
|
|
+ if (DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() != 0) {
|
|
|
+ columnData.put("filters", setListMap(saleOrderList,columnData.get("prop").toString()));
|
|
|
+ }
|
|
|
i++;
|
|
|
}
|
|
|
PageListAdd pageList = new PageListAdd(saleOrderList);
|