From 11d34a373d13fa576ee9312fcf22c49331b0f0c4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 14:00:06 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/OpeningOperationPlanImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index a96e141ba..05c56239f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -133,11 +133,13 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); - List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); - List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); + if (StringUtils.isNotBlank(preparationUserIds)){ + List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); + List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); + openingOperationPlanVO.setPreparationUsers(nameByUserId); + } String userName = enterpriseUserDAO.getUserName(openingOperationPlanDO.getSubmittedUserId()); openingOperationPlanVO.setSubmittedUserName(userName); - openingOperationPlanVO.setPreparationUsers(nameByUserId); openingOperationPlanVO.setShopName(shopInfo.getShopName()); return openingOperationPlanVO; } From 34beb2d853e39b9ce43eec7f85e150fbe109e48d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 17:30:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/request/OpeningOperationPlanRequest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java index 97b2176a5..f8a5dd819 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java @@ -53,6 +53,8 @@ public class OpeningOperationPlanRequest { openingOperationPlanDO.setActivityThemeUrl( this.activityThemeUrl); if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); + }else if (this.preparationUserIds.isEmpty()){ + openingOperationPlanDO.setPreparationUserIds(""); } openingOperationPlanDO.setActivityTheme(this.activityTheme); openingOperationPlanDO.setRouteCompleted(this.routeCompleted); From b9d9712a32e203560dbe7510857a4cf2e6a0d3b7 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 17:55:46 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/OpeningOperationPlanRequest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java index f8a5dd819..b82468200 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java @@ -34,27 +34,28 @@ public class OpeningOperationPlanRequest { private String activityTheme; @ApiModelProperty("活动主题url") - private String activityThemeUrl; + private String activityThemeUrl; @ApiModelProperty("筹备人员ids") - private List preparationUserIds; + private List preparationUserIds; @ApiModelProperty("是否完成排车路线0未完成，1完成") private Byte routeCompleted; - public OpeningOperationPlanDO toOpeningOperationPlanDO() { OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO(); openingOperationPlanDO.setShopId(this.shopId); openingOperationPlanDO.setPlanSource(this.planSource); openingOperationPlanDO.setSurveyResult(this.surveyResult); openingOperationPlanDO.setSurveyResultUrl(this.surveyResultUrl); - openingOperationPlanDO.setActivityThemeUrl( this.activityThemeUrl); - if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { - openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); - }else if (this.preparationUserIds.isEmpty()){ - openingOperationPlanDO.setPreparationUserIds(""); + openingOperationPlanDO.setActivityThemeUrl(this.activityThemeUrl); + if (this.preparationUserIds != null) { + if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { + openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); + } else if (this.preparationUserIds.isEmpty()) { + openingOperationPlanDO.setPreparationUserIds(""); + } } openingOperationPlanDO.setActivityTheme(this.activityTheme); openingOperationPlanDO.setRouteCompleted(this.routeCompleted); From 9e75be5034bd966c94a923299e0669ff7cebf57a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 17:56:12 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/request/OpeningOperationPlanRequest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java index b82468200..1d555f3c4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java @@ -56,6 +56,8 @@ public class OpeningOperationPlanRequest { } else if (this.preparationUserIds.isEmpty()) { openingOperationPlanDO.setPreparationUserIds(""); } + }else{ + openingOperationPlanDO.setPreparationUserIds(""); } openingOperationPlanDO.setActivityTheme(this.activityTheme); openingOperationPlanDO.setRouteCompleted(this.routeCompleted); From 9d81c34ad4d22839509cdb2c6caeea46f489f162 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:07:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= 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; } From 4ff40b2f7f44477773153c475692723d184c2831 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:14:18 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= 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 | 2 -- 2 files changed, 8 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml index 48499d0cb..02f951f92 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml @@ -51,13 +51,7 @@ 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 1b3bf29f9..ebe21c056 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,6 +35,4 @@ public class PlanListRequest { private String curUserId; @ApiModelProperty(value = "管辖区域",hidden = true) private List authRegionIds; - @ApiModelProperty("阶段状态") - private Integer shopSubStageStatus; } From 17d666d328796390bd472c3e7b62a96fdd9c26fc Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:15:31 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 5bb40c1e3..43ca34c61 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -366,7 +366,7 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE); + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142.getShopSubStageStatus()), Boolean.FALSE); } @Override From 8436e0c847ff68741fb3de78ff1db983aeefa17e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:19:21 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 43ca34c61..5bb40c1e3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -366,7 +366,7 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142.getShopSubStageStatus()), Boolean.FALSE); + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE); } @Override From 5361cfc1d4296b9ea6434efbbc7113d05586e1c6 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:38:23 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/OpeningOperationPlanRequest.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java index 1d555f3c4..e8bda62a4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java @@ -50,13 +50,9 @@ public class OpeningOperationPlanRequest { openingOperationPlanDO.setSurveyResult(this.surveyResult); openingOperationPlanDO.setSurveyResultUrl(this.surveyResultUrl); openingOperationPlanDO.setActivityThemeUrl(this.activityThemeUrl); - if (this.preparationUserIds != null) { - if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { - openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); - } else if (this.preparationUserIds.isEmpty()) { - openingOperationPlanDO.setPreparationUserIds(""); - } - }else{ + if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { + openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); + } else { openingOperationPlanDO.setPreparationUserIds(""); } openingOperationPlanDO.setActivityTheme(this.activityTheme); From 0fd5c6d1d864626c38aa2804f359d27520b1fe9a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 20 Dec 2024 18:39:52 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix=20=E5=BC=80=E4=B8=9A=E8=90=A5?= =?UTF-8?q?=E8=BF=90=E6=96=B9=E6=A1=88=E7=AD=B9=E5=A4=87=E4=BA=BA=E4=B8=BA?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/request/OpeningOperationPlanRequest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java index e8bda62a4..5dbf632e3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java @@ -50,10 +50,9 @@ public class OpeningOperationPlanRequest { openingOperationPlanDO.setSurveyResult(this.surveyResult); openingOperationPlanDO.setSurveyResultUrl(this.surveyResultUrl); openingOperationPlanDO.setActivityThemeUrl(this.activityThemeUrl); + openingOperationPlanDO.setPreparationUserIds(""); if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); - } else { - openingOperationPlanDO.setPreparationUserIds(""); } openingOperationPlanDO.setActivityTheme(this.activityTheme); openingOperationPlanDO.setRouteCompleted(this.routeCompleted);