From aa49efb50aa9a904c67ee41d26991693e78134bd Mon Sep 17 00:00:00 2001
From: infin_caishuxiao <caishuxiao@infincash.com>
Date: Tue, 27 Feb 2018 11:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=87=8D,=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=97=A5=E5=BF=97(=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=9C=A8=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection/CronCollectionServiceImpl.java |  6 +-
 .../prd/TBizCollectionRecordMapper.xml        | 64 ++++++++++---------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionServiceImpl.java b/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionServiceImpl.java
index 64c6f56e..50763232 100644
--- a/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionServiceImpl.java
+++ b/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionServiceImpl.java
@@ -61,9 +61,9 @@ public class CronCollectionServiceImpl implements CronCollectionService
 			//FIXME 存量怎么办
 			List<TBizCollection> list = entry.getValue();
 			XxlJobLogger.log("\n\n``````````list size\n\n"+list.size());
-			for (int x=0; x<5; x++) {
-				XxlJobLogger.log("\n"+ x +"\n"+list.get(x).getProjectNumber());
-			}
+//			for (int x=0; x<5; x++) {
+//				XxlJobLogger.log("\n"+ x +"\n"+list.get(x).getProjectNumber());
+//			}
 			for (int a=0; a<list.size(); a++) {
 				//序列化深拷贝
 				TBizCollection s = JSON.parseObject(JSON.toJSONString(list.get(a)), TBizCollection.class); 
diff --git a/infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/TBizCollectionRecordMapper.xml b/infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/TBizCollectionRecordMapper.xml
index 79376ecc..2e233799 100644
--- a/infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/TBizCollectionRecordMapper.xml
+++ b/infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/TBizCollectionRecordMapper.xml
@@ -29,36 +29,42 @@
   </resultMap>
 
   <select id="queryAll" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-        t_biz.project_number, 
-        t_u.login_name user_login_name, 
-        t_ub.real_name user_real_name, 
-        t_u.phone user_phone,
-        t_biz.user_id fk_t_user,
-        t_biz.fk_t_project,
-        t_biz.loan_time, 
-        t_biz.deadline, 
-        t_biz.unit, 
-        t_biz.first_price_loan, 
-        t_biz.repayment_date
-    from
+    select tmp_2.* 
+    from 
+    t_biz_collection tmp_1
+    right join
     (
-        select
-          t1.user_id,
-          t1.id fk_t_project,
-          t1.number project_number,
-          t1.loan_time,
-          t1.deadline,
-          t1.unit,
-          t1.first_price_loan,
-          t2.repayment_date      
-        from t_project t1 inner join t_project_refund t2 on t1.id=t2.project_id and t1.status in ('7') 
-        where t2.repayment_date >  #{_parameter}
-    ) t_biz
-    inner join
-    t_user t_u ON t_u.user_id = t_biz.user_id
-    inner join 
-    t_user_basis t_ub on t_ub.user_id=t_u.user_id;
+        select 
+            t_biz.project_number, 
+            t_u.login_name user_login_name, 
+            t_ub.real_name user_real_name, 
+            t_u.phone user_phone,
+            t_biz.user_id fk_t_user,
+            t_biz.fk_t_project,
+            t_biz.loan_time, 
+            t_biz.deadline, 
+            t_biz.unit, 
+            t_biz.first_price_loan, 
+            t_biz.repayment_date
+        from
+        (
+            select
+              t1.user_id,
+              t1.id fk_t_project,
+              t1.number project_number,
+              t1.loan_time,
+              t1.deadline,
+              t1.unit,
+              t1.first_price_loan,
+              t2.repayment_date      
+            from t_project t1 inner join t_project_refund t2 on t1.id=t2.project_id and t1.status in ('7') 
+            where t2.repayment_date >  #{_parameter}
+        ) t_biz
+        inner join
+        t_user t_u ON t_u.user_id = t_biz.user_id
+        inner join 
+        t_user_basis t_ub on t_ub.user_id=t_u.user_id
+    ) tmp_2 on tmp_2.fk_t_project = tmp_1.fk_t_project where tmp_1.fk_t_project is null;
   </select>
  
   <select id="queryUserByRoleId" parameterType="java.lang.String" resultType="java.util.HashMap">