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

款项结转问题优化

master
God 2 years ago
parent
4779809d91
commit
62b2cd46bd
22 changed files with 291 additions and 164 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. 2
      anrui-base/anrui-base-biz/src/main/resources/application-devv.yml
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
  3. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  4. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  5. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.java
  6. 261
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  7. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java
  8. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml
  9. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java
  10. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  11. 19
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  12. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  13. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
  14. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json
  15. 2
      anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml
  16. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java
  17. 7
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java
  18. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
  19. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java
  20. 42
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
  21. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml
  22. 0
      工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl

2
anrui-base/anrui-base-biz/src/main/resources/application-devv.yml
View File

@ -25,5 +25,5 @@ image:
upload:
path: D:\\anrui\\upload\\
url:
prefix: http://127.0.0.1:8111/upload/
prefix: http://192.168.1.104:8111/upload/

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java
View File

@ -3,7 +3,7 @@ package com.yxt.anrui.fin.api.kingdee;
public enum KingDeeBillId {
AP_PAYABLE("AP_Payable", "应付单"),
AR_RECEIVABLE("AR_receivable", "应收单"),
AR_OTHERRECEIVABLE("AR_OTHERRECEIVABLE", "其他应收单"),
AR_OTHERRECEIVABLE("AR_OtherRecAble", "其他应收单"),
AP_PAYBILL("AP_PAYBILL", "付款单"),
AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"),
STK_INSTOCK("STK_InStock", "采购入库单"),

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

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

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

@ -2761,7 +2761,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return p;
}
}
qw.gt("fcc.balance", 0);
if (StringUtils.isNotBlank(query.getStaffDeptName())) {
qw.like("fcc.staffDeptName", query.getStaffDeptName());
}
@ -2786,8 +2785,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
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());
qw.groupBy("fcc.sid");
if (StringUtils.isNotBlank(query.getCollectionSmallMoney()) && StringUtils.isNotBlank(query.getCollectionBigMoney())){
qw.having("balance > 0").having("balance >= {0}", query.getCollectionSmallMoney()).having("balance <= {0}", query.getCollectionBigMoney());
}else {
qw.having("balance > 0");
}
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();

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

@ -73,4 +73,7 @@ public interface FinFundsCarriedForwardApplyMapper extends BaseMapper<FinFundsCa
@Update("update fin_funds_carried_forward_apply set pdfPath = #{pdfPath} where sid = #{businessSid}")
void updatePathBySid(@Param("pdfPath") String pdfPath,@Param("businessSid") String businessSid);
@Update("update fin_funds_carried_forward_apply set nodeState = #{nodeState} where sid = #{sid}")
void updateNodeStateBySid(@Param("nodeState") String nodeState,@Param("sid") String sid);
}

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

@ -53,13 +53,11 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -147,8 +145,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
private OtherReceivableBillService otherReceivableBillService;
@Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
@Autowired
private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
FinFundsCarriedForwardApplyQuery query = pq.getParams();
@ -292,7 +288,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
appFinFundsCarriedForwardYXYSKXVo.setPayTypeKey(finSelectedReceivablesDetailedVo.getPayTypeKey());
appFinFundsCarriedForwardYXYSKXVo.setUseOrgSid(finSelectedReceivablesDetailedVo.getUseOrgSid());
appFinFundsCarriedForwardYXYSKXVo.setSubscribedOf(finSelectedReceivablesDetailedVo.getSubscribedOf());
appFinFundsCarriedForwardYXYSKXVo.setSid(finSelectedReceivablesDetailedVo.getCollSid());
appFinFundsCarriedForwardYXYSKXVo.setSid(finSelectedReceivablesDetailedVo.getSid());
String currentReceivableMoney = finSelectedReceivablesDetailedVo.getCurrentReceivableMoney();
String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney();
BigDecimal surplusReceivable = new BigDecimal(currentReceivableMoney).subtract(new BigDecimal(subscriptionMoney));
@ -600,39 +596,49 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos1 = data.getYxysFinFundsCarriedForwardYXYSKXVos();
String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath, sid);
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
List<String> jzCustNos = new ArrayList<>();
List<String> ysCustNos = new ArrayList<>();
List<Map<String,String>> jzCustNos = new ArrayList<>();
List<Map<String,String>> ysCustNos = new ArrayList<>();
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos1) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
String custNo = "";
if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
Map<String, String> map = new HashMap<>();
custNo = finSelectedReceivablesDetailed.getContractNo();
map.put("type","全款");
map.put("custNo",custNo);
jzCustNos.add(map);
} else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = busSalesOrderVehicle.getTemporaryNo();
Map<String, String> map = new HashMap<>();
map.put("type","贷款");
map.put("custNo",custNo);
jzCustNos.add(map);
}
jzCustNos.add(custNo);
}
jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
for (String jzCustNo : jzCustNos) {
for (Map jzCustNo : jzCustNos) {
String custNo = (String) jzCustNo.get("custNo");
OtherReceivable otherReceivable = new OtherReceivable();
otherReceivable.setCommUnit(jzCustNo);
otherReceivable.setCommUnit(custNo);
otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
List<String> stringList;
if (jzCustNo.get("type").equals("全款")){
stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}else {
custNo = custNo.substring(0, custNo.length() - 2);
stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}
for (String s : stringList) {
OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
collectionDetailDto.setExTaxMoney(jzMoney);
collectionDetailDto.setExTaxMoney(s);
collectionDetailDtoList.add(collectionDetailDto);
}
otherReceivable.setCollectionDetails(collectionDetailDtoList);
otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos1) {
@ -640,26 +646,45 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
String custNo = "";
if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
custNo = finSelectedReceivablesDetailed.getContractNo();
Map<String, String> map = new HashMap<>();
map.put("type","全款");
map.put("custNo",custNo);
ysCustNos.add(map);
} 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();
Map<String, String> map = new HashMap<>();
map.put("type","贷款");
map.put("custNo",custNo);
ysCustNos.add(map);
}
ysCustNos.add(custNo);
}
ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
for (String ysCustNo : ysCustNos) {
for (Map ysCustNo : ysCustNos) {
OtherReceivable otherReceivable = new OtherReceivable();
otherReceivable.setCommUnit(ysCustNo);
String custNo = (String)ysCustNo.get("custNo");
otherReceivable.setCommUnit(custNo);
otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
List<String> stringList;
if (ysCustNo.get("type").equals("全款")){
stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}else {
custNo = custNo.substring(0, custNo.length() - 2);
stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}
for (String s : stringList) {
OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
collectionDetailDto.setExTaxMoney("-" + jzMoney);
collectionDetailDto.setExTaxMoney("-" + s);
collectionDetailDtoList.add(collectionDetailDto);
}
otherReceivable.setCollectionDetails(collectionDetailDtoList);
otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
//baseMapper.updateNodeStateBySid("已办结",finFundsCarriedForwardApply.getSid());
return rb.success();
}
}
@ -715,14 +740,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, appFinFundsCarriedForwardYXYSKXVo.getSid());
}
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@ -868,14 +885,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
updateFlowFiled(map);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@ -922,16 +931,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
}
return rb.success().setData(resultBean.getData());
}
}
@ -963,16 +962,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
updateFlowFiled(map);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
}
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
@ -986,16 +975,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
updateFlowFiled(map);
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())) {
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
if (finUncollectedReceivablesDetailed != null) {
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
}
return rb.success().setData(resultBean.getData());
}
}
@ -1042,102 +1021,166 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());
}
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
List<String> jzCustNos = new ArrayList<>();
List<String> ysCustNos = new ArrayList<>();
List<Map<String,String>> jyddNos = new ArrayList<>();
List<Map<String,String>> jzCustNos = new ArrayList<>();
List<Map<String,String>> ysCustNos = new ArrayList<>();
if ("简易订单订金".equals(finFundsCarriedForwardApply.getSource())) {
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos1 = finFundsCarriedForwardVehService.fetchByMainSidAndGroupCustPhone(finFundsCarriedForwardApply.getSid());
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos1) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finSelectedReceivablesDetailed.getCustomerSid()).getData();
jzCustNos.add(crmCustomerTempVo.getCustomerNo());
Map<String, String> map = new HashMap<>();
map.put("custSid",crmCustomerTempVo.getSid());
map.put("custNo",crmCustomerTempVo.getCustomerNo());
jyddNos.add(map);
}
jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
for (String jzCustNo : jzCustNos) {
jyddNos = jyddNos.stream().distinct().collect(Collectors.toList());
for (Map<String, String> jyddNo : jyddNos) {
OtherReceivable otherReceivable = new OtherReceivable();
otherReceivable.setCommUnit(jzCustNo);
String custNo = jyddNo.get("custNo");
otherReceivable.setCommUnit(custNo);
otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
String custSid = jyddNo.get("custSid");
List<String> stringList = finFundsCarriedForwardVehService.fetchJzMoneyByCustSidAndMainSid(custSid, finFundsCarriedForwardApply.getSid());
for (String s : stringList) {
OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
collectionDetailDto.setExTaxMoney(jzMoney);
collectionDetailDto.setExTaxMoney(s);
collectionDetailDtoList.add(collectionDetailDto);
}
otherReceivable.setCollectionDetails(collectionDetailDtoList);
otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
String custNo = "";
if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
custNo = finSelectedReceivablesDetailed.getContractNo();
Map<String, String> map = new HashMap<>();
map.put("type","全款");
map.put("custNo",custNo);
ysCustNos.add(map);
} 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();
Map<String, String> map = new HashMap<>();
map.put("type","贷款");
map.put("custNo",custNo);
ysCustNos.add(map);
}
ysCustNos.add(custNo);
}
ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
for (String ysCustNo : ysCustNos) {
for (Map ysCustNo : ysCustNos) {
OtherReceivable otherReceivable = new OtherReceivable();
otherReceivable.setCommUnit(ysCustNo);
String custNo = (String)ysCustNo.get("custNo");
otherReceivable.setCommUnit(custNo);
otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
List<String> stringList;
if (ysCustNo.get("type").equals("全款")){
stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}else {
custNo = custNo.substring(0, custNo.length() - 2);
stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}
for (String s : stringList) {
OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
collectionDetailDto.setExTaxMoney("-" + jzMoney);
collectionDetailDto.setExTaxMoney("-" + s);
collectionDetailDtoList.add(collectionDetailDto);
}
otherReceivable.setCollectionDetails(collectionDetailDtoList);
otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
} else if ("已认款".equals(finFundsCarriedForwardApply.getSource())) {
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo.getBusSid());
for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo2 : finFundsCarriedForwardVehDetailsVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(finFundsCarriedForwardVehDetailsVo2.getBusSid());
String custNo = "";
if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
Map<String, String> map = new HashMap<>();
custNo = finSelectedReceivablesDetailed.getContractNo();
map.put("type","全款");
map.put("custNo",custNo);
jzCustNos.add(map);
} else {//贷款
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finSelectedReceivablesDetailed.getUseOrgSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finSelectedReceivablesDetailed.getContractNo(), baseVehicle.getSid()).getData();
custNo = busSalesOrderVehicle.getTemporaryNo();
Map<String, String> map = new HashMap<>();
map.put("type","贷款");
map.put("custNo",custNo);
jzCustNos.add(map);
}
jzCustNos.add(custNo);
}
jzCustNos = jzCustNos.stream().distinct().collect(Collectors.toList());
for (String jzCustNo : jzCustNos) {
for (Map jzCustNo : jzCustNos) {
String custNo = (String) jzCustNo.get("custNo");
OtherReceivable otherReceivable = new OtherReceivable();
otherReceivable.setCommUnit(jzCustNo);
otherReceivable.setCommUnit(custNo);
otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
List<String> stringList;
if (jzCustNo.get("type").equals("全款")){
stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}else {
custNo = custNo.substring(0, custNo.length() - 2);
stringList = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}
for (String s : stringList) {
OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
jzCustNo = jzCustNo.substring(0, jzCustNo.length() - 2);
String jzMoney = finFundsCarriedForwardVehService.fetchJzMoneyByContractNoAndMainSid(jzCustNo, finFundsCarriedForwardApply.getSid());
collectionDetailDto.setExTaxMoney(jzMoney);
collectionDetailDto.setExTaxMoney(s);
collectionDetailDtoList.add(collectionDetailDto);
}
otherReceivable.setCollectionDetails(collectionDetailDtoList);
otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo2 : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo2.getSid());
String custNo = "";
if ("1".equals(finSelectedReceivablesDetailed.getPayTypeKey())) {//全款
custNo = finSelectedReceivablesDetailed.getContractNo();
Map<String, String> map = new HashMap<>();
map.put("type","全款");
map.put("custNo",custNo);
ysCustNos.add(map);
} 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();
Map<String, String> map = new HashMap<>();
map.put("type","贷款");
map.put("custNo",custNo);
ysCustNos.add(map);
}
ysCustNos.add(custNo);
}
ysCustNos = ysCustNos.stream().distinct().collect(Collectors.toList());
for (String ysCustNo : ysCustNos) {
for (Map ysCustNo : ysCustNos) {
OtherReceivable otherReceivable = new OtherReceivable();
otherReceivable.setCommUnit(ysCustNo);
String custNo = (String)ysCustNo.get("custNo");
otherReceivable.setCommUnit(custNo);
otherReceivable.setCollectionOrg(sysOrganizationVo2.getOrgCode());
otherReceivable.setBussDate(DateUtil.formatDate(new Date()));
List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
List<String> stringList;
if (ysCustNo.get("type").equals("全款")){
stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}else {
custNo = custNo.substring(0, custNo.length() - 2);
stringList = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(custNo, finFundsCarriedForwardApply.getSid());
}
for (String s : stringList) {
OtherReceivable.CollectionDetailDto collectionDetailDto = new OtherReceivable.CollectionDetailDto();
collectionDetailDto.setDearDept(sysOrganizationVo1.getOrgCode());
ysCustNo = ysCustNo.substring(0, ysCustNo.length() - 2);
String jzMoney = finSelectedReceivablesDetailedService.fetchJzMoneyByContractNoAndMainSid(ysCustNo, finFundsCarriedForwardApply.getSid());
collectionDetailDto.setExTaxMoney("-" + jzMoney);
collectionDetailDto.setExTaxMoney("-" + s);
collectionDetailDtoList.add(collectionDetailDto);
}
otherReceivable.setCollectionDetails(collectionDetailDtoList);
otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java
View File

@ -79,5 +79,7 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
List<FinFundsCarriedForwardVehDetailsVo> fetchByMainSidAndGroupCustPhone(String sid);
String fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid);
List<String> fetchJzMoneyByContractNoAndMainSid(@Param("jzCustNo") String jzCustNo,@Param("sid") String sid);
List<String> fetchJzMoneyByCustSidAndMainSid(@Param("custSid") String custSid,@Param("sid") String sid);
}

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml
View File

@ -58,9 +58,16 @@
</select>
<select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
SELECT SUM(ffc.`thisUseMoney`) AS jzMoney
SELECT ffc.`thisUseMoney` AS jzMoney
FROM fin_funds_carried_forward_veh ffc
WHERE ffc.busBillNo = #{jzCustNo}
AND ffc.mainSid = #{sid}
</select>
<select id="fetchJzMoneyByCustSidAndMainSid" resultType="java.lang.String">
SELECT ffc.`thisUseMoney` AS jzMoney
FROM fin_funds_carried_forward_veh ffc
WHERE ffc.customerSid = #{custSid}
AND ffc.mainSid = #{sid}
</select>
</mapper>

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java
View File

@ -166,7 +166,11 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
return baseMapper.fetchByMainSidAndGroupCustPhone(sid);
}
public String fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) {
public List<String> fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) {
return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid);
}
public List<String> fetchJzMoneyByCustSidAndMainSid(String custSid, String sid) {
return baseMapper.fetchJzMoneyByCustSidAndMainSid(custSid,sid);
}
}

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

@ -156,7 +156,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
@Update("update fin_selected_receivables_detailed set balance = #{balance} where sid = #{busSid}")
void updateYeBySid(@Param("balance") String balance,@Param("busSid") String busSid);
String fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid);
List<String> fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid);
String selectBalanceByReceivedSid(String receivablesSid);

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

@ -352,6 +352,7 @@
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
SELECT
ferd.sid,
fcc.createBySid AS createBySid,
fcc.`useOrgSid`,
fcc.`staffDeptName`,
fcc.staffUserSid AS staffSid,
@ -377,9 +378,13 @@
AND fcc.`useOrgSid` = bv.`createOrgSid`
LEFT JOIN `fin_funds_carried_forward_veh` ffc
ON ffc.`busSid` = ferd.`sid`
<where>
${ew.SqlSegment}
</where>
UNION
SELECT
ferd.sid,
ffcfa.createBySid AS createBySid,
ffcfa.useOrgSid,
ffcfa.saleDeptName AS staffDeptName,
ffcfa.staffSid,
@ -410,13 +415,6 @@
</where>
</select>
<select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
SELECT SUM(fsr.`subscriptionMoney`) AS jzMoney
FROM fin_selected_receivables_detailed fsr
WHERE fsr.`contractNo` = #{ysCustNo}
AND fsr.`collSid` = #{sid}
</select>
<select id="selectBalanceByReceivedSid"
resultType="java.lang.String">
select ifnull(sum(balance), 0)
@ -482,4 +480,11 @@
having dbalance &lt;= 0
order by furd.contractNo desc
</select>
<select id="fetchJzMoneyByContractNoAndMainSid" resultType="java.lang.String">
SELECT fsr.subscriptionMoney AS jzMoney
FROM fin_selected_receivables_detailed fsr
WHERE fsr.`contractNo` = #{ysCustNo}
AND fsr.`collSid` = #{sid}
</select>
</mapper>

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

@ -525,6 +525,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
FinSelectedReceivablesPaymentDetailsWCKCLRKQuery query = pagerQuery.getParams();
QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw = new QueryWrapper<>();
//========================================数据授权开始
String orgLevelKey = "";
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@ -541,7 +542,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("fcc.orgSidPath", orgSidPath);
@ -555,7 +556,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("fcc.createBySid", query.getUserSid());
//qw.eq("fcc.createBySid", query.getUserSid());
} else {
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
return p;
@ -589,7 +590,16 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
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());
if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && !"5".equals(orgLevelKey)){
qw.having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney());
}else if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){
qw.having("createBySid = {0}",query.getUserSid()).having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney());
}else if (StringUtils.isBlank(query.getBalanceSmallMoney()) && StringUtils.isBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){
qw.having("createBySid = {0}",query.getUserSid());
}else {
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
return p;
}
IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
@ -609,7 +619,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return baseMapper.selectBalanceByReceivedSid(receivablesSid);
}
public String fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
public List<String> fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid);
}
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java
View File

@ -27,12 +27,22 @@ public class OtherReceivableBillService extends FinKingDeeService {
//业务表的主表数据集合
Map<String,String> map_fEntityModel_=new HashMap<>();
//物料的数组集合
//业务日期
if(otherReceivable.getBussDate()==null){
return rb.setMsg("业务日期不能为空");
}
//业务日期
map_fEntityModel_.put("FDATE",otherReceivable.getBussDate());
//客户
if(otherReceivable.getCommUnit()==null){
return rb.setMsg("客户编码不能为空");
}
map_fEntityModel_.put("FCONTACTUNIT",otherReceivable.getCommUnit());
//收款组织
if(otherReceivable.getCollectionOrg()==null){
return rb.setMsg("收款组织不能为空");
}
map_fEntityModel_.put("FPAYORGID",otherReceivable.getCollectionOrg());
map_fEntityModel_.put("FSETTLEORGID",otherReceivable.getCollectionOrg());
List<OtherReceivable.CollectionDetailDto> collectionDetails = otherReceivable.getCollectionDetails()==null?new ArrayList<>(): otherReceivable.getCollectionDetails();
//准备 物料列表的数据
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json
View File

@ -1,4 +1,4 @@
{
"formId": "AR_OTHERRECEIVABLE",
"formId": "AR_OtherRecAble",
"data": "@KD_data"
}

2
anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml
View File

@ -25,7 +25,7 @@ image:
upload:
path: D:\\anrui\\upload\\
url:
prefix: http://192.168.1.112:8111/upload/
prefix: http://192.168.1.104:8111/upload/
login:
path: D:\\images\\pic-click
config:

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java
View File

@ -61,6 +61,11 @@ public interface LoanPreloanCreditApplyFeign {
@ResponseBody
public ResultBean submitSave(@RequestBody LoanPreloanCreditApplyDto dto);
@ApiOperation("金融内勤确认")
@PostMapping("/finStaffConfirm")
@ResponseBody
public ResultBean finStaffConfirm(@RequestBody LoanPreloanCreditApplyDto dto);
@ApiOperation("公司风控提交")
@PostMapping("/submitCompanyRisk")
@ResponseBody

7
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java
View File

@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.api.loanpreloancreditapply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Component;
@Component
@ -49,11 +50,17 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/save无法访问");
}
@ApiOperation("提交保存")
@Override
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
return null;
}
@Override
public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
return null;
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return null;

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
View File

@ -54,6 +54,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
@Update("update loan_preloan_credit_apply set capitalBalance = #{capitalBalance},zffkjg = #{zfshjg},zfshDate = #{zfshDate},zfshRemarks = #{zfshRemarks} where sid=#{dtoSid}")
void submitCapitalRisk(@Param("dtoSid") String dtoSid, @Param("zfshjg") String zfshjg, @Param("zfshDate") String zfshDate, @Param("zfshRemarks") String zfshRemarks, @Param("capitalBalance") String capitalBalance);
@Update("update loan_preloan_credit_apply set state = 0 where sid = #{sid}")
void updateStateBySid(String sid);
@Update("update loan_preloan_credit_apply set state = #{state} where sid = #{sid}")
void updateStateBySid(@Param("sid") String sid,@Param("state") Integer state);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java
View File

@ -67,11 +67,17 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("提交保存")
@Override
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.submitSave(dto);
}
@Override
public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.finStaffConfirm(dto);
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return loanPreloanCreditApplyService.submitCompanyRisk(dto);

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

@ -188,7 +188,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
return p;
}
}
qw.eq("state", 0);
qw.ne("state", 1);
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
@ -362,7 +362,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
return rb.setMsg("保存失败");
}
String sid = stringResultBean.getData();
baseMapper.updateStateBySid(sid);
baseMapper.updateStateBySid(sid,0);
return rb.success();
}
@ -388,22 +388,32 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
LoanPreloanCreditApply entity = fetchBySid(sid);
LoanPreloanCreditApplyDetailsVo vo = new LoanPreloanCreditApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
CommonAppendixSelectQuery commonAppendixSelectQuery1 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery1.setLinkSid(sid);
commonAppendixSelectQuery1.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery1).getData();
CommonAppendixSelectQuery commonAppendixSelectQuery2 = new CommonAppendixSelectQuery();
commonAppendixSelectQuery2.setLinkSid(sid);
commonAppendixSelectQuery2.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery2).getData();
CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
commonAppendixSelectQuery.setLinkSid(sid);
commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode());
List<CommonAppendixVo> data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode());
List<CommonAppendixVo> data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
List<CommonAppendixVo> data4 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode());
List<CommonAppendixVo> data5 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData();
List<String> idCardImages = new ArrayList<>();
List<String> comFkFiles = new ArrayList<>();
List<String> gsQueryResults = new ArrayList<>();
List<String> zfQueryResults = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : data1) {
idCardImages.add(commonAppendixVo.getFilePath());
}
for (CommonAppendixVo commonAppendixVo : data2) {
comFkFiles.add(commonAppendixVo.getFilePath());
}
for (CommonAppendixVo commonAppendixVo : data4) {
gsQueryResults.add(commonAppendixVo.getFilePath());
}
for (CommonAppendixVo commonAppendixVo : data5) {
zfQueryResults.add(commonAppendixVo.getFilePath());
}
List<LoanPreloanCreditPeoDetailsVo> loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid);
List<String> idCardPeoImages = new ArrayList<>();
for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) {
@ -419,6 +429,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
vo.setIdCardImages(idCardImages);
vo.setComFkFiles(comFkFiles);
vo.setLoanPreloanCreditPeos(loanPreloanCreditPeoDetailsVos);
vo.setGsQueryResults(gsQueryResults);
vo.setZfQueryResults(zfQueryResults);
return vo;
}
@ -470,4 +482,14 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
return rb.success();
}
public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
if (!stringResultBean.getSuccess()) {
return rb.setMsg("保存失败");
}
String sid = stringResultBean.getData();
baseMapper.updateStateBySid(sid,2);
return rb.success();
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml
View File

@ -24,4 +24,4 @@ image:
upload:
path: D:\\anrui\\upload\\
url:
prefix: http://192.168.1.112:8111/upload/
prefix: http://192.168.1.104:8111/upload/

0
工作内容需要的文档/单据模板/款项结转打印模板/kqjz.ftl → 工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl
View File

Write Preview
Loading…
Cancel
Save