|
|
@@ -131,7 +131,7 @@ public class FsStoreOrderController extends BaseController
|
|
|
@PostMapping("/list")
|
|
|
public FsStoreOrderListAndStatisticsVo list(@RequestBody FsStoreOrderParam fsStoreOrder)
|
|
|
{
|
|
|
- PageHelper.startPage(fsStoreOrder);
|
|
|
+ startPage();
|
|
|
if (fsStoreOrder.getUserPhoneMk()!=null&& !fsStoreOrder.getUserPhoneMk().isEmpty()){
|
|
|
fsStoreOrder.setUserPhone(encryptPhone(fsStoreOrder.getUserPhoneMk()));
|
|
|
}
|
|
|
@@ -152,10 +152,6 @@ public class FsStoreOrderController extends BaseController
|
|
|
//金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
|
|
|
TableDataInfo dataTable = getDataTable(list);
|
|
|
|
|
|
- //处理档期标签数据总数问题
|
|
|
- if (StringUtils.isNotEmpty(fsStoreOrder.getTag())) {
|
|
|
- dataTable.setTotal(list.size());
|
|
|
- }
|
|
|
if ("金牛明医".equals(cloudHostProper.getCompanyName())){
|
|
|
if (fsStoreOrder.getStatus() !=null && fsStoreOrder.getStatus() != 1){
|
|
|
list.forEach(vo->{
|