Commit 1f215e1d by zhangxingmin

push

parent 2540cfe5
......@@ -15,13 +15,13 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse;
import com.yd.csf.service.dto.ItineraryDto;
//import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.AppointmentFile;
import com.yd.csf.service.model.Policyholder;
import com.yd.csf.service.service.IAppointmentFileService;
import com.yd.csf.service.service.IAppointmentService;
import com.yd.oss.service.enums.TemplateTypeEnum;
import com.yd.oss.service.service.PdfService;
//import com.yd.oss.service.enums.TemplateTypeEnum;
//import com.yd.oss.service.service.PdfService;
import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -49,8 +49,8 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
@Autowired
private IAppointmentService iAppointmentService;
@Autowired
private PdfService pdfService;
// @Autowired
// private PdfService pdfService;
/**
* 预约附件信息分页查询
......@@ -143,7 +143,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
public Result<String> itineraryPdf(String appointmentBizId) {
String url = "";
//获取行程单的数据
ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
// ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
// ItineraryDto itineraryDto = new ItineraryDto();
// itineraryDto.setArrivalTime("2025-09-10 15:30:20");
// itineraryDto.setBusinessRepresentMobile1("1366666666");
......@@ -160,13 +160,14 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
// itineraryDto.setTotal("29990.99");
// itineraryDto.setNp("王");
// itineraryDto.setPolicyFee("999.89");
try {
url = pdfService.generatePDF(itineraryDto,appointmentBizId, TemplateTypeEnum.XCD.getItemValue());
return Result.success(url);
} catch (IOException e) {
e.printStackTrace();
throw new BusinessException("生成行程单PDF异常");
}
// try {
//// url = pdfService.generatePDF(itineraryDto,appointmentBizId, TemplateTypeEnum.XCD.getItemValue());
// return Result.success(url);
// } catch (IOException e) {
// e.printStackTrace();
// throw new BusinessException("生成行程单PDF异常");
// }
return null;
}
/**
......
......@@ -74,11 +74,11 @@
<artifactId>yd-csf-feign</artifactId>
</dependency>
<!-- OSS实现模块 -->
<dependency>
<groupId>com.yd</groupId>
<artifactId>yd-oss-service</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.yd</groupId>-->
<!-- <artifactId>yd-oss-service</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- 认证模块 -->
<dependency>
......
package com.yd.csf.service.dto;
import com.yd.oss.service.annotation.PdfField;
import lombok.Data;
/**
* 预约行程单PDF字段映射实体类
*/
@Data
public class ItineraryDto {
/**
* 集合时间(到港时间)
*/
@PdfField("arrivalTime")
private String arrivalTime;
/**
* 集合地点(字典)(会面地点)
*/
@PdfField("meetingPoint")
private String meetingPoint;
/**
* 意向地点(签单地址)
*/
@PdfField("signingAddress")
private String signingAddress;
/**
* 业务代表1姓名
*/
@PdfField("businessRepresentName1")
private String businessRepresentName1;
/**
* 业务代表1电话号码区号
*/
@PdfField("businessRepresentMobile1Code")
private String businessRepresentMobile1Code;
/**
* 业务代表1电话号码
*/
@PdfField("businessRepresentMobile1")
private String businessRepresentMobile1;
/**
* 咨询人(客户表-客户姓名)
*/
@PdfField("name")
private String name;
/**
* 受保人(受保人姓名)
*/
@PdfField("insurantName")
private String insurantName;
/**
* 意向缴费年期(产品计划-供款年期(字典))
*/
@PdfField("paymentTerm")
private String paymentTerm;
/**
* 意向年缴保费(产品计划-每期保费)
*/
@PdfField("eachIssuePremium")
private String eachIssuePremium;
/**
* 保单证费(产品计划-保单证费)
*/
@PdfField("policyFee")
private String policyFee;
/**
* 币种(产品计划-货币(字典))
*/
@PdfField("currency")
private String currency;
/**
* 意向咨询产品(产品计划-保险产品名称(中台保险产品名称,冗余))
*/
@PdfField("productName")
private String productName;
/**
* 合计金额(供款年期*每期保费)
*/
@PdfField("total")
private String total;
/**
* 客户姓名前缀
*/
@PdfField("np")
private String np;
}
//package com.yd.csf.service.dto;
//
//import com.yd.oss.service.annotation.PdfField;
//import lombok.Data;
//
///**
// * 预约行程单PDF字段映射实体类
// */
//@Data
//public class ItineraryDto {
//
// /**
// * 集合时间(到港时间)
// */
// @PdfField("arrivalTime")
// private String arrivalTime;
//
// /**
// * 集合地点(字典)(会面地点)
// */
// @PdfField("meetingPoint")
// private String meetingPoint;
//
// /**
// * 意向地点(签单地址)
// */
// @PdfField("signingAddress")
// private String signingAddress;
//
// /**
// * 业务代表1姓名
// */
// @PdfField("businessRepresentName1")
// private String businessRepresentName1;
//
// /**
// * 业务代表1电话号码区号
// */
// @PdfField("businessRepresentMobile1Code")
// private String businessRepresentMobile1Code;
//
// /**
// * 业务代表1电话号码
// */
// @PdfField("businessRepresentMobile1")
// private String businessRepresentMobile1;
//
// /**
// * 咨询人(客户表-客户姓名)
// */
// @PdfField("name")
// private String name;
//
// /**
// * 受保人(受保人姓名)
// */
// @PdfField("insurantName")
// private String insurantName;
//
// /**
// * 意向缴费年期(产品计划-供款年期(字典))
// */
// @PdfField("paymentTerm")
// private String paymentTerm;
//
// /**
// * 意向年缴保费(产品计划-每期保费)
// */
// @PdfField("eachIssuePremium")
// private String eachIssuePremium;
//
// /**
// * 保单证费(产品计划-保单证费)
// */
// @PdfField("policyFee")
// private String policyFee;
//
// /**
// * 币种(产品计划-货币(字典))
// */
// @PdfField("currency")
// private String currency;
//
// /**
// * 意向咨询产品(产品计划-保险产品名称(中台保险产品名称,冗余))
// */
// @PdfField("productName")
// private String productName;
//
// /**
// * 合计金额(供款年期*每期保费)
// */
// @PdfField("total")
// private String total;
//
// /**
// * 客户姓名前缀
// */
// @PdfField("np")
// private String np;
//}
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