From 69da8f6f847b0c980b66d480adae8ac9ddcc16a8 Mon Sep 17 00:00:00 2001
From: leejoker <1056650571@qq.com>
Date: Thu, 4 Feb 2021 09:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AD=97=E6=AE=B5=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E5=85=BC=E5=AE=B9=E7=BE=A4=E8=A3=82=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wecom/domain/WeTaskFission.java | 15 ++++++++-----
.../impl/WeTaskFissionServiceImpl.java | 4 ++--
.../mapper/wecom/WeTaskFissionMapper.xml | 22 +++++++++----------
sql/link-wechat.sql | 4 ++--
4 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java
index 1370a674..0ba7e52e 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.linkwechat.common.annotation.Excel;
import com.linkwechat.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -101,14 +102,16 @@ public class WeTaskFission extends BaseEntity {
/**
* 任务裂变目标员工
*/
- @Excel(name = "任务裂变目标员工")
- private String fissStaffId;
+ @Excel(name = "任务裂变目标id")
+ @ApiModelProperty(value = "任务裂变目标id, 目标员工或者群活码id")
+ private String fissionTargetId;
/**
* 任务裂变目标员工姓名
*/
- @Excel(name = "任务裂变目标员工姓名")
- private String fissStaff;
+ @Excel(name = "任务裂变目标")
+ @ApiModelProperty(value = "任务裂变目标, 目标员工名称或者群活码二维码地址")
+ private String fissionTarget;
/**
* 任务裂变目标员工二维码
@@ -160,8 +163,8 @@ public class WeTaskFission extends BaseEntity {
.append("customerTag", getCustomerTag())
.append("postersId", getPostersId())
.append("postersUrl", getPostersUrl())
- .append("fissStaffId", getFissStaffId())
- .append("fissStaff", getFissStaff())
+ .append("fissionTargetId", getFissionTargetId())
+ .append("fissionTarget", getFissionTarget())
.append("fissQrcode", getFissQrcode())
.append("rewardUrl", getRewardUrl())
.append("rewardImageUrl", getRewardImageUrl())
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTaskFissionServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTaskFissionServiceImpl.java
index bd870564..04cb774b 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTaskFissionServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeTaskFissionServiceImpl.java
@@ -139,9 +139,9 @@ public class WeTaskFissionServiceImpl implements IWeTaskFissionService {
//海报路径
String postersPath = weTaskFission.getPostersUrl();
//目标员工id
- String fissStaffId = weTaskFission.getFissStaffId();
+ String fissionTargetId = weTaskFission.getFissionTargetId();
//目标员工活码
- String fissStaffQrcode = weTaskFission.getFissQrcode();
+ String fissQrcode = weTaskFission.getFissQrcode();
//todo 生成海报
LinkMessageDto linkMessageDto = new LinkMessageDto();
diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeTaskFissionMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeTaskFissionMapper.xml
index 54dfd8df..aa3edcca 100644
--- a/linkwe-wecom/src/main/resources/mapper/wecom/WeTaskFissionMapper.xml
+++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeTaskFissionMapper.xml
@@ -16,8 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
+
+
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, fission_type, task_name, fiss_info, fiss_num, start_time, over_time, customer_tag_id, customer_tag, posters_id, posters_url, fiss_staff_id, fiss_staff, fiss_qrcode, reward_url, reward_image_url, reward_rule, fiss_status, welcome_msg, create_by, create_time, update_by, update_time from we_task_fission
+ select id, fission_type, task_name, fiss_info, fiss_num, start_time, over_time, customer_tag_id, customer_tag, posters_id, posters_url, fission_target_id, fission_target, fiss_qrcode, reward_url, reward_image_url, reward_rule, fiss_status, welcome_msg, create_by, create_time, update_by, update_time from we_task_fission