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

修改

master
ligaode 1 month ago
parent
62eefa9bb3
commit
8e67f6ed14
4 changed files with 47 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
  2. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
  3. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
  4. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

54
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java
View File

@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@ -33,11 +33,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.*;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto;
@ -47,12 +42,8 @@ import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppRedemptionDetails
import com.yxt.anrui.riskcenter.api.loanredemptionapply.app.AppVinListVo;
import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
import com.yxt.anrui.riskcenter.api.loansubletapply.SubletVinList;
import com.yxt.anrui.riskcenter.api.loansubletapply.VehDisposal;
import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
@ -93,14 +84,10 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private LoanRepaymentHistoryService loanRepaymentHistoryService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private LoanBuckleApplyRecordService loanBuckleApplyRecordService;
@Autowired
private LoanFileService loanFileService;
@Autowired
private FileUploadComponent fileUploadComponent;
@ -115,14 +102,8 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private LoanRestoreReportApplyService loanRestoreReportApplyService;
@Autowired
private LoanRedemptionVehService loanRedemptionVehService;
@ -130,6 +111,8 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
private LoanOutboundApplyService loanOutboundApplyService;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
public PagerVo<LoanRedemptionApplyVo> listPage(PagerQuery<LoanRedemptionApplyQuery> pq) {
IPage<LoanRedemptionApply> page = PagerUtil.queryToPage(pq);
@ -804,6 +787,31 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
LoanRedemptionApply redemptionApply = fetchBySid(businessSid);
redemptionApply.setClosingDate(new DateTime());
baseMapper.updateById(redemptionApply);
List<RedemptionVinList> redemptionVinLists = loanRedemptionVehService.selByMainSid(businessSid);
FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR();
finUncollectedReceivablesDetailedJR.setCreateByName(redemptionApply.getApplyName());
finUncollectedReceivablesDetailedJR.setCreateBySid(redemptionApply.getCreateBySid());
//查询销售订单信息
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(redemptionVinLists.get(0).getBusVinSid()).getData();
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
finUncollectedReceivablesDetailedJR.setApplySid(redemptionApply.getSid());
String planSid = loanRepaymentPlanDetailsService.selByBusVinSidMax(busSalesOrderVehicle.getSid());
finUncollectedReceivablesDetailedJR.setBusSid(planSid);
finUncollectedReceivablesDetailedJR.setPayCostTitleKey("016");
finUncollectedReceivablesDetailedJR.setPayCostTitleValue("收回车辆费用");
finUncollectedReceivablesDetailedJR.setReveivableMoney(redemptionApply.getFees());
finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(redemptionApply.getFees());
finUncollectedReceivablesDetailedJR.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
finUncollectedReceivablesDetailedJR.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
finUncollectedReceivablesDetailedJR.setStaffUserSid(busSalesOrder.getCreateBySid());
finUncollectedReceivablesDetailedJR.setStaffName(busSalesOrder.getStaffName());
finUncollectedReceivablesDetailedJR.setStaffDeptSid(busSalesOrder.getOrgSid());
finUncollectedReceivablesDetailedJR.setStaffDeptName(busSalesOrder.getOrgName());
finUncollectedReceivablesDetailedJR.setUseOrgSid(redemptionApply.getUseOrgSid());
finUncollectedReceivablesDetailedJR.setUseOrgName(redemptionApply.getUseOrgName());
finUncollectedReceivablesDetailedJR.setOrgSidPath(redemptionApply.getOrgSidPath());
finUncollectedReceivablesDetailedJR.setKxState("01");
finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
View File

@ -113,4 +113,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
String getBj(@Param("busVinSid") String busVinSid);
String selByBusVinSid(@Param("saleVehSid") String saleVehSid,@Param("date") String date);
String selByBusVinSidMax(String saleVehSid);
}

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
View File

@ -1021,4 +1021,14 @@
WHERE busVinSid = #{saleVehSid}
AND dueDate LIKE CONCAT(#{date}, '%')
</select>
<select id="selByBusVinSidMax" resultType="java.lang.String">
SELECT
sid
FROM
loan_repayment_plan_details
WHERE busVinSid = #{saleVehSid}
ORDER BY period DESC
LIMIT 1
</select>
</mapper>

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
View File

@ -391,4 +391,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
public String selByBusVinSid(String saleVehSid, String date) {
return baseMapper.selByBusVinSid(saleVehSid, date);
}
public String selByBusVinSidMax(String saleVehSid) {
return baseMapper.selByBusVinSidMax(saleVehSid);
}
}

Write Preview
Loading…
Cancel
Save