diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java
index fe02ac62da..751d21d292 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java
@@ -60,4 +60,5 @@ public class BusDiscountpackageHandover extends BaseEntity {
@ApiModelProperty("移交备注")
private String transferRemarks;
private String orgSidPath;
+ private String filePath;
}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java
index 85ae28e6c8..ee1e272747 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java
@@ -46,4 +46,6 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
private Boolean showUploadBtn; // 已交接显示
@ApiModelProperty("车架号")
private String vins; // 车架号
+ private boolean showDownloadBtn;
+ private String filePath;
}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
index 09c0357339..e0d5195383 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
@@ -40,7 +40,8 @@
transferName as receiveName,
transferPhone as receivePhone,
transferStateValue as nodeState,
- vins
+ vins,
+ filePath
FROM
bus_discountpackage_handover
${ew.sqlSegment}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
index 52dd6b3f29..5a0e400e6e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
@@ -413,6 +413,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService 0) {
this.uploadPicture(dto);
}
+ BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(sid);
+ String s = commonCreatePdf(detailsVo);
+ String targetPath = docPdfComponent.getUploadTemplateUrl();
+ String filePath = s.substring(targetPath.length());
+ BusDiscountpackageHandover entity = fetchBySid(sid);
+ entity.setFilePath(filePath);
+ baseMapper.updateById(entity);
} else if ((sysRoleVo.getName()).contains("优惠包管理员")) {
dto.setTransferStateKey("003");
dto.setTransferStateValue("移交中");
@@ -647,9 +654,16 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectAppPageVo(page, qw);
List records = pagging.getRecords();
+ String urlPrefix = docPdfComponent.getPrefixTemplateUrl();
if (null != records && records.size() > 0) {
for (AppBusDiscountpackageHandoverVo record : records) {
if (null != record) {
+ if (StringUtils.isNotBlank(record.getFilePath())) {
+ record.setShowDownloadBtn(true);
+ record.setFilePath(urlPrefix + record.getFilePath());
+ } else {
+ record.setShowDownloadBtn(false);
+ }
if (StringUtils.isBlank(record.getVins())) {
record.setVins("-");
}
@@ -901,6 +915,11 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService 0) {
sbKey.append("008").append("、");
}
- if (Integer.parseInt(information.getGasCertificate()) > 0) {
- if ("0".equals(data.getIsFuelVehicle())) {
- sbKey.append("009").append("、");
+ if (StringUtils.isNotBlank(information.getGasCertificate())) {
+ if (Integer.parseInt(information.getGasCertificate()) > 0) {
+ if ("0".equals(data.getIsFuelVehicle())) {
+ sbKey.append("009").append("、");
+ }
}
}
+
}
} else {
if ("0".equals(data.getIsFuelVehicle())) {
@@ -1132,15 +1135,17 @@ public class BusHandoverService extends MybatisBaseService voResultBean = sysStaffinfoFeign.fetchBySid(staffSid);
- if (voResultBean.getSuccess()) {
- if (null != voResultBean.getData()) {
- SysStaffinfoDetailsVo data = voResultBean.getData();
- if (StringUtils.isNotBlank(data.getName())) {
- pdfVo.setStaffName(data.getName());
- //出门证业务经办人
- permitVo.setOperator(data.getName());
+ if (StringUtils.isNotBlank(busHandover.getStaffSid())) {
+ String staffSid = busHandover.getStaffSid();
+ ResultBean voResultBean = sysStaffinfoFeign.fetchBySid(staffSid);
+ if (voResultBean.getSuccess()) {
+ if (null != voResultBean.getData()) {
+ SysStaffinfoDetailsVo data = voResultBean.getData();
+ if (StringUtils.isNotBlank(data.getName())) {
+ pdfVo.setStaffName(data.getName());
+ //出门证业务经办人
+ permitVo.setOperator(data.getName());
+ }
}
}
}
@@ -1632,9 +1637,11 @@ public class BusHandoverService extends MybatisBaseService 0) {
sbKey.append("008").append("、");
}
- if (Integer.parseInt(information.getGasCertificate()) > 0) {
- if ("0".equals(data.getIsFuelVehicle())) {
- sbKey.append("009").append("、");
+ if (StringUtils.isNotBlank(information.getGasCertificate())) {
+ if (Integer.parseInt(information.getGasCertificate()) > 0) {
+ if ("0".equals(data.getIsFuelVehicle())) {
+ sbKey.append("009").append("、");
+ }
}
}
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java
index 4857300883..405d095952 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java
@@ -46,6 +46,6 @@ public class AppBusDiscountpackageHandoversVo implements Vo {
private Boolean showUploadBtn; // 已交接显示
@ApiModelProperty("车架号")
private String vins; // 车架号
-
-
+ private boolean showDownloadBtn;
+ private String filePath;
}