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

优化

master
God 2 years ago
parent
3cca8f5fd0
commit
afcbb9434c
8 changed files with 183 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
  2. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java
  3. 38
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
  4. 27
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
  5. 213
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  6. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  7. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  8. 12
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
View File

@ -13,7 +13,8 @@ public enum BusAttachTypeEnum {
ZJ("004", "证件"), ZJ("004", "证件"),
FJ("005", "附件"), FJ("005", "附件"),
QKLPFJ("006", "欠款领票附件"), QKLPFJ("006", "欠款领票附件"),
CLMMHT("007", "车辆买卖合同"); CLMMHT("007", "车辆买卖合同"),
JZKHBA("008", "价值客户备案");
/** /**
* 附件类型 * 附件类型

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java
View File

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* Project: anrui-buscenter(价值客户备案申请) <br/> * Project: anrui-buscenter(价值客户备案申请) <br/>
* File: BusValcustFilingVo.java <br/> * File: BusValcustFilingVo.java <br/>
@ -51,6 +53,8 @@ public class BusValcustFilingDetailsVo implements Vo {
private String sid; // sid private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名 private String createByName; // 创建人姓名
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
@ -89,5 +93,6 @@ public class BusValcustFilingDetailsVo implements Vo {
private String procInstId; // 流程实例id private String procInstId; // 流程实例id
@ApiModelProperty("组织机构全路径sid") @ApiModelProperty("组织机构全路径sid")
private String orgSidPath; // 组织机构全路径sid private String orgSidPath; // 组织机构全路径sid
@ApiModelProperty("附件")
private List<String> fjImages;
} }

38
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
View File

@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/** /**
* Project: anrui-buscenter(价值客户备案申请) <br/> * Project: anrui-buscenter(价值客户备案申请) <br/>
* File: BusValcustFilingDto.java <br/> * File: BusValcustFilingDto.java <br/>
@ -51,38 +54,40 @@ public class BusValcustFilingDto implements Dto {
private String sid; // sid private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("创建人sid") @ApiModelProperty("创建人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名 private String createByName;
@ApiModelProperty("申请编号") @ApiModelProperty("申请编号")
private String billNo; // 申请编号 private String billNo;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid;
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName;
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String applyDeptSid; // 申请部门sid private String applyDeptSid;
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String applyDeptName; // 申请部门名称 private String applyDeptName;
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; // 合同编号 private String contractNo;
@ApiModelProperty("车型sid") @ApiModelProperty("车型sid")
private String modelSid; // 车型sid private String modelSid;
@ApiModelProperty("车型名称") @ApiModelProperty("车型名称")
private String modelName; // 车型名称 private String modelName;
@ApiModelProperty("车辆sid") @ApiModelProperty("车辆sid")
private String vinSid; // 车辆sid private String vinSid;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo;
@ApiModelProperty("0高开，1低开") @ApiModelProperty("0高开，1低开")
private String isGdk; private String isGdk;
@ApiModelProperty("加装配置/销售让利金额") @ApiModelProperty("加装配置/销售让利金额")
private String money; // 加装配置/销售让利金额 private String money;
@ApiModelProperty("应收手续费") @ApiModelProperty("应收手续费")
private String ysMoney; // 应收手续费 private String ysMoney;
@ApiModelProperty("实收手续费") @ApiModelProperty("实收手续费")
private String ssMoney; // 实收手续费 private String ssMoney;
@ApiModelProperty("销售订单sid") @ApiModelProperty("销售订单sid")
private String saleOrderSid; private String saleOrderSid;
@ApiModelProperty("业务sid") @ApiModelProperty("业务sid")
@ -90,6 +95,7 @@ public class BusValcustFilingDto implements Dto {
@ApiModelProperty("业务来源") @ApiModelProperty("业务来源")
private String busSource; private String busSource;
@ApiModelProperty("组织机构全路径sid") @ApiModelProperty("组织机构全路径sid")
private String orgSidPath; // 组织机构全路径sid private String orgSidPath;
@ApiModelProperty("附件")
private List<String> fjImages = new ArrayList<>();
} }

27
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
View File

@ -37,6 +37,9 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@ -45,6 +48,7 @@ import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNod
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery;
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.SubmitBusValcustFilingDto; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.SubmitBusValcustFilingDto;
import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
import com.yxt.anrui.buscenter.biz.busfile.BusFileService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
@ -79,6 +83,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.SubmitLoanCreditApplyDto; import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.SubmitLoanCreditApplyDto;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.message.MessageFlowableQuery;
@ -152,6 +157,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
private BusSalesOrderVehicleService busSalesOrderVehicleService; private BusSalesOrderVehicleService busSalesOrderVehicleService;
@Autowired @Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired
private BusFileService busFileService;
@Autowired
private FileUploadComponent fileUploadComponent;
public PagerVo<BusValcustFilingVo> listPageVo(PagerQuery<BusValcustFilingQuery> pq) { public PagerVo<BusValcustFilingVo> listPageVo(PagerQuery<BusValcustFilingQuery> pq) {
BusValcustFilingQuery query = pq.getParams(); BusValcustFilingQuery query = pq.getParams();
@ -219,6 +228,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
public ResultBean<String> saveOrUpdateDto(BusValcustFilingDto dto) { public ResultBean<String> saveOrUpdateDto(BusValcustFilingDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
List<String> fjImages = dto.getFjImages();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
//生成单据编号 //生成单据编号
String billNo = ""; String billNo = "";
@ -233,6 +243,16 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
} }
dto.setBillNo(billNo); dto.setBillNo(billNo);
String sid = this.insertByDto(dto); String sid = this.insertByDto(dto);
for (String fjImage : fjImages) {
BusFile busFile = new BusFile();
if (fjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
fjImage = fjImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
busFile.setFilePath(fjImage);
busFile.setLinkSid(sid);
busFile.setAttachType(BusAttachTypeEnum.JZKHBA.getAttachType());
busFileService.save(busFile);
}
return rb.success().setData(sid); return rb.success().setData(sid);
} }
this.updateByDto(dto); this.updateByDto(dto);
@ -261,6 +281,13 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
BusValcustFiling entity = fetchBySid(sid); BusValcustFiling entity = fetchBySid(sid);
BusValcustFilingDetailsVo vo = new BusValcustFilingDetailsVo(); BusValcustFilingDetailsVo vo = new BusValcustFilingDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
List<String> fjImages = new ArrayList<>();
for (BusFileDto busFileDto : busFileDtos) {
String filePath = fileUploadComponent.getUrlPrefix() + busFileDto.getFilePath();
fjImages.add(filePath);
}
vo.setFjImages(fjImages);
return vo; return vo;
} }

213
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -276,7 +276,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
query.setUseOrgSid(useOrgSid); query.setUseOrgSid(useOrgSid);
} }
//========================================数据授权开始 //========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())){ if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//======================= //=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setOrgPath(query.getOrgPath());
@ -284,7 +284,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
privilegeQuery.setMenuSid(query.getMenuSid()); privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getCreateBySid()); privilegeQuery.setUserSid(query.getCreateBySid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人) //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath(); String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/"; orgSidPath = orgSidPath + "/";
@ -305,17 +305,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else if ("4".equals(orgLevelKey)) { } else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4); orgSidPath = orgSidPath.substring(0, i4);
qw.like("fba.orgSidPath", orgSidPath); qw.like("fba.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){ } else if ("5".equals(orgLevelKey)) {
qw.eq("fba.createBySid",query.getCreateBySid()); qw.eq("fba.createBySid", query.getCreateBySid());
}else{ } else {
PagerVo<FinBillApplicationVo> p = new PagerVo<>(); PagerVo<FinBillApplicationVo> p = new PagerVo<>();
return p; return p;
} }
}else{ } else {
PagerVo<FinBillApplicationVo> p = new PagerVo<>(); PagerVo<FinBillApplicationVo> p = new PagerVo<>();
return p; return p;
} }
}else { } else {
qw.eq("fba.useOrgSid", query.getUseOrgSid()); qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid()); qw.eq("fba.createBySid", query.getCreateBySid());
} }
@ -374,12 +374,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
String contractNo = record.getContractNo(); String contractNo = record.getContractNo();
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
if (busSalesOrder != null){ if (busSalesOrder != null) {
record.setOrderSid(busSalesOrder.getSid()); record.setOrderSid(busSalesOrder.getSid());
} }
if (record.getCreateBySid().equals(query.getCreateBySid())){ if (record.getCreateBySid().equals(query.getCreateBySid())) {
record.setIsCZ(true); record.setIsCZ(true);
}else { } else {
record.setIsCZ(false); record.setIsCZ(false);
} }
} }
@ -730,7 +730,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加 //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey())); variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加 //判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
@ -739,9 +739,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//======================================== //========================================
finBillApplication = fetchBySid(businessSid); finBillApplication = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
if (StringUtils.isBlank(finBillApplication.getProcDefId())){ if (StringUtils.isBlank(finBillApplication.getProcDefId())) {
flowProcessMapQuery.setProDefKey(bv.getModelId()); flowProcessMapQuery.setProDefKey(bv.getModelId());
}else { } else {
flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId()); flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
} }
flowProcessMapQuery.setVariables(variables); flowProcessMapQuery.setVariables(variables);
@ -797,36 +797,78 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
busValcustFilingDto.setBusSid("0"); busValcustFilingDto.setBusSid("0");
busValcustFilingFeign.save(busValcustFilingDto); busValcustFilingFeign.save(busValcustFilingDto);
}else {*///不是高低开 }else {*///不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
} else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
if (count == 0) { if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001"); finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票"); finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001"); finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交"); finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车"); finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
if (busArrearsCarryVehicleApplyVo == null){ finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
}else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
@ -834,7 +876,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else { } else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
} }
@ -842,53 +884,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceService.mySave(finVehicleInvoiceDto); finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
} }
} }
if (finBillTrailerVos != null) { }
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
String gcVinNo = finBillTrailerVo.getGcVinNo(); if (oneBillMoney == null) {
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid()); }
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
}
//} //}
try { try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@ -961,15 +961,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
//查询业务信息 //查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
if ("003".equals(finBillApplication.getBillStateKey())) { bv.setModelId(finBillApplication.getProcDefId());
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
} else {
bv.setModelId(finBillApplication.getProcDefId());
}
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加 //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey())); variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加 //判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
@ -998,15 +994,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
//查询业务信息 //查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
if ("003".equals(finBillApplication.getBillStateKey())) { bv.setModelId(finBillApplication.getProcDefId());
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
} else {
bv.setModelId(finBillApplication.getProcDefId());
}
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加 //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey())); variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加 //判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
@ -1052,7 +1044,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加 //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey())); variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加 //判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
@ -1151,7 +1143,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
String businessTaskId = finBillApplication.getTaskId(); String businessTaskId = finBillApplication.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(finBillApplication.getCreateBySid())){ if (query.getUserSid().equals(finBillApplication.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -1162,7 +1154,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
updateFlowFiled(map); updateFlowFiled(map);
finBillVehicleService.updateByMainSid(finBillApplication.getSid()); finBillVehicleService.updateByMainSid(finBillApplication.getSid());
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
}else{ } else {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
@ -2097,7 +2089,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
for (FinBillVehicleDto finBillVehicle : finBillVehicles) { for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicle.getVehSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicle.getVehSid()).getData();
BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData(); BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData();
if (baseVehicleState == null){ if (baseVehicleState == null) {
return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择"); return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择");
} }
} }
@ -2232,14 +2224,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
bv.setOrgSidPath(finBillApplication.getOrgSidPath()); bv.setOrgSidPath(finBillApplication.getOrgSidPath());
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加 //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//======================================== //========================================
finBillApplication = fetchBySid(businessSid); finBillApplication = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
if (StringUtils.isBlank(finBillApplication.getProcDefId())){ if (StringUtils.isBlank(finBillApplication.getProcDefId())) {
flowProcessMapQuery.setProDefKey(bv.getModelId()); flowProcessMapQuery.setProDefKey(bv.getModelId());
}else { } else {
flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId()); flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
} }
flowProcessMapQuery.setVariables(variables); flowProcessMapQuery.setVariables(variables);
@ -2278,10 +2271,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null){ if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
}else { } else {
finVehicleInvoiceDto.setBusinessStateKey("005"); finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车"); finVehicleInvoiceDto.setBusinessState("欠款提车");
} }
@ -2401,6 +2394,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
bv.setOrgSidPath(finBillApplication.getOrgSidPath()); bv.setOrgSidPath(finBillApplication.getOrgSidPath());
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加 //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//======================================== //========================================
@ -2529,7 +2523,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
//查询业务信息 //查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId()); bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加 //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//======================================== //========================================
@ -2555,7 +2549,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
//查询业务信息 //查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId()); bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加 //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//======================================== //========================================
@ -2689,7 +2683,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
String businessTaskId = finBillApplication.getTaskId(); String businessTaskId = finBillApplication.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(finBillApplication.getCreateBySid())){ if (query.getUserSid().equals(finBillApplication.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -2713,7 +2707,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} }
baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
}else{ } else {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
@ -2888,6 +2882,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return resultBean; return resultBean;
} }
bv.setOrgSidPath(finBillApplication.getOrgSidPath()); bv.setOrgSidPath(finBillApplication.getOrgSidPath());
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加 //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是")); bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//======================================== //========================================
@ -2990,7 +2985,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillApplicationDetailsVo.setSaleDeptSid(deptSid); finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
finBillApplicationDetailsVo.setSaleDeptName(deptName); finBillApplicationDetailsVo.setSaleDeptName(deptName);
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(query.getContractNo()).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(query.getContractNo()).getData();
if (busSalesOrder != null){ if (busSalesOrder != null) {
finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey()); finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType()); finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());
} }
@ -3536,7 +3531,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String contractNo = finBillApplication.getContractNo(); String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加 //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey())); variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加 //判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData(); BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) { if (data != null) {
@ -3646,10 +3641,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null){ if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
}else { } else {
finVehicleInvoiceDto.setBusinessStateKey("005"); finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车"); finVehicleInvoiceDto.setBusinessState("欠款提车");
} }
@ -3756,7 +3751,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> photoList = new ArrayList<>(); List<String> photoList = new ArrayList<>();
List<String> imgList = new ArrayList<>(); List<String> imgList = new ArrayList<>();
FinBillApplication finBillApplication = fetchBySid(sid); FinBillApplication finBillApplication = fetchBySid(sid);
if (!"已办结".equals(finBillApplication.getNodeState())){ if (!"已办结".equals(finBillApplication.getNodeState())) {
return rb.setMsg("该申请尚未办结，无法下载"); return rb.setMsg("该申请尚未办结，无法下载");
} }
Map<String, Object> dataMap = new HashMap(); Map<String, Object> dataMap = new HashMap();
@ -3861,7 +3856,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
List<FinBillApplicationGcListVo> finBillApplicationGcListVos = new ArrayList<>(); List<FinBillApplicationGcListVo> finBillApplicationGcListVos = new ArrayList<>();
int gcId = 1; int gcId = 1;
if (!finBillTrailerVos.isEmpty()){ if (!finBillTrailerVos.isEmpty()) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
FinBillApplicationGcListVo finBillApplicationGcListVo = new FinBillApplicationGcListVo(); FinBillApplicationGcListVo finBillApplicationGcListVo = new FinBillApplicationGcListVo();
finBillApplicationGcListVo.setIdgc(gcId); finBillApplicationGcListVo.setIdgc(gcId);

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -15,7 +15,7 @@ public enum ProcDefEnum {
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:4:4505004"), FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:4:4505004"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"), QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:2:5100004"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),

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

@ -459,13 +459,15 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitInformationStateVo.setProofState(1); loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
} }
//证明文件-配偶 //证明文件-配偶
if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) { if (loanHomevisitInvestigateCustomerDetailsVo != null){
if (posfzImages == null || posfzImages.size() == 0) { if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0); if (posfzImages == null || posfzImages.size() == 0) {
} else if (pohkbImages == null || pohkbImages.size() == 0) { loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0); } else if (pohkbImages == null || pohkbImages.size() == 0) {
} else { loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
loanHomeVisitInvestigateInitInformationStateVo.setProofState(1); } else {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
}
} }
} }
//资产类 //资产类

12
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
View File

@ -25,6 +25,8 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.terminal.api.autoservice.retrieval; package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery;
@ -78,11 +80,21 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
return null; return null;
} }
@Override
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(String sid) {
return null;
}
@Override @Override
public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
return null; return null;
} }
@Override
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto billApplicationIInfoDto) {
return null;
}
@Override @Override
public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) { public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
return null; return null;

Write Preview
Loading…
Cancel
Save