From 65c7a3a3b15efc752f7d0002b9d94dba06e8a004 Mon Sep 17 00:00:00 2001
From: infin_caishuxiao <caishuxiao@infincash.com>
Date: Sat, 24 Feb 2018 18:46:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8F=92=E5=85=A5=E4=BA=86,?=
 =?UTF-8?q?=20=E4=BD=86=E6=98=AF=E8=87=AA=E5=8A=A8=E6=B4=BE=E5=8D=95bug,?=
 =?UTF-8?q?=20=E5=8F=AA=E8=83=BD=E6=B4=BE=E4=B8=80=E4=B8=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection/CronCollectionServiceImpl.java | 15 +--
 .../cron/collection/table/TBizCollection.java |  6 +-
 .../prd/TBizCollectionRecordMapper.xml        | 99 ++-----------------
 3 files changed, 18 insertions(+), 102 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 7a304aea..50db7077 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
@@ -60,20 +60,23 @@ public class CronCollectionServiceImpl implements CronCollectionService
 				Map<String, Object> tmpMap = userList.get(a%cycle);
 				String userId = (String) tmpMap.get("user_id");
 				String userRealName = (String) tmpMap.get("real_name");
+				s.setState(1);
 				s.setFkSystemUser(userId);
 				s.setCollectorLoginName(userRealName);
 				long ll = dateSubstract(new Date(), s.getRepaymentDate());
 				s.setOverdueDayCount(Short.valueOf("" + ll));
 				String tmp = "";
 				tmp += s.getDeadline();
-				if("0".equals(s.getUnit().trim())) {
-					//天
+				if ("0".equals(s.getUnit().trim()))
+				{
+					// 天
 					tmp += " Day";
-					
-				} else if ("1".equals(s.getUnit().trim())) {
-					//月
+				} else if ("1".equals(s.getUnit().trim()))
+				{
+					// 月
 					tmp += " Month";
-				} else {
+				} else
+				{
 					throw new InfintechException("getUnit error! unit:" + s.getUnit());
 				}
 				s.setProjectPeriod(tmp);
diff --git a/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java b/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java
index 500eead8..61f57fa8 100644
--- a/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java
+++ b/infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/table/TBizCollection.java
@@ -44,7 +44,7 @@ public class TBizCollection {
 
     private String updateBy;
 
-    private Byte state;
+    private int state;
 
     private Date fullRepayDate;
 
@@ -182,11 +182,11 @@ public class TBizCollection {
         this.updateBy = updateBy == null ? null : updateBy.trim();
     }
 
-    public Byte getState() {
+    public int getState() {
         return state;
     }
 
-    public void setState(Byte state) {
+    public void setState(int state) {
         this.state = state;
     }
 
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 11f73fc6..204c30bc 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
@@ -21,7 +21,7 @@
     <result column="collector_login_name" jdbcType="VARCHAR" property="collectorLoginName" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="state" jdbcType="TINYINT" property="state" />
+    <result column="state" jdbcType="TINYINT" property="state" javaType="int"/>
     <result column="full_repay_date" jdbcType="TIMESTAMP" property="fullRepayDate" />
     <result column="last_collection_time" jdbcType="TIMESTAMP" property="lastCollectionTime" />
     <result column="next_collection_time" jdbcType="TIMESTAMP" property="nextCollectionTime" />
@@ -69,20 +69,7 @@
   </select>
  
   <insert id="insertBatch" parameterType="com.infincash.cron.collection.table.TBizCollection">
-    insert into t_biz_collection_record
-    
-    "collectorLoginName": "HARRY",
-    "deadline": 1,
-    "firstPriceLoan": 1800000.00,
-    "fkSystemUser": "00101519376707262349",
-    "loanTime": 1511663497000,
-    "projectNumber": "GO20171125435400",
-    "repaymentDate": 1514217600000,
-    "unit": "1",
-    "userLoginName": "MF_qmjoqz",
-    "userPhone": "085934509604",
-    "userRealName": "Sandhi Trisnadi"
-    
+    insert into t_biz_collection
     <trim prefix="(" suffix=")" suffixOverrides=",">
         fk_t_project,
         fk_t_user,
@@ -94,102 +81,28 @@
         loan_time,
         project_period,
         first_price_loan,
-        repayment_date
-      </if>
-      <if test="collectorLoginName != null">
+        repayment_date,
+        overdue_day_count,
         collector_login_name,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="updateBy != null">
-        update_by,
-      </if>
-      <if test="state != null">
-        state,
-      </if>
-      <if test="fullRepayDate != null">
-        full_repay_date,
-      </if>
-      <if test="lastCollectionTime != null">
-        last_collection_time,
-      </if>
-      <if test="nextCollectionTime != null">
-        next_collection_time,
-      </if>
-      <if test="histryCollectionCount != null">
-        histry_collection_count,
-      </if>
+        state
     </trim>
     VALUES
     <foreach collection ="list" item="oneItem" index= "index" separator =",">
     (
-      <if test="fkTProject != null">
         #{oneItem.fkTProject,jdbcType=VARCHAR},
-      </if>
-      <if test="fkTUser != null">
         #{oneItem.fkTUser,jdbcType=VARCHAR},
-      </if>
-      <if test="fkSystemUser != null">
         #{oneItem.fkSystemUser,jdbcType=VARCHAR},
-      </if>
-      <if test="waitOrRecord != null">
-        #{oneItem.waitOrRecord,jdbcType=TINYINT},
-      </if>
-      <if test="projectNumber != null">
         #{oneItem.projectNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="userLoginName != null">
         #{oneItem.userLoginName,jdbcType=VARCHAR},
-      </if>
-      <if test="userRealName != null">
         #{oneItem.userRealName,jdbcType=VARCHAR},
-      </if>
-      <if test="userPhone != null">
         #{oneItem.userPhone,jdbcType=VARCHAR},
-      </if>
-      <if test="loanTime != null">
         #{oneItem.loanTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="projectPeriod != null">
         #{oneItem.projectPeriod,jdbcType=VARCHAR},
-      </if>
-      <if test="firstPriceLoan != null">
         #{oneItem.firstPriceLoan,jdbcType=DECIMAL},
-      </if>
-      <if test="repaymentDate != null">
         #{oneItem.repaymentDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="overdueDayCount != null">
         #{oneItem.overdueDayCount,jdbcType=SMALLINT},
-      </if>
-      <if test="fkTBizCollectionOverdueBucketIntervalId != null">
-        #{oneItem.fkTBizCollectionOverdueBucketIntervalId,jdbcType=SMALLINT},
-      </if>
-      <if test="collectorLoginName != null">
         #{oneItem.collectorLoginName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{oneItem.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        #{oneItem.updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="state != null">
-        #{oneItem.state,jdbcType=TINYINT},
-      </if>
-      <if test="fullRepayDate != null">
-        #{oneItem.fullRepayDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="lastCollectionTime != null">
-        #{oneItem.lastCollectionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="nextCollectionTime != null">
-        #{oneItem.nextCollectionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="histryCollectionCount != null">
-        #{oneItem.histryCollectionCount,jdbcType=SMALLINT},
-      </if>
+        #{oneItem.state,jdbcType=TINYINT}
     )
     </foreach >
   </insert>