diff --git a/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java index 3deb05e..7a81ac0 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java @@ -1,5 +1,6 @@ package com.biutag.supervision.pojo.param; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; @@ -35,4 +36,7 @@ public class RpcApplyQueryParam extends BasePage { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private List crtTime; + + @Schema(description = "发案环节") + private String incidentLinkName; } diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyService.java b/src/main/java/com/biutag/supervision/service/RpcApplyService.java index 3964712..74b8bb3 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplyService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplyService.java @@ -122,6 +122,9 @@ public class RpcApplyService extends ServiceImpl { .like(StrUtil.isNotBlank(queryParam.getCaseCategory()),"a.case_category",queryParam.getCaseCategory()) .eq(StrUtil.isNotBlank(queryParam.getRpcStatus()), "a.rpc_status", queryParam.getRpcStatus()) .orderByDesc("a.crt_time"); + if (StrUtil.isNotBlank(queryParam.getIncidentLinkName())){ + queryWrapper.like("a.Incident_link_name", queryParam.getIncidentLinkName()); + } if (StrUtil.isNotBlank(queryParam.getDepartId())){ queryWrapper.in(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id",departService.getAllNodeIds(queryParam.getDepartId())); } diff --git a/src/main/resources/mapper/RpcApplyMapper.xml b/src/main/resources/mapper/RpcApplyMapper.xml index f4bf2b1..51d13a1 100644 --- a/src/main/resources/mapper/RpcApplyMapper.xml +++ b/src/main/resources/mapper/RpcApplyMapper.xml @@ -28,7 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.rpc_status as rpcStatus, a.rpc_id as rpcId, a.case_name as caseName, - a.crt_time as crtTime + a.crt_time as crtTime, + a.Incident_link_name as incidentLinkName from rpc_apply_person rap LEFT JOIN rpc_apply a on rap.rpc_id = a.rpc_id ${ew.getCustomSqlSegment}