|
@@ -73,10 +73,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer pageNum,
|
|
Integer pageNum,
|
|
Integer pageSize){
|
|
Integer pageSize){
|
|
|
|
|
|
- List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderInfo(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfo(mapValue);
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfo(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -90,10 +89,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer pageNum,
|
|
Integer pageNum,
|
|
Integer pageSize){
|
|
Integer pageSize){
|
|
|
|
|
|
- List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderReported(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReported(mapValue);
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReported(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -107,10 +105,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer pageNum,
|
|
Integer pageNum,
|
|
Integer pageSize){
|
|
Integer pageSize){
|
|
|
|
|
|
- List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
|
|
List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -127,10 +124,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
mapValue = new HashMap<>();
|
|
mapValue = new HashMap<>();
|
|
}
|
|
}
|
|
mapValue.put("saleOrderId",saleOrderId);
|
|
mapValue.put("saleOrderId",saleOrderId);
|
|
- List<Map<String, Object>> amsSaleOrderDetail = amsSaleOrderService.getSaleOrderDetail(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
List<Map<String, Object>> amsSaleOrderDetail1 = amsSaleOrderService.getSaleOrderDetail(mapValue);
|
|
List<Map<String, Object>> amsSaleOrderDetail1 = amsSaleOrderService.getSaleOrderDetail(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderDetail,amsSaleOrderDetail1);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrderDetail1);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -231,10 +227,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
mapValue = new HashMap<>();
|
|
mapValue = new HashMap<>();
|
|
}
|
|
}
|
|
mapValue.put("saleOrderId",saleOrderId);
|
|
mapValue.put("saleOrderId",saleOrderId);
|
|
- List<Map<String, Object>> amsSaleOrderUpdate = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
List<Map<String, Object>> amsSaleOrderUpdate1 = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
|
|
List<Map<String, Object>> amsSaleOrderUpdate1 = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderUpdate,amsSaleOrderUpdate1);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrderUpdate1);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -297,40 +292,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer apiId,
|
|
Integer apiId,
|
|
Integer status,
|
|
Integer status,
|
|
String con) {
|
|
String con) {
|
|
- int count=0;
|
|
|
|
if (status!=null){
|
|
if (status!=null){
|
|
mapValue.put("status",status);
|
|
mapValue.put("status",status);
|
|
- count++;
|
|
|
|
}
|
|
}
|
|
- if(con != null){
|
|
|
|
- if(!"undefined".equals(con)){
|
|
|
|
- String index="get_sale_orderlist";//设置要查询的索引名称
|
|
|
|
- return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- //不分页筛选数据
|
|
|
|
- List<Map<String, Object>> allSaleOrderList = null;
|
|
|
|
- //如果有条件查询则跳过初始化,和创建索引
|
|
|
|
- if(mapValue.size() == count){
|
|
|
|
- //将查询结果存入索引中
|
|
|
|
- allSaleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
|
|
|
|
- Map<String, Object> map1 = new HashMap<>();
|
|
|
|
- //添加索引
|
|
|
|
- map1.put("index","get_sale_orderlist");
|
|
|
|
- //添加id
|
|
|
|
- map1.put("indexId","saleOrderId");
|
|
|
|
- allSaleOrderList.add(map1);
|
|
|
|
- //新建索引
|
|
|
|
- esFeign.insertIndex(allSaleOrderList);
|
|
|
|
- //删除
|
|
|
|
- allSaleOrderList.remove(allSaleOrderList.size()-1);
|
|
|
|
- }
|
|
|
|
- if(allSaleOrderList== null)
|
|
|
|
- allSaleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
//分页数据
|
|
//分页数据
|
|
List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
|
|
List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
|
|
|
|
}
|
|
}
|
|
@@ -350,11 +318,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer pageNum,
|
|
Integer pageNum,
|
|
Integer pageSize,
|
|
Integer pageSize,
|
|
Integer apiId) {
|
|
Integer apiId) {
|
|
- List<Map<String, Object>> saleCompanyList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
//分页数据
|
|
//分页数据
|
|
List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
|
|
List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
|
|
|
|
}
|
|
}
|
|
@@ -417,11 +384,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer apiId,
|
|
Integer apiId,
|
|
Integer status) {
|
|
Integer status) {
|
|
mapValue.put("status",status);
|
|
mapValue.put("status",status);
|
|
- List<Map<String, Object>> list = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
//分页查询数据
|
|
//分页查询数据
|
|
List<Map<String, Object>> columnList = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
|
|
List<Map<String, Object>> columnList = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
|
|
- PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
|
|
|
|
|
|
+ PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
|
|
return success(data);
|
|
return success(data);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -471,11 +437,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
Integer pageNum,
|
|
Integer pageNum,
|
|
Integer pageSize,
|
|
Integer pageSize,
|
|
Integer apiId) {
|
|
Integer apiId) {
|
|
- List<Map<String, Object>> list = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
//分页查询数据
|
|
//分页查询数据
|
|
List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
|
|
List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
|
|
- PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
|
|
|
|
|
|
+ PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
|
|
return success(data);
|
|
return success(data);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -582,10 +547,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
mapValue = new HashMap<>();
|
|
mapValue = new HashMap<>();
|
|
}
|
|
}
|
|
mapValue.put("saleOrderId",saleOrderId);
|
|
mapValue.put("saleOrderId",saleOrderId);
|
|
- List<Map<String,Object>> mapList = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
List<Map<String, Object>> columndata = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
|
|
List<Map<String, Object>> columndata = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, mapList,columndata);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columndata);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -605,11 +569,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
|
|
mapValue.put("con","%" + con + "%");
|
|
mapValue.put("con","%" + con + "%");
|
|
}
|
|
}
|
|
//不分页筛选数据
|
|
//不分页筛选数据
|
|
- List<Map<String, Object>> saleCompanyList = amsSaleOrderService.getCokeSaleOrderList(mapValue);
|
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
//分页数据
|
|
//分页数据
|
|
List<Map<String, Object>> saleOrderList = amsSaleOrderService.getCokeSaleOrderList(mapValue);
|
|
List<Map<String, Object>> saleOrderList = amsSaleOrderService.getCokeSaleOrderList(mapValue);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
|
|
|
|
|
|
+ PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
|
|
return success(pageList);
|
|
return success(pageList);
|
|
}
|
|
}
|
|
}
|
|
}
|