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

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
bdf7bf02ed d16e8a1d20
commit
65dbf369ea
10 changed files with 200 additions and 133 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. 12
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java
  2. 274
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveInvoiceVo.java
  4. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java
  5. 29
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  6. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  7. 22
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单1.docx
  8. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单2.docx
  9. 29
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单3.docx
  10. 42
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单4.docx

12
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java
View File

@ -10,7 +10,7 @@ import lombok.Data;
*/
@Data
public class FinSelectVo {
private String receivablesSid;
@ApiModelProperty("款项名称")
private String receivablesName;
@ -23,4 +23,14 @@ public class FinSelectVo {
private String notSubscriptionMoney;
private String remarks;
@ApiModelProperty("付款时间")
private String subscriptionDate;
@ApiModelProperty("收款开户行")
private String collectionBank;
@ApiModelProperty("收款账户")
private String receivingName;
@ApiModelProperty("付款人")
private String payerName;
@ApiModelProperty("付款时间")
private String collectionDate;
}

274
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -82,9 +82,14 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
@ -204,6 +209,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private LoanSolutionsFeign loanSolutionsFeign;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
@Autowired
private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
/**
* 构造出库申请的查询条件
@ -258,13 +268,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
}
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuUrl())){
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getApplySid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
@ -285,17 +295,17 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bd.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("bd.createBySid",query.getApplySid());
}else{
} else if ("5".equals(orgLevelKey)) {
qw.eq("bd.createBySid", query.getApplySid());
} else {
PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
return p;
}
}else{
} else {
PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
return p;
}
}else{
} else {
qw.eq("bd.applySid", query.getApplySid());
}
}
@ -303,9 +313,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
IPage<BusDeliveredApplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<BusDeliveredApplyVo> records = pagging.getRecords();
for (BusDeliveredApplyVo record : records) {
if(query.getApplySid().equals(record.getCreateBySid())){
if (query.getApplySid().equals(record.getCreateBySid())) {
record.setAllowModify(true);
}else{
} else {
record.setAllowModify(false);
}
}
@ -726,7 +736,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean rb = ResultBean.fireFail();
BusDeliveredApply busDeliveredApply = fetchBySid(bv.getBusinessSid());
bv.setOrgSidPath(busDeliveredApply.getOrgSidPath());
Map<String,Object> variables = new HashMap<>();
Map<String, Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@ -736,24 +746,24 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
variables.put("app", appMap);
// variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
//根据合同号查询销售订单
if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if("2".equals(busSalesOrder.getFinancePlan())){
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if(detailsVoResultBean.getData() != null){
if("01".equals(detailsVoResultBean.getData().getTypeKey())){
if (detailsVoResultBean.getData() != null) {
if ("01".equals(detailsVoResultBean.getData().getTypeKey())) {
//自营非担保
variables.put("isDanBao",true);
}else{
variables.put("isDanBao",false);
variables.put("isDanBao", true);
} else {
variables.put("isDanBao", false);
}
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",true);
} else {
variables.put("isDanBao", true);
}
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@ -815,12 +825,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) {
String vinSid = busDeliveredApplyDetail.getVinSid();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(vinSid, busDeliveredApply.getContractNo()).getData();
if(finVehicleInvoice != null){
if (StringUtils.isNotBlank(finVehicleInvoice.getSid())){
if (finVehicleInvoice != null) {
if (StringUtils.isNotBlank(finVehicleInvoice.getSid())) {
finVehicleInvoiceFeign.updateBySid(finVehicleInvoice.getSid());
}
}
}
} else {
if ("重新提交".equals(bv.getComment())) {
@ -888,8 +898,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appBusHandoverPrepareVehicleDto.setVinNo(details.getVinNo());
appBusHandoverPrepareVehicleDto.setVinSid(details.getVinSid());
//根据合同编号和车辆sid查询
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),details.getVinSid());
BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(),busSalesOrderVehicle.getSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), details.getVinSid());
BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(), busSalesOrderVehicle.getSid());
appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription());
appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());
dtos.add(appBusHandoverPrepareVehicleDto);
@ -1196,10 +1206,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
if(StringUtils.isNotBlank(query.getBusinessSid())){
if (StringUtils.isNotBlank(query.getBusinessSid())) {
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
Map<String,Object> variables = new HashMap<>();
Map<String, Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@ -1208,25 +1218,25 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
// variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
//根据合同号查询销售订单
if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
//根据合同号查询销售订单
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if("2".equals(busSalesOrder.getFinancePlan())){
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if(detailsVoResultBean.getData() != null){
if("01".equals(detailsVoResultBean.getData().getTypeKey())){
if (detailsVoResultBean.getData() != null) {
if ("01".equals(detailsVoResultBean.getData().getTypeKey())) {
//自营非担保
variables.put("isDanBao",true);
}else{
variables.put("isDanBao",false);
variables.put("isDanBao", true);
} else {
variables.put("isDanBao", false);
}
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",true);
} else {
variables.put("isDanBao", true);
}
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@ -1234,7 +1244,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
}else{
} else {
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
}
@ -1254,10 +1264,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
if(StringUtils.isNotBlank(query.getBusinessSid())){
if (StringUtils.isNotBlank(query.getBusinessSid())) {
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
Map<String,Object> variables = new HashMap<>();
Map<String, Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
@ -1266,25 +1276,25 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
// variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
//根据合同号查询销售订单
if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
//根据合同号查询销售订单
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if("2".equals(busSalesOrder.getFinancePlan())){
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if(detailsVoResultBean.getData() != null){
if("01".equals(detailsVoResultBean.getData().getTypeKey())){
if (detailsVoResultBean.getData() != null) {
if ("01".equals(detailsVoResultBean.getData().getTypeKey())) {
//自营非担保
variables.put("isDanBao",true);
}else{
variables.put("isDanBao",false);
variables.put("isDanBao", true);
} else {
variables.put("isDanBao", false);
}
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",true);
} else {
variables.put("isDanBao", true);
}
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@ -1292,7 +1302,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
}else{
} else {
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
}
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@ -1327,25 +1337,25 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
// variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
//根据合同号查询销售订单
if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
//根据合同号查询销售订单
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if("2".equals(busSalesOrder.getFinancePlan())){
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if(detailsVoResultBean.getData() != null){
if("01".equals(detailsVoResultBean.getData().getTypeKey())){
if (detailsVoResultBean.getData() != null) {
if ("01".equals(detailsVoResultBean.getData().getTypeKey())) {
//自营非担保
variables.put("isDanBao",true);
}else{
variables.put("isDanBao",false);
variables.put("isDanBao", true);
} else {
variables.put("isDanBao", false);
}
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",true);
} else {
variables.put("isDanBao", true);
}
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@ -1428,25 +1438,25 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
// variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
//根据合同号查询销售订单
if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
//根据合同号查询销售订单
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if("2".equals(busSalesOrder.getFinancePlan())){
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if(detailsVoResultBean.getData() != null){
if("01".equals(detailsVoResultBean.getData().getTypeKey())){
if (detailsVoResultBean.getData() != null) {
if ("01".equals(detailsVoResultBean.getData().getTypeKey())) {
//自营非担保
variables.put("isDanBao",true);
}else{
variables.put("isDanBao",false);
variables.put("isDanBao", true);
} else {
variables.put("isDanBao", false);
}
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",true);
} else {
variables.put("isDanBao", true);
}
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
@ -1495,7 +1505,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
String businessTaskId = busDeliveredApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(busDeliveredApply.getCreateBySid())){
if (query.getUserSid().equals(busDeliveredApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -1508,7 +1518,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
return rb.success().setData(resultBean.getData());
}else{
} else {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
@ -1540,14 +1550,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
QueryWrapper<AppDeliveredApplyPageQuery> qw = new QueryWrapper<>();
String orgPath = pagerQuery.getParams().getOrgPath();
//========================================数据授权开始
if(StringUtils.isNotBlank(query.getMenuSid())){
if (StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
@ -1568,17 +1578,17 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bd.orgSidPath", orgSidPath);
} else if("5".equals(orgLevelKey)){
qw.eq("bd.createBySid",query.getUserSid());
}else{
} else if ("5".equals(orgLevelKey)) {
qw.eq("bd.createBySid", query.getUserSid());
} else {
PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
return p;
}
}else{
} else {
String orgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
@ -1592,16 +1602,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
IPage<AppDeliveredApplyPageVo> iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName());
List<AppDeliveredApplyPageVo> records = iPage.getRecords();
records.removeAll(Collections.singleton(null));
if(!records.isEmpty()){
for (AppDeliveredApplyPageVo appDeliveredApplyPageVo : records){
if(query.getUserSid().equals(appDeliveredApplyPageVo.getCreateBySid()) && appDeliveredApplyPageVo.isShowDelete()){
if (!records.isEmpty()) {
for (AppDeliveredApplyPageVo appDeliveredApplyPageVo : records) {
if (query.getUserSid().equals(appDeliveredApplyPageVo.getCreateBySid()) && appDeliveredApplyPageVo.isShowDelete()) {
appDeliveredApplyPageVo.setShowDelete(true);
}else{
} else {
appDeliveredApplyPageVo.setShowDelete(false);
}
if(query.getUserSid().equals(appDeliveredApplyPageVo.getCreateBySid()) && appDeliveredApplyPageVo.isShowUpdata()){
if (query.getUserSid().equals(appDeliveredApplyPageVo.getCreateBySid()) && appDeliveredApplyPageVo.isShowUpdata()) {
appDeliveredApplyPageVo.setShowUpdata(true);
}else{
} else {
appDeliveredApplyPageVo.setShowUpdata(false);
}
}
@ -1739,10 +1749,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
discountAll = discountAll.add(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
if (j == 0 || j == discountUse.size() - 1) {
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName()+busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
discountRemarks = discountRemarks.append(disInfo).append(",");
} else {
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName()+busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
discountRemarks = discountRemarks.append(disInfo);
}
}
@ -1885,10 +1895,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
discountAll = discountAll.add(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum())));
if (j == 0 || j == discountUse.size() - 1) {
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName()+busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
discountRemarks = discountRemarks.append(disInfo).append(",");
} else {
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName()+busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
String disInfo = busDeliveredDetailsDiscountsVo.getDiscountName() + busDeliveredDetailsDiscountsVo.getDiscountInfo() + "X" + busDeliveredDetailsDiscount.getGiveNum();
discountRemarks = discountRemarks.append(disInfo);
}
}
@ -2083,18 +2093,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//所有车辆与已出库或审批中的车辆集合查询出差集
busSidList.removeAll(applyBusSidList);
//根据合同编号以及车辆sid查询busVinSid
List<String> busVinSidList = baseMapper.selectByContractNoToVinSid(dto.getContractId(),vinSid);
List<String> busVinSidList = baseMapper.selectByContractNoToVinSid(dto.getContractId(), vinSid);
busSidList.removeAll(busVinSidList);
busVinSidList.removeAll(Collections.singleton(null));
if(busVinSidList.isEmpty()){
if (busVinSidList.isEmpty()) {
isTrue = true;
}
//是否是最后一批出库车辆
if(isTrue){
if (isTrue) {
//是否存在未赠送的套餐，如果存在则不允许提交
int num = baseMapper.selectNumByContractNo(dto.getContractId());
int orderNum = busSalesOrderDiscountService.selectByContractNo(dto.getContractId());
if(orderNum>num){
if (orderNum > num) {
return rb.setMsg("本次出库为该订单最后一批出库，还存在未赠送的套餐，不允许提交");
}
}
@ -2142,26 +2152,26 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
//根据合同号查询销售订单
if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if("2".equals(busSalesOrder.getFinancePlan())){
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
if(detailsVoResultBean.getData() != null){
if("01".equals(detailsVoResultBean.getData().getTypeKey())){
if (detailsVoResultBean.getData() != null) {
if ("01".equals(detailsVoResultBean.getData().getTypeKey())) {
//自营非担保
variables.put("isDanBao",true);
}else{
variables.put("isDanBao",false);
variables.put("isDanBao", true);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",false);
} else {
variables.put("isDanBao", false);
}
}else{
variables.put("isDanBao",true);
} else {
variables.put("isDanBao", true);
}
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -2265,7 +2275,37 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (receiveInvoiceVoResultBean.getData() != null) {
List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList();
List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList());
deliveredFinVo.setFinSelectVoList(voList);
voList.removeAll(Collections.singleton(null));
List<FinSelectVo> finSelectVos = new ArrayList<>();
if (!voList.isEmpty()) {
for (FinSelectVo finSelectVo : voList) {
String receivablesSid = finSelectVo.getReceivablesSid();
FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(receivablesSid).getData();
if (data != null) {
String collSid = data.getCollSid();
if (StringUtils.isNotBlank(data.getSubscriptionDate())) {
finSelectVo.setSubscriptionDate(data.getSubscriptionDate());
}
FinCollectionConfirmationDetailsVo confirmationDetailsVo = finCollectionConfirmationFeign.fetchBySid(collSid).getData();
if (null != confirmationDetailsVo) {
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionBank())) {
finSelectVo.setCollectionBank(confirmationDetailsVo.getCollectionBank());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getReceivingName())) {
finSelectVo.setReceivingName(confirmationDetailsVo.getReceivingName());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getPayerName())) {
finSelectVo.setPayerName(confirmationDetailsVo.getPayerName());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionDate())) {
finSelectVo.setCollectionDate(confirmationDetailsVo.getCollectionDate());
}
}
}
finSelectVos.add(finSelectVo);
}
}
deliveredFinVo.setFinSelectVoList(finSelectVos);
InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
if (invoiceVo != null) {
VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveInvoiceVo.java
View File

@ -14,6 +14,8 @@ import java.util.List;
@Data
public class ReceiveInvoiceVo {
private List<ReceiveSeleteVo> receiveSeleteVoList = new ArrayList<>();
private InvoiceVo invoiceVo;

14
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java
View File

@ -3,6 +3,8 @@ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author dimengzhe
* @Date 2023/4/19 14:18
@ -11,6 +13,7 @@ import lombok.Data;
@Data
public class ReceiveSeleteVo {
private String receivablesSid;
@ApiModelProperty("款项名称")
private String receivablesName;
@ -23,4 +26,15 @@ public class ReceiveSeleteVo {
private String notSubscriptionMoney;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("付款时间")
private String subscriptionDate;
@ApiModelProperty("收款开户行")
private String collectionBank;
@ApiModelProperty("收款账户")
private String receivingName;
@ApiModelProperty("付款人")
private String payerName;
@ApiModelProperty("付款时间")
private String collectionDate;
}

29
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -45,18 +45,18 @@
<select id="selectListAllVo"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.DetailsOfReceivablesAndUncollectedItemsVo">
<!-- SELECT *
FROM fin_uncollected_receivables_detailed
<where>
${ew.sqlSegment}
and length(busVinSid) > 0
</where>
order by id asc-->
<!-- SELECT *
FROM fin_uncollected_receivables_detailed
<where>
${ew.sqlSegment}
and length(busVinSid) > 0
</where>
order by id asc-->
SELECT distinct furd.sid,
furd.contractNo AS contractNo,
furd.receivablesName AS receivablesName,
furd.customerPhone AS customerPhone,
furd.customerName AS `customerName`,
furd.contractNo AS contractNo,
furd.receivablesName AS receivablesName,
furd.customerPhone AS customerPhone,
furd.customerName AS `customerName`,
furd.customerSid,
furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL (10, 2) ) AS currentReceivableMoney,
@ -64,12 +64,12 @@
furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
RIGHT(bv.linkNo, 8)) as VIN,
RIGHT(bv.linkNo, 8)) as VIN,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
0 as subscribedOf,
furd.sid as receivablesSid
0 as subscribedOf,
furd.sid as receivablesSid
FROM fin_uncollected_receivables_detailed furd
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN (
@ -161,6 +161,7 @@
<select id="receivedSelect" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo">
SELECT furd.receivablesName,
furd.reveivableMoney,
furd.sid as receivablesSid,
(
SELECT sum(subscriptionMoney)
FROM fin_selected_receivables_detailed

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

@ -51,7 +51,7 @@ public enum ProcDefEnum {
BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
BASETRAILEROUTAPPLY("挂车出库申请", "process_tkw6vhfw:1:1705004"),
FINFUNDSAPPLY("款项结转申请", "process_ypafrrvg:1:2257504"),
BUSHANDOVER("交车确认", "process_e8feloik:5:1747508"),
BUSHANDOVER("交车确认", "process_e8feloik:6:2675004"),
LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"),

22
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单1.docx
View File

@ -0,0 +1,22 @@
金融方案预估报价单
车型：
${model!}
融资项目：
${templateName!}
总期数
${period!}
前${times!}期月还
${previousRepay!}
剩余期数月还
${monthlyRepay!}
预计首期还款日
${returnTime!}
名义（留购）价款：
${nominalPrice!}
注：结清时需交纳此费用
客户签章：
年 月 日

23
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单2.docx
View File

@ -0,0 +1,23 @@
金融方案预估报价单
车型：
${model!}
融资项目：
${templateName!}
预估应收合计
${amountTotal!}
总期数
${period!}
前${times!}期月还
${previousRepay!}
剩余期数月还
${monthlyRepay!}
名义（留购）价款：
${nominalPrice!}
预计首期还款日
${returnTime!}
客户签章：
年 月 日

29
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单3.docx
View File

@ -0,0 +1,29 @@
金融方案预估报价单
车型：
${model!}
融资项目：
${templateName!}
预估应收合计
${amountTotal!}
贷款保证金
￥${bondAmounts!}
落户保证金
￥${depositSettle!}
保险保证金
￥${depositPremium!}
总期数
${period!}
前${times!}期月还
${previousRepay!}
剩余期数月还
${monthlyRepay!}
名义（留购）价款：
￥${nominalPrice!}
预计首期还款日
${returnTime!}
客户签章：
年 月 日

42
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单4.docx
View File

@ -0,0 +1,42 @@
金融方案预估报价单
车型：
${model!}
融资项目：
${templateName!}
预估应收合计：
${amountTotal!}
融资首付：
￥${downPayAmounts!}
贷款保证金：
￥${bondAmounts!}
服务费：
￥${serviceAmount!}
代收首年保险费：
￥${proxyPremium!}
落户保证金：
￥${depositSettle!}
补车价：
￥${vehOtherPrice!}
代收购置税：
￥${proxyPurchasetax!}
保险保证金：
￥${depositPremium!}
其他费用：
￥${otherAmount!}
代收意外险：
${proxyAccidentPremium!}
总期数：
${period!}
前${times!}期月还：
${previousRepay!}
剩余期数月还：
${monthlyRepay!}
名义（留购）价款：
￥${nominalPrice!}
预计首期还款日：
${returnTime!}
客户签章：
年 月 日
Write Preview
Loading…
Cancel
Save