Skip to content

Y
yd-csf
Commit af19cb60 by zhangxingmin
Options

Merge remote-tracking branch 'origin/dev_zxm' into test

parents 19858736 e644a945
Showing with 54 additions and 15 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiAppointmentFileController.java
...@@ -8,6 +8,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest; ...@@ -8,6 +8,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentExportExcelResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -98,7 +99,7 @@ public class ApiAppointmentFileController implements ApiAppointmentFileFeignClie ...@@ -98,7 +99,7 @@ public class ApiAppointmentFileController implements ApiAppointmentFileFeignClie
* @return * @return
*/ */
@Override @Override
public Result<String> appointmentExportExcel(String appointmentBizId) { public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) {
return apiAppointmentFileService.appointmentExportExcel(appointmentBizId); return apiAppointmentFileService.appointmentExportExcel(appointmentBizId);
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiAppointmentFileService.java
...@@ -7,6 +7,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest; ...@@ -7,6 +7,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentExportExcelResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -29,7 +30,7 @@ public interface ApiAppointmentFileService { ...@@ -29,7 +30,7 @@ public interface ApiAppointmentFileService {
Result<String> itineraryPdf(String appointmentBizId); Result<String> itineraryPdf(String appointmentBizId);
Result<String> appointmentExportExcel(String appointmentBizId); Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId);
Result<ApiAppointmentImportExcelResponse> appointmentImportExcel(MultipartFile file, Result<ApiAppointmentImportExcelResponse> appointmentImportExcel(MultipartFile file,
ApiAppointmentImportExcelRequest request); ApiAppointmentImportExcelRequest request);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentFileServiceImpl.java
...@@ -7,6 +7,7 @@ import com.yd.common.exception.BusinessException; ...@@ -7,6 +7,7 @@ import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.common.utils.BeanMapUtils; import com.yd.common.utils.BeanMapUtils;
import com.yd.common.utils.RandomStringGenerator; import com.yd.common.utils.RandomStringGenerator;
import com.yd.common.utils.RedisUtil;
import com.yd.csf.api.service.ApiAppointmentFileService; import com.yd.csf.api.service.ApiAppointmentFileService;
import com.yd.csf.api.service.ApiAppointmentService; import com.yd.csf.api.service.ApiAppointmentService;
import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto; import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto;
...@@ -15,6 +16,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest; ...@@ -15,6 +16,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentExportExcelResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse;
import com.yd.csf.service.dto.AdditionalDto; import com.yd.csf.service.dto.AdditionalDto;
...@@ -26,8 +28,10 @@ import com.yd.oss.feign.client.ApiExcelFeignClient; ...@@ -26,8 +28,10 @@ import com.yd.oss.feign.client.ApiExcelFeignClient;
import com.yd.oss.feign.client.ApiPdfFeignClient; import com.yd.oss.feign.client.ApiPdfFeignClient;
import com.yd.oss.feign.enums.TemplateTypeEnum; import com.yd.oss.feign.enums.TemplateTypeEnum;
import com.yd.oss.feign.request.ApiGeneratePdfRequest; import com.yd.oss.feign.request.ApiGeneratePdfRequest;
import com.yd.oss.feign.request.ApiOssExportAppointmentExcelRequest;
import com.yd.oss.feign.response.ApiGeneratePdfResponse; import com.yd.oss.feign.response.ApiGeneratePdfResponse;
import com.yd.oss.feign.response.ApiOssExcelParseResponse; import com.yd.oss.feign.response.ApiOssExcelParseResponse;
import com.yd.oss.feign.response.ApiOssExportAppointmentExcelResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -77,6 +81,9 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -77,6 +81,9 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
@Autowired @Autowired
private ApiExcelFeignClient apiExcelFeignClient; private ApiExcelFeignClient apiExcelFeignClient;
@Autowired
private RedisUtil redisUtil;
/** /**
* 预约附件信息分页查询 * 预约附件信息分页查询
* @param request * @param request
...@@ -186,7 +193,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -186,7 +193,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
public Result<String> appointmentExportExcel(String appointmentBizId) { public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
try { try {
//预约信息 //预约信息
...@@ -286,8 +293,15 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -286,8 +293,15 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
Map<String, Object> secondHolderMap = BeanMapUtils.convertToMapSafely(secondHolderDto); Map<String, Object> secondHolderMap = BeanMapUtils.convertToMapSafely(secondHolderDto);
data.putAll(secondHolderMap); data.putAll(secondHolderMap);
} }
ApiOssExportAppointmentExcelRequest excelRequest = new ApiOssExportAppointmentExcelRequest();
return null; excelRequest.setAppointmentBizId(appointmentBizId);
excelRequest.setData(data);
excelRequest.setTemplateType(TemplateTypeEnum.YYD.getItemValue());
Result<ApiOssExportAppointmentExcelResponse> result1 = apiExcelFeignClient.exportAppointment(excelRequest);
ApiOssExportAppointmentExcelResponse excelResponse = result1.getData();
ApiAppointmentExportExcelResponse response = new ApiAppointmentExportExcelResponse();
response.setUrl(excelResponse.getUrl());
return Result.success(response);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new BusinessException("Excel导出-预约信息异常！"); throw new BusinessException("Excel导出-预约信息异常！");
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
...@@ -24,6 +24,7 @@ import com.yd.csf.service.model.ProductPlan; ...@@ -24,6 +24,7 @@ import com.yd.csf.service.model.ProductPlan;
import com.yd.csf.service.service.FnaService; import com.yd.csf.service.service.FnaService;
import com.yd.csf.service.service.IAppointmentService; import com.yd.csf.service.service.IAppointmentService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -265,14 +266,15 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -265,14 +266,15 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
if (AppointmentStatusEnum.ZC.getItemValue().equals(appointmentCheck.getStatus())){ if (AppointmentStatusEnum.ZC.getItemValue().equals(appointmentCheck.getStatus())){
//当前为暂存状态——>提交更新为待预约状态 //当前为暂存状态——>提交更新为待预约状态
status = AppointmentStatusEnum.DYY.getItemValue(); status = AppointmentStatusEnum.DYY.getItemValue();
}else if (AppointmentStatusEnum.DYY.getItemValue().equals(appointmentCheck.getStatus())){
if (Objects.isNull(request.getApiAppointmentInfoDto().getConfirmAppointmentTime())) {
//待预约提交到待签署状态，确定预约时间不能为空
throw new BusinessException("待预约提交确定预约时间不能为空!");
}
//当前为待预约状态——>提交更新为待签署状态-->到新单跟进
status = AppointmentStatusEnum.DQS.getItemValue();
} }
// else if (AppointmentStatusEnum.DYY.getItemValue().equals(appointmentCheck.getStatus())){
// if (Objects.isNull(request.getApiAppointmentInfoDto().getConfirmAppointmentTime())) {
// //待预约提交到待签署状态，确定预约时间不能为空
// throw new BusinessException("待预约提交确定预约时间不能为空!");
// }
// //当前为待预约状态——>提交更新为待签署状态-->到新单跟进
// status = AppointmentStatusEnum.DQS.getItemValue();
// }
//其他状态下都是单纯编辑数据不做状态流转更新 //其他状态下都是单纯编辑数据不做状态流转更新
} }
...@@ -316,6 +318,16 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -316,6 +318,16 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
Appointment appointment = result.getData(); Appointment appointment = result.getData();
if (!AppointmentStatusEnum.DYY.getItemValue().equals(appointment.getStatus())) {
//非待预约状态，不能更新
if (AppointmentStatusEnum.ZC.getItemValue().equals(appointment.getStatus())) {
//暂存
throw new BusinessException("当前为暂存状态，不能提交到新单跟进！");
}else {
//其他状态
throw new BusinessException("你已经提交到新单跟进，不能再次提交！");
}
}
appointment.setConfirmAppointmentTime(request.getConfirmAppointmentTime()); appointment.setConfirmAppointmentTime(request.getConfirmAppointmentTime());
//流转到新单跟进（这里的预约状态为待签署） //流转到新单跟进（这里的预约状态为待签署）
appointment.setStatus(AppointmentStatusEnum.DQS.getItemValue()); appointment.setStatus(AppointmentStatusEnum.DQS.getItemValue());
......
yd-csf-api/src/main/resources/bootstrap.yml
...@@ -44,7 +44,7 @@ spring: ...@@ -44,7 +44,7 @@ spring:
# 配置中心 # 配置中心
config: config:
# 命名空间id(此处不用public,因public初始化的空间, id为空) # 命名空间id(此处不用public,因public初始化的空间, id为空)
namespace: b3b01715-eb85-4242-992a-5aff03d864d4 namespace: 8fbea9a4-b626-46de-a4e6-9d23f6609318
# nacos的ip地址和端口 # nacos的ip地址和端口
server-addr: 139.224.145.34:8848 server-addr: 139.224.145.34:8848
# 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置 # 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置
......
yd-csf-feign/src/main/java/com/yd/csf/feign/client/appointmentfile/ApiAppointmentFileFeignClient.java
...@@ -6,6 +6,7 @@ import com.yd.csf.feign.fallback.appointmentfile.ApiAppointmentFileFeignFallback ...@@ -6,6 +6,7 @@ import com.yd.csf.feign.fallback.appointmentfile.ApiAppointmentFileFeignFallback
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentExportExcelResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -74,7 +75,7 @@ public interface ApiAppointmentFileFeignClient { ...@@ -74,7 +75,7 @@ public interface ApiAppointmentFileFeignClient {
* @return * @return
*/ */
@GetMapping("/excel/export/appointment") @GetMapping("/excel/export/appointment")
Result<String> appointmentExportExcel(@NotBlank(message = "预约信息主表唯一业务ID不能为空") @RequestParam(value = "appointmentBizId") String appointmentBizId); Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(@NotBlank(message = "预约信息主表唯一业务ID不能为空") @RequestParam(value = "appointmentBizId") String appointmentBizId);
/** /**
* Excel导入-预约信息 * Excel导入-预约信息
......
yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/appointmentfile/ApiAppointmentFileFeignFallbackFactory.java
...@@ -6,6 +6,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest; ...@@ -6,6 +6,7 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest; import com.yd.csf.feign.request.appointmentfile.ApiAppointmentImportExcelRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentExportExcelResponse;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse; import com.yd.csf.feign.response.appointmentfile.ApiAppointmentImportExcelResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
...@@ -54,7 +55,7 @@ public class ApiAppointmentFileFeignFallbackFactory implements FallbackFactory<A ...@@ -54,7 +55,7 @@ public class ApiAppointmentFileFeignFallbackFactory implements FallbackFactory<A
} }
@Override @Override
public Result<String> appointmentExportExcel(String appointmentBizId) { public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) {
return null; return null;
} }
......
yd-csf-feign/src/main/java/com/yd/csf/feign/response/appointmentfile/ApiAppointmentExportExcelResponse.java 0 → 100644
package com.yd.csf.feign.response.appointmentfile;
import lombok.Data;
@Data
public class ApiAppointmentExportExcelResponse {
private String url;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment