修改非导入数据更新接口

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java

@@ -25,6 +25,11 @@ import java.util.List;
         fallback = LoanRepaymentPlanDetailsFeignFallback.class)
 public interface LoanRepaymentPlanDetailsFeign {
 
+    @ApiOperation("测试推送转累欠凭证")
+    @PostMapping("/pushLater")
+    public void pushLater();
+
+
     @ApiOperation("保存还款计划表明细")
     @PostMapping("/savePlanDetails")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java

@@ -17,6 +17,11 @@ import java.util.List;
 public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanDetailsFeign {
 
 
+    @Override
+    public void pushLater() {
+
+    }
+
     @Override
     public ResultBean<String> savePlanDetails(LoanRepaymentPlanDetailsDto dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -61,7 +61,7 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
 
     String getUpdateMoneyBySid(@Param("pSid") String pSid, @Param("histories") List<String> histories);
 
-    List<NoImportVo> selPlanDetailsByBank(@Param("bankSid") String bankSid, @Param("useOrgSid") String useOrgSid);
+    List<NoImportVo> selPlanDetailsByBank(@Param("bankShortName") String bankShortName, @Param("useOrgSid") String useOrgSid);
 
     int updateTimeByPlanSids(@Param("stringList") List<String> stringList, @Param("formatDate") String formatDate);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -534,45 +534,12 @@
     </select>
     <select id="selPlanDetailsByBank"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.NoImportVo">
-        SELECT  *
-        FROM (
-                 SELECT p.sid,
-                        po.bankSid,
-                        po.bankShortName,
-                        p.useOrgSid
-                 FROM loan_repayment_plan_details AS p
-                          LEFT JOIN loan_solutions AS s ON p.salesOrderSid = s.salesOrderSid
-                          LEFT JOIN loan_fin_policy AS po ON s.policySid = po.sid
-                 WHERE s.isDelete = 0
-                   AND p.policyOrOther = 0
-                 UNION ALL
-                 SELECT p.sid,
-                        po.bankSid,
-                        po.bankShortName,
-                        p.useOrgSid
-                 FROM loan_repayment_plan_details AS p
-                          LEFT JOIN loan_solutions AS s ON p.salesOrderSid = s.salesOrderSid
-                          LEFT JOIN loan_fin_policy AS po ON s.policySid = po.sid
-                          LEFT JOIN loan_repayment_schedule AS sd ON p.scheduleSid = sd.sid
-                 WHERE s.isDelete = 0
-                   AND p.policyOrOther = 1
-                   AND sd.sameBank = 1
-                 UNION ALL
-                 SELECT p.sid,
-                        po.bankSid,
-                        po.bankShortName,
-                        p.useOrgSid
-                 FROM loan_repayment_plan_details AS p
-                          LEFT JOIN loan_solutions AS s ON p.salesOrderSid = s.salesOrderSid
-                          LEFT JOIN loan_solutions_otherpolicy AS o ON s.sid = o.solutionsSid
-                          LEFT JOIN loan_fin_otherpolicy AS po ON po.sid = o.otherPolicySid
-                          LEFT JOIN loan_repayment_schedule AS sd ON p.scheduleSid = sd.sid
-                 WHERE s.isDelete = 0
-                   AND p.policyOrOther = 1
-                   AND sd.sameBank = 0
-             ) a
-        WHERE a.bankSid = #{bankSid}
-          AND a.useOrgSid = #{useOrgSid}
+        SELECT p.sid,
+               p.bankName bankShortName,
+               p.useOrgSid
+        FROM loan_repayment_plan_details AS p
+        WHERE p.bankName = #{bankShortName}
+          AND p.useOrgSid = #{useOrgSid}
     </select>
     <select id="selNotRuleForBuckSids" resultType="java.lang.String">
         SELECT  b.sid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleHistoryRecord;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
@@ -52,6 +53,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDe
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentHistoryRecord;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
+import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -121,7 +123,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
-
+    @Autowired
+    private LoanFinBankService loanFinBankService;
     public ResultBean<String> saveHistory(LoanRepaymentHistoryDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         LoanRepaymentHistory entity = new LoanRepaymentHistory();
@@ -884,7 +887,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
         if (orgSidByPath.getSuccess()) {
             String useOrgSid = orgSidByPath.getData();
-            List<NoImportVo> voList = baseMapper.selPlanDetailsByBank(query.getBankSid(), useOrgSid);
+            LoanFinBank loanFinBank = loanFinBankService.fetchBySid(query.getBankSid());
+            List<NoImportVo> voList = baseMapper.selPlanDetailsByBank(loanFinBank.getBankShortName(), useOrgSid);
             if (!voList.isEmpty()) {
                 List<String> stringList =
                         voList.stream().map(NoImportVo::getSid).collect(Collectors.toList());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java

@@ -23,6 +23,14 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
 
+    @Autowired
+    private ScheduledRepaymentPlanDetailsService scheduledRepaymentPlanDetailsService;
+
+    @Override
+    public void pushLater() {
+        scheduledRepaymentPlanDetailsService.pushLateVoucher();
+    }
+
     @Override
     public ResultBean<String> savePlanDetails(LoanRepaymentPlanDetailsDto dto) {
         return loanRepaymentPlanDetailsService.savePlanDetails(dto);