优惠包清单下载、交车确认优化

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;
 }

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;
 }

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
         <where>${ew.sqlSegment}</where>

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<BusDis
                     if (null != busFiles && i > 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<BusDis
         IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
         IPage<AppBusDiscountpackageHandoverVo> pagging = baseMapper.selectAppPageVo(page, qw);
         List<AppBusDiscountpackageHandoverVo> 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<BusDis
         entity.setRecTime(new Date());
         entity.setTransferStateValue("已移交");
         entity.setTransferStateKey("004");
+        BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(dto.getSid());
+        String s = commonCreatePdf(detailsVo);
+        String targetPath = docPdfComponent.getUploadTemplateUrl();
+        String filePath = s.substring(targetPath.length());
+        entity.setFilePath(filePath);
         baseMapper.updateById(entity);
         return rb.success();
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -915,12 +915,15 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                                         if (Integer.parseInt(information.getDirverCard()) > 0) {
                                             sbKey.append("008").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())) {
                                         sbKey.append("003、004、005、006、007、008、009").append("、");
@@ -1132,6 +1135,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                     }
                 }
             }
+            if (StringUtils.isNotBlank(busHandover.getStaffSid())) {
                 String staffSid = busHandover.getStaffSid();
                 ResultBean<SysStaffinfoDetailsVo> voResultBean = sysStaffinfoFeign.fetchBySid(staffSid);
                 if (voResultBean.getSuccess()) {
@@ -1144,6 +1148,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                         }
                     }
                 }
+            }
             //查询交车车辆
             List<BusHandoverItems> items = busHandoverItemsService.getItemsListByMainSid(sid).getData();
             List<BusReceiveVehicleListPdfVo> listPdfVos = new ArrayList<>();
@@ -1632,12 +1637,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                                         if (Integer.parseInt(information.getDirverCard()) > 0) {
                                             sbKey.append("008").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())) {
                                         sbKey.append("003、004、005、006、007、008、009").append("、");

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;
 }