Browse Source

大中型产品审核BD不复审三审&土规财务认领实收款改为oa_no

wucl 3 months ago
parent
commit
bbae0f14e0

+ 1 - 1
dao/src/main/resources/mapper/PaymentCollectionMapper.xml

@@ -26,7 +26,7 @@
     <sql id="paymentCollectionSql">
         SELECT
         i.NAME AS itemName,
-        i.business_no,
+        i.oa_no as businessNo,
         dd1.NAME AS cateName,
         dd2.NAME AS businessSource,
         i.client_unit,

+ 2 - 0
domain/src/main/java/com/dayou/common/Constants.java

@@ -146,6 +146,8 @@ public interface Constants {
 
     String RENT = "租金";
 
+    String BD = "BD";
+
     String PNG = ".png";
 
     String PERSONAL_DEPARTMENT = "个贷部";

+ 1 - 1
service/src/main/java/com/dayou/service/impl/FinanceInvoiceServiceImpl.java

@@ -120,7 +120,7 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
             OrderFund orderFund = new OrderFund();
             orderFund.setShouldAmount(item.getAmount());
             orderFund.setOrderName(item.getName());
-            orderFund.setOrderId(item.getBusinessNo());
+            orderFund.setOrderId(item.getOaNo());
             orderFund.setBusinessId(item.getId());
             orderFund.setBusinessType(ITEM_BUSINESS.name());
             orderFundService.add(orderFund);

+ 1 - 1
service/src/main/java/com/dayou/service/impl/ItemServiceImpl.java

@@ -95,7 +95,7 @@ public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements II
         OrderFund orderFund = new OrderFund();
         orderFund.setShouldAmount(itemDTO.getAmount());
         orderFund.setOrderName(itemDTO.getName());
-        orderFund.setOrderId(itemDTO.getBusinessNo());
+        orderFund.setOrderId(itemDTO.getOaNo());
         orderFund.setBusinessId(itemDTO.getId());
         orderFund.setBusinessType(ITEM_BUSINESS.name());
         orderFundService.add(orderFund);

+ 1 - 1
service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -531,7 +531,7 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
         BigDecimal evaluateAmount = majorProduction.getEvaluateAmount();
         String businessObjectType = majorProduction.getBusinessObjectType();
         String production = majorProduction.getProduction();
-        if (evaluateAim.equals(RENT)){
+        if (evaluateAim.equals(RENT) || evaluateAim.equals(BD)){
             majorProduction.setSecondCheck(ReportStatus.不审.name());
             majorProduction.setThirdCheck(ReportStatus.不审.name());
         }else {

+ 1 - 1
service/src/main/java/com/dayou/service/impl/PaymentCollectionServiceImpl.java

@@ -118,7 +118,7 @@ public class PaymentCollectionServiceImpl extends ServiceImpl<PaymentCollectionM
             OrderFund orderFund = new OrderFund();
             orderFund.setShouldAmount(item.getAmount());
             orderFund.setOrderName(item.getName());
-            orderFund.setOrderId(item.getBusinessNo());
+            orderFund.setOrderId(item.getOaNo());
             orderFund.setBusinessId(item.getId());
             orderFund.setBusinessType(ITEM_BUSINESS.name());
             orderFundService.add(orderFund);