feat:待办加入业务字段，方便活动失效更新

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/qdto/PendingTaskQDTO.java

@@ -23,14 +23,20 @@ public class PendingTaskQDTO implements Serializable {
      */
     private String relationId;
 
+
+    /**
+     * 业务id 如果是活动：活动id；话务：ecmid；群发：ecmid；月指标-1
+     */
+    private String businessId;
+
     /**
      * NoticeMessageTypeEnum
-     * 0-不良评价回访 1-ecm话务任务 ,3群发任务  4活动
+     * 0-月指标 1-ecm话务任务 ,3群发任务  4活动
      */
     private Integer taskType;
 
     /**
-     *
+     * 标题
      */
     private String title;
 
@@ -60,11 +66,46 @@ public class PendingTaskQDTO implements Serializable {
      */
     private String clerkId;
 
+    public PendingTaskQDTO() {
+    }
+
+    /**
+     * @param enterpriseId 企业id
+     * @param relationId   关联id relation解释
+     * @param businessId   业务id  如果是活动：活动id；话务：ecmid；群发：ecmid；月指标-1
+     * @param taskType     任务类型
+     * @param title        标题
+     * @param description  描述
+     * @param overdueTime  逾期时间
+     * @param invalidTime  失效时间
+     * @param storeId      门店id
+     * @param clerkId      导购id
+     */
+    public PendingTaskQDTO(String enterpriseId, String relationId, String businessId, Integer taskType, String title, String description, Date overdueTime, Date invalidTime, String storeId, String clerkId) {
+        this.enterpriseId = enterpriseId;
+        this.relationId = relationId;
+        this.businessId = businessId;
+        this.taskType = taskType;
+        this.title = title;
+        this.description = description;
+        this.overdueTime = overdueTime;
+        this.invalidTime = invalidTime;
+        this.storeId = storeId;
+        this.clerkId = clerkId;
+    }
 
     /**
      */
     private static final long serialVersionUID = 1L;
 
+    public String getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(String businessId) {
+        this.businessId = businessId;
+    }
+
     public String getEnterpriseId() {
         return enterpriseId;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/PendingTaskApiService.java

@@ -21,7 +21,7 @@ public interface PendingTaskApiService {
      *
      * @param qdto
      */
-    public void addPendingTask(PendingTaskQDTO qdto);
+    public ServiceResponse<Boolean> addPendingTask(PendingTaskQDTO qdto);
 
     /**
      * 待办列表查询分页

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabPendingTask.java

@@ -25,6 +25,10 @@ public class TabPendingTask implements Serializable {
      * 关联id 对应task_type
      */
     private String relationId;
+    /**
+     * 业务id 如果是活动：活动id；话务：ecmid；群发：ecmid
+     */
+    private String businessId;
 
     /**
      * 0-不良评价回访 1-ecm话务任务 ,3群发任务  4活动
@@ -136,6 +140,14 @@ public class TabPendingTask implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
+    public String getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(String businessId) {
+        this.businessId = businessId;
+    }
+
     /**
      * This method returns the value of the database column tab_haoban_pending_task.relation_id
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/PendingTaskBO.java

@@ -27,6 +27,11 @@ public class PendingTaskBO implements Serializable {
     private String relationId;
 
     /**
+     * 业务id 如果是活动：活动id；话务：ecmid；群发：ecmid
+     */
+    private String businessId;
+
+    /**
      * 0-不良评价回访 1-ecm话务任务 ,3群发任务  4活动
      */
     private Integer taskType;
@@ -100,6 +105,14 @@ public class PendingTaskBO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
+    public String getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(String businessId) {
+        this.businessId = businessId;
+    }
+
     public Long getPendingTaskId() {
         return pendingTaskId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -37,9 +37,10 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
     private PendingTaskService pendingTaskService;
 
     @Override
-    public void addPendingTask(PendingTaskQDTO qdto) {
+    public ServiceResponse<Boolean> addPendingTask(PendingTaskQDTO qdto) {
         //新增待办  todo 后续优化以及完善
         pendingTaskService.addOrUpdatePendingTask(EntityUtil.changeEntityByOrika(PendingTaskBO.class, qdto));
+        return ServiceResponse.success(true);
     }
 
 

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -5,6 +5,7 @@
         <id column="id" jdbcType="INTEGER" property="id"/>
         <result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId"/>
         <result column="relation_id" jdbcType="VARCHAR" property="relationId"/>
+        <result column="business_id" jdbcType="VARCHAR" property="businessId"/>
         <result column="task_type" jdbcType="INTEGER" property="taskType"/>
         <result column="title" jdbcType="VARCHAR" property="title"/>
         <result column="description" jdbcType="VARCHAR" property="description"/>
@@ -21,7 +22,7 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
-    id, enterprise_id, relation_id, task_type, title, description, task_status_flag,
+        id, enterprise_id, relation_id,business_id, task_type, title, description, task_status_flag,
     overdue_time, invalid_time, store_id, clerk_id, finish_time, finish_flag, overdue_flag, 
     delete_flag, create_time, update_time
   </sql>
@@ -61,6 +62,9 @@
             <if test="relationId != null">
                 relation_id,
             </if>
+            <if test="businessId != null">
+                business_id,
+            </if>
             <if test="taskType != null">
                 task_type,
             </if>
@@ -114,6 +118,9 @@
             <if test="relationId != null">
                 #{relationId,jdbcType=VARCHAR},
             </if>
+            <if test="businessId != null">
+                #{businessId,jdbcType=VARCHAR},
+            </if>
             <if test="taskType != null">
                 #{taskType,jdbcType=INTEGER},
             </if>
@@ -167,6 +174,9 @@
             <if test="relationId != null">
                 relation_id = #{relationId,jdbcType=VARCHAR},
             </if>
+            <if test="businessId != null">
+                business_id = #{businessId,jdbcType=VARCHAR},
+            </if>
             <if test="taskType != null">
                 task_type = #{taskType,jdbcType=INTEGER},
             </if>
@@ -216,6 +226,7 @@
     update tab_haoban_pending_task
     set enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
       relation_id = #{relationId,jdbcType=VARCHAR},
+        business_id = #{businessId,jdbcType=VARCHAR},
       task_type = #{taskType,jdbcType=INTEGER},
       title = #{title,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},