suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20241220_fixgetPlan' into 'master'

Browse Source 
Cc 20241220 fixget plan

See merge request hangzhou/java/custom_zxjp!35
This commit is contained in:
苏竹红
2024-12-20 10:41:12 +00:00
parent abdf0bd544 0fd5c6d1d8
commit 6a906f0fc1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java
View File

@@ -34,23 +34,23 @@ public class OpeningOperationPlanRequest {
private String activityTheme; private String activityTheme;
@ApiModelProperty("活动主题url") @ApiModelProperty("活动主题url")
private String activityThemeUrl; private String activityThemeUrl;
@ApiModelProperty("筹备人员ids") @ApiModelProperty("筹备人员ids")
private List<String> preparationUserIds; private List<String> preparationUserIds;
@ApiModelProperty("是否完成排车路线0未完成，1完成") @ApiModelProperty("是否完成排车路线0未完成，1完成")
private Byte routeCompleted; private Byte routeCompleted;
public OpeningOperationPlanDO toOpeningOperationPlanDO() { public OpeningOperationPlanDO toOpeningOperationPlanDO() {
OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO(); OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO();
openingOperationPlanDO.setShopId(this.shopId); openingOperationPlanDO.setShopId(this.shopId);
openingOperationPlanDO.setPlanSource(this.planSource); openingOperationPlanDO.setPlanSource(this.planSource);
openingOperationPlanDO.setSurveyResult(this.surveyResult); openingOperationPlanDO.setSurveyResult(this.surveyResult);
openingOperationPlanDO.setSurveyResultUrl(this.surveyResultUrl); openingOperationPlanDO.setSurveyResultUrl(this.surveyResultUrl);
openingOperationPlanDO.setActivityThemeUrl( this.activityThemeUrl); openingOperationPlanDO.setActivityThemeUrl(this.activityThemeUrl);
openingOperationPlanDO.setPreparationUserIds("");
if (CollectionUtils.isNotEmpty(this.preparationUserIds)) { if (CollectionUtils.isNotEmpty(this.preparationUserIds)) {
openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds)); openingOperationPlanDO.setPreparationUserIds(String.join(",", this.preparationUserIds));
} }

1
coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java
View File

@@ -35,5 +35,4 @@ public class PlanListRequest {
private String curUserId; private String curUserId;
@ApiModelProperty(value = "管辖区域",hidden = true) @ApiModelProperty(value = "管辖区域",hidden = true)
private List<String> authRegionIds; private List<String> authRegionIds;
} }

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -133,11 +133,13 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()); openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName());
openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(",")));
String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds();
List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); if (StringUtils.isNotBlank(preparationUserIds)){
List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(stream); List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList());
List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(stream);
openingOperationPlanVO.setPreparationUsers(nameByUserId);
}
String userName = enterpriseUserDAO.getUserName(openingOperationPlanDO.getSubmittedUserId()); String userName = enterpriseUserDAO.getUserName(openingOperationPlanDO.getSubmittedUserId());
openingOperationPlanVO.setSubmittedUserName(userName); openingOperationPlanVO.setSubmittedUserName(userName);
openingOperationPlanVO.setPreparationUsers(nameByUserId);
openingOperationPlanVO.setShopName(shopInfo.getShopName()); openingOperationPlanVO.setShopName(shopInfo.getShopName());
return openingOperationPlanVO; return openingOperationPlanVO;
} }