diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java index 8a6ef29ab..f6dd3a3d2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java @@ -50,6 +50,7 @@ public class CheckingPointController { @ApiOperation(value = "分页查询巡检点列表", notes = "分页查询巡检点列表") @ApiImplicitParams({ @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "search", value = "搜索巡检点名称、区域、责任人", paramType = "query", required = false, dataType = "String"), }) @PostMapping(value = "/selectPage") public Result> selectCheckingPointPage(@RequestBody ProjectSnQO qo) { diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java index bcbecdd77..d097e386a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java @@ -24,5 +24,7 @@ public class ProjectSnQO extends PageQO { private String xzCheckingRouteTaskId; @ApiModelProperty("巡检点id") private String checkingPointId; + @ApiModelProperty("搜索巡检点名称、区域、责任人") + private String search; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml index 94e6c02b0..05c231f32 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml @@ -16,6 +16,7 @@ su.real_name as createUserName from checking_point t left join system_user su on su.user_id=t.create_user_id + left join system_user su1 on find_in_set( su1.user_id, t.inspect_user_ids ) left join enterprise_info ei on find_in_set(ei.id,t.enterprise_id) left join quality_region qr on qr.id=t.quality_region_id @@ -44,6 +45,12 @@ and t.checking_point_name like CONCAT(CONCAT('%', #{projectSnQo.checkingPointName}), '%') + + and (t.checking_point_name like CONCAT(CONCAT('%', #{projectSnQo.search}), '%') + or qr.region_name like CONCAT(CONCAT('%', #{projectSnQo.search}), '%') + or su1.real_name like CONCAT(CONCAT('%', #{projectSnQo.search}), '%') + ) + group by t.id