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

挂车入库判断修改 

车辆上装合同修改
master
God 10 months ago
parent
36380dc292
commit
a181eb079e
8 changed files with 95 additions and 23 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. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java
  4. 24
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  5. 56
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  6. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherVo.java
  7. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherDto.java
  8. 24
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
View File

@ -300,14 +300,14 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
/***************************************挂车入库判断***************************************/
BaseTrailerModelDetailsVo baseTrailerModelDetailsVo = baseTrailerModelService.fetchDetailsVoBySid(baseTrailer.getTrailerModelSid());
String trailerTypeKey = baseTrailerModelDetailsVo.getTrailerTypeKey();
String appearanceSizeLong = baseTrailerModelDetailsVo.getAppearanceSizeLong();
BigDecimal appearanceSizeLong = new BigDecimal(baseTrailerModelDetailsVo.getAppearanceSizeLong()).divide(new BigDecimal("1000"));
String orderSid = busSalesOrderVehicleFeign.selectOneByVehSidAndNotStop(vehSid).getData();
if (StringUtils.isNotBlank(orderSid)){
List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData();
if (data != null && data.size() > 0){
Boolean tg = false;
for (BusSalesOrderTrailerDetailsVo datum : data) {
if (datum.getAppearanceSizeLong().toString().equals(appearanceSizeLong) && datum.getTrailerTypeKey().equals(trailerTypeKey)){
if (datum.getAppearanceSizeLong().compareTo(appearanceSizeLong) == 0 && datum.getTrailerTypeKey().equals(trailerTypeKey)){
tg = true;
break;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java
View File

@ -83,6 +83,8 @@ public class BusSalesOrderMakeupDetailsVo implements Vo {
@ApiModelProperty("合同中的上装信息")
private String topMessage;
private String buyTypeKey;
private int isMain;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java
View File

@ -89,4 +89,6 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
private String isCompBuy;
@ApiModelProperty("001一车一合同 002一贷款人一合同")
private String conSetUpKey;
@ApiModelProperty("上装或挂车")
private String szOrGc;
}

24
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -34,6 +34,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@ -127,6 +131,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BusSalesOrderMakeupFeign busSalesOrderMakeupFeign;
@Autowired
private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign;
@Autowired
private LoanHomevisitPrepService loanHomevisitPrepService;
@Autowired
private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@ -644,12 +652,15 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if (loanHomeVisitInvestigateInitCustomerVo == null) {
loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo();
String saleOrderBorrowerSid = "";
String saleOrderSid = "";
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
if (loanHomevisitInvestigate == null) {
LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(sid);
saleOrderBorrowerSid = loanHomevisitPrep.getSaleOrderBorrowerSid();
saleOrderSid = loanHomevisitPrep.getSaleOrderSid();
} else {
saleOrderBorrowerSid = loanHomevisitInvestigate.getSaleOrderBorrowerSid();
saleOrderSid = loanHomevisitInvestigate.getSaleOrderSid();
}
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(saleOrderBorrowerSid).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
@ -658,6 +669,19 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
//根据销售订单sid查询是否有挂车或上装
List<BusSalesOrderMakeupDetailsVo> salesOrderMakeupDetailsVos = busSalesOrderMakeupFeign.selectTopByOrderSid(saleOrderSid).getData();
List<BusSalesOrderTrailerDetailsVo> salesOrderTrailerDetailsVos = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(saleOrderSid).getData();
if (salesOrderMakeupDetailsVos != null && salesOrderMakeupDetailsVos.size() > 0){
loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("上装");
if ("01".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())){
loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("0");
}else if ("02".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())){
loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("1");
}
}else if (salesOrderTrailerDetailsVos != null && salesOrderTrailerDetailsVos.size() > 0){
loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("挂车");
}
return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
}
//银行卡附件

56
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
View File

@ -500,9 +500,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData();
//查询金融方案中挂车信息
List<String> cljszcghtUrls = new ArrayList<>();
if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()) {
//生成车辆及上装采购合同
cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey);
if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0)) {
//上装生成车辆及上装采购合同
cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey, "sz");
}else if (solutionsDetailsVo.isTrailerAmountCb()){
//挂车生成车辆及上装采购合同
cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey, "gc");
}
List<String> gsgddwdbjyUrls = new ArrayList<>();
if ("0".equals(homeKcCust.getIsSecurity())) {
@ -1978,7 +1981,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
return urls;
}
public List<String> cljszcght(PrintConfirmDto printConfirmDto, String conSetUpKey) {
public List<String> cljszcght(PrintConfirmDto printConfirmDto, String conSetUpKey, String type) {
Map<String, Object> map = new HashMap<>();
List<SalesOrderVehicle> salesOrderVehicles = printConfirmDto.getSalesOrderVehicles();
//获取销售订单信息
@ -2013,23 +2016,34 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(printConfirmDto.getBusSid()).getData();
//合同补充信息
HomeKcCust homeKcCust = printConfirmDto.getHomeKcCust();
if ("0".equals(homeKcCust.getIsCompBuy())) {
//第一种
map.put("dyz", "☑");
//第二种
map.put("dez", "□");
//上装成交价/挂车成交价
map.put("je", "_____");
} else if ("1".equals(homeKcCust.getIsCompBuy())) {
//第一种
map.put("dyz", "□");
//第二种
map.put("dez", "☑");
//上装成交价/挂车成交价
if (topInfo != null) {
map.put("je", topInfo.getTopPrice());
} else if (solutionsDetailsVo.isTrailerAmountCb()) {
map.put("je", solutionsDetailsVo.getTrailerAmount());
if ("sz".equals(type)){
if ("0".equals(homeKcCust.getIsCompBuy())) {
//第一种
map.put("dyz", "☑");
//第二种
map.put("dez", "□");
//上装成交价/挂车成交价
map.put("je", "_____");
}
}else if ("gc".equals(type)){
if ("0".equals(homeKcCust.getIsCompBuy())) {
//第一种
map.put("dyz", "☑");
//第二种
map.put("dez", "□");
//上装成交价/挂车成交价
map.put("je", "_____");
} else if ("1".equals(homeKcCust.getIsCompBuy())) {
//第一种
map.put("dyz", "□");
//第二种
map.put("dez", "☑");
//上装成交价/挂车成交价
if (topInfo != null) {
map.put("je", topInfo.getTopPrice());
} else if (solutionsDetailsVo.isTrailerAmountCb()) {
map.put("je", solutionsDetailsVo.getTrailerAmount());
}
}
}
List<String> urls = new ArrayList<>();

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherVo.java
View File

@ -26,4 +26,8 @@ public class AppLoanHomeVisitInvestigateInitOtherVo implements Vo {
private String registDetailAddress;
@ApiModelProperty("实际经营地址")
private String realAddress;
@ApiModelProperty("是否公司采购")
private String caigou;
@ApiModelProperty("是否展示公司采购")
private Integer showCaigou;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherDto.java
View File

@ -27,4 +27,6 @@ public class AppLoanHomeVisitInvestigateSaveOtherDto implements Dto {
private String registDetailAddress;
@ApiModelProperty("实际经营地址")
private String realAddress;
@ApiModelProperty("是否公司采购(1是，0否)")
private String caigou;
}

24
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java
View File

@ -245,6 +245,20 @@ public class LoanHomeVisitInvestigateService {
appLoanHomeVisitInvestigateInitOtherVo.setMobile2(data.getMobile());
appLoanHomeVisitInvestigateInitOtherVo.setRegistDetailAddress(data.getAccCompAddress());
appLoanHomeVisitInvestigateInitOtherVo.setRealAddress(data.getAccCompxAddress());
//判断是否有上装或挂车
if (StringUtils.isBlank(data.getSzOrGc())){
appLoanHomeVisitInvestigateInitOtherVo.setShowCaigou(0);
}else if ("上装".equals(data.getSzOrGc())){
appLoanHomeVisitInvestigateInitOtherVo.setShowCaigou(2);
}else if ("挂车".equals(data.getSzOrGc())){
appLoanHomeVisitInvestigateInitOtherVo.setShowCaigou(1);
}
//初始化显示是否公司采购
if ("0".equals(data.getIsCompBuy())){
appLoanHomeVisitInvestigateInitOtherVo.setCaigou("1");
}else if ("1".equals(data.getIsCompBuy())){
appLoanHomeVisitInvestigateInitOtherVo.setCaigou("0");
}
}else {
return rb.setMsg("请优先完善客户信息");
}
@ -257,6 +271,9 @@ public class LoanHomeVisitInvestigateService {
LoanHomeVisitInvestigateInitCustomerVo data = loanHomevisitInvestigateFeign.getHomeVisitCustomerInfo(dto.getSid()).getData();
if (data != null){
BeanUtil.copyProperties(data,loanHomeVisitInvestigateSaveCustomerDto);
if ("挂车".equals(data.getSzOrGc()) && StringUtils.isBlank(dto.getCaigou())){
return rb.setMsg("请选择挂车或上装是否公司采购");
}
List<LoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel = data.getOtherPersonnel();
List<LoanHomeVisitInvestigateSaveOtherPeoDto> loanHomeVisitInvestigateSaveOtherPeoDtos = new ArrayList<>();
if (otherPersonnel != null && otherPersonnel.size() > 0){
@ -268,11 +285,18 @@ public class LoanHomeVisitInvestigateService {
loanHomeVisitInvestigateSaveCustomerDto.setOtherPersonnel(loanHomeVisitInvestigateSaveOtherPeoDtos);
}
loanHomeVisitInvestigateSaveCustomerDto.setVehRegis(dto.getIsGK());
//是否担保
if ("0".equals(dto.getIsDb())){
loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity("1");
}else if ("1".equals(dto.getIsDb())){
loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity("0");
}
//是否采购
if ("0".equals(dto.getCaigou())){
loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy("1");
}else if ("1".equals(dto.getCaigou())){
loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy("0");
}
loanHomeVisitInvestigateSaveCustomerDto.setAccCompName(dto.getDisName());
loanHomeVisitInvestigateSaveCustomerDto.setAccCompRegistNum(dto.getRegistNum());
loanHomeVisitInvestigateSaveCustomerDto.setAccCompContract(dto.getContract());

Write Preview
Loading…
Cancel
Save