企微托管

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

@@ -16,15 +16,20 @@ import com.gic.haoban.manage.web.qo.open.AddTaskDataQO;
 import com.gic.haoban.manage.web.qo.open.AddTaskMemberPageQO;
 import com.gic.haoban.manage.web.qo.open.AddTaskPageQO;
 import com.gic.haoban.manage.web.utils.CreatorUtils;
+import com.gic.haoban.manage.web.vo.open.AddTaskDetailVO;
 import com.gic.haoban.task.manage.api.dto.open.*;
 import com.gic.haoban.task.manage.api.qdto.open.AddTaskMemberPageQDTO;
 import com.gic.haoban.task.manage.api.qdto.open.QwAddTaskPageQDTO;
 import com.gic.haoban.task.manage.api.service.OpenQwApiService;
+import com.gic.member.tag.api.dto.MemberTagDTO;
+import com.gic.member.tag.api.dto.MemberTagItemDTO;
+import com.gic.member.tag.api.service.MemberTagApiService;
 import com.gic.qcloud.BucketNameEnum;
 import com.gic.web.common.download.DownloadTask;
 import com.gic.web.common.download.DownloadTaskUtil;
 import com.gic.web.common.download.constants.TaskTypeEnum;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,6 +49,8 @@ public class QywxOpenTaskController {
     private OpenQwApiService openQwApiService;
     @Autowired
     private OpenAddMemberExcelHandler openAddMemberExcelHandler;
+    @Autowired
+    private MemberTagApiService memberTagApiService;
 
     /**
      * 加好友任务列表
@@ -98,12 +105,22 @@ public class QywxOpenTaskController {
      * @return
      */
     @RequestMapping("get-add-task")
-    public RestResponse<OpenQwAddTaskDTO> getAddTask(Long addTaskId) {
+    public RestResponse<AddTaskDetailVO> getAddTask(Long addTaskId) {
         ServiceResponse<OpenQwAddTaskDTO> resp = this.openQwApiService.getAddTask(addTaskId);
         if (!resp.isSuccess()) {
             return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult());
+        AddTaskDetailVO vo = EntityUtil.changeEntityByJSON(AddTaskDetailVO.class, resp.getResult());
+        if (StringUtils.isNotBlank(vo.getMemberLabelId())) {
+            MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(vo.getMemberLabelId());
+            if (null != tagItem) {
+                String tagId = tagItem.getTagId();
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
+                vo.setMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
+                vo.setMemberLabelStatus(tagItem.getStatus());
+            }
+        }
+        return RestResponse.successResult(vo);
     }
 
     /**

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/open/AddTaskDetailVO.java

+package com.gic.haoban.manage.web.vo.open;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AddTaskDetailVO implements Serializable {
+
+    /**id*/
+    private Long addTaskId;
+    /**企业id*/
+    private String wxEnterpriseId;
+    /**企业id*/
+    private String enterpriseId;
+    /**任务名称*/
+    private String name;
+    /**会员标签*/
+    private String memberLabelId;
+    private String memberLabelName ;
+    private int memberLabelStatus ;
+    /**开始时间*/
+    private java.util.Date startTime;
+    /**结束时间*/
+    private java.util.Date endTime;
+    /**欢迎语*/
+    private String welcomeId;
+    /**（0：会员筛选， 1：会员分组）*/
+    private int memberType;
+    /**人群筛选条件（JSON）*/
+    private String searchParams;
+    /**1和专属无好友 2和所有无好友*/
+    private int memberRule;
+    private java.util.Date createTime;
+    private java.util.Date updateTime;
+    /**创建人*/
+    private String creatorId;
+    /**创建人*/
+    private String creatorName;
+    /**是否删除*/
+    private int deleteFlag;
+    /**状态*/
+    private int statusFlag;
+    /**申请数 */
+    private int applyNum ;
+    /**添加成功数 */
+    private int addNum ;
+
+    public Long getAddTaskId() {
+        return addTaskId;
+    }
+
+    public void setAddTaskId(Long addTaskId) {
+        this.addTaskId = addTaskId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMemberLabelId() {
+        return memberLabelId;
+    }
+
+    public void setMemberLabelId(String memberLabelId) {
+        this.memberLabelId = memberLabelId;
+    }
+
+    public String getMemberLabelName() {
+        return memberLabelName;
+    }
+
+    public void setMemberLabelName(String memberLabelName) {
+        this.memberLabelName = memberLabelName;
+    }
+
+    public int getMemberLabelStatus() {
+        return memberLabelStatus;
+    }
+
+    public void setMemberLabelStatus(int memberLabelStatus) {
+        this.memberLabelStatus = memberLabelStatus;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getWelcomeId() {
+        return welcomeId;
+    }
+
+    public void setWelcomeId(String welcomeId) {
+        this.welcomeId = welcomeId;
+    }
+
+    public int getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(int memberType) {
+        this.memberType = memberType;
+    }
+
+    public String getSearchParams() {
+        return searchParams;
+    }
+
+    public void setSearchParams(String searchParams) {
+        this.searchParams = searchParams;
+    }
+
+    public int getMemberRule() {
+        return memberRule;
+    }
+
+    public void setMemberRule(int memberRule) {
+        this.memberRule = memberRule;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public int getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(int deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public int getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(int statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public int getApplyNum() {
+        return applyNum;
+    }
+
+    public void setApplyNum(int applyNum) {
+        this.applyNum = applyNum;
+    }
+
+    public int getAddNum() {
+        return addNum;
+    }
+
+    public void setAddNum(int addNum) {
+        this.addNum = addNum;
+    }
+}