修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java

@@ -129,6 +129,11 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean saveDeliveryPlanInfo(@RequestBody AppHandoverPrepareDto dto);
 
+    @ApiOperation("保存车辆备注")
+    @PostMapping("/saveRemarks")
+    @ResponseBody
+    ResultBean saveRemarks(@RequestBody RemarkDto dto);
+
     @ApiOperation("交车准备详情")
     @GetMapping("/getDeliveryPlanInfoDetail")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java

@@ -124,6 +124,11 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean saveRemarks(RemarkDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
 		return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/RemarkDto.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @description: 备注保存
+ * @author: dimengzhe
+ * @date: 2023/6/7
+ **/
+@Data
+public class RemarkDto implements Dto {
+    private static final long serialVersionUID = 7415796834369046672L;
+
+    private String sid;
+
+    private String remarks;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPrepareDto.java

@@ -12,23 +12,23 @@ import java.util.List;
 public class AppHandoverPrepareDto implements Dto {
     private static final long serialVersionUID = -3500405140044756010L;
 
-    @ApiModelProperty("客户名称")
+ /*   @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("合同编号")
     private String contractId;
     @ApiModelProperty("车辆集合")
-    private List<AppBusHandoverPrepareVehicleDto> carDataList;
+    private List<AppBusHandoverPrepareVehicleDto> carDataList;*/
     @ApiModelProperty("记录sid")
     private String sid;
     @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("组织机构")
     private String orgPath;
-    @ApiModelProperty("付款方式")
+   /* @ApiModelProperty("付款方式")
     private String payType;
     @ApiModelProperty("车型")
     private String model;
     @ApiModelProperty("品牌")
-    private String brand;
+    private String brand;*/
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java

@@ -14,8 +14,8 @@ public class AppOtherDataDto implements Dto {
 
     private String sid;
 
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
     @ApiModelProperty("其他资料照片")
     private List<String> otherInfo = new ArrayList<>();
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java

@@ -11,6 +11,6 @@ public class AppOtherDataInfoQuery implements Query {
 
     private String sid;
 
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -12,8 +13,8 @@ public class AppOtherDataInfoVo implements Vo {
 
     private String sid;
 
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
     @ApiModelProperty("其他资料照片")
-    private List<String> otherInfo;
+    private List<String> otherInfo = new ArrayList<>();
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -11,12 +12,12 @@ public class AppPolicyDto implements Dto {
     private static final long serialVersionUID = 214089296630394804L;
 
     @ApiModelProperty("保单照片")
-    private List<String> policyList;
+    private List<String> policyList = new ArrayList<>();
     @ApiModelProperty("临时牌照")
-    private List<String> licenceList;
+    private List<String> licenceList = new ArrayList<>();
 
     private String sid;
 
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java

@@ -11,6 +11,6 @@ public class AppPolicyInfoQuery implements Query {
     @ApiModelProperty("sid")
     private String sid;
 
-    @ApiModelProperty("车架号")
+    /*@ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java

@@ -9,12 +9,12 @@ import java.util.List;
 @Data
 public class AppPolicyInfoVo implements Vo {
     private static final long serialVersionUID = 5449450307167004770L;
-    private String sid;
+//    private String sid;
 
     @ApiModelProperty("保单照片")
     private List<String> policyList;
     @ApiModelProperty("临时牌照")
     private List<String> licenceList;
-    @ApiModelProperty("车架号")
+//    @ApiModelProperty("车架号")
-    private String vin;
+//    private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java

@@ -4,8 +4,6 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @description:
  * @author: dimengzhe
@@ -37,7 +35,7 @@ public class BusTransferRecordsDto implements Dto {
     @ApiModelProperty("移交备注")
     private String transferDept;
     @ApiModelProperty("移交附件")
-    private List<String> transferFiles;
+    private String transferFiles;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("使用组织名称")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java

@@ -28,6 +28,7 @@ public class BuscenterFileService extends MybatisBaseService<BuscenterFileMapper
     }
 
     public void saveAll(String sid, List<String> imageFiles, String attachType) {
+        if(!imageFiles.isEmpty()){
             imageFiles.stream().forEach(str -> {
                 BuscenterFile buscenterFile = new BuscenterFile();
                 File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator));
@@ -43,6 +44,8 @@ public class BuscenterFileService extends MybatisBaseService<BuscenterFileMapper
             });
         }
 
+    }
+
     public BuscenterFile selectByLinkSidOne(String sid, String attachType) {
         return baseMapper.selectByLinkSidOne(sid, attachType);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.RemarkDto;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -154,6 +155,11 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
         return busHandoverPrepareService.saveDeliveryPlanInfo(dto);
     }
 
+    @Override
+    public ResultBean saveRemarks(RemarkDto dto) {
+        return busHandoverPrepareService.saveRemarks(dto);
+    }
+
     @Override
     public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
         return busHandoverPrepareService.getDeliveryPlanInfoDetail(query);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -35,10 +35,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign
 import com.yxt.anrui.base.api.basevehiclecertificate.HandoverCertVo;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareAddDto;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
@@ -308,6 +305,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
          * 确认时更新接收记录的接收日期及接收备注，如果发票移交状态为移交中的，则更新为已移交。
          */
         ResultBean<AppInvoicingInfoVo> rb = new ResultBean();
+        AppInvoicingInfoVo vo = new AppInvoicingInfoVo();
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
         //查询销售专员的用户sid
         BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
@@ -316,8 +314,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
         if (busTransferRecordsResultBean.getData() == null) {
             return rb.setMsg("发票未准备好");
+        } else {
+            BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
+            vo.setRemarks(busTransferRecords.getReceiveRemarks());
         }
-        AppInvoicingInfoVo vo = new AppInvoicingInfoVo();
         ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinSids(busHandoverPrepareVehicle.getVinSid());
         if (resultBean.getData() != null) {
             FinVehicleInvoice finVehicleInvoice = resultBean.getData();
@@ -346,6 +346,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      */
     public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
         ResultBean<AppCertificateInfoVo> rb = new ResultBean();
+        AppCertificateInfoVo vo = new AppCertificateInfoVo();
         //根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
         BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
         //查询销售专员的用户sid
@@ -354,8 +355,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
         if (busTransferRecordsResultBean.getData() == null) {
             return rb.setMsg("合格证未准备好");
+        } else {
+            BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData();
+            vo.setRemarks(busTransferRecords.getReceiveRemarks());
         }
-        AppCertificateInfoVo vo = new AppCertificateInfoVo();
         ResultBean<HandoverCertVo> resultBean = baseVehicleCertificateFeign.getCertificateInfoOne(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getUseOrgSid());
         HandoverCertVo handoverCertVo = resultBean.getData();
         BeanUtil.copyProperties(handoverCertVo, vo);
@@ -374,17 +377,23 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         List<String> policyList = new ArrayList<>();// 保单照片
         List<String> licenceList = new ArrayList<>();// 临时牌照
         List<BuscenterFile> policyFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        policyFiles.removeAll(Collections.singleton(null));
+        if (!policyFiles.isEmpty()) {
             for (BuscenterFile file : policyFiles) {
                 policyList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
             }
+        }
         List<BuscenterFile> licenceFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        licenceFiles.removeAll(Collections.singleton(null));
+        if (!licenceFiles.isEmpty()) {
             for (BuscenterFile file : licenceFiles) {
                 licenceList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
             }
+        }
         vo.setPolicyList(policyList);
         vo.setLicenceList(licenceList);
-        vo.setSid(query.getSid());
+       /* vo.setSid(query.getSid());
-        vo.setVin(query.getVin());
+        vo.setVin(query.getVin());*/
         return rb.success().setData(vo);
     }
 
@@ -397,9 +406,17 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     public ResultBean savePolicyInfo(AppPolicyDto dto) {
         ResultBean rb = new ResultBean<>();
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
-        buscenterFile.saveAll(dto.getSid(), dto.getPolicyList(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        List<String> policyList = dto.getPolicyList();
+        if (!policyList.isEmpty()) {
+            policyList = policyList.stream().map(c -> c.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList());
+        }
+        buscenterFile.saveAll(dto.getSid(), policyList, BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
-        buscenterFile.saveAll(dto.getSid(), dto.getLicenceList(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        List<String> licenceList = dto.getLicenceList();
+        if (!licenceList.isEmpty()) {
+            licenceList = licenceList.stream().map(c -> c.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList());
+        }
+        buscenterFile.saveAll(dto.getSid(), licenceList, BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
         return rb.success();
     }
 
@@ -413,13 +430,15 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         ResultBean<AppOtherDataInfoVo> rb = new ResultBean<>();
         AppOtherDataInfoVo vo = new AppOtherDataInfoVo();
         List<BuscenterFile> otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        otherFiles.removeAll(Collections.singleton(null));
         List<String> otherInfo = new ArrayList<>();
+        if(!otherFiles.isEmpty()){
             for (BuscenterFile file : otherFiles) {
                 otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
             }
+        }
         vo.setOtherInfo(otherInfo);
         vo.setSid(query.getSid());
-        vo.setVin(query.getVin());
         return rb.success().setData(vo);
     }
 
@@ -435,7 +454,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             return rb.setMsg("其他资料图片为必填项");
         }
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
-        buscenterFile.saveAll(dto.getSid(), dto.getOtherInfo(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        List<String> otherInfoList = dto.getOtherInfo();
+        if(!otherInfoList.isEmpty()){
+            otherInfoList = otherInfoList.stream().map(v->v.replaceAll(fileUploadComponent.getUrlPrefix(),"")).collect(Collectors.toList());
+            buscenterFile.saveAll(dto.getSid(), otherInfoList, BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        }
         return rb.success();
     }
 
@@ -448,16 +471,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid());
-        BeanUtil.copyProperties(dto, busHandoverPrepare);
+//        BeanUtil.copyProperties(dto, busHandoverPrepare);
-        List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
+       /* if (handoverPrepareVehicleDtos.size() > 0) {
-        if (handoverPrepareVehicleDtos.size() > 0) {
             String sid = dto.getSid();
-//            busHandoverPrepareVehicleService.deleteByMainSid(sid);
             for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
-               /* BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
-                BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
-                busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
-                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);*/
                 BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(handoverPrepareVehicleDto.getSid());
                 busHandoverPrepareVehicle.setInvoicingState(handoverPrepareVehicleDto.isInvoicingState() ? 1 : 0);
                 busHandoverPrepareVehicle.setCertificateState(handoverPrepareVehicleDto.isCertificateState() ? 1 : 0);
@@ -467,7 +484,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
             }
         }
-        updateById(busHandoverPrepare);
+        updateById(busHandoverPrepare);*/
         return rb.success();
     }
 
@@ -581,4 +598,8 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         }
         return rb.success();
     }
+
+    public ResultBean saveRemarks(RemarkDto dto) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@@ -9,7 +9,7 @@
                transferDept,
                transferName,
                transferRemarks,
-               DATE_FORMAT(createTime, '%Y-%m-%d')
+               DATE_FORMAT(createTime, '%Y-%m-%d') as createTime
         from bus_transfer_records
         <where>
             ${ew.sqlSegment}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -93,6 +93,7 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
                 record.setInvoicingName(finVehicleInvoice.getInvoicingName());
                 record.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
                 record.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
+                record.setInvoiceType(finVehicleInvoice.getInvoiceType());
             }
         }
         PagerVo<BusTransferRecordsVo> p = PagerUtil.pageToVo(pagging, null);
@@ -111,26 +112,27 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
 
     public ResultBean<BusRecordsInvoiceVo> getInvoiceInfo(String sid) {
         ResultBean<BusRecordsInvoiceVo> rb = ResultBean.fireFail();
-        BusRecordsInvoiceVo BusRecordsInvoiceVo = new BusRecordsInvoiceVo();
+        BusRecordsInvoiceVo busRecordsInvoiceVo = new BusRecordsInvoiceVo();
         BusTransferRecords BusTransferRecords = fetchBySid(sid);
-        BeanUtil.copyProperties(BusTransferRecords, BusRecordsInvoiceVo);
+        BeanUtil.copyProperties(BusTransferRecords, busRecordsInvoiceVo);
         ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinSids(BusTransferRecords.getVinSid());
         if (resultBean.getData() != null) {
             FinVehicleInvoice finVehicleInvoice = resultBean.getData();
-            BusRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
+            busRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
-            BusRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
+            busRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
-            BusRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
+            busRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
-            BusRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType());
+            busRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType());
+            busRecordsInvoiceVo.setInvoicingName(finVehicleInvoice.getInvoicingName());
             if (StringUtils.isNotBlank(finVehicleInvoice.getFilePath())) {
                 List<String> filePathList = Arrays.asList(finVehicleInvoice.getFilePath().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
-                BusRecordsInvoiceVo.setFilePathList(filePathList);
+                busRecordsInvoiceVo.setFilePathList(filePathList);
             }
         }
         if (StringUtils.isNotBlank(BusTransferRecords.getReceiveFiles())) {
             List<String> receiveFileList = Arrays.asList(BusTransferRecords.getReceiveFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
-            BusRecordsInvoiceVo.setReceiveFilesList(receiveFileList);
+            busRecordsInvoiceVo.setReceiveFilesList(receiveFileList);
         }
-        return rb.success().setData(BusRecordsInvoiceVo);
+        return rb.success().setData(busRecordsInvoiceVo);
     }
 
     public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid,String type) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java

@@ -105,6 +105,11 @@ public interface AppBusHandoverPrepareFeign {
     @ResponseBody
     ResultBean saveDeliveryPlanInfo(@RequestBody HandoverPrepareDto dto);
 
+    @ApiOperation("保存车辆备注")
+    @PutMapping("/saveRemarks")
+    @ResponseBody
+    ResultBean saveRemarks(@RequestBody ReamrksDto dto);
+
     @ApiOperation("交车准备详情")
     @GetMapping("/getDeliveryPlanInfoDetail")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeignFallback.java

@@ -97,6 +97,11 @@ public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepare
         return null;
     }
 
+    @Override
+    public ResultBean saveRemarks(ReamrksDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfoDetail(HandoverPrepareInfoQuery query) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareDto.java

@@ -4,29 +4,27 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class HandoverPrepareDto implements Dto {
     private static final long serialVersionUID = -8440894378823670730L;
 
-    @ApiModelProperty("客户名称")
+ /*   @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("合同编号")
     private String contractId;
     @ApiModelProperty("车辆集合")
-    private List<HandoverPrepareVehicleDto> carDataList;
+    private List<HandoverPrepareVehicleDto> carDataList;*/
     @ApiModelProperty("记录sid")
     private String sid;
     @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("组织机构")
     private String orgPath;
-    @ApiModelProperty("付款方式")
+   /* @ApiModelProperty("付款方式")
     private String payType;
     @ApiModelProperty("车型")
     private String model;
     @ApiModelProperty("品牌")
-    private String brand;
+    private String brand;*/
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/OtherDataDto.java

@@ -1,10 +1,10 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -14,9 +14,9 @@ public class OtherDataDto implements Dto {
     @ApiModelProperty("车辆列表sid")
     private String sid;
 
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
     @ApiModelProperty("其他资料照片")
-    private List<String> otherInfo;
+    private List<String> otherInfo = new ArrayList<>();
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/OtherDataInfoQuery.java

@@ -1,12 +1,9 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class OtherDataInfoQuery implements Query {
     private static final long serialVersionUID = -2645426505344369850L;
@@ -15,7 +12,7 @@ public class OtherDataInfoQuery implements Query {
     @ApiModelProperty("车辆列表sid")
     private String sid;
 
-    @ApiModelProperty("车架号")
+  /*  @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/OtherDataInfoVo.java

@@ -1,10 +1,10 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -12,11 +12,10 @@ public class OtherDataInfoVo implements Vo {
     private static final long serialVersionUID = 3389392232627388039L;
 
     @ApiModelProperty("车辆列表sid")
-    @JsonProperty("vinSid")
     private String sid;
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
     @ApiModelProperty("其他资料照片")
-    private List<String> otherInfo;
+    private List<String> otherInfo = new ArrayList<>();
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/PolicyInfoQuery.java

@@ -8,8 +8,8 @@ import lombok.Data;
 public class PolicyInfoQuery implements Query {
     private static final long serialVersionUID = 7475128359557107062L;
 
-    @ApiModelProperty("车架号")
+  /*  @ApiModelProperty("车架号")
-    private String vin;
+    private String vin;*/
 
     @ApiModelProperty("车辆列表sid")
     private String sid;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/PolicyInfoVo.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,11 +14,11 @@ public class PolicyInfoVo implements Vo {
     private List<String> policyList;
     @ApiModelProperty("临时牌照")
     private List<String> licenceList;
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
     private String vin;
 
     @ApiModelProperty("车辆列表sid")
     @JsonProperty("vinSid")
-    private String sid;
+    private String sid;*/
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/ReamrksDto.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 备注保存
+ * @author: dimengzhe
+ * @date: 2023/6/7
+ **/
+@Data
+public class ReamrksDto implements Dto {
+    private static final long serialVersionUID = 5027967940801316349L;
+
+    @ApiModelProperty("列表sid")
+    private String sid;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareRest.java

@@ -105,6 +105,11 @@ public class AppBusHandoverPrepareRest implements AppBusHandoverPrepareFeign {
         return appBusHandoverPrepareService.saveDeliveryPlanInfo(dto);
     }
 
+    @Override
+    public ResultBean saveRemarks(ReamrksDto dto) {
+        return appBusHandoverPrepareService.saveRemarks(dto);
+    }
+
     @Override
     public ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfoDetail(HandoverPrepareInfoQuery query) {
         return appBusHandoverPrepareService.getDeliveryPlanInfoDetail(query);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

@@ -192,4 +192,9 @@ public class AppBusHandoverPrepareService {
         ResultBean resultBean = busHandoverPrepareFeign.submitDeliveryPlanInfo(appSubmitHandoverPrepareDto);
         return resultBean;
     }
+
+    public ResultBean saveRemarks(ReamrksDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        return null;
+    }
 }