From 0c31dbc9072f8ad78dc69ac34552e3db2dd2e535 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Thu, 17 Aug 2023 16:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E4=BB=BB=E5=8A=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/dao/HyFollowTaskDAO.java     |  1 +
 .../src/main/resources/mapper/HyFollowTaskMapper.xml | 12 +++++++++++-
 .../java/com/cool/store/entity/HyFollowTaskDO.java   |  3 +++
 .../service/impl/HyPartnerLineInfoServiceImpl.java   |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
index 89ebbec86..f414b9405 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
@@ -90,6 +90,7 @@ public class HyFollowTaskDAO {
         HyFollowTaskDO update = new HyFollowTaskDO();
         update.setId(followTaskId);
         update.setTaskStatus(FollowTaskStatusEnum.FINISHED.getCode());
+        update.setFinishTime(new Date());
         return updateFollowTask(update);
     }
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
index b7d249ff0..a7354eff5 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
@@ -10,13 +10,14 @@
         <result column="deadline" jdbcType="TIMESTAMP" property="deadline"/>
         <result column="communication_content" jdbcType="VARCHAR" property="communicationContent"/>
         <result column="task_status" jdbcType="TINYINT" property="taskStatus"/>
+        <result column="finish_time" jdbcType="TIMESTAMP" property="finishTime"/>
         <result column="deleted" jdbcType="BIT" property="deleted"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
         id, partner_line_id, follow_user_id, task_title, communication_type, deadline, communication_content,
-        task_status, deleted, create_time, update_time
+        task_status, finish_time, deleted, create_time, update_time
     </sql>
     <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
         insert into hy_follow_task
@@ -42,6 +43,9 @@
             <if test="record.taskStatus != null">
                 task_status,
             </if>
+            <if test="record.finishTime != null">
+                finish_time,
+            </if>
             <if test="record.deleted != null">
                 deleted,
             </if>
@@ -74,6 +78,9 @@
             <if test="record.taskStatus != null">
                 #{record.taskStatus},
             </if>
+            <if test="record.finishTime != null">
+                #{record.finishTime},
+            </if>
             <if test="record.deleted != null">
                 #{record.deleted},
             </if>
@@ -109,6 +116,9 @@
             <if test="record.taskStatus != null">
                 task_status = #{record.taskStatus},
             </if>
+            <if test="record.finishTime != null">
+                finish_time = #{record.finishTime},
+            </if>
             <if test="record.deleted != null">
                 deleted = #{record.deleted},
             </if>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
index 81c50e169..36106228f 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java
@@ -43,6 +43,9 @@ public class HyFollowTaskDO implements Serializable {
     @ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废")
     private Integer taskStatus;
 
+    @ApiModelProperty("任务截止时间")
+    private Date finishTime;
+
     @ApiModelProperty("删除标识")
     private Boolean deleted;
 
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 08dfc76ae..0032d49a1 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
@@ -190,7 +190,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),DateUtil.formatDateTime(new Date()),hyPartnerBaseInfoDO.getUsername(),hyPartnerBaseInfoDO.getMobile());
 
         //作废待完成&已逾期的任务
-        hyFollowTaskDAO.updateUndoTaskFollowUserId(request.getLineId(), request.getUserId());
+        hyFollowTaskDAO.cancelUndoFollowTask(request.getLineId());
 
         //添加日志
         LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(),