yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
32204b8c7b 16782400f3
commit
ab58bc79b5
24 changed files with 5083 additions and 341 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
  2. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  3. 321
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  4. 1545
      anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
  5. 2879
      anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl
  6. 33
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  7. 406
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  8. 29
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  9. 51
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
  10. 12
      anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
  11. 2
      anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
  12. 2
      anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue
  13. 25
      anrui-riskcenter-ui/src/views/homevisitpreparation/thehomevisitisready.vue
  14. 8
      anrui-riskcenter-ui/src/views/settle/settleAdd.vue
  15. 4
      anrui-riskcenter-ui/src/views/settle/settleInfo.vue
  16. 2
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue
  17. 2
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
  18. 2
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue
  19. 4
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
  20. 8
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
  21. 4
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
  22. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java
  23. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
  24. 58
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import org.apache.ibatis.annotations.*;
import java.util.List;
@ -111,4 +112,8 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
BusSalesOrder selectByBusSids(String busSid);
CommonContract selectByBusSidss(String busSid);
CrmCustomerTemp selectByCustomerSid(String affiliatedCompanySid);
List<SalesOrderVehicle> selectByOrderSid(String busSid);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
View File

@ -279,4 +279,12 @@
<select id="selectByBusSidss" resultType="com.yxt.anrui.base.api.commoncontract.CommonContract">
select * from common_contract where busSid = #{busSid}
</select>
<select id="selectByCustomerSid" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
select * from anrui_crm.crm_customer_temp where sid = #{affiliatedCompanySid}
</select>
<select id="selectByOrderSid" resultType="com.yxt.anrui.base.api.commoncontract.SalesOrderVehicle">
select * from anrui_buscenter.bus_sales_order_vehicle where salesOrderSid = #{busSid}
</select>
</mapper>

321
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -72,6 +72,8 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign;
import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
@ -202,6 +204,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
private LoanTemplateFeign loanTemplateFeign;
@Autowired
private BaseDistributorService baseDistributorService;
@Autowired
private LoanSolutionsFeign loanSolutionsFeign;
private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
@ -821,7 +825,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String remarks = "";
CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
if (commonContract != null) {
String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
String date = DateUtil.today();
List<String> dateString = Arrays.asList(date.split("-"));
String year = dateString.get(0);
String month = dateString.get(1);
@ -836,24 +840,32 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
if (baseDistributor != null) {
map.put("invoiceName", busSalesOrder.getAffiliatedCompany());//开票名称
map.put("invoiceName", baseDistributor.getDisName());//开票名称
map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
}else{
if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
} else {
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid());
if (crmCustomerTemp != null) {
map.put("invoiceName", crmCustomerTemp.getName());//开票名称
map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
}
//组装到文档相对应的字段中
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板
ftl = "existingvehicles";
if (stringList.size() > 0) {
@ -927,7 +939,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String remarks = "";
CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
if (commonContract != null) {
String date = DateUtil.format(commonContract.getCreateTime(), "yyyy-MM-dd");
String date = DateUtil.today();
List<String> dateString = Arrays.asList(date.split("-"));
String year = dateString.get(0);
String month = dateString.get(1);
@ -942,20 +954,32 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
if (baseDistributor != null) {
map.put("invoiceName", busSalesOrder.getAffiliatedCompany());//开票名称
map.put("invoiceName", baseDistributor.getDisName());//开票名称
map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
} else {
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid());
if (crmCustomerTemp != null) {
map.put("invoiceName", crmCustomerTemp.getName());//开票名称
map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
}
//组装到文档相对应的字段中
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板
ftl = "existingvehicles";
if (stringList.size() > 0) {
@ -1016,16 +1040,56 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String num = priceInfo.getNumber();
String remarks = "";
String ftl = "";
CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
if (commonContract != null) {
String date = DateUtil.today();
List<String> dateString = Arrays.asList(date.split("-"));
String year = dateString.get(0);
String month = dateString.get(1);
String day = dateString.get(2);
map.put("year", year);
map.put("month", month);
map.put("day", day);
}
BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
if (busSalesOrder.getAffiliatedCompanyType() == 0) {
//根据挂靠公司sid查询信息
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
if (baseDistributor != null) {
map.put("invoiceName", baseDistributor.getDisName());//开票名称
map.put("customerName", baseDistributor.getDisName());//开票名称
map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号
map.put("idNo", baseDistributor.getRegistNum());//纳税人识别号
map.put("adds", baseDistributor.getRegistDetailAddress());//户籍地址
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
} else {
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid());
if (crmCustomerTemp != null) {
map.put("invoiceName", crmCustomerTemp.getName());//开票名称
map.put("customerName", crmCustomerTemp.getName());//开票名称
map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
map.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号
map.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
}
map.put("createOrgName", "");
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) {
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板
ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) {
remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
// remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
remarks = "数量" + num + "台，单台成交价： 元。";
} else {
remarks = "数量" + num + "台，单台成交价： 元。";
}
@ -1036,7 +1100,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
remarks = "数量" + num + "台，单台成交价： 元。";
}
map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@ -1066,16 +1130,56 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String num = priceInfo.getNumber();
String remarks = "";
String ftl = "";
CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
if (commonContract != null) {
String date = DateUtil.today();
List<String> dateString = Arrays.asList(date.split("-"));
String year = dateString.get(0);
String month = dateString.get(1);
String day = dateString.get(2);
map.put("year", year);
map.put("month", month);
map.put("day", day);
}
BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
if (busSalesOrder.getAffiliatedCompanyType() == 0) {
//根据挂靠公司sid查询信息
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
if (baseDistributor != null) {
map.put("invoiceName", baseDistributor.getDisName());//开票名称
map.put("customerName", baseDistributor.getDisName());//开票名称
map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号
map.put("idNo", baseDistributor.getRegistNum());//纳税人识别号
map.put("adds", baseDistributor.getRegistDetailAddress());//户籍地址
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
} else {
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(busSalesOrder.getAffiliatedCompanySid());
if (crmCustomerTemp != null) {
map.put("invoiceName", crmCustomerTemp.getName());//开票名称
map.put("customerName", crmCustomerTemp.getName());//开票名称
map.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
map.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号
map.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
}
}
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
}
map.put("createOrgName", "");
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) {
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板
ftl = "existingvehicles_black2";
ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) {
remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
// remarks = "数量" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
remarks = "数量" + num + "台，单台成交价： 元。";
} else {
remarks = "数量" + num + "台，单台成交价： 元。";
}
@ -1086,7 +1190,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
remarks = "数量" + num + "台，单台成交价： 元。";
}
map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@ -1106,16 +1210,27 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return url;
}
private String getReceiveCar(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
private String getReceiveCar(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
//查询销售订单的现车
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
/*if (stringList.size() > 0) {
map.put("vinNo", String.join(",", stringList));
}*/
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
String idNo = crmCustomerTempVo.getIDNumber();
map.put("customerName", appOrderDetailsVo.getName());
map.put("idNo", idNo);
if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}
String ftl = "receiveCar";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@ -1237,10 +1352,39 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
private String getCarContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
// map.put("createDate", DateUtil.today());
BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
if (busSalesOrder != null) {
map.put("Yf", busSalesOrder.getCustomerName());
if (busSalesOrder.getAffiliatedCompanyType() == 0) {
//根据挂靠公司sid查询信息
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid());
if (baseDistributor != null) {
map.put("invoiceName", baseDistributor.getDisName());//开票名称
}
}
}
}
map.put("contractNo", "D" + map.get("contractNo"));
if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}
CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
if (commonContract != null) {
String date =DateUtil.today();
map.put("date", date);
}
List<CarContractListVo> carContractListVos = new ArrayList<>();
if (dto != null) {
List<SalesOrderVehicle> salesOrderVehicles = dto.getSalesOrderVehicles();
List<SalesOrderVehicle> salesOrderVehicles = baseMapper.selectByOrderSid(dto.getBusSid());
salesOrderVehicles.removeAll(Collections.singleton(null));
for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
CarContractListVo carContractListVo = new CarContractListVo();
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(salesOrderVehicle.getLinkSid());
@ -1263,7 +1407,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("carLists", carContractListVos);
}
String ftl = "carContract";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl2/" + ftl + ".ftl");
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@ -2080,12 +2224,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String mobile = appOrderDetailsVo.getPhone();
//根据客户sid查询客户的身份证号
sid = appOrderDetailsVo.getCustomerSid();
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(sid);
if (!crmResultBean.getSuccess()) {
return rb.setMsg(crmResultBean.getMsg());
}
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
String idNo = crmCustomerTempVo.getIDNumber();
//查询销售订单的车型信息
AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
//根据车型sid查询车型的全称
@ -2194,7 +2333,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
modelAllName.append("、").append(baseModelConfig.getTireCover());
}
StringBuilder modelAllName2 = new StringBuilder();
modelAllName2.append("\t");
modelAllName2.append("\t\t");
//驾驶室
if (StringUtils.isNotBlank(baseModelConfig.getSpecification()) && !"-".equals(baseModelConfig.getSpecification())) {
modelAllName2.append(baseModelConfig.getSpecification());
@ -2267,9 +2406,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
AppOrderDiscountListVo vv = discountList.get(iii);
String discountName = vv.getDiscountName();
if (iii == discountList.size() - 1) {
discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName + vv.getNumber() + "份（每份包含" + vv.getDiscountExplain() + "）。";
discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName + vv.getNumber() + "份";
if (StringUtils.isNotBlank(vv.getDiscountExplain())) {
discountDetail = discountDetail + "（每份包含" + vv.getDiscountExplain() + "）。";
}
} else {
discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName + vv.getNumber() + "份（每份包含" + vv.getDiscountExplain() + "），";
discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName + vv.getNumber() + "份";
if (StringUtils.isNotBlank(vv.getDiscountExplain())) {
discountDetail = discountDetail + "（每份包含" + vv.getDiscountExplain() + "），";
}
}
}
map.put("discountDetail", discountDetail);
@ -2380,68 +2526,71 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ExecutorService pool = new ThreadPoolExecutor(1, 2,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, appOrderDetailsVo);
});
Future<String> future1_2 = pool.submit(() -> {
return genCarSaleContract2(dto, map, appOrderDetailsVo);
});
/*Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
Future<String> future2_2 = pool.submit(() -> {
return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
});
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map, appOrderDetailsVo);
});
String singleFinalPriceOne = priceInfo.getSingleFinalPrice();
String depositOne = depositInfo.getDeposit();
Future<String> future8 = null;
if (!"02".equals(appOrderDetailsVo.getInvoiceType())) {
future8 = pool.submit(() -> {
return getCarContract(null, map, appOrderDetailsVo);
});
}*/
BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
List<File> filesList = new ArrayList<>();
if (future1 != null) {
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, appOrderDetailsVo);
});
Future<String> future1_2 = pool.submit(() -> {
return genCarSaleContract2(dto, map, appOrderDetailsVo);
});
Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
Future<String> future2_2 = pool.submit(() -> {
return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
});
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(dto, map, appOrderDetailsVo);
});
Future<String> future8 = null;
if ("0".equals(dto.getDiscountKey())) {
if (busSalesOrder.getAffiliatedCompanyType() == 0) {
future8 = pool.submit(() -> {
return getCarContract(dto, map, appOrderDetailsVo);
});
}
}
if (StringUtils.isNotBlank(future1.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
filesList.add(file);
}
}
if (future1_2 != null) {
if (StringUtils.isNotBlank(future1_2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get());
filesList.add(file);
}
}
/*if (future2 != null) {
if (StringUtils.isNotBlank(future2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
filesList.add(file);
}
}
if (future2_2 != null) {
if (StringUtils.isNotBlank(future2_2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get());
filesList.add(file);
}
}
//合并pdf文件
if (future8 != null) {
if (StringUtils.isNotBlank(future8.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get());
if (StringUtils.isNotBlank(future4.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
filesList.add(file);
}
}
if (StringUtils.isNotBlank(future4.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
filesList.add(file);
}*/
//合并pdf文件
if (future8 != null) {
if (StringUtils.isNotBlank(future8.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get());
filesList.add(file);
}
}
} else {//贷款
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(dto.getBusSid()).getData();
if (loanSolutions != null) {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
//担保
} else {
//非担保
}
}
}
if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {
Future<String> future10 = pool.submit(() -> {
return getRisk(appOrderDetailsVo, dto);

1545
anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
View File

File diff suppressed because it is too large

2879
anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl
View File

File diff suppressed because it is too large

33
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
View File

@ -964,7 +964,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${createOrgName!} </w:t>
<w:t>${createOrgName!}</w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1589,7 +1589,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${totalPrice!} </w:t>
<w:t>${totalPrice!}</w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1632,7 +1632,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${priceRemarks!} </w:t>
<w:t>${priceRemarks!}</w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1736,7 +1736,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${depositTotal!} </w:t>
<w:t>${depositTotal!}</w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1831,7 +1831,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${address!} </w:t>
<w:t>${address!}</w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2359,7 +2359,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceName!} </w:t>
<#if invoiceName??>
<w:t> ${invoiceName!} </w:t>
<#else><w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2402,7 +2406,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceNo!} </w:t>
<#if invoiceNo??>
<w:t> ${invoiceNo!} </w:t>
<#else><w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2480,6 +2488,17 @@
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00F05BA9">
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
<wx:font wx:val="宋体"/>
<w:spacing w:val="8"/>
<w:sz w:val="19"/>
<w:sz-cs w:val="19"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000">
<w:pPr>
<w:tabs>

406
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
View File

@ -1039,7 +1039,12 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${customerName!} </w:t>
<#if customerName??>
<w:t> ${customerName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1102,7 +1107,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${idNo!} </w:t>
<#if idNo??>
<w:t> ${idNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1160,13 +1170,18 @@
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="等线" w:h-ansi="宋体" w:hint="fareast"/>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${adds!} </w:t>
<#if adds??>
<w:t>${adds!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1310,196 +1325,196 @@
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<#if modelName??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${modelName!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${modelName!}</w:t>
</w:r>
</w:p>
</#if>
<#if modelConfig??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${modelConfig!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${modelConfig!}</w:t>
</w:r>
</w:p>
</#if>
<#if modelConfigs??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${modelConfigs!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${modelConfigs!}</w:t>
</w:r>
</w:p>
</#if>
<#if publicModel??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${publicModel!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${publicModel!}</w:t>
</w:r>
</w:p>
</#if>
<#if topName??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${topName!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${topName!}</w:t>
</w:r>
</w:p>
</#if>
<#if trailerName??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${trailerName!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${trailerName!}</w:t>
</w:r>
</w:p>
</#if>
<#if remarks??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${remarks!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${remarks!}</w:t>
</w:r>
</w:p>
</#if>
<#if discountDetail??>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${discountDetail!}</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000"
wsp:rsidP="000B0934">
<w:pPr>
<w:spacing w:before="27" w:line="246" w:line-rule="auto"/>
<w:ind w:left="113" w:right="44" w:hanging="1"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${discountDetail!}</w:t>
</w:r>
</w:p>
</#if>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00F05BA9"
wsp:rsidP="000B0934">
@ -1589,7 +1604,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${totalPrice!} </w:t>
<w:t> ${totalPrice!} </w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1632,7 +1647,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${priceRemarks!} </w:t>
<w:t> ${priceRemarks!} </w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1736,7 +1751,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${depositTotal!} </w:t>
<w:t> ${depositTotal!} </w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2359,7 +2374,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceName!} </w:t>
<#if invoiceName??>
<w:t> ${invoiceName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2402,7 +2421,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceNo!} </w:t>
<#if invoiceNo??>
<w:t> ${invoiceNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2480,6 +2503,17 @@
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00F05BA9">
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
<wx:font wx:val="宋体"/>
<w:spacing w:val="8"/>
<w:sz w:val="19"/>
<w:sz-cs w:val="19"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="00F05BA9" wsp:rsidRPr="000B0934" wsp:rsidRDefault="00000000">
<w:pPr>
<w:tabs>
@ -2740,7 +2774,7 @@
<w:sz w:val="19"/>
<w:sz-cs w:val="19"/>
</w:rPr>
<w:t> </w:t>
<w:t></w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>

29
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
View File

@ -1080,7 +1080,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${createOrgName!} </w:t>
<w:t>${createOrgName!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1707,7 +1707,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${totalPrice!} </w:t>
<w:t>${totalPrice!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1750,7 +1750,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${priceRemarks!} </w:t>
<w:t>${priceRemarks!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1835,7 +1835,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${dayOne!} </w:t>
<w:t>${dayOne!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1888,7 +1888,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${depositTotal!} </w:t>
<w:t>${depositTotal!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1993,7 +1993,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${address!} </w:t>
<w:t>${address!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2482,7 +2482,10 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceName!} </w:t>
<#if invoiceName??>
<w:t> ${invoiceName!} </w:t>
<#else><w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2525,7 +2528,10 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceNo!} </w:t>
<#if invoiceNo??>
<w:t> ${invoiceNo!} </w:t>
<#else><w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2577,6 +2583,13 @@
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="008101B7" wsp:rsidRPr="0071392F" wsp:rsidRDefault="008101B7">
<w:pPr>
<w:rPr>
<w:rFonts w:fareast="等线"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="008101B7" wsp:rsidRPr="0071392F" wsp:rsidRDefault="00000000">
<w:pPr>
<w:spacing w:before="39" w:line="439" w:line-rule="exact"/>

51
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
View File

@ -1166,7 +1166,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${customerName!} </w:t>
<#if customerName??>
<w:t> ${customerName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1229,7 +1233,11 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${idNo!} </w:t>
<#if idNo??>
<w:t> ${idNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1287,13 +1295,17 @@
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
<w:rFonts w:ascii="宋体" w:fareast="等线" w:h-ansi="宋体" w:hint="fareast"/>
<w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${adds!} </w:t>
<#if adds??>
<w:t>${adds!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1707,7 +1719,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${totalPrice!} </w:t>
<w:t> ${totalPrice!} </w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1750,7 +1762,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${priceRemarks!} </w:t>
<w:t> ${priceRemarks!} </w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1835,7 +1847,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${dayOne!} </w:t>
<w:t> ${dayOne!} </w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1888,7 +1900,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${depositTotal!} </w:t>
<w:t> ${depositTotal!} </w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1993,7 +2005,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${address!} </w:t>
<w:t>${address!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2482,7 +2494,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceName!} </w:t>
<#if invoiceName??>
<w:t> ${invoiceName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2525,7 +2541,11 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceNo!} </w:t>
<#if invoiceNo??>
<w:t> ${invoiceNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2556,7 +2576,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t>${invoiceType!} </w:t>
<w:t>${invoiceType!}</w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2577,6 +2597,13 @@
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="008101B7" wsp:rsidRPr="0071392F" wsp:rsidRDefault="008101B7">
<w:pPr>
<w:rPr>
<w:rFonts w:fareast="等线"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="008101B7" wsp:rsidRPr="0071392F" wsp:rsidRDefault="00000000">
<w:pPr>
<w:spacing w:before="39" w:line="439" w:line-rule="exact"/>

12
anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
View File

@ -772,7 +772,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${customerName!} </w:t>
<w:t> ${customerName!} </w:t>
</w:r>
<w:r wsp:rsidRPr="00D5237D">
<w:rPr>
@ -812,7 +812,11 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t>${idNo!} </w:t>
<#if idNo??>
<w:t>${idNo!}</w:t>
<#else><w:t> </w:t>
</#if>
</w:r>
</w:p>
<w:p wsp:rsidR="00D42F8B" wsp:rsidRPr="00D5237D" wsp:rsidRDefault="00000000">
@ -893,7 +897,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${createOrgName!} </w:t>
<w:t>${createOrgName!}</w:t>
</w:r>
<w:r wsp:rsidRPr="00D5237D">
<w:rPr>
@ -913,7 +917,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${contractNo!} </w:t>
<w:t>${contractNo!}</w:t>
</w:r>
<w:r wsp:rsidRPr="00D5237D">
<w:rPr>

2
anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
View File

@ -138,7 +138,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">

2
anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue
View File

@ -136,7 +136,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">

25
anrui-riskcenter-ui/src/views/homevisitpreparation/thehomevisitisready.vue
View File

@ -54,7 +54,7 @@
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini">下载合同</el-button>
<el-button type="primary" size="mini" @click="toDownLoad(scope.row)">下载合同</el-button>
<el-button type="primary" size="mini" @click="lookSale(scope.row)">查看订单</el-button>
</template>
</el-table-column>
@ -133,6 +133,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import salesOrder from '@/components/publicPage/salesOrder'
import {getStorage} from "@/utils/auth";
export default {
name: 'TheHomeVisitIsReady',
@ -265,6 +266,28 @@ export default {
}
this.getList()
},
toDownLoad(row) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.downUrl + '&outFileName=' + '消贷合同', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
// 如果请求执行成功
var blob = this.response
var filename = '消贷合同.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// 创键临时url对象
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// 释放之前创建的URL对象
window.URL.revokeObjectURL(url)
}
// 发送请求
xhr.send()
},
lookSale(row) {
this.viewState = 2
this.$refs['divSale'].showInfo(row.saleOrderSid)

8
anrui-riskcenter-ui/src/views/settle/settleAdd.vue
View File

@ -165,14 +165,16 @@
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<el-image v-if="formobj.showHg" class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" />
<div v-if="formobj.showHg">
<el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" />
</div>
<uploadImg v-else ref="uploadImg" class="addinputInfo" v-model="formobj.loanSettleBankCostVo.filesList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">
@ -278,7 +280,7 @@
</div>
<el-row>
<el-col :span="24">
<div class="span-sty">公司利润</div>
<div class="span-sty">结清利润</div>
<el-form-item><span class="addinputInfo">{{ calculateProfit }}</span></el-form-item>
</el-col>
</el-row>

4
anrui-riskcenter-ui/src/views/settle/settleInfo.vue
View File

@ -145,7 +145,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">
@ -236,7 +236,7 @@
</div>
<el-row>
<el-col :span="24">
<div class="span-sty">公司利润</div>
<div class="span-sty">结清利润</div>
<el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyReductionVo.profit }}</span></el-form-item>
</el-col>
</el-row>

2
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue
View File

@ -139,7 +139,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">

2
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
View File

@ -137,7 +137,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">

2
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue
View File

@ -136,7 +136,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.companyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">

4
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue
View File

@ -148,7 +148,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">
@ -239,7 +239,7 @@
</div>
<el-row>
<el-col :span="24">
<div class="span-sty">公司利润</div>
<div class="span-sty">结清利润</div>
<el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyReductionVo.profit }}</span></el-form-item>
</el-col>
</el-row>

8
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
View File

@ -164,14 +164,16 @@
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<el-image v-if="formobj.showHg" class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" />
<div v-if="formobj.showHg">
<el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" />
</div>
<uploadImg v-else ref="uploadImg" :disabled="formobj.showHg" class="addinputInfo" v-model="formobj.loanSettleBankCostVo.filesList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">
@ -277,7 +279,7 @@
</div>
<el-row>
<el-col :span="24">
<div class="span-sty">公司利润</div>
<div class="span-sty">结清利润</div>
<el-form-item><span class="addinputInfo">{{ calculateProfit }}</span></el-form-item>
</el-col>
</el-row>

4
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue
View File

@ -145,7 +145,7 @@
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>公司结清费用</div>
<div>贷款保整金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
<div>贷款保证金：<span>{{ formobj.loanSettleCompanyCostVo.loanDeposit }}</span></div>
</div>
<el-row>
<el-col :span="8">
@ -236,7 +236,7 @@
</div>
<el-row>
<el-col :span="24">
<div class="span-sty">公司利润</div>
<div class="span-sty">结清利润</div>
<el-form-item><span class="addinputInfo">{{ formobj.loanSettleCompanyReductionVo.profit }}</span></el-form-item>
</el-col>
</el-row>

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java
View File

@ -46,11 +46,15 @@ public class ScheduledLoanFundDayService {
List<LoanRepaymentPlanDetails> list = loanRepaymentPlanDetailsService.planList();
list.removeAll(Collections.singleton(null));
if (list.size() > 0) {
//截止到当天垫款余额T
BigDecimal paymentMoneyAll = list.stream().map(LoanRepaymentPlanDetails::getPaymentMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
//当天资金占用费B
BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING);
// //截止到当天垫款余额T
// BigDecimal paymentMoneyAll = list.stream().map(LoanRepaymentPlanDetails::getPaymentMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
// //当天资金占用费B
// BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING);
for (int i = 0; i < list.size(); i++) {
//截止到当天垫款余额T
BigDecimal paymentMoneyAll = list.get(i).getPaymentMoney();
//当天资金占用费B
BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING);
LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(i);
LoanFundDay loanFundDay = new LoanFundDay();
loanFundDay.setBusSid(loanRepaymentPlanDetails.getSid());

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
View File

@ -50,7 +50,7 @@
<where>
${ew.sqlSegment}
</where>
order by la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo
order by la.createTime desc,la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo
</select>
<select id="selectBySid" resultType="int">

58
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
View File

@ -389,8 +389,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
loanSettleApplyDetailsVo.setShowHg(true);
}
if(loanSettleApplyDetailsVo.isShowHg()){
loanSettleApplyDetailsVo = getInit(loanSettleApplyDetailsVo,loanSettleApply);
if (loanSettleApplyDetailsVo.isShowHg()) {
loanSettleApplyDetailsVo = getInit(loanSettleApplyDetailsVo, loanSettleApply);
}
}
return rb.success().setData(loanSettleApplyDetailsVo);
@ -924,20 +924,48 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
}
LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid);
if (loanSettleCompanyCost != null) {
settleApplyAppVo.setLoanDeposit(loanSettleCompanyCost.getLoanDeposit().toString());
settleApplyAppVo.setOverduePrice(loanSettleCompanyCost.getOverduePrice().toString());
settleApplyAppVo.setPutBankInterest(loanSettleCompanyCost.getPutBankInterest().toString());
settleApplyAppVo.setFunfCost(loanSettleCompanyCost.getFunfCost().toString());
settleApplyAppVo.setBankOverInterest(loanSettleCompanyCost.getBankOverInterest().toString());
settleApplyAppVo.setCompanyCurrentNotPrice(loanSettleCompanyCost.getCompanyCurrentNotPrice().toString());
settleApplyAppVo.setBankNotPrice(loanSettleCompanyCost.getBankNotPrice().toString());
settleApplyAppVo.setDeductionAmount(loanSettleCompanyCost.getDeductionAmount().toString());
settleApplyAppVo.setCompanyNominalPrice(loanSettleCompanyCost.getCompanyNominalPrice().toString());
settleApplyAppVo.setContractLiquidated(loanSettleCompanyCost.getContractLiquidated().toString());
settleApplyAppVo.setCompanyOtherPrice(loanSettleCompanyCost.getCompanyOtherPrice().toString());
if (loanSettleCompanyCost.getLoanDeposit() != null) {
settleApplyAppVo.setLoanDeposit(loanSettleCompanyCost.getLoanDeposit().toString());
}
if (loanSettleCompanyCost.getOverduePrice() != null) {
settleApplyAppVo.setOverduePrice(loanSettleCompanyCost.getOverduePrice().toString());
}
if (loanSettleCompanyCost.getPutBankInterest() != null) {
settleApplyAppVo.setPutBankInterest(loanSettleCompanyCost.getPutBankInterest().toString());
}
if (loanSettleCompanyCost.getFunfCost() != null) {
settleApplyAppVo.setFunfCost(loanSettleCompanyCost.getFunfCost().toString());
}
if (loanSettleCompanyCost.getBankOverInterest() != null) {
settleApplyAppVo.setBankOverInterest(loanSettleCompanyCost.getBankOverInterest().toString());
}
if (loanSettleCompanyCost.getCompanyCurrentNotPrice() != null) {
settleApplyAppVo.setCompanyCurrentNotPrice(loanSettleCompanyCost.getCompanyCurrentNotPrice().toString());
}
if (loanSettleCompanyCost.getBankNotPrice() != null) {
settleApplyAppVo.setBankNotPrice(loanSettleCompanyCost.getBankNotPrice().toString());
}
if (loanSettleCompanyCost.getDeductionAmount() != null) {
settleApplyAppVo.setDeductionAmount(loanSettleCompanyCost.getDeductionAmount().toString());
}
if (loanSettleCompanyCost.getCompanyNominalPrice() != null) {
settleApplyAppVo.setCompanyNominalPrice(loanSettleCompanyCost.getCompanyNominalPrice().toString());
}
if (loanSettleCompanyCost.getContractLiquidated() != null) {
settleApplyAppVo.setContractLiquidated(loanSettleCompanyCost.getContractLiquidated().toString());
}
if (loanSettleCompanyCost.getCompanyOtherPrice() != null) {
settleApplyAppVo.setCompanyOtherPrice(loanSettleCompanyCost.getCompanyOtherPrice().toString());
}
if (loanSettleCompanyCost.getSettleAll() != null) {
settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
}
if (loanSettleCompanyCost.getFundAll() != null) {
settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
}
settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
}
LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid);
if (loanSettleCompanyReduction != null) {

Write Preview
Loading…
Cancel
Save