巡检修改
This commit is contained in:
parent
398d2e445c
commit
d5e54730c6
@ -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<IPage<CheckingPoint>> selectCheckingPointPage(@RequestBody ProjectSnQO qo) {
|
||||
|
||||
@ -24,5 +24,7 @@ public class ProjectSnQO extends PageQO {
|
||||
private String xzCheckingRouteTaskId;
|
||||
@ApiModelProperty("巡检点id")
|
||||
private String checkingPointId;
|
||||
@ApiModelProperty("搜索巡检点名称、区域、责任人")
|
||||
private String search;
|
||||
|
||||
}
|
||||
|
||||
@ -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
|
||||
<if test="projectSnQo.xzCheckingRouteTaskId != null and projectSnQo.xzCheckingRouteTaskId != ''">
|
||||
@ -44,6 +45,12 @@
|
||||
<if test="projectSnQo.checkingPointName != null and projectSnQo.checkingPointName != ''">
|
||||
and t.checking_point_name like CONCAT(CONCAT('%', #{projectSnQo.checkingPointName}), '%')
|
||||
</if>
|
||||
<if test="projectSnQo.search != null and projectSnQo.search != ''">
|
||||
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}), '%')
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
group by t.id
|
||||
<choose>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user