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

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
9a6ba10707 7130405d40
commit
75f10f2ba5
7 changed files with 208 additions and 212 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. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  2. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  3. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
  4. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  5. 27
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  6. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  7. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

18
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
View File

@ -201,21 +201,27 @@
<select id="jyddkydjListPage"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
SELECT
fcc.sid,
fsrd.sid,
fcc.useOrgSid,
fcc.staffDeptName,
fcc.staffUserSid as staffSid,
fcc.staffUserSid AS staffSid,
fcc.staffName,
fcc.`billNo`,
fcc.`payerName`,
bd.`draweeMobile` as phone,
fsrd.`customerName`,
bd.`draweeMobile` AS phone,
fcc.collectionDate,
fcc.collectionMoney,
fcc.balance
(
fsrd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS balance
FROM
fin_collection_confirmation fcc
fin_selected_receivables_detailed fsrd
LEFT JOIN fin_collection_confirmation fcc
ON fcc.`sid` = fsrd.`collSid`
LEFT JOIN anrui_buscenter.`bus_deposit` bd
ON fcc.`busSid` = bd.`billSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = fsrd.`sid`
<where>
${ew.sqlSegment}
</where>

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -2782,15 +2782,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (fcc.collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (fcc.collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String collectionSmallMoney = query.getCollectionSmallMoney();
String collectionBigMoney = query.getCollectionBigMoney();
if (StringUtils.isNotBlank(collectionSmallMoney) && StringUtils.isNotBlank(collectionBigMoney)) {
qw.between("fcc.balance", collectionSmallMoney, collectionBigMoney);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName()));
}
qw.isNotNull("fcc.busSid");
qw.groupBy("fsrd.sid");
qw.having("balance >=", query.getCollectionSmallMoney()).having("balance <=", query.getCollectionBigMoney());
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
View File

@ -13,7 +13,7 @@
fa.`createByName`,
fa.`createTime`,
fa.`source`,
SUM(fv.`thisUseMoney`) AS carryForwardMoney,
COALESCE(SUM(fv.`thisUseMoney`), 0) AS carryForwardMoney,
fa.`remarks`,
fa.pdfPath AS downloadUrl,
fa.pdfPath AS tzsqPath

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
View File

@ -40,6 +40,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.*;
import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.FinFundsApplyNodeQuery;
@ -140,6 +142,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private OtherReceivableBillService otherReceivableBillService;
@Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
@ -596,7 +600,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath, sid);
updateYeBySid(sid);
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
@ -615,7 +618,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
custNo = busSalesOrderVehicle.getTemporaryNo();
}
jzCustNos.add(custNo);
}
@ -707,7 +710,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
updateYeBySid(businessSid);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxyskxVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) {
@ -864,7 +866,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
updateYeBySid(businessSid);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -919,7 +920,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -961,7 +961,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -985,7 +984,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
updateYeBySid(query.getBusinessSid());
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
@ -1049,10 +1047,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
String customerName = finFundsCarriedForwardVehDetailsVo.getCustomerName();
String draweeMobile = finFundsCarriedForwardVehDetailsVo.getDraweeMobile();
String custNo = getPrefix(finFundsCarriedForwardApply.getStaffSid(), customerName, draweeMobile);
jzCustNos.add(custNo);
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finSelectedReceivablesDetailed.getCustomerSid()).getData();
jzCustNos.add(crmCustomerTempVo.getCustomerNo());
}
jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
for (String jzCustNo : jzCustNos) {
@ -1101,7 +1098,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = finSelectedReceivablesDetailed.getContractNo() + busSalesOrderVehicle.getTemporaryNo();
custNo = busSalesOrderVehicle.getTemporaryNo();
}
jzCustNos.add(custNo);
}

27
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -303,8 +303,7 @@
FROM fin_selected_receivables_detailed
WHERE receivablesSid = #{ysSid}
AND auditState = 3
ORDER BY createTime DESC
LIMIT 1
ORDER BY createTime DESC LIMIT 1
</select>
<select id="selectUnSelectList" resultType="java.lang.String">
@ -351,7 +350,8 @@
<select id="noOutVehRecPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
SELECT ferd.sid,
SELECT
ferd.sid,
fcc.`useOrgSid`,
fcc.`staffDeptName`,
fcc.staffUserSid AS staffSid,
@ -364,16 +364,22 @@
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`,
ferd.balance AS reveivableMoney,
(
ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS reveivableMoney,
ferd.kxState AS state
FROM fin_selected_receivables_detailed ferd
FROM
fin_selected_receivables_detailed ferd
LEFT JOIN fin_collection_confirmation fcc
ON ferd.`collSid` = fcc.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND fcc.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid`
UNION
SELECT ferd.sid,
SELECT
ferd.sid,
ffcfa.useOrgSid,
ffcfa.saleDeptName AS staffDeptName,
ffcfa.staffSid,
@ -386,14 +392,19 @@
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`,
ferd.balance AS reveivableMoney,
(
ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0)
) AS reveivableMoney,
ferd.kxState AS state
FROM fin_selected_receivables_detailed ferd
FROM
fin_selected_receivables_detailed ferd
LEFT JOIN fin_funds_carried_forward_apply ffcfa
ON ferd.`collSid` = ffcfa.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON RIGHT(ferd.`VIN`, 8) = RIGHT(bv.`vinNo`, 8)
AND ffcfa.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid`
<where>
${ew.sqlSegment}
</where>

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -585,23 +585,17 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("ferd.VIN", query.getVinNo());
}
String balanceSmallMoney = query.getBalanceSmallMoney();
String balanceBigMoney = query.getBalanceBigMoney();
if (StringUtils.isNotBlank(balanceSmallMoney) && StringUtils.isNotBlank(balanceBigMoney)) {
qw.between("ferd.balance", balanceSmallMoney, balanceBigMoney);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("ffcfa.saleDeptName",query.getName()).or().like("ffcfa.staffName",query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
}
qw.groupBy("ferd.sid");
qw.having("reveivableMoney >=",query.getBalanceSmallMoney()).having("reveivableMoney <=",query.getBalanceBigMoney());
IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
String useOrgSid = record.getUseOrgSid();
String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
record.setUseOrgName(useOrgName);
if (StringUtils.isBlank(record.getReveivableMoney())){
record.setReveivableMoney(record.getSubscriptionMoney());
}
}
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
return p;

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
View File

@ -399,16 +399,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
List<String> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : data1) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardImages.add(filePath);
idCardImages.add(commonAppendixVo.getFilePath());
}
for (CommonAppendixVo commonAppendixVo : data2) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
comFkFiles.add(filePath);
comFkFiles.add(commonAppendixVo.getFilePath());
}
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>();
@ -418,10 +412,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
commonAppendixSelectQuery3.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data3 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery3).getData();
for (CommonAppendixVo commonAppendixVo : data3) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
idCardPeoImages.add(filePath);
idCardPeoImages.add(commonAppendixVo.getFilePath());
}
loanPreloanCreditPeoDetailsVo.setIdCardImages(idCardPeoImages);
}

Write Preview
Loading…
Cancel
Save