变更字段名称兼容群裂变

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())

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();

linkwe-wecom/src/main/resources/mapper/wecom/WeTaskFissionMapper.xml

@@ -16,8 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="customerTag"    column="customer_tag"    />
         <result property="postersId"    column="posters_id"    />
         <result property="postersUrl"    column="posters_url"    />
-        <result property="fissStaffId"    column="fiss_staff_id"    />
-        <result property="fissStaff"    column="fiss_staff"    />
+        <result property="fissionTargetId"    column="fission_target_id"    />
+        <result property="fissionTarget"    column="fission_target"    />
         <result property="fissQrcode"    column="fiss_qrcode"    />
         <result property="rewardUrl"    column="reward_url"    />
         <result property="rewardImageUrl"    column="reward_image_url"    />
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWeTaskFissionVo">
-        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
     </sql>
 
     <select id="selectWeTaskFissionList" parameterType="WeTaskFission" resultMap="WeTaskFissionResult">
@@ -47,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerTag != null  and customerTag != ''"> and customer_tag = #{customerTag}</if>
             <if test="postersId != null "> and posters_id = #{postersId}</if>
             <if test="postersUrl != null  and postersUrl != ''"> and posters_url = #{postersUrl}</if>
-            <if test="fissStaffId != null  and fissStaffId != ''"> and fiss_staff_id = #{fissStaffId}</if>
-            <if test="fissStaff != null  and fissStaff != ''"> and fiss_staff = #{fissStaff}</if>
+            <if test="fissionTargetId != null  and fissionTargetId != ''"> and fission_target_id = #{fissionTargetId}</if>
+            <if test="fissionTarget != null  and fissionTarget != ''"> and fission_target = #{fissionTarget}</if>
             <if test="fissQrcode != null  and fissQrcode != ''"> and fiss_qrcode = #{fissQrcode}</if>
             <if test="rewardUrl != null  and rewardUrl != ''"> and reward_url = #{rewardUrl}</if>
             <if test="rewardImageUrl != null  and rewardImageUrl != ''"> and reward_image_url = #{rewardImageUrl}</if>
@@ -76,8 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerTag != null">customer_tag,</if>
             <if test="postersId != null">posters_id,</if>
             <if test="postersUrl != null and postersUrl != ''">posters_url,</if>
-            <if test="fissStaffId != null and fissStaffId != ''">fiss_staff_id,</if>
-            <if test="fissStaff != null and fissStaff != ''">fiss_staff,</if>
+            <if test="fissionTargetId != null and fissionTargetId != ''">fission_target_id,</if>
+            <if test="fissionTarget != null and fissionTarget != ''">fission_target,</if>
             <if test="fissQrcode != null and fissQrcode != ''">fiss_qrcode,</if>
             <if test="rewardUrl != null and rewardUrl != ''">reward_url,</if>
             <if test="rewardImageUrl != null and rewardImageUrl != ''">reward_image_url,</if>
@@ -100,8 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerTag != null">#{customerTag},</if>
             <if test="postersId != null">#{postersId},</if>
             <if test="postersUrl != null and postersUrl != ''">#{postersUrl},</if>
-            <if test="fissStaffId != null and fissStaffId != ''">#{fissStaffId},</if>
-            <if test="fissStaff != null and fissStaff != ''">#{fissStaff},</if>
+            <if test="fissionTargetId != null and fissionTargetId != ''">#{fissionTargetId},</if>
+            <if test="fissionTarget != null and fissionTarget != ''">#{fissionTarget},</if>
             <if test="fissQrcode != null and fissQrcode != ''">#{fissQrcode},</if>
             <if test="rewardUrl != null and rewardUrl != ''">#{rewardUrl},</if>
             <if test="rewardImageUrl != null and rewardImageUrl != ''">#{rewardImageUrl},</if>
@@ -128,8 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerTag != null">customer_tag = #{customerTag},</if>
             <if test="postersId != null">posters_id = #{postersId},</if>
             <if test="postersUrl != null and postersUrl != ''">posters_url = #{postersUrl},</if>
-            <if test="fissStaffId != null and fissStaffId != ''">fiss_staff_id = #{fissStaffId},</if>
-            <if test="fissStaff != null and fissStaff != ''">fiss_staff = #{fissStaff},</if>
+            <if test="fissionTargetId != null and fissionTargetId != ''">fission_target_id = #{fissionTargetId},</if>
+            <if test="fissionTarget != null and fissionTarget != ''">fission_target = #{fissionTarget},</if>
             <if test="fissQrcode != null and fissQrcode != ''">fiss_qrcode = #{fissQrcode},</if>
             <if test="rewardUrl != null and rewardUrl != ''">reward_url = #{rewardUrl},</if>
             <if test="rewardImageUrl != null and rewardImageUrl != ''">reward_image_url = #{rewardImageUrl},</if>

sql/link-wechat.sql

@@ -6420,8 +6420,8 @@ CREATE TABLE `we_task_fission` (
   `customer_tag` MEDIUMTEXT NULL COMMENT '客户标签名称列表，为all是可为空',
   `posters_id` BIGINT NULL DEFAULT NULL COMMENT '海报id',
   `posters_url` VARCHAR(300) NOT NULL DEFAULT 'NULL' COMMENT '裂变海报路径',
-  `fiss_staff_id` VARCHAR(64) NOT NULL DEFAULT 'NULL' COMMENT '任务裂变目标员工',
-  `fiss_staff` VARCHAR(100) NOT NULL DEFAULT 'NULL' COMMENT '任务裂变目标员工姓名',
+  `fission_target_id` VARCHAR(64) NOT NULL DEFAULT 'NULL' COMMENT '任务裂变目标员工/群裂变id',
+  `fission_target` VARCHAR(100) NOT NULL DEFAULT 'NULL' COMMENT '任务裂变目标员工姓名/群裂变二维码地址',
   `fiss_qrcode` VARCHAR(500) NOT NULL DEFAULT 'NULL' COMMENT '任务裂变目标二维码',
   `reward_url` VARCHAR(500) NOT NULL DEFAULT 'NULL' COMMENT '兑奖链接',
   `reward_image_url` VARCHAR(500) NOT NULL DEFAULT 'NULL' COMMENT '兑奖链接图片',