Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@@ -116,7 +116,7 @@ public class BaseDistributorVo implements Vo {
     private String salesman;
     @ApiModelProperty("联系电话")
     private String invoPhone;
-
+    private String effectiveDate;
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListVo.java

@@ -33,4 +33,5 @@ public class BaseDistributorsListVo implements Vo {
     private String invoPhone;//开票联系电话
     private String invoBank;//开票开户行
     private String invoBankNum;//开票银行账号
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java

@@ -36,4 +36,5 @@ public class BaseDistributorsVo implements Vo {
     private boolean updateBtn;
     private boolean reportBtn;
     private boolean deleteBtn;
+    private String effectiveDate;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -14,6 +14,7 @@
         bd.isGuarantee as isGuarantee,
         bd.pDistributorName as pDistributorName,
         bd.isDelivery as isDelivery,
+        bd.effectiveDate as effectiveDate,
         case bd.filingState
         when 0 then '未备案'
         when 2 then '备案中'
@@ -149,6 +150,7 @@
         DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime,
         bd.isDelivery,
         bd.legalMobile as invoPhone,
+        bd.effectiveDate as effectiveDate,
         case bd.filingState
         when 0 then '未备案'
         when 1 then '已备案'
@@ -297,6 +299,10 @@
     </select>
 
     <select id="selectByRecord" resultType="com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord">
-        select * from anrui_riskcenter.loan_customer_record where customerSid = #{sid} and nodeState = '已办结' and effectiveDate> NOW()
+        select *
+        from anrui_riskcenter.loan_customer_record
+        where customerSid = #{sid}
+          and nodeState = '已办结'
+          and effectiveDate > NOW()
     </select>
 </mapper>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java

@@ -39,4 +39,5 @@ public class DistributorVo implements Vo {
     //private String nodeState;
     private boolean reportBtn;
     private boolean deleteBtn;
+    private String effectiveDate;
 }