Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 1 month ago
parent
commit
d64cbfd435
  1. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  2. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmisdelivery/StkMisDelivery.java
  4. 153
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  5. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  6. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java
  7. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java
  8. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApply.java
  9. 14
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyFeign.java
  10. 46
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyPdfVo.java
  11. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundFeignFallback.java
  12. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java
  13. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
  14. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java
  15. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyRest.java
  16. 193
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
  17. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java
  18. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml
  19. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java
  20. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java
  21. 33
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml
  22. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java
  23. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java
  24. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -24,6 +24,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous;
import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
@ -371,4 +372,10 @@ public interface FinKingDeeFeign {
@ResponseBody
ResultBean<String> draftStkMiscellaneous(@RequestBody @Valid StkMiscellaneous stkMiscellaneous);
@ApiOperation("其它出库单保存接口")
@PostMapping("/draftStkMisDelivery")
@ResponseBody
ResultBean<String> draftStkMisDelivery(@RequestBody @Valid StkMisDelivery stkMisDelivery);
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@ -24,6 +24,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous;
import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
@ -340,5 +341,10 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<String> draftStkMisDelivery(StkMisDelivery stkMisDelivery) {
return null;
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmisdelivery/StkMisDelivery.java

@ -32,7 +32,7 @@ public class StkMisDelivery {
@Data
public class StkMisDeliveryEntry {
public static class StkMisDeliveryEntry {
//物料编码
private String FMATERIALID;

153
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -75,6 +75,7 @@ import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.SceneCodeEnum;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
@ -87,6 +88,10 @@ import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCred
import com.yxt.anrui.fin.fegin.as.asbusrepairbill.AsBusrepairBillFeign;
import com.yxt.anrui.fin.fegin.as.asbusrepairbill.FinBusrepairBillVo;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.anrui.portal.api.sysmapping.SysMappingListInfoQuery;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -110,6 +115,8 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDe
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeign;
import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign;
import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@ -147,6 +154,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@ -219,6 +227,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private AsBusrepairBillFeign asBusrepairBillFeign;
@Autowired
private ScmVehRebateFeign scmVehRebateFeign;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private SysMappingFeign sysMappingFeign;
@Autowired
private LoanRestoreReportApplyFeign loanRestoreReportApplyFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -4364,6 +4378,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
collectionAfterVoucher.setUseOrgCode(organizationVo.getOrgCode());
}
List<CollectionVoucher.CollectionVoucherDetail> collectionAfterVoucherDetails = new ArrayList<>();
//----------------------------------------------------------
//--------------------------推送赎回款
Voucher voucher = new Voucher();
if(organizationVo != null){
voucher.setAccountBook(organizationVo.getOrgCode());
voucher.setVoucherNo(organizationVo.getOrgCode());
}
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
AtomicReference<List<Voucher.VoucherResultDetailDto>> resultRef =
new AtomicReference<>(voucherResultDetailDtos);
//===========================================
//查询该申请下的所有待审核的款项明细
BigDecimal subscriptionMoneyAll = new BigDecimal("0");
@ -4633,6 +4658,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate);
voucherDetails.add(d);
}
if("收回车辆费用".equals(v.getReceivablesName())){
resultRef.set(getAll(finalConfirmation, v, collectionDate));
}
});
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
@ -4665,9 +4693,134 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
collectionAfterVoucher.setVoucherDetails(collectionAfterVoucherDetails);
finKingDeeFeignRest.saveFeeVoucher(collectionAfterVoucher);
}
if(resultRef.get() != null){
voucherResultDetailDtos = resultRef.get();
if(!voucherResultDetailDtos.isEmpty()){
voucher.setResultDetails(voucherResultDetailDtos);
finKingDeeFeignRest.saveVoucher(voucher);
}
}
return rb.success().setMsg("款项确认成功");
}
private List<Voucher.VoucherResultDetailDto> getAll(FinCollectionConfirmation finalConfirmation, FinSelectedReceivablesDetailedVo v, String collectionDate) {
List<Voucher.VoucherResultDetailDto> list = new ArrayList<>();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finalConfirmation.getCreateDeptSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
String customerNumber = "";
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
if (salesOrder != null && busSalesOrderVehicle != null) {
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
}
bdCustomer.setTOrgIds(deptVo.getOrgCode());
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
String vinNo = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
linkNo = busSalesOrderVehicle.getLinkNo();
}
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
}
} else {
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
ResultBean<String> resultBean = finKingDeeFeignRest.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
}
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
String payType = "";
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData();
if (null != dictCommonVo) {
SysMappingListInfoQuery query = new SysMappingListInfoQuery();
query.setDictSid(dictCommonVo.getSid());
List<SysMappingInfoVo> data = sysMappingFeign.selectMappingListInfo(query).getData();
if (!data.isEmpty()) {
SysMappingInfoVo sysMappingInfoVo = data.get(0);
payType = sysMappingInfoVo.getMap_itemKey();
}
}
//--收款-赎回款(yyyy-MM-dd)
BigDecimal all = new BigDecimal(v.getSubscriptionMoney());
if (all.compareTo(BigDecimal.ZERO) != 0) {
voucherResultDetailDtoJf.setSummary("收款-赎回款"+"(" + collectionDate + ")");
voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
voucherResultDetailDtoJf.setDebit(all.toString());
list.add(voucherResultDetailDtoJf);
}
//-----出纳收款确认后-资金占用费
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyFeign.getAlrepaidAndArr2(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
BigDecimal zjzyfMoney = BigDecimal.ZERO;
String zjzyf = alrepaidAndArrVo.getWheFundOccMoney();
zjzyfMoney = new BigDecimal(StringUtils.isBlank(zjzyf) ? "0" : zjzyf);
if (zjzyfMoney.compareTo(BigDecimal.ZERO) != 0) {
voucherResultDetailDtoDf.setSummary("收款-赎回款");
voucherResultDetailDtoDf.setSubjectNo("1201.02.03");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf.setCredit(zjzyfMoney.toString());
list.add(voucherResultDetailDtoDf);
voucherResultDetailDtoJf2.setSummary("资金占用费转收入");
voucherResultDetailDtoJf2.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoJf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoJf2.setCredit(zjzyfMoney.toString());
list.add(voucherResultDetailDtoJf2);
voucherResultDetailDtoDf3.setSummary("资金占用费转收入");
voucherResultDetailDtoDf3.setSubjectNo("6002.01.17");
//核算部门
voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf3.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf3.setCredit(zjzyfMoney.toString());
list.add(voucherResultDetailDtoDf3);
}
BigDecimal allM = BigDecimal.ZERO;
allM = all.subtract(zjzyfMoney);
if(allM.compareTo(BigDecimal.ZERO)>0){
voucherResultDetailDtoDf2.setSummary("收款-赎回款");
voucherResultDetailDtoDf2.setSubjectNo("1201.03.01");
//核算部门
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
//核算客户
voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
voucherResultDetailDtoDf2.setCredit(allM.toString());
list.add(voucherResultDetailDtoDf2);
}
return list;
}
//名义价其他费用推财务
private CollectionVoucher.CollectionVoucherDetail getBalanceMoneyVoucher(FinSelectedReceivablesDetailedVo v, String collectionDate) {
String planSid = "";

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -29,6 +29,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous;
import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
import com.yxt.anrui.fin.api.kingdee.voucher.*;
import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService;
@ -56,6 +57,7 @@ import com.yxt.anrui.fin.biz.kingdee.salesreturn.SalesReturnOrdersService;
import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService;
import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService;
import com.yxt.anrui.fin.biz.kingdee.stkmiscellaneous.StkMiscellaneousService;
import com.yxt.anrui.fin.biz.kingdee.stkmisdelivery.StkMisDeliveryService;
import com.yxt.anrui.fin.biz.kingdee.stktransferdirect.StkTransferDirectService;
import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
@ -220,6 +222,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Autowired
private StkMiscellaneousService stkMiscellaneousService;
@Autowired
private StkMisDeliveryService stkMisDeliveryService;
@ApiOperation("入账暂存应付单的接口")
@PostMapping("/draftEntryBill")
@ -2019,6 +2023,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
return stkMiscellaneousService.draftStkMiscellaneous(stkMiscellaneous);
}
@Override
public ResultBean<String> draftStkMisDelivery(StkMisDelivery stkMisDelivery) {
log.info("FinKingDeeFeignRest-draftStkMisDelivery:{}", JSONObject.toJSONString(stkMisDelivery));
return stkMisDeliveryService.draftStkMisDelivery(stkMisDelivery);
}
@ApiOperation("暂存收款单的接口")
@PostMapping("/draftArReceivebill")
@ResponseBody

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java

@ -38,6 +38,9 @@ public class StkMisDeliveryService extends FinKingDeeService {
map_fEntityModel_.put("FDate", sdf.format(new Date()));
}
map_fEntityModel_.put("FBaseCurrId", "PRE001");
map_fEntityModel_.put("FOwnerIdHead",stkMisDelivery.getFOwnerIdHead());
map_fEntityModel_.put("FDEPTID",stkMisDelivery.getFDEPTID());
map_fEntityModel_.put("FNOTE",stkMisDelivery.getFNOTE());
List<StkMisDelivery.StkMisDeliveryEntry> stkMiscellaneousEntryList =
stkMisDelivery.getStkMisDeliveryEntry() == null ? new ArrayList<>() : stkMisDelivery.getStkMisDeliveryEntry();
//准备 物料列表的数据
@ -74,7 +77,7 @@ public class StkMisDeliveryService extends FinKingDeeService {
m.put("FUnitID", c.getFUnitID());
m.put("FSTOCKID", c.getFSTOCKID());
m.put("FOWNERID", c.getFOWNERID());
m.put("FKEEPERID", c.getFOWNERID());
mapList.add(m);
}
return rb.success().setData(mapList);

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/PushCaseDto.java

@ -30,6 +30,10 @@ public class PushCaseDto {
private String loanSid;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("贷款人身份证号")
private String loanId;
@ApiModelProperty("贷款人户籍地址")
private String loanAddress;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApply.java

@ -30,6 +30,8 @@ public class LoanOutboundApply extends BaseEntity {
private String dept;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请编号")
private String billNo;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")

14
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyFeign.java

@ -2,8 +2,6 @@ package com.yxt.anrui.riskcenter.api.loanoutboundapply;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*;
import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinListQuery;
import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinListVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -17,12 +15,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "交回车辆出库申请")
@FeignClient(
contextId = "anrui-riskcenter-LoanOutboundApply",
@ -31,7 +23,6 @@ import java.util.List;
fallback = LoanOutboundFeignFallback.class)
public interface LoanOutboundApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<LoanOutboundApplyVo>> listPage(@RequestBody PagerQuery<LoanOutboundApplyQuery> pq);
@ -46,12 +37,15 @@ public interface LoanOutboundApplyFeign {
@ResponseBody
public ResultBean<String> updateOutbound(@RequestBody LoanUpdateApplyDto dto);
@ApiOperation("详情查看")
@GetMapping("outboundDetails")
@ResponseBody
public ResultBean<LoanOutboundApplyInit> outboundDetails(@RequestParam("sid") String sid);
@ApiOperation("生成pdf")
@PostMapping("/createPdf")
@ResponseBody
ResultBean<String> createPdf(@RequestParam("sid") String sid, @RequestParam("userName") String userName);
//------------------------------流程接口----------------------------------------------

46
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundApplyPdfVo.java

@ -0,0 +1,46 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanoutboundapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class LoanOutboundApplyPdfVo implements Vo {
private Integer id;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String cph;
@ApiModelProperty("车辆类型")
private String lx;
@ApiModelProperty("车型")
private String cx;
@ApiModelProperty("库存地点")
private String dd;
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoutboundapply/LoanOutboundFeignFallback.java

@ -35,6 +35,11 @@ public class LoanOutboundFeignFallback implements LoanOutboundApplyFeign {
return null;
}
@Override
public ResultBean<String> createPdf(String sid, String userName) {
return null;
}
@Override
public ResultBean submitRecordApplication(SubmitOutboundDto dto) {
return null;

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java

@ -122,4 +122,9 @@ public interface LoanRestoreReportApplyFeign {
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody LoanRestoreReportDelegateQuery query);
@ApiOperation(value = "查询车辆费用相关")
@GetMapping(value = "/getAlrepaidAndArr2")
public ResultBean<AlrepaidAndArrVo> getAlrepaidAndArr2(String busVinSid);
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java

@ -79,6 +79,6 @@ public interface LoanHomevisitInvestigateCustomerMapper extends BaseMapper<LoanH
@Select("select * from loan_homevisit_investigate_customer where mainSid = #{mainSid}")
LoanHomevisitInvestigateCustomerDetailsVo selectByMainSid(String mainSid);
@Select("select * from loan_homevisit_investigate_customer where borrowerSid = #{saleOrderBorrowerSid}")
@Select("select * from loan_homevisit_investigate_customer where borrowerSid = #{saleOrderBorrowerSid} limit 1")
LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid);
}

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@ -28,6 +28,7 @@ import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseDto;
import com.yxt.anrui.riskcenter.api.loancaseprogress.PushCaseVehDto;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
import com.yxt.anrui.riskcenter.api.loanlawsuitapply.*;
import com.yxt.anrui.riskcenter.api.loanlawsuitapply.app.AppLawsuitDetailsVo;
import com.yxt.anrui.riskcenter.api.loanlawsuitapply.app.AppVehListVo;
@ -47,6 +48,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesAp
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.biz.loancaseprogress.LoanCaseProgressService;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService;
import com.yxt.anrui.riskcenter.biz.loanlawsuitveh.LoanLawsuitVehService;
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
@ -100,6 +102,8 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
private LoanLawsuitVehService loanLawsuitVehService;
@Autowired
private LoanCaseProgressService loanCaseProgressService;
@Autowired
private LoanHomevisitInvestigateCustomerService loanHomevisitInvestigateCustomerService;
public PagerVo<LoanContractVehList> loanContractListPage(PagerQuery<LoanContractVehQuery> pq) {
IPage<LoanContractVehList> page = PagerUtil.queryToPage(pq);
@ -713,6 +717,9 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
}
pushCaseDto.setVehList(vehList);
}
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(lawsuitApply.getLoanSid());
pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
loanCaseProgressService.pushCase(pushCaseDto);
} else {
//极光推送

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyRest.java

@ -50,6 +50,13 @@ public class LoanOutboundApplyRest implements LoanOutboundApplyFeign {
return loanOutboundApplyService.outboundDetails(sid);
}
@Override
public ResultBean<String> createPdf(String sid, String userName) {
ResultBean rb = ResultBean.fireFail();
String pdf = loanOutboundApplyService.createPdf(sid, userName);
return rb.success().setData(pdf);
}
@Override
public ResultBean submitRecordApplication(SubmitOutboundDto dto) {
return loanOutboundApplyService.submitRecordApplication(dto);

193
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@ -2,16 +2,16 @@ package com.yxt.anrui.riskcenter.biz.loanoutboundapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@ -21,6 +21,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -35,27 +36,22 @@ import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundVinListVo;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh;
import com.yxt.anrui.riskcenter.api.loansubletapply.*;
import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletVinListVo;
import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh;
import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanoutboundveh.LoanOutboundVehService;
import com.yxt.anrui.riskcenter.biz.loanredemptionapply.LoanRedemptionApplyService;
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
import com.yxt.anrui.riskcenter.biz.loansubletveh.LoanSubletVehService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.ConstantUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -66,6 +62,8 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
import static java.util.Comparator.comparing;
/**
* @description:
* @author: fzz
@ -79,14 +77,10 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private LoanRepaymentHistoryService loanRepaymentHistoryService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private LoanBuckleApplyRecordService loanBuckleApplyRecordService;
@Autowired
private LoanFileService loanFileService;
@Autowired
private FileUploadComponent fileUploadComponent;
@ -97,23 +91,15 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
private LoanOutboundVehService loanOutboundVehService;
@Autowired
private LoanRedemptionApplyService loanRedemptionApplyService;
private MessageListFeign messageListFeign;
@Autowired
private LoanSubletVehService loanSubletVehService;
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
@Autowired
private LoanOutboundVehService loanOutboundVehService;
private FinKingDeeFeign finKingDeeFeign;
public PagerVo<LoanOutboundApplyVo> listPage(PagerQuery<LoanOutboundApplyQuery> pq) {
IPage<LoanOutboundApply> page = PagerUtil.queryToPage(pq);
@ -589,7 +575,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
//修改销售订单车辆表风控状态和资金占用费状态
BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
List<String> busVinSidList = loanOutboundVehService.selectByMainSid(businessSid);
if(busVinSidList.isEmpty()){
if(!busVinSidList.isEmpty()){
busVinStateSetQuery.setBusVinSidList(busVinSidList);
if("客户赎回".equals(loanOutboundApply.getDisposal())){
busVinStateSetQuery.setState(2);
@ -603,6 +589,24 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}*/else if("二次销售".equals(loanOutboundApply.getDisposal())){
//ToDo:
}
//推送金蝶财务其他出库单
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
LoanOutboundApply finalLoanOutboundApply = loanOutboundApply;
Future future1 = pool.submit(() -> {
//推送其他出库单
//TOdO:
pushStkOut(finalLoanOutboundApply,busVinSidList);
});
} catch (Exception e) {
e.printStackTrace();
}
@ -640,6 +644,32 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}
}
public void pushStkOut(LoanOutboundApply loanOutboundApply,List<String> busVinSidList) {
SysOrganizationVo sysOrg = sysOrganizationFeign.fetchBySid(loanOutboundApply.getUseOrgSid()).getData();
StkMisDelivery stkMisDelivery = new StkMisDelivery();
List<StkMisDelivery.StkMisDeliveryEntry> stkMiscellaneousEntryList = new ArrayList<>();
SysOrganizationVo sysOrgDept = sysOrganizationFeign.fetchBySid(loanOutboundApply.getDeptSid()).getData();
stkMisDelivery.setFStockOrgId(sysOrg.getOrgCode());
stkMisDelivery.setFDEPTID(sysOrgDept.getOrgCode());
stkMisDelivery.setFNOTE("");
stkMisDelivery.setFDate(DateUtil.today());
stkMisDelivery.setFOwnerIdHead(sysOrg.getOrgCode());
for (int i = 0; i < busVinSidList.size(); i++) {
StkMisDelivery.StkMisDeliveryEntry stkMisDeliveryEntry = new StkMisDelivery.StkMisDeliveryEntry();
LoanOutboundVeh loanOutboundVeh = loanOutboundVehService.selectByMainSidAndBusVinSid(loanOutboundApply.getSid(),busVinSidList.get(i));
stkMisDeliveryEntry.setFMATERIALID(loanOutboundVeh.getVinNo());
stkMisDeliveryEntry.setFUnitID("liang");
stkMisDeliveryEntry.setFSTOCKID("ARZSCK");
stkMisDeliveryEntry.setFOWNERID(sysOrg.getOrgCode());
stkMiscellaneousEntryList.add(stkMisDeliveryEntry);
stkMisDelivery.setStkMisDeliveryEntry(stkMiscellaneousEntryList);
}
ResultBean resultBean = finKingDeeFeign.draftStkMisDelivery(stkMisDelivery);
}
/**
* 撤回
*
@ -976,4 +1006,107 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
}
public String createPdf(String sid, String userName) {
LoanOutboundApplyInit data = outboundDetails(sid).getData();
Map<String, Object> dataMap = new HashMap<String, Object>();
LoanOutboundApply loanOutboundApply = fetchBySid(sid);
//分公司
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(data.getOrgPath()).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
dataMap.put("orgName", sysOrganizationVo.getName());
//创建部门
dataMap.put("deptName", data.getDept());
//创建人
dataMap.put("createName", data.getApplyName());
//创建日期
dataMap.put("createTime", data.getApplyDate());
//办结日期
dataMap.put("finishTime", DateUtil.formatDate(loanOutboundApply.getClosingDate()));
//审批编号
dataMap.put("billNo", loanOutboundApply.getBillNo());
List<LoanOutboundApplyPdfVo> loanOutboundApplyPdfVos = new ArrayList<>();
//循环获取车辆信息
Integer i = 1;
for (OutboundVinList outboundVinList : data.getVinList()) {
LoanOutboundApplyPdfVo loanOutboundApplyPdfVo = new LoanOutboundApplyPdfVo();
loanOutboundApplyPdfVo.setId(i);
i = i + 1;
loanOutboundApplyPdfVo.setVinNo(outboundVinList.getVinNo());
loanOutboundApplyPdfVo.setCph(outboundVinList.getVehMark());
loanOutboundApplyPdfVo.setLx(outboundVinList.getVehType());
loanOutboundApplyPdfVo.setCx(outboundVinList.getVehModel());
loanOutboundApplyPdfVo.setDd(outboundVinList.getLocation());
loanOutboundApplyPdfVos.add(loanOutboundApplyPdfVo);
}
dataMap.put("wlList", loanOutboundApplyPdfVos);
dataMap.put("cz", data.getDisposal());
dataMap.put("czh", data.getDisposalContractNo());
dataMap.put("name", data.getNewCustomer());
dataMap.put("sjh", data.getPhoneNum());
dataMap.put("ckj", data.getAmount());
dataMap.put("remarks", data.getRemarks());
//获取审批记录
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignSp.flowRecordAndComment(loanOutboundApply.getProcInstId(), "1").getData();
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
if (flowTask.getFlowableRecordVo() != null) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String comment1 = (String) comment.get("comment");
finPaymentrecordSourceLCVo.setName(assigneeName);
finPaymentrecordSourceLCVo.setComment(comment1);
finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString());
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
} else {
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo();
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString());
finPaymentrecordSourceLCVo.setComment(processCommentVo.get("content").toString());
finPaymentrecordSourceLCVo.setSpsj(processCommentVo.get("time").toString());
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
}
}
List<Message> messages = messageFeign.selectByBusinessSid(data.getSid()).getData();
if (messages.size() > 0) {
for (Message message : messages) {
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
String receiverNames = "";
List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData();
if (messageLists.size() > 0) {
for (MessageList messageList : messageLists) {
receiverNames = receiverNames + messageList.getReceiverName() + ",";
}
}
finPaymentrecordSourceLCVo.setName("系统");
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf(",")));
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
}
}
finPaymentrecordSourceLCVos.sort(comparing(FinPaymentrecordSourceLCVo::getSpsj));
dataMap.put("lcList", finPaymentrecordSourceLCVos);
//下载人
dataMap.put("downName", userName);
//下载时间
dataMap.put("downTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//获取模板
//模板路径
String sourcePath = "D:\\anrui\\upload\\template\\";
//生成word文件名
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
// 生成文件路径
String targetPath = sourcePath + dateStr;
WordUtils.creatWord(dataMap, "jhclck", sourcePath, targetPath, typeName);
//新生成的word路径
String wordPath = targetPath + "\\" + typeName;
//生成出门证文件名
String pdfName = "交回车辆出库审批_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
return "/template/" + dateStr + "/" + pdfName;
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java

@ -19,4 +19,6 @@ public interface LoanOutboundVehMapper extends BaseMapper<LoanOutboundVeh> {
List<OutboundVinList> selByMainSid(@Param("mainSid") String mainSid);
List<String> selectByMainSid(String businessSid);
LoanOutboundVeh selectByMainSidAndBusVinSid(@Param("mainSid") String sid, @Param("busVinSid") String s);
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml

@ -18,4 +18,8 @@
from loan_out_bound_veh
where mainSid = #{businessSid}
</select>
<select id="selectByMainSidAndBusVinSid" resultType="com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh">
select * from loan_out_bound_veh where mainSid = #{mainSid} and busVinSid = #{busVinSid}
</select>
</mapper>

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java

@ -29,4 +29,8 @@ public class LoanOutboundVehService extends MybatisBaseService<LoanOutboundVehMa
public List<String> selectByMainSid(String businessSid) {
return baseMapper.selectByMainSid(businessSid);
}
public LoanOutboundVeh selectByMainSidAndBusVinSid(String sid, String s) {
return baseMapper.selectByMainSidAndBusVinSid(sid,s);
}
}

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java

@ -66,6 +66,7 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreRepo
String getDqyqje(String saleVehSid);
String getQzzjzyf(String saleVehSid);
String getQzzjzyf2(String saleVehSid);
String getYqjehsqs(String saleVehSid);

33
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@ -149,6 +149,39 @@
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())
</select>
<select id="getQzzjzyf2" resultType="java.lang.String">
SELECT
sum( a.fund ) AS fund_sum
FROM
(
SELECT
( fjj.reveivableMoney - fjj.m ) AS fund,
lp.busVinSid
FROM
(
SELECT
IFNULL((
SELECT
SUM( subscriptionMoney )
FROM
anrui_fin.fin_selected_receivables_detailed AS s
WHERE
s.auditState = '3'
AND s.receivablesSid = fj.sid
),
0
) AS m,
fj.*
FROM
( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
) AS fjj
LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
where lp.dueDate &lt;= lp.updateTime and lp.busVinSid = #{saleVehSid}
GROUP BY
lp.busVinSid
) a
</select>
<select id="getYqjehsqs" resultType="java.lang.String">
SELECT
ROUND(

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java

@ -138,4 +138,11 @@ public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign {
public ResultBean delegate(LoanRestoreReportDelegateQuery query) {
return loanRestoreReportApplyService.delegate(query);
}
@Override
public ResultBean<AlrepaidAndArrVo> getAlrepaidAndArr2(String busVinSid){
ResultBean<AlrepaidAndArrVo> rb = ResultBean.fireFail();
AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
return rb.success().setData(alrepaidAndArrVo);
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@ -682,7 +682,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
String dqyqje = baseMapper.getDqyqje2(saleVehSid);
alrepaidAndArrVo.setCurrentBeMoney(dqyqje);
//其中资金占用费
String qzzjzyf = baseMapper.getQzzjzyf(saleVehSid);
String qzzjzyf = baseMapper.getQzzjzyf2(saleVehSid);
alrepaidAndArrVo.setWheFundOccMoney(qzzjzyf);
//未到期金额
String wdqje = baseMapper.getWdqje(saleVehSid);

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@ -1040,7 +1040,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
SolutionsDetailsVo solutionsDetailsVo = new SolutionsDetailsVo();
LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(businessSid);
if (loanSolutions == null) {
return rb;
return rb.setMsg("暂无金融方案");
}
BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo);
if (StringUtils.isNotBlank(loanSolutions.getPolicySid())) {

Loading…
Cancel
Save