更改

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java

@@ -72,4 +72,7 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
     List<AdCarListVo> selectByApplySidVehicle(String sid);
 
     int selByVinSidAndYBJ(String vinSid);
+
+    @Select("select applySid from bus_arrears_carry_vehicle_details where vinSid = #{linkSid}")
+    String selByVinSid(String linkSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@@ -147,4 +147,8 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
         int i = baseMapper.selByVinSidAndYBJ(vinSid);
         return rb.success().setData(i);
     }
+
+    public String selByVinSid(String linkSid) {
+        return baseMapper.selByVinSid(linkSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@@ -102,4 +102,7 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
 
     @Update("update bus_delivered_apply_details set isDelete = 1 where vinSid = #{vehSid}")
     void updateIsDel(String vehSid);
+
+    @Select("select applySid from bus_delivered_apply_details where busVinSid = #{busVinSid}}")
+    String selByBusVinSid(String busVinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -230,4 +230,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     public void updateIsDel(String vehSid) {
         baseMapper.updateIsDel(vehSid);
     }
+
+    public String selByBusVinSid(String busVinSid) {
+        return baseMapper.selByBusVinSid(busVinSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/vehicleBusinessFileManagement/VehicleBusinessFileManagementService.java

@@ -73,8 +73,10 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
@@ -131,7 +133,10 @@ import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusiness
 import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementQuery;
 import com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement.VehicleBusinessFileManagementVo;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
+import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService;
 import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
+import com.yxt.anrui.buscenter.biz.busdeliveredapply.BusDeliveredApplyService;
+import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
@@ -204,16 +209,26 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyFeign;
 import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord;
 import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecordFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileFeign;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanXdConDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanZfConDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrep;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanFileTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
@@ -223,6 +238,8 @@ import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
+import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmfile.ScmFileFeign;
 import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign;
@@ -313,6 +330,28 @@ public class VehicleBusinessFileManagementService extends MybatisBaseService<Veh
     private BusValcustFilingService busValcustFilingService;
     @Autowired
     private LoanCustomerRecordFeign loanCustomerRecordFeign;
+    @Autowired
+    private BusDeliveredApplyDetailsService busDeliveredApplyDetailsService;
+    @Autowired
+    private BusDeliveredApplyService busDeliveredApplyService;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
+    @Autowired
+    private BusArrearsCarryVehicleDetailsService busArrearsCarryVehicleDetailsService;
+    @Autowired
+    private BusArrearsCarryVehicleApplyService busArrearsCarryVehicleApplyService;
+    @Autowired
+    private LoanPreloanCreditApplyFeign loanPreloanCreditApplyFeign;
+    @Autowired
+    private LoanCreditAppealApplyFeign loanCreditAppealApplyFeign;
+    @Autowired
+    private LoanHomevisitPrepFeign loanHomevisitPrepFeign;
+    @Autowired
+    private LoanHomevisitFileexamineFeign loanHomevisitFileexamineFeign;
+    @Autowired
+    private LoanFileexamineFeign loanFileexamineFeign;
+    @Autowired
+    private LoanWarrantInformationFeign loanWarrantInformationFeign;
 
     public PagerVo<VehicleBusinessFileManagementVo> listPageVo(PagerQuery<VehicleBusinessFileManagementQuery> pq) {
         VehicleBusinessFileManagementQuery query = pq.getParams();
@@ -495,7 +534,7 @@ public class VehicleBusinessFileManagementService extends MybatisBaseService<Veh
             vehicleBusinessFileManagementFileVo.setUploadName(kxqq.getName());
             collectionPaymentsFileList.add(vehicleBusinessFileManagementFileVo);
         }
-        List<FinBillFileVo> zjApplicationAppendxs = finBillFileFeign.fetchzjBySid(sid).getData();
+        List<FinBillFileVo> zjApplicationAppendxs = finBillFileFeign.fetchzjBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
         for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
             VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
             vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + zjApplicationAppendx.getFileUrl());
@@ -504,7 +543,7 @@ public class VehicleBusinessFileManagementService extends MybatisBaseService<Veh
             vehicleBusinessFileManagementFileVo.setUploadName(zjApplicationAppendx.getCreateByName());
             invoiceFileList.add(vehicleBusinessFileManagementFileVo);
         }
-        List<FinBillFileVo> clmmhtApplicationAppendxs = finBillFileFeign.fetchclmmhtBySid(sid).getData();
+        List<FinBillFileVo> clmmhtApplicationAppendxs = finBillFileFeign.fetchclmmhtBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
         for (FinBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) {
             VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
             vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + clmmhtApplicationAppendx.getFileUrl());
@@ -513,7 +552,7 @@ public class VehicleBusinessFileManagementService extends MybatisBaseService<Veh
             vehicleBusinessFileManagementFileVo.setUploadName(clmmhtApplicationAppendx.getCreateByName());
             invoiceFileList.add(vehicleBusinessFileManagementFileVo);
         }
-        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillFileFeign.fetchcldjhtBySid(sid).getData();
+        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillFileFeign.fetchcldjhtBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
         for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
             VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
             vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + cldjhtApplicationAppendx.getFileUrl());
@@ -522,7 +561,7 @@ public class VehicleBusinessFileManagementService extends MybatisBaseService<Veh
             vehicleBusinessFileManagementFileVo.setUploadName(cldjhtApplicationAppendx.getCreateByName());
             invoiceFileList.add(vehicleBusinessFileManagementFileVo);
         }
-        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileFeign.fetchkhkpsqsBySid(sid).getData();
+        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileFeign.fetchkhkpsqsBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
         for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
             VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
             vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + khkpsqsApplicationAppendx.getFileUrl());
@@ -735,19 +774,489 @@ public class VehicleBusinessFileManagementService extends MybatisBaseService<Veh
             vehicleBusinessFileManagementFileVo.setUploadName(sysUserVo.getName());
             arrearsCustomersFileList.add(vehicleBusinessFileManagementFileVo);
         }
-        /*List<FinBillFileVo> fjApplicationAppendxs = finBillFileFeign.fetchfjBySid(sid);
+        List<FinBillFileVo> qkzjApplicationAppendxs = finBillFileFeign.fetchzjBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo qkzjApplicationAppendx : qkzjApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + qkzjApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("营业执照或身份证");
+            vehicleBusinessFileManagementFileVo.setUploadDate(qkzjApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(qkzjApplicationAppendx.getCreateByName());
+            arrearsInvoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> qkclmmhtApplicationAppendxs = finBillFileFeign.fetchclmmhtBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo qkclmmhtApplicationAppendx : qkclmmhtApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + qkclmmhtApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("新车买卖合同");
+            vehicleBusinessFileManagementFileVo.setUploadDate(qkclmmhtApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(qkclmmhtApplicationAppendx.getCreateByName());
+            arrearsInvoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> qkcldjhtApplicationAppendxs = finBillFileFeign.fetchcldjhtBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo qkcldjhtApplicationAppendx : qkcldjhtApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + qkcldjhtApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("车辆登记合同");
+            vehicleBusinessFileManagementFileVo.setUploadDate(qkcldjhtApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(qkcldjhtApplicationAppendx.getCreateByName());
+            arrearsInvoiceFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> lpclmmhtApplicationAppendxs = finBillFileFeign.fetchclmmhtBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo lpclmmhtApplicationAppendx : lpclmmhtApplicationAppendxs) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + lpclmmhtApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("车辆买卖合同（欠款）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(lpclmmhtApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(lpclmmhtApplicationAppendx.getCreateByName());
+            arrearscollectionFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> fjApplicationAppendxs = finBillFileFeign.fetchfjBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
         for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) {
-            String fileUrl = fjApplicationAppendx.getFileUrl();
-            String urlPrefix = fileUploadComponent.getUrlPrefix();
-            fileUrl = urlPrefix + fileUrl;
-            fjApplicationAppendx.setFileUrl(fileUrl);
-        }*/
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + fjApplicationAppendx.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("欠款承诺书");
+            vehicleBusinessFileManagementFileVo.setUploadDate(fjApplicationAppendx.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(fjApplicationAppendx.getCreateByName());
+            arrearscollectionFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> pcgsgdhdwdbjys = finBillFileFeign.fetchgsgdhdwdbjyBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo pcgsgdhdwdbjy : pcgsgdhdwdbjys) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + pcgsgdhdwdbjy.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("公司股东会对外担保决议（公司担保）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(pcgsgdhdwdbjy.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(pcgsgdhdwdbjy.getCreateByName());
+            arrearscollectionFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> pczrrdbcns = finBillFileFeign.fetchzrrdbcnsBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + pczrrdbcn.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("责任人担保承诺书--总经理签字");
+            vehicleBusinessFileManagementFileVo.setUploadDate(pczrrdbcn.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(pczrrdbcn.getCreateByName());
+            arrearscollectionFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<FinBillFileVo> pczfxsjt = finBillFileFeign.fetchzfxsjtBySid(finBillVehicleDetailsVo.getBillAppSid()).getData();
+        for (FinBillFileVo pczfxs : pczfxsjt) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + pczfxs.getFileUrl());
+            vehicleBusinessFileManagementFileVo.setFileNmae("资方信审截图");
+            vehicleBusinessFileManagementFileVo.setUploadDate(pczfxs.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(pczfxs.getCreateByName());
+            arrearscollectionFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        String applySid = busDeliveredApplyDetailsService.selByBusVinSid(sid);
+        if (StringUtils.isNotBlank(applySid)){
+            BusDeliveredApply busDeliveredApply = busDeliveredApplyService.fetchBySid(applySid);
+            if (StringUtils.isNotBlank(busDeliveredApply.getPromiseFile())){
+                String[] split = busDeliveredApply.getPromiseFile().split(",");
+                for (String s : split) {
+                    VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                    vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + s);
+                    vehicleBusinessFileManagementFileVo.setFileNmae("责任人担保承诺书--销售专员签字");
+                    vehicleBusinessFileManagementFileVo.setUploadDate(busDeliveredApply.getCreateTime().toString());
+                    vehicleBusinessFileManagementFileVo.setUploadName(busDeliveredApply.getStaffName());
+                    arrearsOutBoundFileList.add(vehicleBusinessFileManagementFileVo);
+                }
+            }
+            if (StringUtils.isNotBlank(busDeliveredApply.getDanFile())){
+                String[] split = busDeliveredApply.getDanFile().split(",");
+                for (String s : split) {
+                    VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                    vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + s);
+                    vehicleBusinessFileManagementFileVo.setFileNmae("担保承诺书");
+                    vehicleBusinessFileManagementFileVo.setUploadDate(busDeliveredApply.getCreateTime().toString());
+                    vehicleBusinessFileManagementFileVo.setUploadName(busDeliveredApply.getStaffName());
+                    arrearsOutBoundFileList.add(vehicleBusinessFileManagementFileVo);
+                }
+            }
+            if (StringUtils.isNotBlank(busDeliveredApply.getCarFile())){
+                String[] split = busDeliveredApply.getCarFile().split(",");
+                for (String s : split) {
+                    VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                    vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + s);
+                    vehicleBusinessFileManagementFileVo.setFileNmae("车辆登记合同");
+                    vehicleBusinessFileManagementFileVo.setUploadDate(busDeliveredApply.getCreateTime().toString());
+                    vehicleBusinessFileManagementFileVo.setUploadName(busDeliveredApply.getStaffName());
+                    arrearsOutBoundFileList.add(vehicleBusinessFileManagementFileVo);
+                }
+            }
+        }
+        String tcApplySid = busArrearsCarryVehicleDetailsService.selByVinSid(busSalesOrderVehicle.getLinkSid());
+        BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.fetchBySid(tcApplySid);
+        BuscenterFile buscenterFile = buscenterFileService.selectByLinkSidOne(tcApplySid, BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
+        if (buscenterFile != null) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("车辆买卖合同（欠款）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(busArrearsCarryVehicleApply.getStaffName());
+            arrearsPickupCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        buscenterFile = buscenterFileService.selectByLinkSidOne(tcApplySid, BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
+        if (buscenterFile != null) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("欠款提车担保承诺书（外部金融必传）");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(busArrearsCarryVehicleApply.getStaffName());
+            arrearsPickupCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        buscenterFile = buscenterFileService.selectByLinkSidOne(tcApplySid, BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
+        if (buscenterFile != null) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("股东会对外担保决议");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(busArrearsCarryVehicleApply.getStaffName());
+            arrearsPickupCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        buscenterFile = buscenterFileService.selectByLinkSidOne(tcApplySid, BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
+        if (buscenterFile != null) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("总经理担保书*");
+            vehicleBusinessFileManagementFileVo.setUploadDate(buscenterFile.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(busArrearsCarryVehicleApply.getStaffName());
+            arrearsPickupCarFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOtherFile())){
+            String[] split = busArrearsCarryVehicleApply.getOtherFile().split(",");
+            for (String s : split) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + s);
+                vehicleBusinessFileManagementFileVo.setFileNmae("其他附件");
+                vehicleBusinessFileManagementFileVo.setUploadDate(busArrearsCarryVehicleApply.getCreateTime().toString());
+                vehicleBusinessFileManagementFileVo.setUploadName(busArrearsCarryVehicleApply.getStaffName());
+                arrearsPickupCarFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        LoanPreloanCreditApply preloanCreditApply = loanPreloanCreditApplyFeign.selectByCustSid(busSalesOrder.getCustomerSid()).getData();
+        CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
+        commonAppendixSelectQuery.setLinkSid(preloanCreditApply.getSid());
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
+        List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        for (CommonAppendixVo commonAppendixVo : data1) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("信用审核资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName());
+            loanBeforeFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
+        List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        for (CommonAppendixVo commonAppendixVo : data2) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("信用审核资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName());
+            loanBeforeFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
+        List<CommonAppendixVo> data4 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        for (CommonAppendixVo commonAppendixVo : data4) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("信用审核资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName());
+            loanBeforeFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
+        List<CommonAppendixVo> data5 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
+        for (CommonAppendixVo commonAppendixVo : data5) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("信用审核资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(commonAppendixVo.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(commonAppendixVo.getName());
+            loanBeforeFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        String ssSid = loanCreditAppealApplyFeign.selectByCreditApplySid(preloanCreditApply.getSid()).getData();
+        List<CommonAppendixVo> ssFiles = commonAppendixFeign.selByLinkSid(ssSid).getData();
+        for (CommonAppendixVo ssFile : ssFiles) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(fileUploadComponent.getUrlPrefix() + ssFile.getFilePath());
+            vehicleBusinessFileManagementFileVo.setFileNmae("上诉资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(ssFile.getCreateTime());
+            vehicleBusinessFileManagementFileVo.setUploadName(ssFile.getName());
+            loanBeforeFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepFeign.selectBySaleOrderSid(busSalesOrder.getSid()).getData();
+        VehicleBusinessFileManagementFileVo vo1 = new VehicleBusinessFileManagementFileVo();
+        vo1.setFileUrl(loanHomevisitPrep.getDownUrl());
+        vo1.setFileNmae("贷款系列合同");
+        vo1.setUploadDate(loanHomevisitPrep.getCreateTime().toString());
+        vo1.setUploadName(loanHomevisitPrep.getCreateByName());
+        loanInFileList.add(vo1);
+        String jfzlSid = loanHomevisitFileexamineFeign.selectSaleOrderSid(busSalesOrder.getSid()).getData();
+        LoanHomevisitFileexamineDetailsVo loanHomevisitFileexamineDetailsVo = loanHomevisitFileexamineFeign.fetchDetailsBySid(jfzlSid).getData();
+        for (String s : loanHomevisitFileexamineDetailsVo.getHouse()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getDoorway()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getIndoor()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getGroupPhoto()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getLenderIdCard()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getLenderAccount()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getLenderMarriageCertificate()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getLenderDriverBook()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getLenderBankStatement()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getSpouseIdCard()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }for (String s : loanHomevisitFileexamineDetailsVo.getSpouseAccount()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getGuarantorIdCard()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getGuarantorAccount()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getYhkImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getHouseProperty()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanHomevisitFileexamineDetailsVo.getCarProperty()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        List<LoanXdConDetailsVo> loanXdCons = loanHomevisitFileexamineDetailsVo.getLoanXdCons();
+        for (LoanXdConDetailsVo loanXdCon : loanXdCons) {
+            List<String> loanCotractImages = loanXdCon.getLoanCotractImages();
+            for (String loanCotractImage : loanCotractImages) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(loanCotractImage);
+                vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+                vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+                vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+                loanInFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        List<LoanZfConDetailsVo> loanZfCons = loanHomevisitFileexamineDetailsVo.getLoanZfCons();
+        for (LoanZfConDetailsVo loanZfCon : loanZfCons) {
+            List<String> bankContractImages = loanZfCon.getBankContractImages();
+            for (String bankContractImage : bankContractImages) {
+                VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+                vehicleBusinessFileManagementFileVo.setFileUrl(bankContractImage);
+                vehicleBusinessFileManagementFileVo.setFileNmae("家访资料");
+                vehicleBusinessFileManagementFileVo.setUploadDate(loanHomevisitFileexamineDetailsVo.getCreateTime().toString());
+                vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+                loanInFileList.add(vehicleBusinessFileManagementFileVo);
+            }
+        }
+        String fkzlSid = loanFileexamineFeign.selectOrderSid(busSalesOrder.getSid()).getData();
+        LoanFileexamineDetailsVo loanFileexamineDetailsVo = loanFileexamineFeign.fetchDetailsBySid(fkzlSid).getData();
+        for (String s : loanFileexamineDetailsVo.getHgzImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getFpImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getYhkImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getGzsfpImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getBxfpImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getBdImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getRzhtImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanFileexamineDetailsVo.getZmfjImages()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("放款资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanFileexamineDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        String qzzlSid = loanWarrantInformationFeign.selectBusVinSid(busSalesOrderVehicle.getSid()).getData();
+        LoanWarrantInformationDetailsVo loanWarrantInformationDetailsVo = loanWarrantInformationFeign.detailsInfo(qzzlSid).getData();
+        for (String s : loanWarrantInformationDetailsVo.getRegistrationFiles1()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("权证资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanWarrantInformationDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanWarrantInformationDetailsVo.getRegistrationFiles2()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("权证资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanWarrantInformationDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanWarrantInformationDetailsVo.getTaxiFiles()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("权证资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanWarrantInformationDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
+        for (String s : loanWarrantInformationDetailsVo.getDrivingFiles()) {
+            VehicleBusinessFileManagementFileVo vehicleBusinessFileManagementFileVo = new VehicleBusinessFileManagementFileVo();
+            vehicleBusinessFileManagementFileVo.setFileUrl(s);
+            vehicleBusinessFileManagementFileVo.setFileNmae("权证资料");
+            vehicleBusinessFileManagementFileVo.setUploadDate(loanWarrantInformationDetailsVo.getCreateTime().toString());
+            vehicleBusinessFileManagementFileVo.setUploadName(loanHomevisitPrep.getCreateByName());
+            loanInFileList.add(vehicleBusinessFileManagementFileVo);
+        }
         vo.setSaleOrderFileList(saleOrderFileList);
         vo.setCollectionPaymentsFileList(collectionPaymentsFileList);
         vo.setInvoiceFileList(invoiceFileList);
         vo.setDeliveryCarFileList(deliveryCarFileList);
         vo.setValueCustomersFileList(valueCustomersFileList);
-        vo.setArrearsCustomersFileList(valueCustomersFileList);
+        vo.setArrearsCustomersFileList(arrearsCustomersFileList);
+        vo.setArrearsInvoiceFileList(arrearsInvoiceFileList);
+        vo.setArrearscollectionFileList(arrearscollectionFileList);
+        vo.setArrearsOutBoundFileList(arrearsOutBoundFileList);
+        vo.setArrearsPickupCarFileList(arrearsPickupCarFileList);
+        vo.setLoanBeforeFileList(loanBeforeFileList);
+        vo.setLoanInFileList(loanInFileList);
         return rb.success().setData(vo);
     }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java

@@ -101,8 +101,23 @@ public interface FinBillFileFeign {
     @ResponseBody
     ResultBean<List<FinBillFileVo>> fetchkhkpsqsBySid(@RequestParam("sid") String sid);
 
-    @ApiOperation("查询")
+    @ApiOperation("查询欠款承诺书附件")
     @PostMapping("/fetchfjBySid")
     @ResponseBody
     ResultBean<List<FinBillFileVo>> fetchfjBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("查询公司股东会对外担保决议附件")
+    @PostMapping("/fetchgsgdhdwdbjyBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchgsgdhdwdbjyBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("查询责任人担保承诺书附件")
+    @PostMapping("/fetchzrrdbcnsBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchzrrdbcnsBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("查询资方信审截图附件")
+    @PostMapping("/fetchzfxsjtBySid")
+    @ResponseBody
+    ResultBean<List<FinBillFileVo>> fetchzfxsjtBySid(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java

@@ -99,4 +99,19 @@ public class FinBillFileFeignFallback implements FinBillFileFeign {
 	public ResultBean<List<FinBillFileVo>> fetchfjBySid(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchgsgdhdwdbjyBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchzrrdbcnsBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchzfxsjtBySid(String sid) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java

@@ -123,7 +123,30 @@ public class FinBillFileRest implements FinBillFileFeign {
 
 	@Override
 	public ResultBean<List<FinBillFileVo>> fetchfjBySid(String sid) {
-		return null;
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchfjBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchgsgdhdwdbjyBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchgsgdhdwdbjyBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchzrrdbcnsBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchzrrdbcnsBySid(sid);
+		return rb.success().setData(finBillFileVos);
+	}
+
+	@Override
+	public ResultBean<List<FinBillFileVo>> fetchzfxsjtBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<FinBillFileVo> finBillFileVos = finBillFileService.fetchzfxsjtBySid(sid);
+		return rb.success().setData(finBillFileVos);
 	}
 
 	@Override

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java

@@ -121,4 +121,9 @@ public interface LoanCreditAppealApplyFeign {
     @PostMapping("/fetchDetailsByShSidAndState")
     @ResponseBody
     ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(@RequestParam("shSid") String shSid, @RequestParam("nodeState") String nodeState);
+
+    @ApiOperation("根据审核sid查询")
+    @PostMapping("/selectByCreditApplySid")
+    @ResponseBody
+    ResultBean<String> selectByCreditApplySid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java

@@ -120,4 +120,9 @@ public class LoanCreditAppealApplyFeignFallback implements LoanCreditAppealApply
 	public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selectByCreditApplySid(String sid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java

@@ -26,12 +26,14 @@
 package com.yxt.anrui.riskcenter.api.loanfileexamine;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +55,9 @@ public class LoanFileexamineDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("消贷合同编号")
     private String loanContractNo;
     @ApiModelProperty("贷款人名称")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java

@@ -92,4 +92,9 @@ public interface LoanFileexamineFeign {
     @GetMapping("/getToDoNum")
     @ResponseBody
     ResultBean<String> getToDoNum(@SpringQueryMap RiskToDoNumQuery riskToDoNumQuery);
+
+    @ApiOperation("根据销售订单sid查询")
+    @PostMapping("/selectOrderSid")
+    @ResponseBody
+    ResultBean<String> selectOrderSid(@RequestParam("saleOrderSid") String saleOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java

@@ -85,4 +85,9 @@ public class LoanFileexamineFeignFallback implements LoanFileexamineFeign {
 	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selectOrderSid(String saleOrderSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,6 +55,9 @@ import java.util.List;
 public class LoanHomevisitFileexamineDetailsVo implements Vo {
 
     private String sid;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("家访考察sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java

@@ -87,4 +87,9 @@ public interface LoanHomevisitFileexamineFeign {
     @PostMapping("/selSaleOrderSid")
     @ResponseBody
     ResultBean<String> selSaleOrderSid(@RequestParam("salesOrderSid") String salesOrderSid);
+
+    @ApiOperation("根据销售订单sid查询家访资料sid")
+    @PostMapping("/selectSaleOrderSid")
+    @ResponseBody
+    ResultBean<String> selectSaleOrderSid(@RequestParam("salesOrderSid") String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java

@@ -81,4 +81,9 @@ public class LoanHomevisitFileexamineFeignFallback implements LoanHomevisitFilee
 	public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selectSaleOrderSid(String salesOrderSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java

@@ -95,4 +95,9 @@ public interface LoanHomevisitPrepFeign {
     @PostMapping("/saveHomeVisit")
     @ResponseBody
     ResultBean saveHomeVisit(@RequestBody HomeVisitDto dto);
+
+    @ApiOperation("根据销售订单sid查询")
+    @PostMapping("/selectBySaleOrderSid")
+    @ResponseBody
+    ResultBean<LoanHomevisitPrep> selectBySaleOrderSid(@RequestParam("saleOrderSid") String saleOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeignFallback.java

@@ -89,4 +89,9 @@ public class LoanHomevisitPrepFeignFallback implements LoanHomevisitPrepFeign {
 	public ResultBean saveHomeVisit(HomeVisitDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<LoanHomevisitPrep> selectBySaleOrderSid(String saleOrderSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java

@@ -101,6 +101,8 @@ public interface LoanPreloanCreditApplyFeign {
     @ResponseBody
     ResultBean<LoanOrderPreloanVo> judgeIsLoan(@RequestParam("sid") String sid);
 
-
-
+    @ApiOperation("根据客户sid查询")
+    @GetMapping("/selectByCustSid")
+    @ResponseBody
+    ResultBean<LoanPreloanCreditApply> selectByCustSid(@RequestParam("customerSid") String customerSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java

@@ -96,4 +96,9 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp
 	public ResultBean<LoanOrderPreloanVo> judgeIsLoan(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<LoanPreloanCreditApply> selectByCustSid(String customerSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationDetailsVo.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.riskcenter.api.loanwarrantinformation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,6 +18,9 @@ import java.util.List;
 public class LoanWarrantInformationDetailsVo implements Vo {
     @ApiModelProperty("业务sid")
     private String sid;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
     @ApiModelProperty("消贷合同编号")
     private String contractNo;
     @ApiModelProperty("客户名称")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java

@@ -102,4 +102,8 @@ public interface LoanWarrantInformationFeign {
     @ResponseBody
     public ResultBean<LoanWarrantInformationDetailsVo> detailsInfo(@PathVariable("sid") String sid);
 
+    @ApiOperation("根据销售订单车辆sid查询")
+    @GetMapping("/selectBusVinSid")
+    @ResponseBody
+    ResultBean<String> selectBusVinSid(@RequestParam("busVinSid") String busVinSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java

@@ -49,6 +49,11 @@ public class LoanWarrantInformationFeignFallback implements LoanWarrantInformati
         return null;
     }
 
+    @Override
+    public ResultBean<String> selectBusVinSid(String busVinSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<String> approvedWarrantInfo(LoanAuditInfoDto dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java

@@ -77,4 +77,7 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper<LoanCreditAppeal
 	int selectByAppSid(String sid);
 
     LoanCreditAppealApplyDetailsVo fetchDetailsByShSidAndState(@Param("shSid") String shSid,@Param("nodeState") String nodeState);
+
+	@Select("select sid from loan_credit_appeal_apply where creditApplySid = #{creditApplySid}}")
+    String selectByCreditApplySid(String creditApplySid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java

@@ -150,4 +150,9 @@ public class LoanCreditAppealApplyRest implements LoanCreditAppealApplyFeign {
     public ResultBean<LoanCreditAppealApplyDetailsVo> fetchDetailsByShSidAndState(String shSid, String nodeState) {
         return loanCreditAppealApplyService.fetchDetailsByShSidAndState(shSid, nodeState);
     }
+
+    @Override
+    public ResultBean<String> selectByCreditApplySid(String sid) {
+        return loanCreditAppealApplyService.selectByCreditApplySid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java

@@ -663,4 +663,10 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
         LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = baseMapper.fetchDetailsByShSidAndState(shSid,nodeState);
         return rb.success().setData(loanCreditAppealApplyDetailsVo);
     }
+
+    public ResultBean<String> selectByCreditApplySid(String creditApplySid) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = baseMapper.selectByCreditApplySid(creditApplySid);
+        return rb.success().setData(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java

@@ -68,4 +68,7 @@ public interface LoanFileexamineMapper extends BaseMapper<LoanFileexamine> {
     int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid);
 
     int setState(String loanContractSid);
+
+    @Select("select sid from loan_fileexamine where saleOrderSid = #{saleOrderSid}")
+    String selectOrderSid(String saleOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java

@@ -110,4 +110,9 @@ public class LoanFileexamineRest implements LoanFileexamineFeign {
 	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
 		return loanFileexamineService.getToDoNum(riskToDoNumQuery);
 	}
+
+	@Override
+	public ResultBean<String> selectOrderSid(String saleOrderSid) {
+		return loanFileexamineService.selectOrderSid(saleOrderSid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -547,4 +547,10 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         int count = baseMapper.getToDoNum(orgPath, userSid);
         return rb.success().setData(String.valueOf(count));
     }
+
+    public ResultBean<String> selectOrderSid(String saleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = baseMapper.selectOrderSid(saleOrderSid);
+        return rb.success().setData(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java

@@ -66,4 +66,7 @@ public interface LoanHomevisitFileexamineMapper extends BaseMapper<LoanHomevisit
 
 	@Select("select state from loan_homevisit_fileexamine where saleOrderSid = #{salesOrderSid}")
 	String selSaleOrderSid(String salesOrderSid);
+
+	@Select("select sid from loan_homevisit_fileexamine where saleOrderSid = #{salesOrderSid}")
+	String selectSaleOrderSid(String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java

@@ -102,4 +102,9 @@ public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFei
 	public ResultBean<String> selSaleOrderSid(String salesOrderSid) {
 		return loanHomevisitFileexamineService.selSaleOrderSid(salesOrderSid);
 	}
+
+	@Override
+	public ResultBean<String> selectSaleOrderSid(String salesOrderSid) {
+		return loanHomevisitFileexamineService.selectSaleOrderSid(salesOrderSid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -704,4 +704,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         String state = baseMapper.selSaleOrderSid(salesOrderSid);
         return rb.success().setData(state);
     }
+
+    public ResultBean<String> selectSaleOrderSid(String salesOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = baseMapper.selectSaleOrderSid(salesOrderSid);
+        return rb.success().setData(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java

@@ -73,4 +73,7 @@ public interface LoanHomevisitPrepMapper extends BaseMapper<LoanHomevisitPrep> {
 
     @Update("update loan_homevisit_prep set downUrl = #{downUrl} where sid = #{sid}")
     void updateDownUrl(@Param("sid") String sid,@Param("downUrl") String downUrl);
+
+    @Select("select * from loan_homevisit_prep where saleOrderSid = #{saleOrderSid}}")
+    LoanHomevisitPrep selectBySaleOrderSid(String saleOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepRest.java

@@ -113,4 +113,9 @@ public class LoanHomevisitPrepRest implements LoanHomevisitPrepFeign {
     public ResultBean saveHomeVisit(HomeVisitDto dto) {
         return loanHomevisitPrepService.saveHomeVisit(dto);
     }
+
+    @Override
+    public ResultBean<LoanHomevisitPrep> selectBySaleOrderSid(String saleOrderSid) {
+        return loanHomevisitPrepService.selectBySaleOrderSid(saleOrderSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -2195,4 +2195,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         baseMapper.insert(loanHomevisitPrep);
         return rb.success();
     }
+
+    public ResultBean<LoanHomevisitPrep> selectBySaleOrderSid(String saleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitPrep loanHomevisitPrep = baseMapper.selectBySaleOrderSid(saleOrderSid);
+        return rb.success().setData(loanHomevisitPrep);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@@ -74,4 +74,7 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     void updateSsjgBySid(@Param("ssjg") String ssjg, @Param("creditApplySid") String creditApplySid);
 
     BusSalesOrder selectAppSid(String sid);
+
+    @Select("select * from loan_preloan_credit_apply where custSid = #{customerSid}")
+    LoanPreloanCreditApply selectByCustSid(String customerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java

@@ -121,4 +121,9 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
 	public ResultBean<LoanOrderPreloanVo> judgeIsLoan(String sid) {
 		return loanPreloanCreditApplyService.judgeIsLoan(sid);
 	}
+
+	@Override
+	public ResultBean<LoanPreloanCreditApply> selectByCustSid(String customerSid) {
+		return loanPreloanCreditApplyService.selectByCustSid(customerSid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -683,4 +683,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
     public void updateSsjgBySid(String ssjg, String creditApplySid) {
         baseMapper.updateSsjgBySid(ssjg, creditApplySid);
     }
+
+    public ResultBean<LoanPreloanCreditApply> selectByCustSid(String customerSid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.selectByCustSid(customerSid);
+        return rb.success().setData(loanPreloanCreditApply);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationMapper.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformatio
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -27,4 +28,7 @@ public interface LoanWarrantInformationMapper extends BaseMapper<LoanWarrantInfo
     LoanWarrantInformationDetailsVo getMortgageInfo(String busVinSid);
 
     IPage<LoanWarrantInformationVo> listPage(IPage<LoanWarrantInformation> page, @Param(Constants.WRAPPER) QueryWrapper<LoanWarrantInformation> qw);
+
+    @Select("select sid from loan_warrant_information where busVinSid = #{busVinSid}")
+    String selectBusVinSid(String busVinSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java

@@ -65,4 +65,9 @@ public class LoanWarrantInformationRest implements LoanWarrantInformationFeign {
         return loanMortgageInformationTransactService.detailsInfo(sid);
     }
 
+    @Override
+    public ResultBean<String> selectBusVinSid(String busVinSid) {
+        return loanMortgageInformationTransactService.selectBusVinSid(busVinSid);
+    }
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java

@@ -468,4 +468,10 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         }
         return rb.success();
     }
+
+    public ResultBean<String> selectBusVinSid(String busVinSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = baseMapper.selectBusVinSid(busVinSid);
+        return rb.success().setData(sid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.terminal.api.as.oldparts;
+
+import com.yxt.anrui.terminal.api.as.oldpartreturnapply.AppOldpartreturnApplyDetailsVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "旧件入库")
+@FeignClient(
+        contextId = "terminal-AppOldParts",
+        name = "anrui-terminal",
+        path = "v1/oldparts")
+public interface AppOldPartsFeign {
+
+    @PostMapping("/storage/list")
+    @ApiOperation("旧件入库列表")
+    ResultBean<PagerVo<AppOldPartsVo>> list(@RequestBody PagerQuery<AppOldPartsQuery> pagerQuery);
+
+    @ApiOperation("详情")
+    @GetMapping("/recycle/initRegistered")
+    public ResultBean<AppOldPartsReVo> fetchDetailsBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("旧件回收登记保存")
+    @PostMapping("/recycle/saveRegistered")
+    ResultBean saveRegistered(@RequestBody AppOldPartsReDto dto);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.terminal.api.as.oldparts;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AppOldPartsQuery implements Query {
+
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("查询条件")
+    private String name;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsReDto.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.as.oldparts;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AppOldPartsReDto implements Vo {
+
+    @ApiModelProperty("维修单编号")
+    private String billId;
+    @ApiModelProperty("回收说明")
+    private String remarks;
+    @ApiModelProperty("旧件照片")
+    private List<String> files;
+    @ApiModelProperty("sid")
+    private String sid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsReVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.as.oldparts;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AppOldPartsReVo implements Vo {
+
+    @ApiModelProperty("维修单编号")
+    private String billId;
+    @ApiModelProperty("回收说明")
+    private String remarks;
+    @ApiModelProperty("旧件照片")
+    private List<String> files;
+    @ApiModelProperty("sid")
+    private String sid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.as.oldparts;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/18 13:33
+ */
+@Data
+public class AppOldPartsVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("维修单编号")
+    private String billId;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("状态")
+    private String state;
+    @ApiModelProperty("回收按钮（维修时true）")
+    private Boolean showHsBtn;
+    @ApiModelProperty("打印按钮（结算时true）")
+    private Boolean showPrintBtn;
+    @ApiModelProperty("上架按钮（结算时true）")
+    private Boolean showSjBtn;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsRest.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.as.oldparts;
+
+import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageQuery;
+import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageVo;
+import com.yxt.anrui.terminal.api.as.oldparts.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionPageVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("v1/oldparts")
+public class AppOldPartsRest implements AppOldPartsFeign {
+
+    @Autowired
+    private AppOldPartsService appOldPartsService;
+
+    @Override
+    public ResultBean<PagerVo<AppOldPartsVo>> list(PagerQuery<AppOldPartsQuery> pagerQuery) {
+        ResultBean<PagerVo<AppOldPartsVo>> rb = ResultBean.fireFail();
+        PagerQuery<AppOldPartsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<AppOldPartsVo>> virtualOrders = appOldPartsService.list(pq);
+        PagerVo<AppOldPartsVo> vo = CoverUtils.selectPagerVo(virtualOrders.getData());
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean<AppOldPartsReVo> fetchDetailsBySid(String sid) {
+        return appOldPartsService.fetchDetailsBySid(sid);
+    }
+
+    @Override
+    public ResultBean saveRegistered(AppOldPartsReDto dto) {
+        return appOldPartsService.saveRegistered(dto);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java

@@ -0,0 +1,114 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.as.oldparts;
+
+import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsQuery;
+import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsReDto;
+import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsReVo;
+import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsVo;
+import com.yxt.anrui.terminal.fegin.asoldparts.AsBusrepairPageQuery;
+import com.yxt.anrui.terminal.fegin.asoldparts.AsBusrepairPageVo;
+import com.yxt.anrui.terminal.fegin.asoldparts.AsOldPartsFeign;
+import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldPartsReFeign;
+import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDetails;
+import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDto;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AppOldPartsService {
+
+    @Resource
+    private AsOldPartsFeign asOldPartsFeign;
+    @Resource
+    private WmsOldPartsReFeign wmsOldPartsReFeign;
+
+    public ResultBean<PagerVo<AppOldPartsVo>> list(PagerQuery<AppOldPartsQuery> pq) {
+        AsBusrepairPageQuery asBusrepairPageQuery = new AsBusrepairPageQuery();
+        AppOldPartsQuery params = pq.getParams();
+        asBusrepairPageQuery.setOrgPath(params.getOrgPath());
+        asBusrepairPageQuery.setUserSid(params.getUserSid());
+        asBusrepairPageQuery.setMenuSid(params.getMenuSid());
+        asBusrepairPageQuery.setName(params.getName());
+        PagerQuery<AsBusrepairPageQuery> query = new PagerQuery<>();
+        query.setParams(asBusrepairPageQuery);
+        ResultBean<PagerVo<AsBusrepairPageVo>> pagerVoResultBean = asOldPartsFeign.pageBillList(query);
+        ResultBean<PagerVo<AppOldPartsVo>> resultBean = new ResultBean<>();
+        PagerVo<AppOldPartsVo> appOldPartsVoPagerVo = new PagerVo<>();
+        List<AppOldPartsVo> appOldPartsVos = new ArrayList<>();
+        List<AsBusrepairPageVo> records = pagerVoResultBean.getData().getRecords();
+        for (AsBusrepairPageVo record : records) {
+            AppOldPartsVo appOldPartsVo = new AppOldPartsVo();
+            appOldPartsVo.setBillId(record.getBillNo());
+            appOldPartsVo.setVehMark(record.getVehMark());
+            appOldPartsVo.setVinNo(record.getVinNo());
+            appOldPartsVo.setState(record.getTaskName());
+            if ("维修".equals(record.getTaskName())){
+                appOldPartsVo.setShowHsBtn(true);
+            }else {
+                appOldPartsVo.setShowHsBtn(false);
+            }
+            if ("结算".equals(record.getTaskName())){
+                appOldPartsVo.setShowPrintBtn(true);
+                appOldPartsVo.setShowSjBtn(true);
+            }else {
+                appOldPartsVo.setShowPrintBtn(false);
+                appOldPartsVo.setShowSjBtn(false);
+            }
+            appOldPartsVos.add(appOldPartsVo);
+        }
+        appOldPartsVoPagerVo.setRecords(appOldPartsVos);
+        resultBean.setData(appOldPartsVoPagerVo);
+        return resultBean;
+    }
+
+    public ResultBean<AppOldPartsReVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsOldRegisterDetails wmsOldRegisterDetails = wmsOldPartsReFeign.fetchDetailsBySid(sid).getData();
+        AppOldPartsReVo appOldPartsReVo = new AppOldPartsReVo();
+        appOldPartsReVo.setSid(wmsOldRegisterDetails.getSid());
+        appOldPartsReVo.setBillId(wmsOldRegisterDetails.getBillNo());
+        appOldPartsReVo.setRemarks(wmsOldRegisterDetails.getShortss());
+        appOldPartsReVo.setFiles(wmsOldRegisterDetails.getPhotos());
+        return rb.success().setData(appOldPartsReVo);
+    }
+
+    public ResultBean saveRegistered(AppOldPartsReDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsOldRegisterDto wmsOldRegisterDto = new WmsOldRegisterDto();
+        wmsOldRegisterDto.setBillNo(dto.getBillId());
+        wmsOldRegisterDto.setShortss(dto.getRemarks());
+        wmsOldRegisterDto.setPhotos(dto.getFiles());
+        wmsOldPartsReFeign.saveorUpdateOldRegister(wmsOldRegisterDto);
+        return rb.success();
+    }
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterQuery.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparts/AsBusrepairPageQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.inventory.wmsoldregister;
+package com.yxt.anrui.terminal.fegin.asoldparts;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;
@@ -9,17 +9,24 @@ import lombok.Data;
  * @date: 2024/4/26
  **/
 @Data
-public class WmsOldRegisterQuery implements Query {
+public class AsBusrepairPageQuery implements Query {
 
     //维修工单编号
     private String billNo;
-
     //工单创建开始时间
     private String createTimeStart;
-
     //工单创建结束时间
     private String createTimeEnd;
-
+    //客户名称
+    private String customerName;
     //车牌号
     private String vehMark;
+    //车架号
+    private String vinNo;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
+    private String name;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparts/AsBusrepairPageVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.terminal.fegin.asoldparts;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 旧件回收登记
+ * @author: dimengzhe
+ * @date: 2024/4/26
+ **/
+@Data
+public class AsBusrepairPageVo {
+
+    private String sid;
+    //维修工单sid
+    private String billSid;
+    //维修工单编号
+    private String billNo;
+    //工单创建日期
+    private String billTime;
+    //客户名称
+    private String customerName;
+    //车牌号
+    private String vehMark;
+    //车架号
+    private String vinNo;
+    //工单环节
+    private String taskName;
+    //旧件回收说明
+    private String shortss;
+    //旧件照片
+    private String photoss;
+    //旧件照片
+    private List<String> photos = new ArrayList<>();
+
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparts/AsOldPartsFeign.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.terminal.fegin.asoldparts;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "旧件入库")
+@FeignClient(
+        contextId = "terminal-AsOldParts",
+        name = "yxt-as",
+        path = "v1/AsBusrepairBill")
+public interface AsOldPartsFeign {
+
+    /**
+     * 旧件回收登记分页列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @PostMapping("/pageBillList")
+    @ApiOperation("旧件回收登记分页列表")
+    ResultBean<PagerVo<AsBusrepairPageVo>> pageBillList(@RequestBody PagerQuery<AsBusrepairPageQuery> pagerQuery);
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldPartsReFeign.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.terminal.fegin.wmsoldregister;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "旧件回收登记")
+@FeignClient(
+        contextId = "terminal-WmsOldPartsRe",
+        name = "yxt-wms",
+        path = "/apiadmin/WmsOldRegister")
+public interface WmsOldPartsReFeign {
+
+    @ApiOperation("详情初始化")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<WmsOldRegisterDetails> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("新增修改保存")
+    @PostMapping("/saveorUpdateOldRegister")
+    ResultBean saveorUpdateOldRegister(@RequestBody WmsOldRegisterDto dto);
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterVo.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldRegisterDetails.java

@@ -1,15 +1,20 @@
-package com.yxt.wms.biz.inventory.wmsoldregister;
+package com.yxt.anrui.terminal.fegin.wmsoldregister;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
  * @date: 2024/4/26
  **/
 @Data
-public class WmsOldRegisterVo {
+public class WmsOldRegisterDetails {
 
+    //维修工单编号
+    private String sid;
     //维修工单编号
     private String billNo;
     //工单创建日期
@@ -25,5 +30,5 @@ public class WmsOldRegisterVo {
     //旧件回收说明
     private String shortss;
     //旧件照片
-    private String photos;
+    private List<String> photos = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldRegisterDto.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.fegin.wmsoldregister;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/26
+ **/
+@Data
+public class WmsOldRegisterDto {
+
+    //维修工单编号
+    private String billNo;
+    //旧件回收说明
+    private String shortss;
+    //旧件照片
+    private List<String> photos = new ArrayList<>();
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java

@@ -28,4 +28,5 @@ public class AsBusrepairPageQuery implements Query {
     private String userSid;
     private String orgPath;
     private String menuUrl;
+    private String menuSid;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java

@@ -32,4 +32,6 @@ public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
 
     @Select("select billNo from as_busclaim_bill where repairBillSid = #{repairBillSid}")
     List<String> selectByRepairBillSid(String repairBillSid);
+
+    AsBusclaimBill selectByBillNoAndVinNo(@Param("billNo") String billNo,@Param("vinNo") String vinNo);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml

@@ -44,4 +44,15 @@
         order by id desc
         limit 1
     </select>
+
+    <select id="selectByBillNoAndVinNo" resultType="com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill">
+        SELECT
+            ab.*
+        FROM
+            as_busclaim_bill ab
+                LEFT JOIN as_busrepair_bill_vech abbv
+                          ON ab.repairBillSid = abbv.billSid
+        WHERE ab.billNo = #{billNo}
+        AND abbv.vinNo = #{vinNo}
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@@ -99,13 +99,7 @@ public class AsBusclaimBillRest {
         System.out.println("结果是--->" + resultList);
         try {
             for (AsBusclaimBillExcelInfo asBusclaimBillExcelInfo : resultList) {
-                int i = asBusclaimBillService.checkBillNo(asBusclaimBillExcelInfo.getBillNo());
-                if (i == 0) {
-                    return ResultBean.fireFail().setMsg("索赔单号" + asBusclaimBillExcelInfo.getBillNo() + "不存在");
-                }
-            }
-            for (AsBusclaimBillExcelInfo asBusclaimBillExcelInfo : resultList) {
-                AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asBusclaimBillExcelInfo.getBillNo());
+                AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNoAndVinNo(asBusclaimBillExcelInfo.getBillNo(),asBusclaimBillExcelInfo.getVinNo());
                 asBusclaimBill.setClaimHourAmount(asBusclaimBillExcelInfo.getClaimHourAmount());
                 asBusclaimBill.setClaimGoodsAmount(asBusclaimBillExcelInfo.getClaimGoodsAmount());
                 asBusclaimBill.setClaimOutAmount(asBusclaimBillExcelInfo.getClaimOutAmount());
@@ -133,6 +127,9 @@ public class AsBusclaimBillRest {
         ReturnExcelInfo importReturn = new ReturnExcelInfo();
         List<AsBusclaimBillExcelInfo> asBusclaimBillExcelInfoList = new ArrayList<>();
         Set<String> checkWord = new HashSet<>();
+        if (sheet.getLastRowNum() == 0){
+            checkWord.add("请填写导入模板");
+        }
         for (int r = 1; r <= sheet.getLastRowNum(); r++) {
             Row row = sheet.getRow(r);
             if (row == null) {
@@ -240,6 +237,12 @@ public class AsBusclaimBillRest {
                     if (StringUtils.isBlank(excelInfo.getBillNo())) {
                         checkWord.add("索赔单编号不能为空");
                         break;
+                    }else {
+                        AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(excelInfo.getBillNo());
+                        if (asBusclaimBill == null){
+                            checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在");
+                            break;
+                        }
                     }
                     if (StringUtils.isBlank(excelInfo.getVinNo())) {
                         checkWord.add("车架号不能为空");

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@@ -28,7 +28,7 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
     public ResultBean saveBill(AsBusclaimBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         int i = baseMapper.checkBillNo(dto.getBillNo());
-        if (i > 0){
+        if (i > 0) {
             return rb.setMsg("索赔单号已存在");
         }
         AsBusclaimBill asBusclaimBill = new AsBusclaimBill();
@@ -84,4 +84,7 @@ public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapp
         return baseMapper.selectByRepairBillSid(repairBillSid);
     }
 
+    public AsBusclaimBill selectByBillNoAndVinNo(String billNo, String vinNo) {
+        return baseMapper.selectByBillNoAndVinNo(billNo, vinNo);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply;
 import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillExcelInfo;
 import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckDto;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.*;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*;
@@ -643,13 +644,20 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         ReturnExcelInfoVo returnExcelInfoVo = new ReturnExcelInfoVo();
         List<ExcelInfoVo> importVoList = new ArrayList<>();
         Set<String> checkWord = new HashSet<>();
+        if (sheet.getLastRowNum() == 0){
+            checkWord.add("请填写导入模板");
+        }
         for (int r = 1; r <= sheet.getLastRowNum(); r++) {
             Row row = sheet.getRow(r);
             if (row == null) {
                 continue;
             }
             ExcelInfoVo excelInfoVo = new ExcelInfoVo();
-            for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) {
+            int physicalNumberOfCells = row.getPhysicalNumberOfCells();
+            if (physicalNumberOfCells < 6) {
+                physicalNumberOfCells = 6;
+            }
+            for (int i = 0; i < physicalNumberOfCells; i++) {
                 String trim = new String();
                 try {
                     trim = getCellVal(row.getCell(i)).toString().trim();
@@ -675,8 +683,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
                                     break;
                                 case 4:
                                     excelInfoVo.setClaimSubsidyAmount(temp);
+                                    break;
                                 case 5:
                                     excelInfoVo.setClaimOtherAmount(temp);
+                                    break;
                                 default:
                                     break;
                             }
@@ -723,10 +733,12 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
             for (ExcelInfoVo excelInfoVo : importVoList) {
                 if (StringUtils.isBlank(excelInfoVo.getClaimBillNo())) {
                     checkWord.add("索赔单号不能为空");
+                    break;
                 }else {
                     AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(excelInfoVo.getClaimBillNo());
                     if (asBusclaimBill == null){
                         checkWord.add("索赔单号" + excelInfoVo.getClaimBillNo() + "不存在");
+                        break;
                     }else {
                         BigDecimal importMoney = new BigDecimal(excelInfoVo.getClaimHourAmount()).add(new BigDecimal(excelInfoVo.getClaimGoodsAmount()).add(new BigDecimal(excelInfoVo.getClaimOutAmount()).add(new BigDecimal(excelInfoVo.getClaimSubsidyAmount()).add(new BigDecimal(excelInfoVo.getClaimOtherAmount())))));
                         BigDecimal selectMoney = asBusclaimBill.getClaimHourAmount().add(asBusclaimBill.getClaimGoodsAmount().add(asBusclaimBill.getClaimOutAmount().add(asBusclaimBill.getClaimSubsidyAmount().add(asBusclaimBill.getClaimOtherAmount()))));

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -62,20 +62,22 @@
 
     <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
         SELECT
-        wor.sid,
+        wor.billNo AS sid,
         a.sid AS billSid,
         a.nodeName AS taskName,
         wor.billNo,
         DATE_FORMAT(a.createTime, '%Y-%m-%d') AS billTime,
-        wor.customerName,
-        wor.vinNo,
-        wor.vehMark,
+        a.customerName,
+        av.vinNo,
+        av.vehMark,
         wor.shortss,
         wor.photos AS photoss
         FROM
         yxt_wms.wms_old_register wor
         LEFT JOIN as_busrepair_bill a
         ON a.billNo = wor.billNo
+        LEFT JOIN as_busrepair_bill_vech av av
+        ON a.sid = av.billSid
         LEFT JOIN as_busrepair_inventorybill ai
         ON ai.sourceBillSid = a.sid
         LEFT JOIN as_busrepair_inventorybill_detail ad
@@ -97,7 +99,7 @@
         AND ad.`billSid` = ai.sid) > 0
         UNION ALL
         SELECT
-        wor.sid,
+        a.billNo AS sid,
         a.sid AS billSid,
         a.nodeName AS taskName,
         a.billNo,

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldRegisterRest.java

@@ -3,18 +3,13 @@ package com.yxt.wms.apiadmin.inventroy;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterDto;
-import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterQuery;
-import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterService;
-import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterVo;
+import com.yxt.wms.biz.inventory.wmsoldregister.*;
+import com.yxt.wms.biz.inventory.wmsotheroutapply.WmsOtheroutApplyDetailsVo;
 import com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @description:
@@ -34,4 +29,12 @@ public class WmsOldRegisterRest {
     ResultBean saveorUpdateOldRegister(@RequestBody WmsOldRegisterDto dto) {
         return wmsOldRegisterService.saveorUpdateOldRegister(dto);
     }
+
+    @ApiOperation("详情初始化")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<WmsOldRegisterDetails> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WmsOldRegisterDetails vo = wmsOldRegisterService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegister.java

@@ -13,16 +13,6 @@ public class WmsOldRegister extends BaseEntity {
 
     //维修工单编号
     private String billNo;
-    //工单创建日期
-    private String billTime;
-    //客户sid
-    private String customerSid;
-    //客户名称
-    private String customerName;
-    //车牌号
-    private String vehMark;
-    //车架号
-    private String vinNo;
     //旧件回收说明
     private String shortss;
     //旧件照片

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterDetails.java

@@ -0,0 +1,22 @@
+package com.yxt.wms.biz.inventory.wmsoldregister;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/26
+ **/
+@Data
+public class WmsOldRegisterDetails {
+
+    //维修工单编号
+    private String billNo;
+    //旧件回收说明
+    private String shortss;
+    //旧件照片
+    private List<String> photos = new ArrayList<>();
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterDto.java

@@ -15,16 +15,6 @@ public class WmsOldRegisterDto {
 
     //维修工单编号
     private String billNo;
-    //工单创建日期
-    private String billTime;
-    //客户sid
-    private String customerSid;
-    //客户名称
-    private String customerName;
-    //车牌号
-    private String vehMark;
-    //车架号
-    private String vinNo;
     //旧件回收说明
     private String shortss;
     //旧件照片

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterMapper.java

@@ -10,5 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
  **/
 @Mapper
 public interface WmsOldRegisterMapper extends BaseMapper<WmsOldRegister> {
+
     WmsOldRegister selectByBillNo(String billNo);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java

@@ -6,11 +6,14 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,4 +48,23 @@ public class WmsOldRegisterService extends MybatisBaseService<WmsOldRegisterMapp
         asBusrepairBillFeign.updateOldIsReclaim(wmsOldRegister.getBillNo());
         return rb.success();
     }
+
+    public WmsOldRegisterDetails fetchDetailsVoBySid(String sid) {
+        WmsOldRegisterDetails wmsOldRegisterDetails = new WmsOldRegisterDetails();
+        wmsOldRegisterDetails.setBillNo(sid);
+        WmsOldRegister wmsOldRegister = baseMapper.selectByBillNo(sid);
+        if (wmsOldRegister != null){
+            wmsOldRegisterDetails.setShortss(wmsOldRegister.getShortss());
+            if (StringUtils.isNotBlank(wmsOldRegister.getPhotos())){
+                String[] files = wmsOldRegister.getPhotos().split(",");
+                List<String> photos = new ArrayList<>();
+                for (String file : files) {
+                    String url = fileUploadComponent.getUrlPrefix() + file;
+                    photos.add(url);
+                }
+                wmsOldRegisterDetails.setPhotos(photos);
+            }
+        }
+        return wmsOldRegisterDetails;
+    }
 }