push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentFileServiceImpl.java

@@ -11,6 +11,7 @@ import com.yd.common.enums.DictTypeEnum;
 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.BeanMapUtils;
 import com.yd.common.utils.BeanMapUtils;
+import com.yd.common.utils.DateUtil;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RedisUtil;
 import com.yd.common.utils.RedisUtil;
 import com.yd.csf.api.service.ApiAppointmentFileService;
 import com.yd.csf.api.service.ApiAppointmentFileService;
@@ -40,6 +41,7 @@ import com.yd.oss.feign.response.ApiOssExcelParseResponse;
 import com.yd.oss.feign.response.ApiOssExportAppointmentExcelResponse;
 import com.yd.oss.feign.response.ApiOssExportAppointmentExcelResponse;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 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;
@@ -197,6 +199,11 @@ 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());
+        if (StringUtils.isNotBlank(itineraryDto.getName()) &&
+                StringUtils.isNotBlank(itineraryDto.getArrivalTime())) {
+            //咨询人和集合日（签单日）都不为空，文件名 = 咨询人 + 集合日（20260103）
+            request.setCustomFileName(itineraryDto.getName() + DateUtil.yyMMdd(itineraryDto.getArrivalTime()));
+        }
         Result<ApiGeneratePdfResponse> result = apiPdfFeignClient.generatePDF(request);
         Result<ApiGeneratePdfResponse> result = apiPdfFeignClient.generatePDF(request);
         if (!Objects.isNull(result.getData())) {
         if (!Objects.isNull(result.getData())) {
             url = result.getData().getUrl();
             url = result.getData().getUrl();

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointmentfile/ItineraryDto.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 public class ItineraryDto {
 public class ItineraryDto {
 
 
     /**
     /**
-     * 集合时间（签约信息-签单日）
+     * 集合时间（签约信息-签单日）（年月日时分）
      */
      */
     @PdfField("arrivalTime")
     @PdfField("arrivalTime")
     private String arrivalTime;
     private String arrivalTime;

yd-csf-service/src/main/resources/mappers/AppointmentMapper.xml

@@ -67,7 +67,8 @@
 
 
     <select id="getItineraryDto" resultType="com.yd.csf.feign.dto.appointmentfile.ItineraryDto">
     <select id="getItineraryDto" resultType="com.yd.csf.feign.dto.appointmentfile.ItineraryDto">
         select
         select
-        a.sign_date as arrivalTime,a.meeting_point,
+        DATE_FORMAT(a.sign_date, '%Y-%m-%d %H:%i') as arrivalTime,
+        a.meeting_point,
         (select aus.name from appointment_user_sign aus where aus.appointment_biz_id = #{appointmentBizId} limit 1) as businessRepresentName1,
         (select aus.name from appointment_user_sign aus where aus.appointment_biz_id = #{appointmentBizId} limit 1) as businessRepresentName1,
         (select aus.phone from appointment_user_sign aus where aus.appointment_biz_id = #{appointmentBizId} limit 1) as businessRepresentMobile1,
         (select aus.phone from appointment_user_sign aus where aus.appointment_biz_id = #{appointmentBizId} limit 1) as businessRepresentMobile1,
         t.name_cn as name,
         t.name_cn as name,