rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(ebom): 列表页面的查询条件设计人员支持模糊搜索；增加通知单号模糊搜索

This commit is contained in:
曹鹏飞 2024-06-02 20:08:17 +08:00
parent da4f625170
commit f5aa9863cf
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
View File

@ -52,5 +52,11 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl
@ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为0") @ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为0")
private Integer showMySelfOnly = 0; private Integer showMySelfOnly = 0;
/**
* 通知单号
*/
@ApiModelProperty(value = "通知单号")
private String noticeNo;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

10
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
View File

@ -75,7 +75,10 @@
and material_no=#{query.materialNo} and material_no=#{query.materialNo}
</if> </if>
<if test="query.deviseName!=null and query.deviseName!=''"> <if test="query.deviseName!=null and query.deviseName!=''">
and devise_name=#{query.deviseName} and devise_name LIKE concat('%', #{query.deviseName}, '%')
</if>
<if test="query.noticeNo!=null and query.noticeNo!=''">
AND notice_nums LIKE concat('%', #{query.noticeNo}, '%')
</if> </if>
<if test="query.startDate!=null and query.startDate!=''"> <if test="query.startDate!=null and query.startDate!=''">
and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
@ -419,11 +422,14 @@
root_is_for_wait_review=1) AND created_by=#{userCode}) root_is_for_wait_review=1) AND created_by=#{userCode})
</if> </if>
<if test="query.deviseName!=null and query.deviseName!=''"> <if test="query.deviseName!=null and query.deviseName!=''">
AND devise_name=#{query.deviseName} AND devise_name LIKE concat('%', #{query.deviseName}, '%')
</if> </if>
<if test="query.startDate!=null and query.startDate!=''"> <if test="query.startDate!=null and query.startDate!=''">
AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
</if> </if>
<if test="query.noticeNo!=null and query.noticeNo!=''">
AND notice_nums LIKE concat('%', #{query.noticeNo}, '%')
</if>
</where> </where>
order by row_id desc order by row_id desc
</select> </select>