|
@@ -3,10 +3,12 @@ package com.huimv.receive.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.api.R;
|
|
import com.baomidou.mybatisplus.extension.api.R;
|
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.huimv.receive.common.utils.Result;
|
|
import com.huimv.receive.common.utils.Result;
|
|
import com.huimv.receive.common.utils.ResultCode;
|
|
import com.huimv.receive.common.utils.ResultCode;
|
|
import com.huimv.receive.common.utils.ResultUtil;
|
|
import com.huimv.receive.common.utils.ResultUtil;
|
|
import com.huimv.receive.entity.BaseLocation;
|
|
import com.huimv.receive.entity.BaseLocation;
|
|
|
|
+import com.huimv.receive.entity.BillSampling;
|
|
import com.huimv.receive.entity.Exist;
|
|
import com.huimv.receive.entity.Exist;
|
|
import com.huimv.receive.service.IBaseLocationService;
|
|
import com.huimv.receive.service.IBaseLocationService;
|
|
import com.huimv.receive.service.IExistService;
|
|
import com.huimv.receive.service.IExistService;
|
|
@@ -38,6 +40,16 @@ public class BaseLocationController {
|
|
.like(BaseLocation::getFarmIds,farmId)));
|
|
.like(BaseLocation::getFarmIds,farmId)));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @PostMapping("/page")
|
|
|
|
+ public Result page(@RequestBody Map<String, String> paramsMap) {
|
|
|
|
+ String farmId = paramsMap.get("farmId");
|
|
|
|
+ String pageNo = paramsMap.get("pageNum");
|
|
|
|
+ String pageSize = paramsMap.get("pageSize");
|
|
|
|
+ Page<BaseLocation> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
|
|
|
|
+ return new Result(ResultCode.SUCCESS,baseLocationService.page(page,new QueryWrapper<BaseLocation>().lambda()
|
|
|
|
+ .like(BaseLocation::getFarmIds,farmId)));
|
|
|
|
+ }
|
|
|
|
+
|
|
@PostMapping("/listLuggageLocation")
|
|
@PostMapping("/listLuggageLocation")
|
|
public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
|
|
public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|