Merge #38 into master from cc_20260202_point
feat:点位添加名称搜索 * cc_20260202_point: (1 commits squashed) - feat:点位添加名称搜索 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/38
This commit is contained in:
@@ -162,6 +162,9 @@
|
|||||||
#{pointStatus}
|
#{pointStatus}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
|
<if test="request.pointName!=null and request.pointName!=''">
|
||||||
|
and point_name like concat('%',#{request.pointName},'%')
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateSelectedDevelopmentManager">
|
<update id="updateSelectedDevelopmentManager">
|
||||||
|
|||||||
@@ -94,6 +94,9 @@
|
|||||||
xfsg_point_todo_info a inner join xfsg_point_info b on a.point_id = b.id
|
xfsg_point_todo_info a inner join xfsg_point_info b on a.point_id = b.id
|
||||||
where
|
where
|
||||||
a.handler_user_id = #{request.developmentManager} and a.status = 0 and a.deleted = 0 and b.deleted = 0 and b.point_status in (3,4)
|
a.handler_user_id = #{request.developmentManager} and a.status = 0 and a.deleted = 0 and b.deleted = 0 and b.point_status in (3,4)
|
||||||
|
<if test="request.pointName!=null and request.pointName!=''">
|
||||||
|
and point_name like concat('%',#{request.pointName},'%')
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getCurNodeNoByPoint" resultType="integer">
|
<select id="getCurNodeNoByPoint" resultType="integer">
|
||||||
|
|||||||
@@ -16,4 +16,7 @@ public class PointTodoPageRequest extends PageBasicInfo {
|
|||||||
@ApiModelProperty(value = "扩展经理", hidden = true)
|
@ApiModelProperty(value = "扩展经理", hidden = true)
|
||||||
private String developmentManager;
|
private String developmentManager;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "铺位名称")
|
||||||
|
private String pointName;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ public class RecommendPointPageRequest extends PageBasicInfo {
|
|||||||
@ApiModelProperty(value = "铺位状态列表", hidden = true)
|
@ApiModelProperty(value = "铺位状态列表", hidden = true)
|
||||||
private List<Integer> pointStatusList;
|
private List<Integer> pointStatusList;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "铺位名称 模糊搜索")
|
||||||
|
private String pointName;
|
||||||
|
|
||||||
public List<Integer> getPointStatusList() {
|
public List<Integer> getPointStatusList() {
|
||||||
List<Integer> pointStatusList = new ArrayList<>();
|
List<Integer> pointStatusList = new ArrayList<>();
|
||||||
if (pointStatus != null) {
|
if (pointStatus != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user