|
|
@ -41,6 +41,7 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import me.chanjar.weixin.common.error.WxErrorException; |
|
|
|
import me.chanjar.weixin.mp.api.WxMpService; |
|
|
|
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
@ -192,21 +193,26 @@ public class UserProjectController { |
|
|
|
if (count == CommonConstants.ConstantNumber.ZERO) { |
|
|
|
return Result.failed("无有效表单项,无法发布"); |
|
|
|
} |
|
|
|
//获取旧的发布范围
|
|
|
|
List<PrPublishRangeEntity> publishRangeList = publishRangeService.list(Wrappers.<PrPublishRangeEntity>lambdaQuery().eq(PrPublishRangeEntity::getProjectKey, request.getKey())); |
|
|
|
if (CollectionUtils.isNotEmpty(publishRangeList)) { |
|
|
|
//删除旧的发布范围
|
|
|
|
publishRangeService.removeByIds(publishRangeList.stream().map(PrPublishRangeEntity::getId).collect(Collectors.toList())); |
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(request.getRangeList())) { |
|
|
|
//获取旧的发布范围
|
|
|
|
List<PrPublishRangeEntity> publishRangeList = publishRangeService.list(Wrappers.<PrPublishRangeEntity>lambdaQuery().eq(PrPublishRangeEntity::getProjectKey, request.getKey())); |
|
|
|
if (CollectionUtils.isNotEmpty(publishRangeList)) { |
|
|
|
//删除旧的发布范围
|
|
|
|
publishRangeService.removeByIds(publishRangeList.stream().map(PrPublishRangeEntity::getId).collect(Collectors.toList())); |
|
|
|
} |
|
|
|
//保存发布范围
|
|
|
|
request.getRangeList().forEach(item -> { |
|
|
|
item.setProjectKey(request.getKey()); |
|
|
|
}); |
|
|
|
publishRangeService.saveBatch(request.getRangeList()); |
|
|
|
} |
|
|
|
//保存发布范围
|
|
|
|
request.getRangeList().forEach(item -> { |
|
|
|
item.setProjectKey(request.getKey()); |
|
|
|
}); |
|
|
|
publishRangeService.saveBatch(request.getRangeList()); |
|
|
|
|
|
|
|
UserProjectEntity entity = projectService.getByKey(request.getKey()); |
|
|
|
entity.setStatus(ProjectStatusEnum.RELEASE); |
|
|
|
entity.setClient(request.getClient()); |
|
|
|
if (StringUtils.isNotEmpty(request.getClient())) { |
|
|
|
entity.setClient(request.getClient()); |
|
|
|
} |
|
|
|
return Result.success(projectService.updateById(entity)); |
|
|
|
} |
|
|
|
|
|
|
|