代码合并

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -81,12 +81,14 @@ public class ContingencyPlanController extends BaseController {
                                     @RequestParam(value = "classifyId", required = false) Long classifyId,
                                     @RequestParam(value = "planRange", required = false) List<String> planRange,
                                     @RequestParam(value = "editOrgName", required = false) String editOrgName,
-                                     @RequestParam(value = "implementationTimeLeft", required = false) Date implementationTimeLeft,
-                                     @RequestParam(value = "implementationTimeRight", required = false) Date implementationTimeRight,
+                                    @RequestParam(value = "implementationTimeLeft", required = false) Long implementationTimeLeftStamp,
+                                    @RequestParam(value = "implementationTimeRight", required = false) Long implementationTimeRightStamp,
                                     @RequestParam(value = "size") int size) {
         if (current < 1 || size < 1) {
             throw new YeeException("分页参数有误");
         }
+        Date implementationTimeLeft = implementationTimeLeftStamp == null ? null : new Date(implementationTimeLeftStamp);
+        Date implementationTimeRight = implementationTimeRightStamp == null ? null : new Date(implementationTimeRightStamp);
         Page page = new Page(current, size);
         return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight));
     }
@@ -185,8 +187,16 @@ public class ContingencyPlanController extends BaseController {
     public ResponseModel recordList(
             @RequestParam int current,
             @RequestParam  int pageSize,
-            @RequestParam(required = false) String  planName) {
-        Page page =  contingencyPlanService.recordListByPage(current,pageSize,planName);
+            @ApiParam(value = "预案类型") @RequestParam(value = "classifyId", required = false) List<Long> classifyId,
+            @ApiParam(value = "预案类型") @RequestParam(value = "startTimeLeft", required = false) Long startTimeLeftStamp,
+            @ApiParam(value = "预案类型") @RequestParam(value = "startTimeRight", required = false) Long startTimeRightStamp,
+            @ApiParam(value = "预案类型") @RequestParam(value = "executionType", required = false) Integer executionType,
+            @ApiParam(value = "预案类型") @RequestParam(value = "planPattern", required = false) Integer planPattern,
+            @ApiParam(value = "预案名称") @RequestParam(value = "planName", required = false) String planName) {
+        Date startTimeLeft = startTimeLeftStamp == null ? null : new Date(startTimeLeftStamp);
+        Date startTimeRight = startTimeRightStamp == null ? null : new Date(startTimeRightStamp);
+
+        Page page = contingencyPlanService.recordListByPage(current, pageSize, planName);
         return CommonResponseUtil2.success(page);
     }
 
@@ -203,4 +213,5 @@ public class ContingencyPlanController extends BaseController {
        List<HashMap<String, Object>> List =  contingencyPlanService.getRecordList(batchNo);
         return CommonResponseUtil2.success(List);
     }
+
 }