Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java

@@ -72,5 +72,7 @@ public class BusSalesOrderLoancontract extends BaseEntity {
     private String busName; // 业务阶段名称
 	@ApiModelProperty("业务状态码")
     private String busState; // 业务状态码
+    @ApiModelProperty("是否生成还款计划表（0否，1是）")
+    private String repaymentState; // 是否生成还款计划表（0否，1是）
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@@ -66,12 +66,12 @@ public interface BusSalesOrderLoancontractFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean<String> save(@RequestBody BusSalesOrderLoancontractDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -90,12 +90,17 @@ public interface BusSalesOrderLoancontractFeign {
     @ApiOperation("更新资方合同号和状态")
     @PostMapping("/updateBankConAndBusNo")
     @ResponseBody
-    ResultBean updateBankConAndBusNo(@RequestParam("loanContractSid") String loanContractSid,@RequestParam("bankContractNo") String bankContractNo);
+    ResultBean updateBankConAndBusNo(@RequestParam("loanContractSid") String loanContractSid, @RequestParam("bankContractNo") String bankContractNo);
+
     @ApiOperation("消贷合同生成还款计划表列表")
     @PostMapping("/listPageForRepay")
     @ResponseBody
     public ResultBean<PagerVo<BusLoancontractForRepayVo>> listPageForRepay(@RequestBody PagerQuery<BusLoancontractForRepayQuery> pq);
 
+    @ApiOperation("设置是否生成还款计划状态")
+    @PostMapping("/setRepaymentState")
+    public ResultBean setRepaymentState(@RequestParam("sid") String sid);
+
     @ApiOperation("推送融资放款的应收")
     @PostMapping("/pushLoanOrder")
     @ResponseBody
@@ -124,16 +129,16 @@ public interface BusSalesOrderLoancontractFeign {
     @ApiOperation("根据销售订单sid及贷款人sid查询")
     @PostMapping("/fetchAllByOrderSidAndDkrSid")
     @ResponseBody
-    ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
+    ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
     @ApiOperation("根据销售订单sid和贷款人sid删除消贷合同信息")
     @PostMapping("/delByOrderSidAndDkrSid")
     @ResponseBody
-    ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid);
+    ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid);
 
     @ApiOperation("推送融资放款的其他应收单应收")
     @PostMapping("/pushOtherDocument")
     @ResponseBody
     ResultBean pushOtherDocument(@RequestBody PushOtherDocument push);
 
-}
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@@ -91,6 +91,11 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 		return null;
 	}
 
+	@Override
+	public ResultBean setRepaymentState(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
 		return null;
@@ -130,4 +135,4 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	public ResultBean pushOtherDocument(PushOtherDocument push) {
 		return null;
 	}
-}
+}

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

@@ -68,13 +68,13 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
     @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}")
     BusSalesOrderLoancontract fetchDetailsByOrderSid(String sid);
 
-	@Select("select * from bus_sales_order_loancontract where borrowerSid = #{saleOrderBorrowerSid}")
+    @Select("select * from bus_sales_order_loancontract where borrowerSid = #{saleOrderBorrowerSid}")
     List<BusSalesOrderLoancontractDetailsVo> selectByBorrowerSid(String saleOrderBorrowerSid);
 
-    IPage<BusLoancontractForRepayVo> listPageForRepay(IPage<BusSalesOrderLoancontract> page,@Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderLoancontract> qw);
+    IPage<BusLoancontractForRepayVo> listPageForRepay(IPage<BusSalesOrderLoancontract> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderLoancontract> qw);
 
     @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305',busName='放款资料审核' where sid=#{loanContractSid}")
-    void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid,@Param("bankContractNo") String bankContractNo);
+    void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid, @Param("bankContractNo") String bankContractNo);
 
     @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}")
     List<BusSalesOrderLoancontract> fetchAllByOrderSid(String sid);
@@ -85,10 +85,13 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
     List<BusSalesOrderLoancontract> fetchAllByBorrowerSid(String saleOrderBorrowerSid);
 
     @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{saleOrderBorrowerSid}")
-    List<BusSalesOrderLoancontract> fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
+    List<BusSalesOrderLoancontract> fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
     FinUncollectedReceivablesDetailed selectByBusVinSId(@Param("name") String name, @Param("sid") String sid);
 
     @Delete("delete from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{borrowerSid}")
-    void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
-}
+    void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("borrowerSid") String borrowerSid);
+
+    @Update("update bus_sales_order_loancontract set repaymentState = 1 where sid=#{sid}")
+    int setRepaymentState(String sid);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml

@@ -26,7 +26,14 @@
         co.bankName as bankName,
         co.bankContractNo as bankContractNo,
         co.policyName as policyName,
-        co.sid as salesOrderSid
+        co.sid as salesOrderSid,
+        CASE
+        co.repaymentState
+        WHEN '1' THEN
+        '是'
+        WHEN '0' THEN
+        '否'
+        END AS builded
         FROM
         bus_sales_order_loancontract AS co
         LEFT JOIN bus_sales_order AS bs ON co.salesOrderSid = bs.sid
@@ -46,4 +53,4 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
         select * from anrui_fin.fin_uncollected_receivables_detailed where busVinSid = #{sid} and receivablesName = #{name}
     </select>
-</mapper>
+</mapper>

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

@@ -120,6 +120,13 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean setRepaymentState(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = busSalesOrderLoancontractService.setRepaymentState(sid);
+        return rb.success();
+    }
+
     @Override
     public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
         return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush);

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

@@ -282,7 +282,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {
             for (BusLoancontractForRepayVo record : records) {
-                record.setHandleBtn(false);
+//                record.setHandleBtn(false);
                 if (StringUtils.isNotBlank(record.getSalesOrderSid())) {
                     List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid());
                     busSalesOrderVehicles.removeAll(Collections.singleton(null));
@@ -292,19 +292,19 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             record.setVinNo(String.join(",", stringVinNos));
                         }
                     }
-                    ResultBean<LoanRepaymentSchedule> repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid());
-                    if (repaymentSchedule.getData() != null) {
-                        record.setBuilded("是");
-                        List<LoanRepaymentHistory> histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData();
-                        if (histories.isEmpty() || histories == null) {
-                            record.setHandleBtn(true);
-                        }
-                    } else {
-                        record.setBuilded("否");
-                        if (StringUtils.isNotBlank(record.getBankContractNo())) {
-                            record.setHandleBtn(true);
-                        }
-                    }
+//                    ResultBean<LoanRepaymentSchedule> repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid());
+//                    if (repaymentSchedule.getData() != null) {
+//                        record.setBuilded("是");
+//                        List<LoanRepaymentHistory> histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData();
+//                        if (histories.isEmpty() || histories == null) {
+//                            record.setHandleBtn(true);
+//                        }
+//                    } else {
+//                        record.setBuilded("否");
+//                        if (StringUtils.isNotBlank(record.getBankContractNo())) {
+//                            record.setHandleBtn(true);
+//                        }
+//                    }
                 }
             }
         }
@@ -1093,4 +1093,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         }
 
     }
-}
+
+    public int setRepaymentState(String sid) {
+        return baseMapper.setRepaymentState(sid);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -121,18 +121,23 @@
                invoiceTypeKey as openTickTypeKey
         from fin_company_invoicing
         where taxpayerNo = #{taxpayerNo}
-          and useOrgSid = #{useOrgSid}
-          and isDelete = 0
+            and useOrgSid = #{useOrgSid}
+            and isDelete = 0
+          and (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
 
     <select id="getInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.CompanyInvoicingVo">
-        select name companyInvoicingName,sid companyInvoicingSid,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid = #{useOrgSid} and length(purchaseSystemSid)>0
+        select name companyInvoicingName, sid companyInvoicingSid, purchaseSystemSid, purchaseSystemName
+        from fin_company_invoicing
+        where useOrgSid = #{useOrgSid}
+          and length(purchaseSystemSid) > 0
     </select>
 
     <select id="getAppInvoicingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.AppCompanyInvoicingVo">
-        select name dictValue,sid as id,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid = #{useOrgSid} and length(purchaseSystemSid)>0
+        select name dictValue,sid as id,purchaseSystemSid,purchaseSystemName from fin_company_invoicing where useOrgSid
+        = #{useOrgSid} and length(purchaseSystemSid)>0
         <if test="search != null and search != ''">
             and name like concat('%',#{search},'%')
         </if>
     </select>
-</mapper>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -1224,7 +1224,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 Future future2 = pool.submit(() -> {
                     pushScheduleVoucher(schedule);
                 });
-
+                //设置消贷合同是否生成还款计划状态
+                Future future3 = pool.submit(() -> {
+                    busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid());
+                });
             } catch (Exception e) {
                 e.printStackTrace();
             }