Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java

@@ -65,14 +65,18 @@ public interface BaseVehicleOutApplyFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-}
+
+    @ApiOperation("查询根据车架号查询销售订单信息")
+    @PostMapping("/selectSidByVinNo")
+    ResultBean<String> selectSidByVinNo(@RequestParam("vinNo") String vinNo);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java

@@ -69,4 +69,9 @@ public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basevehicleoutapply/fetchDetailsBySid无法访问");
 	}
-}
+
+	@Override
+	public ResultBean<String> selectSidByVinNo(String vinNo) {
+		return null;
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java

@@ -57,13 +57,15 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutAppl
 
 	//@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}")
 	//IPage<BaseVehicleOutApplyVo> voPage(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
-	
+
 	IPage<BaseVehicleOutApplyVoNew> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
-	
+
 	List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
-	
+
 	@Select("select * from base_vehicle_out_apply")
 	List<BaseVehicleOutApplyVo> selectListVo();
 
 	int selectPageVoCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
-}
+
+    String selectSidByVinNo(@Param("vinNo") String vinNo);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -77,4 +77,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
-</mapper>
+    <select id="selectSidByVinNo" resultType="java.lang.String">
+        SELECT
+            s.sid
+        FROM
+            base_vehicle_out AS o
+                LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
+                LEFT JOIN anrui_buscenter.bus_sales_order as s ON a.contractNo = s.contractNo
+        WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
+    </select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java

@@ -92,4 +92,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
 		BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<String> selectSidByVinNo(String vinNo) {
+		return baseVehicleOutApplyService.selectSidByVinNo(vinNo);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -55,6 +55,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -295,4 +296,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
-}
+
+    public ResultBean<String> selectSidByVinNo(String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = "";
+        String substringVinNo = vinNo.substring(vinNo.length() - 8);
+        sid = baseMapper.selectSidByVinNo(substringVinNo);
+        return rb.success().setData(sid);
+    }
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -62,6 +62,8 @@ public class AppOrderDetailsVo implements Vo {
     private AppOrderPriceInfoVo priceInfo;
     @ApiModelProperty(value = "上装信息")
     private AppOrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "挂车信息")
+    private List<AppOrderTrailerInfoVo> trailerInfo = new ArrayList<>();
     @ApiModelProperty(value = "主车优惠")
     private List<AppOrderDiscountListVo> discountList = new ArrayList<>();
     @ApiModelProperty(value = "订金信息")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class AppOrderTrailerInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -104,6 +104,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
@@ -3849,6 +3851,33 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
             vo.setTopMessage(topMessage);
         }
+        /***************************挂车信息***************************************/
+        List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
+        List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
+        for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
+            BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile");
+                List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
+                List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
+                ArrayList<String> contractFileString = new ArrayList<>();
+                ArrayList<String> certFileString = new ArrayList<>();
+                for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
+                    contractFileString.add(busSalesOrderTrailerFile.getUrl());
+                }
+                for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
+                    certFileString.add(busSalesOrderTrailerFile.getUrl());
+                }
+            appOrderTrailerInfoVo.setContractFile(contractFileString);
+            appOrderTrailerInfoVo.setCertFile(certFileString);
+            appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m");
+            appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount())));
+            appOrderTrailerInfoVos.add(appOrderTrailerInfoVo);
+        }
+        for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
+            appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
+        }
+        vo.setTrailerInfo(appOrderTrailerInfoVos);
         /***************************主车优惠***************************************/
         List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
         discountList.removeAll(Collections.singleton(null));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
@@ -122,7 +123,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     private LoanFinOtherPolicyService loanFinOtherPolicyService;
     @Autowired
     private LoanFinPolicyService loanFinPolicyService;
-
+    @Autowired
+    private BaseVehicleOutApplyFeign baseVehicleOutApplyFeign;
     /**
      * 根据销售订单SID生成还款计划表回显
      *
@@ -4661,6 +4663,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<FinUncollectedReceivablesDetailedJR> jrList = new ArrayList<>();//金融应收
         List<LoanFundDay> loanFundDays = new ArrayList<>();//资金占用费生成记录
         for (HistoryDataImportVo v : list) {
+            String isOther = "0";//是否有其他融 1是0否
+            String sameBank = "0";//是否资方一致 1是0否
             String customerNo = ""; //客户编码
             String customerSid = "";
             String customerName = "";
@@ -4671,6 +4675,31 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             String orgPath = "";
             String borrowerCustomerSid = "";
             String borrowerCustomerName = "";
+            String mPeriod = v.getMainPeriod();
+            String mDay = v.getMainRepayDate();
+            String mF = v.getMainFirstRepay();
+            String mM = v.getMainMidRepay();
+            String mL = v.getMainLastRepay();
+            String oF = "";
+            String oM = "";
+            String oL = "";
+            String oPeriod = "";
+            String oDay = "";
+            String salesOrderSid = "";
+            String loanContractSid = "";
+            String borrowerSid = "";
+            String[] splitVin = v.getVinNo().split(",");
+            if (StringUtils.isNotBlank(v.getOtherBankNo())) {
+                isOther = "1";
+                if (v.getBankContractNo().equals(v.getOtherBankNo())) {
+                    sameBank = "1";
+                }
+                oF = v.getOtherFirstRepay();
+                oM = v.getOtherMidRepay();
+                oL = v.getOtherLastRepay();
+                oPeriod = v.getOtherPeriod();
+                oDay = v.getOtherRepayDate();
+            }
             SysOrganization orgDept = sysOrganizationFeign.selectByOrgCode(v.getSalesDeptNo()).getData();
             if (orgDept != null) {
                 deptSid = orgDept.getSid();
@@ -4683,7 +4712,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 useOrgName = orgCompany.getName();
             }
             String prefix = getPrefix(orgDept, orgCompany, v.getActualName(), v.getActualPhone());
-          //客户表新增实际购车人
+            //客户表新增实际购车人
             if (StringUtils.isNotBlank(prefix)) {
                 CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntityByCustomerNo(prefix).getData();
                 if (null != customerTemp) {
@@ -4691,9 +4720,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     customerName = customerTemp.getName();
                 } else {
                     CrmCustomerTemp crmCustomerTemp = new CrmCustomerTemp();
+                    String phone = v.getActualPhone() + "-D";
+                    String prefixNo = getPrefix(orgDept, orgCompany, v.getActualName(), phone);
                     customerSid = crmCustomerTemp.getSid();
                     customerName = v.getActualName();
-                    crmCustomerTemp.setCustomerNo(prefix);
+                    crmCustomerTemp.setCustomerNo(prefixNo);
+                    crmCustomerTemp.setName(v.getActualName());
                     crmCustomerTemp.setMobile(v.getActualPhone());
                     crmCustomerTemp.setCustomerType("个人");
                     crmCustomerTemp.setCustomerTypeKey("1");
@@ -4703,7 +4735,29 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 }
             }
             //客户表新增贷款人
-            crmCustomerTempFeign.fetchEntityByCustomerNo(v.getBorrowerNo());
+            CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntityByCustomerNo(v.getBorrowerNo()).getData();
+            if (null != customerTemp) {
+                borrowerCustomerSid = customerTemp.getSid();
+                borrowerCustomerName = customerTemp.getName();
+            } else {
+                CrmCustomerTemp crmCustomerTemp = new CrmCustomerTemp();
+                borrowerCustomerSid = crmCustomerTemp.getSid();
+                borrowerCustomerName = v.getBorrowerName();
+                crmCustomerTemp.setCustomerNo(v.getBorrowerNo());
+                crmCustomerTemp.setName(v.getBorrowerName());
+                crmCustomerTemp.setCustomerType("个人");
+                crmCustomerTemp.setCustomerTypeKey("1");
+                crmCustomerTemp.setCreateOrgSid(useOrgSid);
+                crmCustomerTemp.setIsEnable(3);
+                customerTemps.add(crmCustomerTemp);
+            }
+            //根据车架号查询销售订单
+            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(splitVin[0]).getData();
+            if (StringUtils.isNotBlank(orderSid)) {
+
+            }
+
+
         }
 
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,6 +55,8 @@ public class OrderDetailsVo implements Vo {
     private OrderPriceInfoVo priceInfo;
     @ApiModelProperty(value = "上装信息")
     private OrderTopInfoVo topInfo;
+    @ApiModelProperty(value = "挂车信息")
+    private List<OrderTrailerInfoVo> trailerInfo;
     @ApiModelProperty(value = "主车优惠")
     private List<OrderDiscountListVo> discountList;
     @ApiModelProperty(value = "订金信息")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(销售订单挂车信息) <br/>
+ * File: BusSalesOrderTrailerVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo <br/>
+ * Description: 销售订单-挂车信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-24 09:54:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情")
+public class OrderTrailerInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("销售订单sid")
+    private String salesOrderSid; // 销售订单sid
+	@ApiModelProperty("挂车类型key")
+    private String trailerTypeKey; // 挂车类型key
+	@ApiModelProperty("挂车类型value")
+    private String trailerTypeValue; // 挂车类型value
+	@ApiModelProperty("外廓尺寸长")
+    private String appearanceSizeLong; // 外廓尺寸长
+	@ApiModelProperty("单台成交价")
+    private BigDecimal singleFinalPrice; // 单台成交价
+	@ApiModelProperty("数量")
+    private Integer trailerCount; // 数量
+    @ApiModelProperty("合同附件")
+    private List<String> contractFile = new ArrayList<>(); // 合同附件
+    @ApiModelProperty("同车型合格证附件")
+    private List<String> certFile = new ArrayList<>(); // 同车型合格证附件
+	@ApiModelProperty("0不过票，1过票")
+    private Integer isCompPassTicket; // 0不过票，1过票
+
+    @ApiModelProperty("挂车标识")
+    private String trailerName;
+    @ApiModelProperty("合计")
+    private BigDecimal totalPrice;
+}

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java

@@ -89,9 +89,9 @@ public class PmsSupplierInfoRest {
 
 	@ApiOperation("选择供应商")
 	@PostMapping("/choiceSupplierInfo")
-	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("orgSid") String orgSid){
+	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("deptSid") String deptSid){
 		ResultBean rb = ResultBean.fireFail();
-		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(orgSid);
+		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(deptSid);
 		return rb.success().setData(baseSupplierInfoChoiceList);
 	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java

@@ -57,8 +57,8 @@ public interface PmsSupplierInfoMapper extends BaseMapper<PmsSupplierInfo> {
 	@Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}")
     int updateBySidIsDelete(String sid);
 
-	@Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'")
-    List<PmsSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
+	@Select("select * from yxt_base.base_supplier_info where useOrgSid = #{deptSid} and isDelete = '0'")
+    List<PmsSupplierInfoChoice> choiceSupplierInfo(String deptSid);
 
 	@Select("select * from yxt_base.base_supplier_info where sid = #{sid} and isDelete = '0'")
     PmsSupplierInfo selBySid(String sid);

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@@ -187,8 +187,8 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 		}
 	}
 
-	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String orgSid) {
-		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(orgSid);
+	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String deptSid) {
+		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(deptSid);
 		for (PmsSupplierInfoChoice pmsSupplierInfoChoice : pmsSupplierInfoChoiceList) {
 			List<PmsSupplierBankChoice> pmsSupplierBankChoices = new ArrayList<>();
 			List<PmsSupplierBankDetailsVo> pmsSupplierBankDetailsVos = pmsSupplierBankService.selectBySupplierSid(pmsSupplierInfoChoice.getSid());