From 9d81c34ad4d22839509cdb2c6caeea46f489f162 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:07:58 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5=E8=BF=90?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/OpeningOperationPlanMapper.xml | 6 ++++++ .../main/java/com/cool/store/request/PlanListRequest.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml index 02f951f92..48499d0cb 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml @@ -51,7 +51,13 @@ op.result_type AS resultType,si.supervisor_user_id as supervisorUserId from xfsg_opening_operation_plan op join xfsg_shop_info si on si.id = op.shop_id + + left join xfsg_shop_stage_info xssi on xssi.shop_id = si.id + where 1=1 + + xssi.shop_sub_stage_status = #{request.shopSubStageStatus} + AND si.shop_name like concat('%', #{request.shopName}, '%') diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java index 026fbdfee..1b3bf29f9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java @@ -35,5 +35,6 @@ public class PlanListRequest { private String curUserId; @ApiModelProperty(value = "管辖区域",hidden = true) private List authRegionIds; - + @ApiModelProperty("阶段状态") + private Integer shopSubStageStatus; }