From a0a36748c944a6f91fc76f4667fe540a5209722c Mon Sep 17 00:00:00 2001
From: infin_caishuxiao <caishuxiao@infincash.com>
Date: Sat, 24 Feb 2018 15:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=A1=A8=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...lectionRecord.java => TBizCollection.java} |  2 +-
 .../prd/TBizCollectionRecordMapper.xml        | 41 +++++++++++++------
 2 files changed, 30 insertions(+), 13 deletions(-)
 rename infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/{TBizCollectionRecord.java => TBizCollection.java} (99%)

diff --git a/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollectionRecord.java b/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java
similarity index 99%
rename from infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollectionRecord.java
rename to infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java
index 707cfac0..36972c38 100644
--- a/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollectionRecord.java
+++ b/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java
@@ -3,7 +3,7 @@ package com.infincash.cron.collection.table;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class TBizCollectionRecord {
+public class TBizCollection {
     private Long id;
 
     private String fkTProject;
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 9613a5f5..cff12a83 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.infincash.cron.collection.mapper.TBizCollectionRecordMapper">
-  <resultMap id="BaseResultMap" type="com.infincash.cron.collection.table.TBizCollectionRecord">
+  <resultMap id="BaseResultMap" type="com.infincash.cron.collection.table.TBizCollection">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="fk_t_project" jdbcType="VARCHAR" property="fkTProject" />
     <result column="fk_t_user" jdbcType="VARCHAR" property="fkTUser" />
@@ -11,6 +11,8 @@
     <result column="user_real_name" jdbcType="VARCHAR" property="userRealName" />
     <result column="user_phone" jdbcType="VARCHAR" property="userPhone" />
     <result column="loan_time" jdbcType="TIMESTAMP" property="loanTime" />
+    <result column="deadline" jdbcType="INT" property="deadline" />
+    <result column="unit" jdbcType="CHAR" property="unit" />
     <result column="project_period" jdbcType="VARCHAR" property="projectPeriod" />
     <result column="first_price_loan" jdbcType="DECIMAL" property="firstPriceLoan" />
     <result column="repayment_date" jdbcType="TIMESTAMP" property="repaymentDate" />
@@ -28,19 +30,34 @@
 
   <select id="queryAll" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
-      t1.id,
-      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 
-      t1.loan_time > #{_parameter}
+        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.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 t1.loan_time >  #{_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>
  
-  <insert id="insertSelective" parameterType="com.infincash.cron.collection.table.TBizCollectionRecord">
+  <insert id="insertSelective" parameterType="com.infincash.cron.collection.table.TBizCollection">
     insert into t_biz_collection_record
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">