Commit f22d7605 by zhangxingmin

push

parent bf4d74a1
...@@ -8,6 +8,7 @@ import com.yd.auth.core.utils.SecurityUtil; ...@@ -8,6 +8,7 @@ import com.yd.auth.core.utils.SecurityUtil;
import com.yd.common.constant.RedisConstants; import com.yd.common.constant.RedisConstants;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.DictTypeEnum; import com.yd.common.enums.DictTypeEnum;
import com.yd.common.enums.ProjectEnum;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.common.utils.*; import com.yd.common.utils.*;
...@@ -206,6 +207,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -206,6 +207,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
request.setDataObject(itineraryDto); request.setDataObject(itineraryDto);
request.setObjectId(appointmentBizId); request.setObjectId(appointmentBizId);
request.setTemplateType(TemplateTypeEnum.XCD.getItemValue()); request.setTemplateType(TemplateTypeEnum.XCD.getItemValue());
request.setProjectBizId(ProjectEnum.CSF_PC.getProjectBizId());
if (StringUtils.isNotBlank(itineraryDto.getName()) && if (StringUtils.isNotBlank(itineraryDto.getName()) &&
StringUtils.isNotBlank(itineraryDto.getArrivalTime())) { StringUtils.isNotBlank(itineraryDto.getArrivalTime())) {
//咨询人和集合日(签单日)都不为空,文件名 = 咨询人 + 集合日(20260103) //咨询人和集合日(签单日)都不为空,文件名 = 咨询人 + 集合日(20260103)
...@@ -342,6 +344,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -342,6 +344,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
excelRequest.setAppointmentBizId(appointmentBizId); excelRequest.setAppointmentBizId(appointmentBizId);
excelRequest.setData(data); excelRequest.setData(data);
excelRequest.setTemplateType(TemplateTypeEnum.YYD.getItemValue()); excelRequest.setTemplateType(TemplateTypeEnum.YYD.getItemValue());
excelRequest.setProjectBizId(ProjectEnum.CSF_PC.getProjectBizId());
Result<ApiOssExportAppointmentExcelResponse> result1 = apiExcelFeignClient.exportAppointment(excelRequest); Result<ApiOssExportAppointmentExcelResponse> result1 = apiExcelFeignClient.exportAppointment(excelRequest);
ApiOssExportAppointmentExcelResponse excelResponse = result1.getData(); ApiOssExportAppointmentExcelResponse excelResponse = result1.getData();
ApiAppointmentExportExcelResponse response = new ApiAppointmentExportExcelResponse(); ApiAppointmentExportExcelResponse response = new ApiAppointmentExportExcelResponse();
......
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