|
|
|
@ -3,8 +3,6 @@ package com.yxt.anrui.base.biz.commoncontract; |
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendix; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.*; |
|
|
|
import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; |
|
|
|
@ -15,20 +13,13 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; |
|
|
|
import com.yxt.anrui.base.biz.flow.FlowableService; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busordermodel.AppBusOrderModelVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign; |
|
|
|
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
|
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; |
|
|
|
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganization; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; |
|
|
|
@ -51,12 +42,8 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.io.File; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.text.MessageFormat; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.ExecutorService; |
|
|
|
import java.util.concurrent.Executors; |
|
|
|
import java.util.concurrent.Future; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -94,14 +81,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
private DictCommonFeign dictCommonFeign; |
|
|
|
@Autowired |
|
|
|
private BusDepositFeign busDepositFeign; |
|
|
|
@Autowired |
|
|
|
/* @Autowired |
|
|
|
private BusOrderFeign busOrderFeign; |
|
|
|
@Autowired |
|
|
|
private BusOrderDiscountFeign busOrderDiscountFeign; |
|
|
|
@Autowired |
|
|
|
private BusOrderDiscountFeign busOrderDiscountFeign;*/ |
|
|
|
/* @Autowired |
|
|
|
private BusOrderModelFeign busOrderModelFeign; |
|
|
|
@Autowired |
|
|
|
private BusOrderVehicleFeign busOrderVehicleFeign; |
|
|
|
private BusOrderVehicleFeign busOrderVehicleFeign;*/ |
|
|
|
@Autowired |
|
|
|
private BusDepositVehicleFeign busDepositVehicleFeign; |
|
|
|
@Autowired |
|
|
|
@ -410,7 +397,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
* @param orderSid 销售订单sid |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) { |
|
|
|
/* public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) { |
|
|
|
Map<String, String> map = generateContractNo(userSid); |
|
|
|
String staffSid = map.get("staffSid"); |
|
|
|
CommonContractVo commonContractVo = baseMapper.selectCountByCusAndStaAndBusSid(staffSid, orderSid); |
|
|
|
@ -439,7 +426,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultBean<AppBusOrderContractVo>().success().setData(contractVo); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 手机端保存/修改销售订单 |
|
|
|
@ -580,7 +567,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) { |
|
|
|
/* public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) { |
|
|
|
Map<String, Object> map = new HashMap<String, Object>(); |
|
|
|
// 合同信息
|
|
|
|
CommonContract contract = fetchBySid(dto.getSid()); |
|
|
|
@ -699,7 +686,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
return new ResultBean().fail().setMsg("生成文件失败"); |
|
|
|
} |
|
|
|
return new ResultBean().success().setData(list); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 生成 新车买卖合同(现车或订车) pdf |
|
|
|
@ -865,7 +852,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
* @param createDate 交订金时间(未确定，暂时取“制单日期”) |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public String genContractNo(String brandSid, String modelSid, String orgSid, String createDate) { |
|
|
|
/* public String genContractNo(String brandSid, String modelSid, String orgSid, String createDate) { |
|
|
|
// 品牌简称
|
|
|
|
String brandShortName = baseVehicleBrandService.getBrandShortName(brandSid); |
|
|
|
// 车型代号
|
|
|
|
@ -888,7 +875,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
String loanType = ""; |
|
|
|
|
|
|
|
return brandShortName + vehicleTypeCodeNum + orgShortName + regionDivision + yearAndMonth + num + loanType; |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据传入的交订金时间获取所属年份和月份 |
|
|
|
@ -953,8 +940,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
* @param map 封装数据 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) { |
|
|
|
Map<String, Object> commonContractMap = map; |
|
|
|
/* public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) { |
|
|
|
Map<String, Object> commonContractMap = map;*/ |
|
|
|
/** |
|
|
|
* 车辆登记合同参数： |
|
|
|
* 甲方：${partyA} |
|
|
|
@ -971,7 +958,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
*/ |
|
|
|
//甲方为卖方，即xxx公司，即根据销售订单的单位sid查询单位的名称
|
|
|
|
//乙方为受卖方，即销售订单的客户名称
|
|
|
|
ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); |
|
|
|
/* ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); |
|
|
|
if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) { |
|
|
|
BusOrderVo orderVo = busOrderVoResultBean.getData(); |
|
|
|
//乙方
|
|
|
|
@ -979,9 +966,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
//客户名称
|
|
|
|
commonContractMap.put("customerName", orderVo.getCustomerName()); |
|
|
|
} |
|
|
|
return commonContractMap; |
|
|
|
return commonContractMap;*/ |
|
|
|
|
|
|
|
} |
|
|
|
/* }*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 涉及高低开票的，需要打印两套合同： |
|
|
|
|
