|
@@ -117,11 +117,13 @@ public class TMSController extends BaseRESTfulController {
|
|
|
public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
- Integer apiId) {
|
|
|
+ Integer apiId,
|
|
|
+ Integer status,
|
|
|
+ @RequestParam(required = false) String con) {
|
|
|
if (mapValue == null) {
|
|
|
mapValue = new HashMap<>();
|
|
|
}
|
|
|
- return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
|
|
|
+ return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
|
|
|
}
|
|
|
|
|
|
@PostMapping("getLoadShip/{resultId}")
|
|
@@ -336,9 +338,10 @@ public class TMSController extends BaseRESTfulController {
|
|
|
public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
- Integer apiId) {
|
|
|
+ Integer apiId,
|
|
|
+ @RequestParam(required = false) String con) {
|
|
|
|
|
|
- return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
|
|
|
+ return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
|
|
|
}
|
|
|
|
|
|
@PostMapping("getWaterQuality/{resultId}")
|
|
@@ -625,11 +628,12 @@ public class TMSController extends BaseRESTfulController {
|
|
|
Integer pageNum,
|
|
|
Integer pageSize,
|
|
|
Integer apiId,
|
|
|
- Integer status) {
|
|
|
+ Integer status,
|
|
|
+ @RequestParam(required = false) String con) {
|
|
|
if (mapValue == null) {
|
|
|
mapValue = new HashMap<>();
|
|
|
}
|
|
|
- return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
|
|
|
+ return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
|
|
|
}
|
|
|
|
|
|
@PostMapping("insertDeliveryNotice")
|