修改

src/main/java/com/steerinfo/dil/controller/WMSHController.java

@@ -74,11 +74,14 @@ public class WMSHController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String con) {
+                                                  String con,
+                                            String activeName,
+                                            String startTime,
+                                            String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con);
+        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con,activeName,startTime,endTime);
     }
 
 

src/main/java/com/steerinfo/dil/feign/WMSHFeign.java

@@ -140,7 +140,10 @@ public interface WMSHFeign {
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("con") String con);
+                                          @RequestParam("con") String con ,
+                                     @RequestParam("activeName")String activeName,
+                                     @RequestParam("startTime")String startTime,
+                                     @RequestParam("endTime")String endTime);
 
     @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
     Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,