From 8fc0a38dc85276a6e6e1b4361c9fafc092ad70b6 Mon Sep 17 00:00:00 2001
From: "xiaodong.hu" <1075471126@qq.com>
Date: Fri, 24 Nov 2023 14:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerLineInfoMapper.xml        | 20 +++++++++++++------
 .../store/entity/HyPartnerLineInfoDO.java     |  3 +++
 .../store/service/impl/EcSyncServiceImpl.java |  4 +++-
 .../impl/HyPartnerIntentInfoServiceImpl.java  |  1 +
 .../impl/HyPartnerLineInfoServiceImpl.java    |  2 ++
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 03555d16d..44991a658 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -24,12 +24,13 @@
     <result column="create_user_mobile" jdbcType="VARCHAR" property="createUserMobile" />
     <result column="operator_type" jdbcType="VARCHAR" property="operatorType" />
     <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
+    <result column="allot_time" jdbcType="TIMESTAMP" property="allotTime" />
   </resultMap>
   <sql id="Base_Column_List">
     id, partner_id, workflow_stage, workflow_status, line_status, investment_manager, 
     development_director, development_manager, deadline, pass_reason, reject_public_reason, 
     reject_real_reason, certify_file, deleted, create_time, update_time, close_time, 
-    close_user_id,create_user_id,create_user_mobile,operator_type,update_user_id
+    close_user_id,create_user_id,create_user_mobile,operator_type,update_user_id,allot_time
   </sql>
 
   <select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
@@ -140,6 +141,9 @@
       <if test="record.updateUserId != null">
         update_user_id,
       </if>
+      <if test="record.allotTime != null">
+        allot_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="record.partnerId != null">
@@ -205,6 +209,9 @@
       <if test="record.updateUserId != null">
         #{record.updateUserId},
       </if>
+      <if test="record.allotTime != null">
+        #{record.allotTime},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective">
@@ -267,6 +274,9 @@
       <if test="record.removeBlackReason != null">
         remove_black_reason = #{record.removeBlackReason},
       </if>
+      <if test="record.allotTime != null">
+        allot_time = #{record.allotTime},
+      </if>
     </set>
     where id = #{record.id}
   </update>
@@ -388,7 +398,7 @@
 
   <update id="updateInvestmentManager">
     update hy_partner_line_info
-      set investment_manager = #{userId}, line_status= '1'
+      set investment_manager = #{userId}, line_status= '1',allot_time=now()
     <if test="lineIdList!=null and lineIdList.size>0">
       <foreach collection="lineIdList" open="where id in (" close=")" separator="," item="lineId">
         #{lineId}
@@ -536,7 +546,7 @@
       bi.user_portrait as userPortrait,
       eu.name as investmentManagerName,
       eu.mobile as investmentManagerMobile,
-      hptil.create_time AS allotTime
+      hpli.allot_time AS allotTime
     FROM
     hy_partner_line_info hpli
     LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id
@@ -544,7 +554,6 @@
     LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id
     LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id
     LEFT JOIN hy_open_area_info hoai ON hoai.id = hpuinfo.want_shop_area
-    LEFT JOIN ( SELECT create_time,partner_line_id FROM hy_partner_task_info_log WHERE id IN ( SELECT max( id ) FROM hy_partner_task_info_log WHERE operate_type IN ( 'allocation_investment_manager', 'transfer_investment_manager', 'ec_sync_add_line' ) AND deleted = 0 AND operate_user_id = #{investmentManagerId} GROUP BY partner_line_id  )   ) hptil  ON hpli.id = hptil.partner_line_id
     WHERE hpli.line_status in (1,2)
     AND ( hpli.deleted IS NULL OR hpli.deleted = 0 )
     <if test="keyword!=null and keyword!='' and keywordType!=null and keywordType=='name'">
@@ -829,7 +838,6 @@
     LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id
     LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id
     LEFT JOIN hy_open_area_info hoai ON hoai.id = hpuinfo.want_shop_area
-    LEFT JOIN ( SELECT create_time,partner_line_id FROM hy_partner_task_info_log WHERE id IN ( SELECT max( id ) FROM hy_partner_task_info_log WHERE operate_type IN ( 'allocation_investment_manager', 'transfer_investment_manager', 'ec_sync_add_line' ) AND deleted = 0 AND operate_user_id = #{investmentManagerId}  GROUP BY partner_line_id  )   ) hptil  ON hpli.id = hptil.partner_line_id
     WHERE hpli.line_status in (1,2)
     AND ( hpli.deleted IS NULL OR hpli.deleted = 0 )
     <if test="keyword!=null and keyword!='' and keywordType!=null and keywordType=='name'">
@@ -956,7 +964,7 @@
       </if>
     </if>
     <if test="sortField!=null and sortField != ''  and  sortField=='allotTime' ">
-      order by hptil.create_time
+      order by hpli.allot_time
       <if test="sortOrder!=null and sortOrder != ''  and  sortOrder=='descend' ">
         desc
       </if>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
index b7854032e..a239a019e 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
@@ -94,4 +94,7 @@ public class HyPartnerLineInfoDO implements Serializable {
 
     @ApiModelProperty("更新人")
     private  String updateUserId;
+
+    @ApiModelProperty("分配时间")
+    private  Date allotTime;
 }
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
index dc4f5b24d..a0611a24a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
@@ -218,7 +218,9 @@ public class EcSyncServiceImpl implements EcSyncService {
         String followUserName = customerInfoItem.getFollowUserName();
         String followUserMobile = customerInfoItem.getFollowUserMobile();
         //获取招商经理
-        resultLine.setInvestmentManager(getInvestmentManager(followUserName, followUserMobile));
+        String investmentManager = getInvestmentManager(followUserName, followUserMobile);
+        resultLine.setInvestmentManager(investmentManager);
+        resultLine.setAllotTime(StringUtil.isEmpty(investmentManager)?null:new Date());
         resultLine.setWorkflowStage(WorkflowStageEnum.INTENT.getCode())
                 .setLineStatus(StringUtil.isEmpty(customerInfoItem.getFollowUserName()) ? LineStatusEnum.PUBLIC_SEAS.getCode() : LineStatusEnum.PRIVATE_SEAS.getCode());
         resultBase.setUsername(customerInfoItem.getName()).setMobile(customerInfoItem.getMobile());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
index d355eaf99..4b727d256 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -252,6 +252,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
                 String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent");
                 hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
                 userIdList.add(investmentManager);
+                hyPartnerLineInfoDO.setAllotTime(new Date());
             }
             hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index 8e7d50dd2..2a584a516 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -895,11 +895,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode());
             hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
             hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+            hyPartnerLineInfoDO.setAllotTime(new Date());
             hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
         } else {
             if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())) {
                 hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
                 hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                hyPartnerLineInfoDO.setAllotTime(new Date());
                 hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
             }
         }