Commit 508680d2 authored by 宋源硕's avatar 宋源硕

Merge branch 'songyuanshuo' into 'master'

1./Plan/Record/page 接口添加request的deptName属性,并且添加deptName的模糊查询

See merge request !22
parents 51ef5643 96271851
...@@ -41,4 +41,7 @@ public class TestPlanRecordPageRequest extends PageDomain { ...@@ -41,4 +41,7 @@ public class TestPlanRecordPageRequest extends PageDomain {
@ApiModelProperty("检测机构") @ApiModelProperty("检测机构")
private Long testOrganizationId; private Long testOrganizationId;
@ApiModelProperty("检测机构名称")
private String deptName;
} }
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<if test="carModel != null and carModel != ''"> and pr.car_model like concat('%', #{carModel}, '%')</if> <if test="carModel != null and carModel != ''"> and pr.car_model like concat('%', #{carModel}, '%')</if>
<if test="inspectCarCompanyId != null and inspectCarCompanyId != ''"> and pr.inspect_car_company_id= #{inspectCarCompanyId}</if> <if test="inspectCarCompanyId != null and inspectCarCompanyId != ''"> and pr.inspect_car_company_id= #{inspectCarCompanyId}</if>
<if test="testOrganizationId != null and testOrganizationId != ''"> and pr.test_organization_id= #{testOrganizationId}</if> <if test="testOrganizationId != null and testOrganizationId != ''"> and pr.test_organization_id= #{testOrganizationId}</if>
<if test="deptName != null and deptName != ''"> and sd.dept_name = #{deptName}</if>
</where> </where>
ORDER BY pr.car_model,pr.create_time desc ORDER BY pr.car_model,pr.create_time desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment