Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
ba340e3cd1
  1. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java
  2. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java
  3. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java
  4. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java
  5. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java
  6. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  7. 144
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  8. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
  9. 102
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  10. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  11. 17
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  12. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml
  13. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
  14. 36
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  15. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  16. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  17. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  18. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java
  19. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  20. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  21. 47
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  22. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
  23. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json
  24. 62
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/remarks.txt
  25. 20
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java
  26. 39
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java
  27. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitZLVo.java
  28. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java
  29. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java
  30. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFile.java
  31. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileAllDto.java
  32. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileDetailsVo.java
  33. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileDto.java
  34. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java
  35. 40
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  36. 44
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
  37. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
  38. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
  39. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
  40. 235
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  41. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml
  42. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java
  43. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  44. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java
  45. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.xml
  46. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
  47. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
  48. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
  49. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java
  50. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java
  51. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java
  52. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java
  53. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java
  54. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java
  55. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java
  56. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java
  57. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java
  58. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java
  59. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java

@ -40,4 +40,9 @@ public class AppBusDeliveredPageVo implements Vo {
@ApiModelProperty("车架号集合")
private List<AppVinListVo> vinList;
private String loanSid;
private String loanName;
@ApiModelProperty("是否显示贷款人")
private boolean showLoan;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@ -107,4 +107,7 @@ public class AppDeliveredDetailsVo implements Vo {
@ApiModelProperty("是否开票(1开票,0不开票)")
private String hasInvoice;
@ApiModelProperty("是否开票是否有禁止修改")
private boolean forbidInvoiceChoice;
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java

@ -89,6 +89,11 @@ public interface BusDeliveredFeign {
@ResponseBody
public ResultBean<PagerVo<AppBusDeliveredPageVo>> getRetrievalNotList(@RequestBody PagerQuery<AppBusDeliveredPageQuery> pq);
@ApiOperation("移动端-获取待出库列表")
@PostMapping("/getRetrievalNotList2")
@ResponseBody
public ResultBean<PagerVo<AppBusDeliveredPageVo>> getRetrievalNotList2(@RequestBody PagerQuery<AppBusDeliveredPageQuery> pq);
@ApiOperation("移动端-初始化 出库申请 待出库进入")
@PostMapping("/getRetrievalApplyInfo")
@ResponseBody

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java

@ -82,6 +82,11 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign {
return null;
}
@Override
public ResultBean<PagerVo<AppBusDeliveredPageVo>> getRetrievalNotList2(PagerQuery<AppBusDeliveredPageQuery> pq) {
return null;
}
@Override
public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
return null;

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java

@ -20,4 +20,6 @@ public class DeliverDetailsQuery {
private List<String> vinSelectsid = new ArrayList<>();
@ApiModelProperty("补充车辆sid:pc需要的")
private List<String> vinSids = new ArrayList<>();
private String loanSid;
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.busdelivered.*;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -104,8 +107,15 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<AppBusDeliveredPageVo> getRetrievalNotListNew(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<AppBusDeliveredPageVo> getRetrievalNotListNew2(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<UnDeliverVo> unListPage(IPage<BusDelivered> page, @Param(Constants.WRAPPER) QueryWrapper<BusDelivered> qw);
IPage<BusDeliveredPageVo2> getRetrievalNotListQk(IPage<BusDeliveredPageVo2> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
LoanHomevisitInvestigate selectByBorrowSidAndOrder(@Param("borrowerSid") String borrowerSid, @Param("salesOrderSid") String salesOrderSid);
LoanHomevisitInvestigateOtherpeo selectVisitSid(String sid);
LoanHomevisitInvestigateCustomer selectCustomer(String sid);
}

144
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@ -373,6 +373,86 @@
order by bo.contractNo desc-->
</select>
<select id="getRetrievalNotListNew2" resultMap="listMaps3">
select a.* from (SELECT
bo.contractNo,
bo.customerName AS name,
bo.payType paymentMethod,
bbv.vehicleState,
bv.borrowerSid as loanSid,
bv.borrowName as loanName,
false showLoan
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
and bo.payTypeKey = '1'
<if test="name != null and name != ''">
and concat(IFNULL(bo.contractNo
, '')
, ifnull(bo.`customerName`
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND (saleTypeKey = '1' and (finState = '1' OR carryVehicleState = '1' )))
AND bbv.vehicleState != '0002'
</where>
GROUP BY
bo.contractNo
union all
SELECT
bo.contractNo,
bo.customerName AS name,
bo.payType paymentMethod,
bbv.vehicleState,
bv.borrowerSid loanSid,
bv.borrowName loanName,
true showLoan
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
and bo.payTypeKey = '2'
<if test="name != null and name != ''">
and concat(IFNULL(bo.contractNo
, '')
, ifnull(bo.`customerName`
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND (saleTypeKey = '2' and invoiceApplyState = '1'))
AND bbv.vehicleState != '0002'
</where>
GROUP BY
bo.contractNo,ifnull(bv.borrowerSid,'')
)a ORDER BY
a.contractNo DESC
</select>
<select id="getRetrievalNotListQk" resultMap="listMaps2">
select a.* from (SELECT
bo.contractNo,
@ -421,6 +501,15 @@
</collection>
</resultMap>
<resultMap id="listMaps3" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="paymentMethod" jdbcType="VARCHAR" property="paymentMethod"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
select="vinLists3" column="{contractNo=contractNo,loanSid=loanSid}">
</collection>
</resultMap>
<resultMap id="listMaps2" type="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredPageVo2">
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
@ -454,6 +543,46 @@
AND (( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )) or (saleTypeKey = '2' and invoiceApplyState = '1')))
</select>
<select id="vinLists3" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo} and bbv.vehicleState != '0002' and bo.payTypeKey = '1'
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND ( saleTypeKey = '1' and (finState = '1' OR carryVehicleState = 1 )))
union all
select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo} and bbv.vehicleState != '0002' and bo.payTypeKey = '2'
<if test = "loanSid != '' and loanSid != null">
and bv.borrowerSid = #{loanSid}
</if>
<if test = "loanSid == '' or loanSid == null">
and (bv.borrowerSid = '' or bv.borrowerSid is null)
</if>
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND (saleTypeKey = '2' and invoiceApplyState = '1'))
</select>
<select id="vinLists2" resultType="com.yxt.anrui.buscenter.api.busdelivered.VinListVo2">
select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
FROM
@ -500,4 +629,19 @@
order by bo.contractNo desc,bv.id desc) a
</select>
<select id="selectVisitSid"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo">
select * from anrui_riskcenter.loan_homevisit_investigate_otherpeo where mainSid = #{sid}
</select>
<select id="selectByBorrowSidAndOrder"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate">
select * from anrui_riskcenter.loan_homevisit_investigate where saleOrderSid = #{salesOrderSid} and saleOrderBorrowerSid = #{borrowerSid}
</select>
<select id="selectCustomer"
resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer">
select * from anrui_riskcenter.loan_homevisit_investigate_customer where mainSid = #{sid}
</select>
</mapper>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java

@ -114,6 +114,13 @@ public class BusDeliveredRest implements BusDeliveredFeign {
return rb.success().setData(voIPage);
}
@Override
public ResultBean<PagerVo<AppBusDeliveredPageVo>> getRetrievalNotList2(PagerQuery<AppBusDeliveredPageQuery> pq) {
ResultBean rb = ResultBean.fireFail();
IPage<AppBusDeliveredPageVo> voIPage = busDeliveredService.getRetrievalNotListNew2(pq);
return rb.success().setData(voIPage);
}
@Override
public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
return busDeliveredService.getRetrievalApplyInfo(query);

102
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@ -48,6 +48,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@ -57,6 +58,7 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet
import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
@ -69,6 +71,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -135,6 +140,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
private FileUploadComponent fileUploadComponent;
@Autowired
private BusBillApplicationService busBillApplicationService;
@Autowired
private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
/**
* 待出库车辆分页列表
@ -297,6 +304,26 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
return iPage;
}
public IPage<AppBusDeliveredPageVo> getRetrievalNotListNew2(PagerQuery<AppBusDeliveredPageQuery> pq) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
String name = pq.getParams().getName();
IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
String orgPath = pq.getParams().getOrgPath();
String orgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
}
qw.eq("bo.useOrgSid", orgSid);
if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
qw.eq("bo.createBySid", pq.getParams().getUserSid());
}
IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotListNew2(page, qw, name);
return iPage;
}
/* public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
String name = pq.getParams().getName();
@ -396,6 +423,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
appDeliveredDetailsVo.setPaymentMethodKey(appOrderDetailsVo.getPayTypeKey());
if ("2".equals(appDeliveredDetailsVo.getPaymentMethodKey())) {
appDeliveredDetailsVo.setShowLoanUser(true);
appDeliveredDetailsVo.setForbidInvoiceChoice(true);
appDeliveredDetailsVo.setHasInvoice("否");
appDeliveredDetailsVo.setHasInvoiceKey("0");
}
//客户名称
appDeliveredDetailsVo.setName(appOrderDetailsVo.getName());
@ -433,6 +463,12 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
appCarListVo.setVinSid(list.get(i));
appDeliveredDetailsVo.setLoanSid(busSalesOrderVehicle.getBorrowerSid());
appDeliveredDetailsVo.setLoanName(busSalesOrderVehicle.getBorrowName());
if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(busSalesOrderVehicle.getBorrowerSid());
appDeliveredDetailsVo.setLoanMobile(busSalesOrderBorrower.getMobile());
}
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
@ -457,6 +493,51 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
appCarListVo.setDiscountUse(discountList);
BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
//查询实际购车人
LoanHomevisitInvestigate loanHomevisitInvestigate = baseMapper.selectByBorrowSidAndOrder(busSalesOrderVehicle.getBorrowerSid(),busSalesOrderVehicle.getSalesOrderSid());
if(loanHomevisitInvestigate != null){
LoanHomevisitInvestigateOtherpeo loanHomevisitInvestigateOtherpeo = baseMapper.selectVisitSid(loanHomevisitInvestigate.getSid());
if(loanHomevisitInvestigateOtherpeo != null){
appDeliveredDetailsVo.setTypeKey("2");
appDeliveredDetailsVo.setType("其他人");
}
LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.selectCustomer(loanHomevisitInvestigate.getSid());
if(loanHomevisitInvestigateCustomer != null){
appDeliveredDetailsVo.setTypeKey("1");
appDeliveredDetailsVo.setType("贷款人");
}
if (!query.isPcView()) {
if ("2".equals(appDeliveredDetailsVo.getTypeKey())) {//其他人
deliveredUseMessagesVo.setMobile(loanHomevisitInvestigateOtherpeo.getMobile());
deliveredUseMessagesVo.setCustomerType("个人");
deliveredUseMessagesVo.setCustomerTypeKey("1");
deliveredUseMessagesVo.setAddress(loanHomevisitInvestigateOtherpeo.getPeoPreAddress());
deliveredUseMessagesVo.setName(loanHomevisitInvestigateOtherpeo.getPeoName());
deliveredUseMessagesVo.setIdNumber(loanHomevisitInvestigateOtherpeo.getIdNumber());
}
} else {
if ("2".equals(appDeliveredDetailsVo.getTypeKey())) {//其他人
deliveredUseMessagesVo.setMobile(loanHomevisitInvestigateOtherpeo.getMobile());
deliveredUseMessagesVo.setCustomerType("个人");
deliveredUseMessagesVo.setCustomerTypeKey("1");
deliveredUseMessagesVo.setAddress(loanHomevisitInvestigateOtherpeo.getPeoPreAddress());
deliveredUseMessagesVo.setName(loanHomevisitInvestigateOtherpeo.getPeoName());
deliveredUseMessagesVo.setIdNumber(loanHomevisitInvestigateOtherpeo.getIdNumber());
}else if("1".equals(appDeliveredDetailsVo.getTypeKey())){
deliveredUseMessagesVo.setMobile(loanHomevisitInvestigateCustomer.getBorrowerMobile());
deliveredUseMessagesVo.setCustomerType("个人");
deliveredUseMessagesVo.setCustomerTypeKey("1");
deliveredUseMessagesVo.setAddress(loanHomevisitInvestigateCustomer.getBorrowerPreAddress());
deliveredUseMessagesVo.setName(loanHomevisitInvestigateCustomer.getBorrowerName());
deliveredUseMessagesVo.setIdNumber(loanHomevisitInvestigateCustomer.getBorrowerIdNumber());
}
}
}
}
appCarListVo.setRealBuyer(deliveredUseMessagesVo);
//===============================添加资料是否齐全和资方放款是否审核
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
@ -495,7 +576,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
ResultBean<List<DictCommonVo>> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0");
List<DictCommonVo> dictCommonVoList = listResultBean.getData();
List<DeliveredDictVo> voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList());
if ("1".equals(appOrderDetailsVo.getPayTypeKey())) {//
if ("1".equals(appOrderDetailsVo.getPayTypeKey())) {//
voList.remove(1);
}
appDeliveredDetailsVo.setBuyerType(voList);
@ -544,6 +625,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
}
if ("2".equals(appDeliveredDetailsVo.getPaymentMethodKey())) {
appDeliveredDetailsVo.setShowLoanUser(true);
appDeliveredDetailsVo.setForbidInvoiceChoice(true);
}
appDeliveredDetailsVo.setTaskDefKey(busDeliveredApply.getTaskDefKey());
appDeliveredDetailsVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid());
@ -585,8 +667,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
AppCarListVo appCarListVo = new AppCarListVo();
appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
appDeliveredDetailsVo.setLoanName(busSalesOrderVehicle.getBorrowName());
appDeliveredDetailsVo.setLoanSid(busSalesOrderVehicle.getBorrowerSid());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
@ -790,7 +870,14 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
List<String> vinSids = query.getVinSids();
vinSids.removeAll(Collections.singleton(null));
List<AppCarListVo> list = new ArrayList<>();
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew(contractNo);
List<BusSalesOrderVehicle> busSalesOrderVehicleList = new ArrayList<>();
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo);
if("1".equals(busSalesOrder.getPayTypeKey())){
busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew(contractNo);
}else{
busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew1(contractNo);
}
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
AppCarListVo appCarListVo = new AppCarListVo();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
@ -799,6 +886,11 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
if (vinSelectSid.contains(vinSid)) {
continue;
}
if(StringUtils.isNotBlank(query.getLoanSid())){
if(!query.getLoanSid().equals(busSalesOrderVehicle.getBorrowerSid())){
continue;
}
}
}
if (!vinSids.isEmpty()) {
if (vinSids.contains(vinSid)) {
@ -835,7 +927,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
appCarListVo.setRealBuyer(deliveredUseMessagesVo);
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
if (busSalesOrder != null && "2".equals(busSalesOrder.getPayTypeKey())) {
//===============================添加资料是否齐全和资方放款是否审核
String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid();

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -3033,6 +3033,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
@Transactional(rollbackFor = Exception.class)
public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractId());
if(busSalesOrder != null){
if("2".equals(busSalesOrder.getPayTypeKey())){
if(StringUtils.isBlank(dto.getLoanSid())){
return rb.setMsg("贷款的无贷款人不允许提交");
}
}
}
//判断选择的优惠是否超出
List<AppCarListVo> carList = dto.getCarList();
if (!carList.isEmpty()) {
@ -3177,7 +3185,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
variables.put("app", appMap);
//根据合同号查询销售订单
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());

17
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -7652,12 +7652,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public ResultBean deleteSaleOrderInputLender(String sid) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
//删除销售订单车辆表中的贷款人的名称
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(sid);
if (busSalesOrderVehicle != null) {
busSalesOrderVehicle.setBorrowerSid("");
busSalesOrderVehicle.setBorrowName("");
busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid,busSalesOrderBorrower.getSalesOrderSid());
busSalesOrderVehicleList.removeAll(Collections.singleton(null));
if (!busSalesOrderVehicleList.isEmpty()) {
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
busSalesOrderVehicle.setBorrowerSid("");
busSalesOrderVehicle.setBorrowName("");
busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
}
}
//删除销售订单贷款表的数据
busSalesOrderBorrowerService.deleteBySid(sid);
@ -7704,6 +7709,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//-------家访准备补充推送createBySid---------
homeVisitDto.setCreateBySid(busSalesOrder.getCreateBySid());
loanHomevisitPrepFeign.saveHomeVisit(homeVisitDto);
}else{
busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
}
}
} else {

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@ -67,9 +67,10 @@
</select>
<select id="selectBorrow" resultType="int">
select count(*)
<!-- select count(*)
from anrui_riskcenter.loan_homevisit_prep
where saleOrderBorrowerSid = #{sid}
where saleOrderBorrowerSid = #{sid}-->
select IFNULL(vehCount,0) from bus_sales_order_borrower where sid = #{sid}
</select>
<select id="selectByNum" resultType="int">

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@ -276,6 +276,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
}
qw.eq("bor.isDelete", 0);
qw.eq("ls.isDelete", 0);
qw.eq("bor.state", 1);
qw.eq("bo.nodeState", "已办结");
qw.eq("ls.typeKey", "01");
qw.orderByDesc("bo.createDate");

36
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@ -382,6 +382,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
String customerNumber = "";
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String vinNoCode = "";
String linkNo = "";
if (!aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
@ -392,6 +393,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
bdCustomer.setTOrgIds(data.getOrgCode());
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
String vinNo = busSalesOrderVehicle.getLinkNo();
vinNoCode = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
@ -414,13 +416,14 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResult.setCollectionOrg(basePurchaseSystemDetailsVo.getOrgCode());
creditResult.setBussDate(DateUtil.formatDate(new Date()));
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicySid())){
if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicySid())) {
LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData();
LoanFinBankVo loanFinBankVo = loanFinBankFeign.details(loanFinPolicyVo.getBankSid()).getData();
creditResult.setBankName(loanFinBankVo.getBankNo());
}
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(salesOrder.getOrgSid()).getData();
SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
//这是生成业务系统融资放款应收的逻辑:
// 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息],根据选择的产品政策来判断,若贷款保证金为固定的,需要减去,若为敞口的,不需要减;差额放款需要减厂家贴息,全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中,
//计算融资放款的金额以及厂家贴息金额
@ -428,13 +431,31 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
if (null != resultBean.getData()) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
if (null != solutions) {
if (StringUtils.isNotBlank(loanOtherReceivablePush.getIsCompInvoic())) {
if (loanOtherReceivablePush.getIsCompInvoic().equals("1")) {
//挂车待退款
if (StringUtils.isNotBlank(solutions.getTrailerAmount()) && !("0").equals(solutions.getTrailerAmount())) {
BigDecimal trailerAmount = new BigDecimal(solutions.getTrailerAmount());
BigDecimal money = new BigDecimal(resultBean.getData().getMoney());
BigDecimal subtract = money.subtract(trailerAmount);
creditResultDetailDto.setExTaxMoney("-" + subtract);
} else {
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
}
} else {
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
}
} else {
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
}
}
creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.RONGZI_FANGKUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
if (null != solutions) {
if (StringUtils.isNotBlank(loanOtherReceivablePush.getIsCompInvoic())) {
if (loanOtherReceivablePush.getIsCompInvoic().equals("1")) {
@ -446,6 +467,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setUseTo(CwSystemYT.GCDTK.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.GCDTK.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
@ -458,6 +480,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.BOND_AMOUNTS.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//保险保证金
@ -468,6 +491,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_PREMIUM.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_PREMIUM.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//落户保证金
@ -478,6 +502,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_SETTLE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_SETTLE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//服务费
@ -488,6 +513,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setExTaxMoney(solutions.getServiceAmount());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//代收意外险
@ -498,6 +524,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setExTaxMoney(solutions.getProxyAccidentPremium());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//上牌费、运管费
@ -512,6 +539,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setExTaxMoney(add.toString());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SHANGPAI_YUNGUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//其它费用
@ -522,6 +550,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setUseTo(CwSystemYT.OTHER_AMOUNT.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.OTHER_AMOUNT.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//补车价
@ -532,6 +561,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setUseTo(CwSystemYT.VEH_OTHER_PRICE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.VEH_OTHER_PRICE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
creditResultDetailDto.setMaterialNo(vinNoCode);
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//留购价

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@ -116,6 +116,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo);
List<BusSalesOrderVehicle> selectByNoAndVinSidsNew1(String contractNo);
List<BusSalesOrderVehicle> selectByNoAndVinSidsNew2(String contractNo);
List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@ -123,7 +123,7 @@
select bv.linkSid, bv.sid, bv.linkNo,bv.salesOrderSid
from (select busSid
from anrui_base.base_vehicle_state
where busState = '401'
where busState = '401' and saleTypeKey = 1
and (finState = '1' or carryVehicleState = 1)) as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
@ -131,6 +131,19 @@
and bo.contractNo = #{contractNo}
</select>
<select id="selectByNoAndVinSidsNew1"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select bv.linkSid, bv.sid, bv.linkNo,bv.salesOrderSid,bv.borrowerSid,bv.borrowName
from (select busSid
from anrui_base.base_vehicle_state
where busState = '401'
and (saleTypeKey = '2' and invoiceApplyState = '1')) as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where length(bv.linkSid) > 0
and bo.contractNo = #{contractNo}
</select>
<select id="selectByNoAndVinSidsNew2"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select bv.linkSid, bv.sid, bv.linkNo,bv.salesOrderSid

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@ -290,6 +290,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
return baseMapper.selectByNoAndVinSidsNew(contractNo);
}
public List<BusSalesOrderVehicle> selectByNoAndVinSidsNew1(String contractNo) {
return baseMapper.selectByNoAndVinSidsNew1(contractNo);
}
public List<BusSalesOrderVehicle> selectByNoAndVinSidsNew2(String contractNo) {
return baseMapper.selectByNoAndVinSidsNew2(contractNo);
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java

@ -48,5 +48,7 @@ public class CapitalCreditResult {
public String useTo;
@ApiModelProperty("备注")
public String remarks;
@ApiModelProperty("物料编码")
public String materialNo;
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
@ -153,4 +154,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
LoanFinBank selectFinBnk(String contractNo);
LoanFinBank selectByBankSid(String bankSid);
BaseVehicle selectByVSid(String busVinSid);
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -298,4 +298,10 @@
<select id="selectByBankSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
select * from anrui_riskcenter.loan_fin_bank where sid = #{bankSid}
</select>
<select id="selectByVSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bbv.* from anrui_base.base_vehicle bbv
left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bbv.sid
where bov.sid = #{busVinSid}
</select>
</mapper>

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

@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
@ -1718,6 +1719,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
for (int i = 0; i < finLi.size(); i++) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finLi.get(i);
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BaseVehicle baseVehicle = baseMapper.selectByVSid(finUncollectedReceivablesDetailed.getBusVinSid());
BigDecimal bigAdd = BigDecimal.ZERO;
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
LoanSolutions loanSolutions = baseMapper.selectLoanBySid(finUncollectedReceivablesDetailed.getBusVinSid());
@ -1836,6 +1838,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1847,6 +1853,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1858,6 +1868,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1869,6 +1883,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
@ -1947,6 +1965,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1958,6 +1980,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1969,20 +1995,27 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
if (loanSolutionsDetail.getProxyAccidentPremium() != null) {//意外险
if(loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0){
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额");

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java

@ -32,7 +32,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
// if (creditResult.getBillNo() == null) {
// return rb.setMsg("单据编号不能为空");
// }
if(StringUtils.isNotBlank(creditResult.getBillNo())){
if (StringUtils.isNotBlank(creditResult.getBillNo())) {
map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
}
//业务日期
@ -63,8 +63,10 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept());
//银行
map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName());
if(StringUtils.isNotBlank(creditResult.getRemarks())){
map_fEntityModel_.put("FAR_OtherRemarks",creditResult.getRemarks());
if (StringUtils.isNotBlank(creditResult.getRemarks())) {
map_fEntityModel_.put("FAR_OtherRemarks", creditResult.getRemarks());
} else {
map_fEntityModel_.put("FAR_OtherRemarks", "");
}
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails();
//准备 物料列表的数据
@ -108,8 +110,11 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
m.put("FCOSTDEPARTMENTID", c.getDearDept());
m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
m.put("F_PAEZ_Assistant1", c.getUseTo());
if(StringUtils.isNotBlank(c.getRemarks())){
m.put("FCOMMENT",c.getRemarks());
if (StringUtils.isNotBlank(c.getRemarks())) {
m.put("FCOMMENT", c.getRemarks());
}
if (StringUtils.isNotBlank(c.getMaterialNo())) {
m.put("F_PMZC_Base1", c.getMaterialNo());
}
collectionDetailMap.add(m);
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json

@ -26,6 +26,9 @@
"FNumber": ""
},
"FCOMMENT": "@KD_FCOMMENT",
"F_PMZC_Base1": {
"FNUMBER": "@KD_F_PMZC_Base1"
},
"FSourceBillNo": "",
"FCREATEINVOICE": "false",
"FIVAmountFor": "0",

62
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/remarks.txt

@ -14,42 +14,43 @@ data:Json格式数据(详情参考Json格式数据)(必录)
2.11.Model:表单数据包,Json类型(必录)
字段说明:
银行:F_PAEZ_Base
银行帐号:F_PAEZ_Base1
转出往来单位类型:FOUTCONTACTTYPE
转出往来单位:FOUTCONTACTID
项目类别:F_PMZC_Assistant1
备注:FCOMMENT
费用项目名称:FCOSTNAME
转出往来单位:FOUTCONTACTID
银行:F_PAEZ_Base
费用项目编码:FCOSTID
费用项目名称:FCOSTNAME
总金额本位币:FAMOUNT_D
总金额:FAMOUNTFOR_D
备注:FAR_OtherRemarks
备注:FCOMMENT
扫描点:FScanPoint
表头-付款申请关联金额:FAPPLYAMOUNT_H
销售组织:FSALEORGID
转销:FIsWriteOff
销售组:FSALEGROUPID
销售部门:FSALEDEPTID
销售组织:FSALEORGID
备注:FAR_OtherRemarks
收(退)款单关联金额本位币:FWRITTENOFFAMOUNT
销售部门:FSALEDEPTID
转出往来单位类型:FOUTCONTACTTYPE
销售员:FSALEERID
销售组:FSALEGROUPID
不含税金额:FNOTAXAMOUNTFOR
利息:F_PAEZ_Amount
用途:F_PAEZ_Assistant1 (必填项)
税率(%):FEntryTaxRate
已开票金额:FIVAmountFor
发票类型:FINVOICETYPE (必填项)
已生成发票:FCREATEINVOICE
利息:F_PAEZ_Amount
运输编号:F_PMZC_Assistant
物料编码:F_PMZC_Base1
物料名称:F_PMZC_BaseProperty
物流车辆:F_PMZC_Base
油卡号码:F_PMZC_Assistant2
用途:F_PAEZ_Assistant1 (必填项)
运输编号:F_PMZC_Assistant
税额本位币:FTAXAMOUNT_D
费用承担部门:FCOSTDEPARTMENTID (必填项)
税额:FTAXAMOUNTFOR
不含税金额本位币:FNOTAXAMOUNT_D
总金额本位币:FAMOUNT_D
不含税金额:FNOTAXAMOUNTFOR
税额本位币:FTAXAMOUNT_D
付款申请关联金额:FAPPLYAMOUNT
发票类型:FINVOICETYPE (必填项)
已生成发票:FCREATEINVOICE
源单类型:FSOURCETYPE
源单编号:FSourceBillNo
费用承担部门:FCOSTDEPARTMENTID (必填项)
付款申请关联金额:FAPPLYAMOUNT
汇率类型:FEXCHANGETYPE (必填项)
汇率:FExchangeRate
收款条件:FPayConditon
@ -68,20 +69,21 @@ data:Json格式数据(详情参考Json格式数据)(必录)
结算组织:FSETTLEORGID (必填项)
往来单位:FCONTACTUNIT (必填项)
往来单位类型:FCONTACTUNITTYPE (必填项)
结算方式:FSettleTypeID
审核日期:FAPPROVEDATE
已收款核销金额:FWRITTENOFFAMOUNTFOR
来源系统:FSOURCESYSTEM
申请部门:FDEPARTMENTID
是否期初单据:FISINIT
税额本位币:FTAXAMOUNT
收款组织:FPAYORGID (必填项)
申请部门:FDEPARTMENTID
结算方式:FSettleTypeID
到期日计算日期:FACCNTTIMEJUDGETIME
收款组织:FPAYORGID (必填项)
表头-付款申请关联金额:FAPPLYAMOUNT_H
不含税金额本位币:FNOTAXAMOUNT
修改人:FModifierId
税额本位币:FTAXAMOUNT
创建人:FCreatorId
审核日期:FAPPROVEDATE
作废人:FCancellerId
总金额:FAMOUNTFOR
总金额本位币:FAMOUNT
作废人:FCancellerId
修改人:FModifierId
表头基本 - 收款核销状态:FWRITTENOFFSTATUS
表头基本 - 收(退)款单的关联金额:FRelateHadPayAmount
来源系统:FSOURCESYSTEM
表头基本 - 收(退)款单的关联金额:FRelateHadPayAmount
总金额本位币:FAMOUNT

20
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java

@ -7,26 +7,30 @@ import lombok.Data;
@Data
public class LoanBeOverdueVehQuery implements Query {
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("销售部门")
private String dept;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("贷款人名称")
private String borrowerName;
@ApiModelProperty("客户姓名")
private String customerName;
@ApiModelProperty("销售专员")
private String staffName;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String carNum;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("逾期期数")
private String beOverduePeriod;
@ApiModelProperty("逾期金额")
private String beOverdueMoney;
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod;
@ApiModelProperty("风控专员")
private String riskStaffName;
private String userSid;
private String orgPath;

39
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java

@ -10,33 +10,34 @@ import java.util.Date;
@Data
public class LoanBeOverdueVehVo implements Vo {
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("销售部门")
private String dept;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("贷款人名称")
private String borrowerName;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("客户姓名")
private String customerName;
@ApiModelProperty("销售专员")
private String staffName;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
@ApiModelProperty("车牌号")
private String carNum;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")
private String bankName;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("首期还款日")
private Date downPayRePayDate;
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("资方月还")
private String bankMonthRep;
@ApiModelProperty("逾期期数")
private String dueMoney;
@ApiModelProperty("逾期期数")
private String beOverduePeriod;
@ApiModelProperty("逾期金额")
@ApiModelProperty("逾期金额")
private String beOverdueMoney;
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod;
@ApiModelProperty("垫款金额")
private String advMoney;
@ApiModelProperty("资金占用费")
private String fundPossCostMoney;
@ApiModelProperty("风控专员")
private String riskStaffName;
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitZLVo.java

@ -9,8 +9,8 @@ import java.util.List;
@Data
public class LoanHomeVisitInvestigateInitZLVo implements Vo {
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java

@ -10,8 +10,10 @@ import java.util.List;
public class LoanHomeVisitInvestigateInitJFJZVo implements Vo {
private String sid;
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("定位坐标")
private String location2;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java

@ -11,8 +11,10 @@ import java.util.List;
public class LoanHomeVisitInvestigateSaveJFJZDto implements Vo {
private String sid;
@ApiModelProperty("定位信息")
private List<String> location = new ArrayList<>();
@ApiModelProperty("定位坐标")
private String location2;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> house = new ArrayList<>();;
@ApiModelProperty("门口照片")

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFile.java

@ -58,5 +58,8 @@ public class LoanHomevisitInvestigateFile extends BaseEntity {
private String fileUrl; // 附件路径
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("定位坐标")
private String locationCoord;
@ApiModelProperty("定位具体位置")
private String locationStr;
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileAllDto.java

@ -53,8 +53,10 @@ public class LoanHomevisitInvestigateFileAllDto implements Dto {
private String sid; // sid
@ApiModelProperty("定位信息")
private List<String> dwxxImages = new ArrayList<>();
@ApiModelProperty("定位坐标")
private String locationCoord;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> fwzpImages = new ArrayList<>();
@ApiModelProperty("门口照片")

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileDetailsVo.java

@ -59,5 +59,8 @@ public class LoanHomevisitInvestigateFileDetailsVo implements Vo {
private String fileUrl; // 附件路径
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("定位坐标")
private String locationCoord;
@ApiModelProperty("定位具体位置")
private String locationStr;
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileDto.java

@ -59,5 +59,8 @@ public class LoanHomevisitInvestigateFileDto implements Dto {
private String fileUrl; // 附件路径
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("定位坐标")
private String locationCoord;
@ApiModelProperty("定位具体位置")
private String locationStr;
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java

@ -9,7 +9,7 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo {
private String sid;
@ApiModelProperty("房产状态")
private Boolean houseCheck;
private Boolean houseCheck = null;
@ApiModelProperty("产权类型")
private int houseState;
@ApiModelProperty("房产有无贷款value")
@ -19,7 +19,7 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo {
@ApiModelProperty("房产备注")
private String houseRemarks;
@ApiModelProperty("车辆状态")
private Boolean carCheck;
private Boolean carCheck = null;
@ApiModelProperty("车辆类型")
private int carState;
@ApiModelProperty("车辆有无贷款value")

40
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@ -5,5 +5,45 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo">
SELECT a1.`useOrgName`,
a1.`dept` AS saleDeptName,
a1.`loanContractNo`,
a1.borrowerName,
a1.`vinNo`,
a1.`bankName`,
a1.`bankContractNo`,
a1.dueMoney AS bankMonthRep,
COUNT(a1.sid) AS beOverduePeriod,
SUM(a1.yq_total) AS beOverdueMoney,
SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
SUM(a1.yd_dkje) AS advMoney,
SUM(a1.yd_zjzyf) AS fundPossCostMoney
FROM (SELECT lrpd.sid,
lrpd.`useOrgName`,
lrpd.`dept`,
lrpd.`loanContractNo`,
lrpd.borrowerName,
lrpd.`vinNo`,
lrpd.`bankName`,
lrpd.`bankContractNo`,
lrpd.dueMoney,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.`dueMoney` AS yq_hsqs,
lrpd.`paymentMoney` AS yd_dkje,
lrpd.fund AS yd_zjzyf,
lrpd.orgSidPath,
lrpd.createBySid
FROM `loan_repayment_plan_details` lrpd
LEFT JOIN `loan_repayment_history` lrh
ON lrh.planDetailSid = lrpd.`sid`
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.`sid`
HAVING (yq_total > 0)) a1
GROUP BY a1.loanContractNo,
a1.vinNo
</select>
</mapper>

44
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java

@ -46,18 +46,18 @@ public class LoanBeOverdueVehService{
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("al.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("al.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("al.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("al.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("bd.createBySid", query.getUserSid());
qw.eq("al.createBySid", query.getUserSid());
} else {
PagerVo<LoanBeOverdueVehVo> p = new PagerVo<>();
return p;
@ -67,37 +67,39 @@ public class LoanBeOverdueVehService{
return p;
}
}
if (StringUtils.isNotBlank(query.getBorrowerName())){
qw.like("",query.getBorrowerName());
if (StringUtils.isNotBlank(query.getUseOrgName())){
qw.like("a1.useOrgName",query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getCustomerName())){
qw.like("",query.getCustomerName());
if (StringUtils.isNotBlank(query.getDept())){
qw.like("a1.dept",query.getDept());
}
if (StringUtils.isNotBlank(query.getStaffName())){
qw.like("",query.getStaffName());
if (StringUtils.isNotBlank(query.getLoanContractNo())){
qw.like("a1.loanContractNo",query.getLoanContractNo());
}
if (StringUtils.isNotBlank(query.getModelName())){
qw.like("",query.getModelName());
if (StringUtils.isNotBlank(query.getBorrowerName())){
qw.like("a1.borrowerName",query.getBorrowerName());
}
if (StringUtils.isNotBlank(query.getVinNo())){
qw.like("",query.getVinNo());
qw.like("a1.vinNo",query.getVinNo());
}
if (StringUtils.isNotBlank(query.getCarNum())){
qw.like("",query.getCarNum());
}
if (StringUtils.isNotBlank(query.getLoanContractNo())){
qw.like("",query.getLoanContractNo());
}
if (StringUtils.isNotBlank(query.getBankName())){
qw.like("",query.getBankName());
qw.like("a1.bankName",query.getBankName());
}
if (StringUtils.isNotBlank(query.getBankContractNo())){
qw.like("a1.bankContractNo",query.getBankContractNo());
}
if (StringUtils.isNotBlank(query.getBeOverduePeriod())){
qw.like("",query.getBeOverduePeriod());
qw.having("beOverduePeriod = {0}",query.getBeOverduePeriod());
}
if (StringUtils.isNotBlank(query.getBeOverdueMoney())){
qw.like("",query.getBeOverdueMoney());
qw.like("beOverdueMoney = {0}",query.getBeOverdueMoney());
}
if (StringUtils.isNotBlank(query.getBeOverdueMoneyAndPeriod())){
qw.like("beOverdueMoneyAndPeriod = {0}",query.getBeOverdueMoneyAndPeriod());
}
qw.orderByDesc("");
IPage<LoanBeOverdueVehVo> page = PagerUtil.queryToPage(pq);
IPage<LoanBeOverdueVehVo> pagging = loanBeOverdueVehMapper.selectPageVo(page, qw);
PagerVo<LoanBeOverdueVehVo> p = PagerUtil.pageToVo(pagging, null);

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
@ -33,4 +34,6 @@ public interface LoanDiffMapper extends BaseMapper<LoanDiff> {
String selectNum(String bill);
int selectByBusVnS(@Param("busVinSid") String busVinSid, @Param("realityLoan") String realityLoan);
BaseVehicle selectByVSid(String busVinSid);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml

@ -56,4 +56,10 @@
<update id="selectByBusVnS">
update anrui_fin.fin_uncollected_receivables_detailed set reveivableMoney = #{realityLoan} where busVinSid = #{busVinSid} and receivablesName = '融资放款'
</update>
<select id="selectByVSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bbv.* from anrui_base.base_vehicle bbv
left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bbv.sid
where bov.sid = #{busVinSid}
</select>
</mapper>

23
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
@ -293,8 +294,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
CapitalCreditResult creditResult = new CapitalCreditResult();
LoanDiffDetails loanDiffDetails = list.get(i);
String busVinSid = loanDiffDetails.getBusVinSid();
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBusVinSid(busVinSid);
BaseVehicle baseVehicle = baseMapper.selectByVSid(busVinSid);
BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(busSalesOrder.getSid());
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
@ -343,6 +344,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -354,6 +359,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -365,6 +374,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -376,6 +389,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -387,6 +404,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}

235
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@ -395,11 +395,37 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = new LoanHomeVisitInvestigateInitReportStateVo();
//客户信息状态
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid);
List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
if (loanHomevisitInvestigateCustomerDetailsVo == null) {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
} else {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())) {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerCareerValue())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusValue())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsChildrenValue())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerPreAddress())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getDepositBank())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyContact())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyMobile())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())) {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
} else if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0) {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
} else if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseIdNumber())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseCareerValue())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpouseDomAddress())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getSpousePreAddress())) {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
}
} else {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
}
@ -407,7 +433,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
} else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())) {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName())
|| StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())) {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
@ -425,21 +453,50 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if (loanHomevisitInvestigateOrderDetailsVo == null) {
loanHomeVisitInvestigateInitReportStateVo.setOrderState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setOrderState(1);
if (StringUtils.isBlank(loanHomevisitInvestigateOrderDetailsVo.getCarConfirm())
|| StringUtils.isBlank(loanHomevisitInvestigateOrderDetailsVo.getFinConfirm())
|| StringUtils.isBlank(loanHomevisitInvestigateOrderDetailsVo.getFinDownPay())) {
loanHomeVisitInvestigateInitReportStateVo.setOrderState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setOrderState(1);
}
}
//运营经历信息
LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
if (loanHomevisitInvestigateOperationsDetailsVo == null) {
loanHomeVisitInvestigateInitReportStateVo.setOperationState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setOperationState(1);
if (StringUtils.isBlank(loanHomevisitInvestigateOperationsDetailsVo.getIndustryYears())
|| StringUtils.isBlank(loanHomevisitInvestigateOperationsDetailsVo.getDriveProTypeValue())
|| StringUtils.isBlank(loanHomevisitInvestigateOperationsDetailsVo.getBeforeOpeTypeValue())) {
loanHomeVisitInvestigateInitReportStateVo.setOperationState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setOperationState(1);
}
}
//运输情况信息
LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid);
if (loanHomevisitInvestigateTransportDetailsVo == null) {
loanHomeVisitInvestigateInitReportStateVo.setTransportState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setTransportState(1);
if (StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportRoute())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportTypeValue())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsTrip())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsRetTrip())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getRoundTripMileage())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getDeadWeight())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getMonthlyTrip())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getPerTripYuan())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getFuelConsumptionPerTrip())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getDriverSalary())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getToll())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getMaintenance())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getExpectedRevenue())
|| StringUtils.isBlank(loanHomevisitInvestigateTransportDetailsVo.getNetIncome())) {
loanHomeVisitInvestigateInitReportStateVo.setTransportState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setTransportState(1);
}
}
//资产情况信息
LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
@ -447,6 +504,24 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
} else {
loanHomeVisitInvestigateInitReportStateVo.setAssetsState(1);
if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate() != null && loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) {
if (loanHomevisitInvestigatePropertyDetailsVo.getPropertyType() == 0
|| StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getRealLoanSituation())) {
loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
}
}
if (loanHomevisitInvestigatePropertyDetailsVo.getIsCar() != null && loanHomevisitInvestigatePropertyDetailsVo.getIsCar()) {
if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 0
|| StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getCarLoanSituation())) {
loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
}
}
if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate() == null || loanHomevisitInvestigatePropertyDetailsVo.getIsCar() == null) {
loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
} else if (StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getDownPaySourceValue())
|| StringUtils.isBlank(loanHomevisitInvestigatePropertyDetailsVo.getOtherSourceValue())) {
loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
}
}
return rb.success().setData(loanHomeVisitInvestigateInitReportStateVo);
}
@ -503,7 +578,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
} else {
loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(1);
}
//证明文件
//证明文件-贷款人
loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
if (dkrsfzImages == null || dkrsfzImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else if (dkrhkbImages == null || dkrhkbImages.size() == 0) {
@ -514,12 +590,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else if (dkryhlsImages == null || dkryhlsImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else if (dbrsfzImages == null || dbrsfzImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else if (dbrhkbImages == null || dbrhkbImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
}
//证明文件-配偶
if (loanHomevisitInvestigateCustomerDetailsVo != null) {
@ -528,8 +598,19 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else if (pohkbImages == null || pohkbImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
}
}
}
//证明文件-担保人
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())) {
if (dbrsfzImages == null || dbrsfzImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
} else if (dbrhkbImages == null || dbrhkbImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
}
}
}
}
@ -683,6 +764,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateOtherpeoDto.setMainSid(dto.getSid());
loanHomevisitInvestigateOtherpeoService.saveOrUpdateDto(loanHomevisitInvestigateOtherpeoDto);
}
if (!otherPersonnel.stream().anyMatch(p -> p.getPersonnelKey().equals("1"))) {
loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DBRSFZ.getAttachType());
loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DBRHKB.getAttachType());
}
return rb.success();
}
@ -808,28 +893,32 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
BeanUtil.copyProperties(loanHomevisitInvestigatePropertyDetailsVo, loanHomevisitInvestigatePropertyDto);
}
loanHomevisitInvestigatePropertyDto.setIsRealEstate(dto.getHouseCheck());
if (dto.getHouseCheck()) {
loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState());
loanHomevisitInvestigatePropertyDto.setRealLoanSituationKey(dto.getHouseLoanKey());
loanHomevisitInvestigatePropertyDto.setRealLoanSituation(dto.getHouseLoan());
loanHomevisitInvestigatePropertyDto.setRealRemarks(dto.getHouseRemarks());
} else {
loanHomevisitInvestigatePropertyDto.setPropertyType(0);
loanHomevisitInvestigatePropertyDto.setRealLoanSituationKey("");
loanHomevisitInvestigatePropertyDto.setRealLoanSituation("");
loanHomevisitInvestigatePropertyDto.setRealRemarks("");
if (dto.getHouseCheck() != null) {
if (dto.getHouseCheck()) {
loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState());
loanHomevisitInvestigatePropertyDto.setRealLoanSituationKey(dto.getHouseLoanKey());
loanHomevisitInvestigatePropertyDto.setRealLoanSituation(dto.getHouseLoan());
loanHomevisitInvestigatePropertyDto.setRealRemarks(dto.getHouseRemarks());
} else {
loanHomevisitInvestigatePropertyDto.setPropertyType(0);
loanHomevisitInvestigatePropertyDto.setRealLoanSituationKey("");
loanHomevisitInvestigatePropertyDto.setRealLoanSituation("");
loanHomevisitInvestigatePropertyDto.setRealRemarks("");
}
}
loanHomevisitInvestigatePropertyDto.setIsCar(dto.getCarCheck());
if (dto.getCarCheck()) {
loanHomevisitInvestigatePropertyDto.setCarType(dto.getCarState());
loanHomevisitInvestigatePropertyDto.setCarLoanSituationKey(dto.getCarLoanKey());
loanHomevisitInvestigatePropertyDto.setCarLoanSituation(dto.getCarLoan());
loanHomevisitInvestigatePropertyDto.setCarRemarks(dto.getCarRemarks());
} else {
loanHomevisitInvestigatePropertyDto.setCarType(0);
loanHomevisitInvestigatePropertyDto.setCarLoanSituationKey("");
loanHomevisitInvestigatePropertyDto.setCarLoanSituation("");
loanHomevisitInvestigatePropertyDto.setCarRemarks("");
if (dto.getCarCheck() != null) {
if (dto.getCarCheck()) {
loanHomevisitInvestigatePropertyDto.setCarType(dto.getCarState());
loanHomevisitInvestigatePropertyDto.setCarLoanSituationKey(dto.getCarLoanKey());
loanHomevisitInvestigatePropertyDto.setCarLoanSituation(dto.getCarLoan());
loanHomevisitInvestigatePropertyDto.setCarRemarks(dto.getCarRemarks());
} else {
loanHomevisitInvestigatePropertyDto.setCarType(0);
loanHomevisitInvestigatePropertyDto.setCarLoanSituationKey("");
loanHomevisitInvestigatePropertyDto.setCarLoanSituation("");
loanHomevisitInvestigatePropertyDto.setCarRemarks("");
}
}
loanHomevisitInvestigatePropertyDto.setDownPaySourceKey(dto.getDownPaymentKey());
loanHomevisitInvestigatePropertyDto.setDownPaySourceValue(dto.getDownPayment());
@ -845,13 +934,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomeVisitInvestigateInitJFJZVo loanHomeVisitInvestigateInitJFJZVo = new LoanHomeVisitInvestigateInitJFJZVo();
//定位信息
List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
List<String> location = new ArrayList<>();
if (dwxxImages != null && dwxxImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
location.add(dwxxImage.getFileUrl());
loanHomeVisitInvestigateInitJFJZVo.setLocation2(dwxxImage.getLocationCoord());
loanHomeVisitInvestigateInitJFJZVo.setLocationStr(dwxxImage.getLocationStr());
}
}
loanHomeVisitInvestigateInitJFJZVo.setLocation(location);
//房屋照片
List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
List<String> house = new ArrayList<>();
@ -896,16 +984,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
ResultBean rb = ResultBean.fireFail();
//定位信息
loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.DWXX.getAttachType());
for (String dwxx : dto.getLocation()) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
loanHomevisitInvestigateFileDto.setMainSid(dto.getSid());
loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
}
loanHomevisitInvestigateFileDto.setFileUrl(dwxx);
loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
}
LoanHomevisitInvestigateFileDto dwxxFileDto = new LoanHomevisitInvestigateFileDto();
dwxxFileDto.setMainSid(dto.getSid());
dwxxFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
dwxxFileDto.setLocationCoord(dto.getLocation2());
dwxxFileDto.setLocationStr(dto.getLocationStr());
loanHomevisitInvestigateFileService.saveOrUpdateDto(dwxxFileDto);
//房屋照片
loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.FWZP.getAttachType());
for (String fwzp : dto.getHouse()) {
@ -1252,10 +1336,22 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = getHomeVisitReportInfo(sid).getData();
LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = getHomeVisitDataInfo(sid).getData();
if (loanHomeVisitInvestigateInitReportStateVo.getOperationState() == 0) {
if (loanHomeVisitInvestigateInitReportStateVo.getCustomerState() == 0) {
return rb.setMsg("家访考察报告-客户信息未完善");
} else if (loanHomeVisitInvestigateInitReportStateVo.getOtherState() == 0) {
return rb.setMsg("家访考察报告-其他补充信息未完善");
} else if (loanHomeVisitInvestigateInitReportStateVo.getOrderState() == 0) {
return rb.setMsg("家访考察报告-订单信息未完善");
} else if (loanHomeVisitInvestigateInitReportStateVo.getOperationState() == 0) {
return rb.setMsg("家访考察报告-营运经历未完善");
} else if (loanHomeVisitInvestigateInitReportStateVo.getTransportState() == 0) {
return rb.setMsg("家访考察报告-运输信息未完善");
} else if (loanHomeVisitInvestigateInitReportStateVo.getAssetsState() == 0) {
return rb.setMsg("家访考察报告-资产情况未完善");
} else if (loanHomeVisitInvestigateInitInformationStateVo.getWitnessState() == 0) {
return rb.setMsg("家防资料-家访见证类未完善");
} else if (loanHomeVisitInvestigateInitInformationStateVo.getProofState() == 0) {
return rb.setMsg("家防资料-证明文件未完善");
} else if (loanHomeVisitInvestigateInitInformationStateVo.getAssetsInfo() == 0) {
return rb.setMsg("家防资料-资产类未完善");
}
@ -1691,13 +1787,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomeVisitInvestigateInitZLVo loanHomeVisitInvestigateInitZLVo = new LoanHomeVisitInvestigateInitZLVo();
//定位信息
List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
List<String> location = new ArrayList<>();
if (dwxxImages != null && dwxxImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
location.add(dwxxImage.getFileUrl());
loanHomeVisitInvestigateInitZLVo.setLocationStr(dwxxImage.getLocationStr());
}
}
loanHomeVisitInvestigateInitZLVo.setLocation(location);
//房屋照片
List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
List<String> house = new ArrayList<>();
@ -1803,24 +1897,31 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitZLVo.setSpouseState(true);
}
}
//担保人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<String> pohkbImage = new ArrayList<>();
if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
pohkbImage.add(dbrsfzImage.getFileUrl());
}
}
loanHomeVisitInvestigateInitZLVo.setGuarantorIdCard(pohkbImage);
//担保人户口本
List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
List<String> guarantorAccount = new ArrayList<>();
if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
guarantorAccount.add(dbrhkbImage.getFileUrl());
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())) {
//担保人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<String> pohkbImage = new ArrayList<>();
if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
pohkbImage.add(dbrsfzImage.getFileUrl());
}
}
loanHomeVisitInvestigateInitZLVo.setGuarantorIdCard(pohkbImage);
//担保人户口本
List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
List<String> guarantorAccount = new ArrayList<>();
if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
guarantorAccount.add(dbrhkbImage.getFileUrl());
}
}
loanHomeVisitInvestigateInitZLVo.setGuarantorAccount(guarantorAccount);
}
}
}
loanHomeVisitInvestigateInitZLVo.setGuarantorAccount(guarantorAccount);
//银行卡
List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
List<String> yhkImagess = new ArrayList<>();

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml

@ -25,6 +25,8 @@
createByName,
concat(#{path}, fileUrl) as fileUrl,
attachType,
locationCoord,
locationStr,
mainSid
from loan_homevisit_investigate_file
where mainSid = #{sid}

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java

@ -112,16 +112,12 @@ public class LoanHomevisitInvestigateFileService extends MybatisBaseService<Loan
public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) {
ResultBean rb = ResultBean.fireFail();
//定位信息
for (String dwxxImage : dto.getDwxxImages()) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage);
loanHomevisitInvestigateFileDto.setSid(dto.getSid());
loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
saveOrUpdateDto(loanHomevisitInvestigateFileDto);
}
LoanHomevisitInvestigateFileDto dwxxFileDto = new LoanHomevisitInvestigateFileDto();
dwxxFileDto.setLocationCoord(dto.getLocationCoord());
dwxxFileDto.setLocationStr(dto.getLocationStr());
dwxxFileDto.setSid(dto.getSid());
dwxxFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
saveOrUpdateDto(dwxxFileDto);
//房屋照片
for (String fwzpImage : dto.getFwzpImages()) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@ -362,10 +362,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
String urlAllVo = "";
List<File> filesList = new ArrayList<>();
//贷款人生成车辆买卖合同
/*List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
for (File xcmmContractUrl : xcmmContractUrls) {
filesList.add(xcmmContractUrl);
}*/
}
if (conSetUpKey.equals("001")) {//一车一合同
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@ -392,7 +392,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
busSalesOrderLoancontractDto.setBusName("资方终审确认");
String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
/* //生成车辆融资协议
//生成车辆融资协议
String clrzxyUrl = generateCLRZXY(printConfirmDto);
//生成还款协议
String hkxyUrl = hkxy(printConfirmDto);
@ -421,7 +421,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
if (StringUtils.isNotBlank(gsgddwdbjy)) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
filesList.add(file);
}*/
}
}
} else if (conSetUpKey.equals("002")) {//一人一合同
List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@ -452,7 +452,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
}
/*//生成车辆融资协议
//生成车辆融资协议
String clrzxyUrl = generateCLRZXY(printConfirmDto);
//生成还款协议
String hkxy = hkxy(printConfirmDto);
@ -481,7 +481,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
if (StringUtils.isNotBlank(gsgddwdbjy)) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
filesList.add(file);
}*/
}
}
//合并pdf文件
if (filesList.size() > 0) {
@ -680,7 +680,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
map.put("partyEaddress", homeKcOtherPeo.getResidentAddress());
//戊方实际居住地址
map.put("partyExaddress", homeKcOtherPeo.getAddress());
otherPersonnel.remove(otherPersonnel);
otherPersonnel.remove(homeKcOtherPeo);
break;
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java

@ -23,4 +23,6 @@ public interface LoanNoGuaranteeCreditReviewMapper extends BaseMapper<LoanNoGuar
@Select("SELECT * FROM loan_noguarantee_credit_review WHERE borrowerSid = #{salesOrderSid}")
LoanNoGuaranteeCreditReview selectOneByBorrowerSid(String salesOrderSid);
int updateByBorrow(String borrowerSid);
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.xml

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.riskcenter.biz.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewMapper">
<update id="updateByBorrow">
update anrui_buscenter.bus_sales_order_borrower set state = 0 where sid = #{borrowerSid}
</update>
</mapper>

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@ -267,6 +267,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
}
}
if("不通过".equals(dto.getCreditReview()) || "不通过".equals(dto.getHomeVisit()) || "不通过".equals(dto.getLoanReview())){
//更新贷款人为作废
baseMapper.updateByBorrow(borrowerSid);
}
return rb.success().setData(borrowerSid);
}
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@ -66,6 +66,12 @@ public interface AppBusDeliveredApplyFeign {
@ResponseBody
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(@RequestBody PagerQuery<DeliveredPageQuery> pagerQuery);
@ApiOperation("移动端-获取待出库列表2")
@PostMapping("/getRetrievalNotList2")
@ResponseBody
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList2(@RequestBody PagerQuery<DeliveredPageQuery> pagerQuery);
@ApiOperation("移动端-初始化 出库申请 待出库进入")
@GetMapping("/getRetrievalApplyInfo")
@ResponseBody

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@ -57,6 +57,11 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
return null;
}
@Override
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList2(PagerQuery<DeliveredPageQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
return null;

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@ -117,4 +117,7 @@ public class DeliveredDetailsVo implements Vo {
@ApiModelProperty("开票sid")
private String invoiceSid;
@ApiModelProperty("是否开票是否允许修改")
private boolean forbidInvoiceChoice;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java

@ -19,4 +19,6 @@ public class DeliveredDetailssQuery {
private String contractNo;
@ApiModelProperty("当前申请页面已选车辆的sid:app需要排除")
private List<String> vinSelectsid = new ArrayList<>();
private String loanSid;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java

@ -34,4 +34,9 @@ public class DeliveredPageVo implements Vo {
@ApiModelProperty("车架号集合")
private List<VinListVo> vinList;
private String loanSid;
private String loanName;
private boolean showLoan;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java

@ -10,8 +10,10 @@ import java.util.List;
public class AppLoanHomeVisitInvestigateInitJFJZVo implements Vo {
private String sid;
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("定位坐标")
private String location2;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java

@ -9,7 +9,7 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo {
private String sid;
@ApiModelProperty("房产状态")
private Boolean houseCheck;
private Boolean houseCheck = null;
@ApiModelProperty("产权类型")
private int houseState;
@ApiModelProperty("房产有无贷款value")
@ -19,7 +19,7 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo {
@ApiModelProperty("房产备注")
private String houseRemarks;
@ApiModelProperty("车辆状态")
private Boolean carCheck;
private Boolean carCheck = null;
@ApiModelProperty("车辆类型")
private int carState;
@ApiModelProperty("车辆有无贷款value")

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java

@ -9,8 +9,8 @@ import java.util.List;
@Data
public class AppLoanHomeVisitInvestigateInitZLVo implements Vo {
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java

@ -30,4 +30,6 @@ public class AppLoanHomeVisitInvestigateInitZMWJVo implements Vo {
private List<String> guarantorAccount;
@ApiModelProperty("是否有配偶")
private Boolean spouseState = false;
@ApiModelProperty("是否有担保人")
private Boolean dbrState = false;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java

@ -10,8 +10,10 @@ import java.util.List;
public class AppLoanHomeVisitInvestigateSaveJFJZDto implements Vo {
private String sid;
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("定位坐标")
private String location2;
@ApiModelProperty("定位具体位置")
private String locationStr;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@ -66,6 +66,11 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
return appBusDeliveredApplyService.getRetrievalNotList(pagerQuery);
}
@Override
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList2(PagerQuery<DeliveredPageQuery> pagerQuery) {
return appBusDeliveredApplyService.getRetrievalNotList2(pagerQuery);
}
@Override
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
return appBusDeliveredApplyService.getRetrievalApplyInfo(query);

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@ -915,4 +915,12 @@ public class AppBusDeliveredApplyService {
List<CarListVos2> voList = Optional.ofNullable(selectInfo.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CarListVos2.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList2(PagerQuery<DeliveredPageQuery> pagerQuery) {
ResultBean<PagerVo<DeliveredPageVo>> rb = ResultBean.fireFail();
PagerQuery<AppBusDeliveredPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppBusDeliveredPageVo>> retrievalNotList = busDeliveredFeign.getRetrievalNotList2(pq);
PagerVo<DeliveredPageVo> vo = CoverUtils.selectPagerVo(retrievalNotList.getData());
return rb.success().setData(vo);
}
}

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@ -218,7 +218,10 @@ public class LoanHomeVisitInvestigateService {
loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy());
loanHomeVisitInvestigateSaveCustomerDto.setConSetUpKey(loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey());
loanHomeVisitInvestigateSaveCustomerDto.setContractUrl(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl());
loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
ResultBean resultBean = loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
@ -277,7 +280,10 @@ public class LoanHomeVisitInvestigateService {
}else {
return rb.setMsg("请优先完善客户信息");
}
loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
ResultBean resultBean = loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}

Loading…
Cancel
Save