|
|
|
@ -70,10 +70,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelD |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordertrailer.*; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery; |
|
|
|
@ -123,6 +120,7 @@ import com.yxt.anrui.terminal.api.base.common.SystemVo; |
|
|
|
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; |
|
|
|
import com.yxt.anrui.terminal.biz.base.common.CommonService; |
|
|
|
import com.yxt.anrui.terminal.config.CoverUtils; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import com.yxt.common.base.utils.StringUtils; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
@ -195,6 +193,8 @@ public class AppBusSalesOrderService { |
|
|
|
private FinCompanyInvoicingFeign finCompanyInvoicingFeign; |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign; |
|
|
|
@Autowired |
|
|
|
private FileUploadComponent fileUploadComponent; |
|
|
|
|
|
|
|
/************************************* 销售订单接口 *********************************************/ |
|
|
|
|
|
|
|
@ -778,7 +778,7 @@ public class AppBusSalesOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
} else {//贷款
|
|
|
|
if("Activity_1ckx8lq".equals(query.getTaskDefKey())){//金融服务部经理审批
|
|
|
|
if ("Activity_1ckx8lq".equals(query.getTaskDefKey())) {//金融服务部经理审批
|
|
|
|
flowOrderVo.setShow(true); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -953,7 +953,7 @@ public class AppBusSalesOrderService { |
|
|
|
BigDecimal total = new BigDecimal("0"); |
|
|
|
for (BusSalesOrderTrailerDetailsVo datum : data) { |
|
|
|
AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo(); |
|
|
|
BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile"); |
|
|
|
BeanUtil.copyProperties(datum, appSalesOrderTrailerDetailsVo, "contractFile", "certFile"); |
|
|
|
List<BusSalesOrderTrailerFile> contractFile = datum.getContractFile(); |
|
|
|
List<BusSalesOrderTrailerFile> certFile = datum.getCertFile(); |
|
|
|
ArrayList<String> contractFileString = new ArrayList<>(); |
|
|
|
@ -980,17 +980,41 @@ public class AppBusSalesOrderService { |
|
|
|
return rb.success().setData(trailerVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveOrUpdateAppOrderTrailer(List<AppSalesOrderTrailerDto> dto) { |
|
|
|
List<BusSalesOrderTrailerDto> busSalesOrderTrailerDtos = new ArrayList<>(); |
|
|
|
for (AppSalesOrderTrailerDto appSalesOrderTrailerDto : dto) { |
|
|
|
BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto(); |
|
|
|
BeanUtil.copyProperties(appSalesOrderTrailerDto,busSalesOrderTrailerDto); |
|
|
|
busSalesOrderTrailerDtos.add(busSalesOrderTrailerDto); |
|
|
|
} |
|
|
|
return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDtos); |
|
|
|
public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) { |
|
|
|
BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto(); |
|
|
|
BeanUtil.copyProperties(dto, busSalesOrderTrailerDto); |
|
|
|
return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDto); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delAppOrderTrailerBySid(String sid) { |
|
|
|
return busSalesOrderTrailerFeign.delete(sid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<AppSalesOrderTrailerDetailsVo> initAppOrderTrailer(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo(); |
|
|
|
BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerFeign.fetchBySid(sid).getData(); |
|
|
|
BeanUtil.copyProperties(busSalesOrderTrailer, appSalesOrderTrailerDetailsVo); |
|
|
|
List<String> contractFiless = new ArrayList<>(); |
|
|
|
List<String> certFiless = new ArrayList<>(); |
|
|
|
String certFile = busSalesOrderTrailer.getCertFile(); |
|
|
|
if (StringUtils.isNotBlank(certFile)) { |
|
|
|
String[] certFiles = certFile.split(","); |
|
|
|
for (String file : certFiles) { |
|
|
|
String url = fileUploadComponent.getUrlPrefix() + file; |
|
|
|
certFiless.add(url); |
|
|
|
} |
|
|
|
} |
|
|
|
String contractFile = busSalesOrderTrailer.getContractFile(); |
|
|
|
if (StringUtils.isNotBlank(contractFile)) { |
|
|
|
String[] contractFiles = contractFile.split(","); |
|
|
|
for (String file : contractFiles) { |
|
|
|
String url = fileUploadComponent.getUrlPrefix() + file; |
|
|
|
contractFiless.add(url); |
|
|
|
} |
|
|
|
} |
|
|
|
appSalesOrderTrailerDetailsVo.setCertFile(certFiless); |
|
|
|
appSalesOrderTrailerDetailsVo.setContractFile(contractFiless); |
|
|
|
return rb.success().setData(appSalesOrderTrailerDetailsVo); |
|
|
|
} |
|
|
|
} |
fanzongzhe
11 months ago