前端联调接口修改

sop-api/src/main/java/com/qmth/sop/server/api/TBDelayWarnController.java

@@ -52,9 +52,10 @@ public class TBDelayWarnController {
             @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo,
             @ApiParam(value = "预警时间开始", required = false) @RequestParam(required = false) Long startTime,
             @ApiParam(value = "预警时间结束", required = false) @RequestParam(required = false) Long endTime,
+            @ApiParam(value = "预警表ID", required = false) @RequestParam(required = false) Long id,
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(tBDelayWarnService.query(new Page<>(pageNumber, pageSize), type, status, serviceId, custom, fieldObj, sopNo, startTime, endTime, null));
+        return ResultUtil.ok(tBDelayWarnService.query(new Page<>(pageNumber, pageSize), type, status, serviceId, custom, fieldObj, sopNo, startTime, endTime, id));
     }
 
     @ApiOperation(value = "延期预警跟进表获取单个接口")

sop-business/src/main/java/com/qmth/sop/business/bean/result/ProjectMonitorResult.java

@@ -56,6 +56,10 @@ public class ProjectMonitorResult implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long warnId;
 
+    @ApiModelProperty(value = "预警表的ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String sopNo;
+
     @ApiModelProperty(value = "区域协调人")
     private ProjectMonitorUserResult regionCoordinator;
 
@@ -184,4 +188,12 @@ public class ProjectMonitorResult implements Serializable {
     public void setWarnId(Long warnId) {
         this.warnId = warnId;
     }
+
+    public String getSopNo() {
+        return sopNo;
+    }
+
+    public void setSopNo(String sopNo) {
+        this.sopNo = sopNo;
+    }
 }