Browse Source

销售订单查询合同下载

zhanglei
fanzongzhe 2 years ago
parent
commit
effbc25c4b
  1. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
  2. 19
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  3. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  4. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

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

@ -197,4 +197,11 @@ public class AppBusSalesOrderVo implements Vo {
private String distributorNameTwo; private String distributorNameTwo;
@ApiModelProperty("单车中介服务费2") @ApiModelProperty("单车中介服务费2")
private String distributorPriceTwo; private String distributorPriceTwo;
@ApiModelProperty("App合同下载路径")
private String contractPath;
@ApiModelProperty("PC合同下载路径")
private String contractFilePath;
@ApiModelProperty("是否显示生成合同按钮")
private boolean showContractBtn2;
} }

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

@ -164,6 +164,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherp
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.Base64; import com.yxt.common.base.utils.Base64;
@ -311,6 +312,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired @Autowired
private BaseDiscountpackageFeign baseDiscountpackageFeign; private BaseDiscountpackageFeign baseDiscountpackageFeign;
@Autowired
private DocPdfComponent docPdfComponent;
/** /**
* 构造查询条件 * 构造查询条件
@ -5890,10 +5893,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount()); qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount());
} }
String typeState = "getSaleOrdersByOrgPath";//查询接口的标识 String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
String urlPrefix = docPdfComponent.getPrefixTemplateUrl();
String temp = "/template/";
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo()); IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo());
for (AppBusSalesOrderVo record : pagging.getRecords()) { for (AppBusSalesOrderVo record : pagging.getRecords()) {
record.setShowStopBtn(false); record.setShowStopBtn(false);
record.setShowContractBtn(false); record.setShowContractBtn(false);
record.setShowContractBtn2(false);
//判断该合同是否有下载附件
if (StringUtils.isNotBlank(record.getContractId())) {
String contractId = record.getContractId();
CommonContract contract = commonContractFeign.selectByNo(contractId).getData();
if (null != contract) {
if (StringUtils.isNotBlank(contract.getContractUrlAll())) {
record.setShowContractBtn2(true);
record.setContractPath(urlPrefix + contract.getContractUrlAll());
record.setContractFilePath(temp + contract.getContractUrlAll());
}
}
}
if (StringUtils.isNotBlank(record.getCustomerImage())) { if (StringUtils.isNotBlank(record.getCustomerImage())) {
record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
} }

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@ -365,7 +365,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
} }
public PagerVo<FinUncollectedReceivablesDetailedVo> detailedListPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) { public PagerVo<FinUncollectedReceivablesDetailedVo> detailedListPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
// Map<String, Boolean> dict = new HashMap<>();
//==============================分页开始==================================== //==============================分页开始====================================
FinUncollectedReceivablesDetailedQuery params = pq.getParams(); FinUncollectedReceivablesDetailedQuery params = pq.getParams();
//车架号查询 //车架号查询
@ -514,11 +513,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
} }
} }
} }
// dict.put(record.getContractNo() + record.getVinNo(), dict.getOrDefault(record.getContractNo() + record.getVinNo(), true) ? record.getDownload() : false);
} }
// for (FinUncollectedReceivablesDetailedVo record : records) {
// record.setDownload(dict.get(record.getContractNo() + record.getVinNo()));
// }
PagerVo<FinUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }

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

@ -116,4 +116,8 @@ public class BusOrderSalesVo implements Vo {
private String saler; private String saler;
@ApiModelProperty("车架号的展示") @ApiModelProperty("车架号的展示")
private String vinNo; private String vinNo;
@ApiModelProperty("App合同下载路径")
private String contractPath;
@ApiModelProperty("是否显示生成合同按钮")
private boolean showContractBtn2;
} }

Loading…
Cancel
Save