diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java index 83eaaa6cea9957390979266e0fba725822db641e..7dc063ea3c0add161ddc354dfa3b3fe6e313ab2d 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java +++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java @@ -1,15 +1,16 @@ package com.linkwechat.web.controller.wecom; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.linkwechat.common.core.controller.BaseController; import com.linkwechat.common.core.domain.AjaxResult; +import com.linkwechat.common.core.page.TableDataInfo; import com.linkwechat.wecom.domain.WeCustomerPortrait; +import com.linkwechat.wecom.domain.WeCustomerTrajectory; import com.linkwechat.wecom.domain.WeFlowerCustomerTagRel; import com.linkwechat.wecom.domain.WeTagGroup; import com.linkwechat.wecom.domain.vo.WeMakeCustomerTag; -import com.linkwechat.wecom.service.IWeCustomerService; -import com.linkwechat.wecom.service.IWeGroupService; -import com.linkwechat.wecom.service.IWeTagGroupService; -import com.linkwechat.wecom.service.IWeUserService; +import com.linkwechat.wecom.service.*; +import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -41,6 +42,11 @@ public class WeCustomerPortraitController extends BaseController { private IWeGroupService iWeGroupService; + + @Autowired + private IWeCustomerTrajectoryService iWeCustomerTrajectoryService; + + /** * 根据客户id和当前企业员工id获取员工详细信息 * @param externalUserid @@ -138,6 +144,25 @@ public class WeCustomerPortraitController extends BaseController { } + /** + * 获取轨迹信息 + * @param trajectoryType + * @return + */ + @GetMapping(value = "/findTrajectory") + public TableDataInfo findTrajectory(Integer trajectoryType){ + + startPage(); + + return getDataTable( + iWeCustomerTrajectoryService.list(new LambdaQueryWrapper() + .eq(WeCustomerTrajectory::getTrajectoryType,trajectoryType)) + ); + } + + + + diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java new file mode 100644 index 0000000000000000000000000000000000000000..476aaa72c214c4f74b06effa4df63f772070b1c8 --- /dev/null +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java @@ -0,0 +1,30 @@ +package com.linkwechat.wecom.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.sql.Time; +import java.util.Date; + +/** + * 活动轨迹相关 + */ +@Data +@TableName("we_customer_trajectory") +public class WeCustomerTrajectory { + @TableId + private Long id; + //轨迹类型(1:信息动态;2:社交动态;3:活动规则;4:待办动态) + private Integer trajectoryType; + //外部联系人id + private String externalUserid; + //文案内容 + private String content; + //处理日期 + private Date createDate; + //处理时间 + private Time createTime; + //0:正常;1:删除;2:完成 + private Integer status; +} diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerTrajectoryMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerTrajectoryMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..df13f27153b3ca352788687bc3ab162d5c1e320c --- /dev/null +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerTrajectoryMapper.java @@ -0,0 +1,9 @@ +package com.linkwechat.wecom.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.linkwechat.wecom.domain.WeCustomerTrajectory; + +public interface WeCustomerTrajectoryMapper extends BaseMapper { + + +} diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java new file mode 100644 index 0000000000000000000000000000000000000000..700bc077641cfb2315fc2735cf60e4226a7f6d5d --- /dev/null +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java @@ -0,0 +1,8 @@ +package com.linkwechat.wecom.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.linkwechat.wecom.domain.WeCustomerTrajectory; + +public interface IWeCustomerTrajectoryService extends IService { + +} diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerTrajectoryServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerTrajectoryServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..e71773b76d51843b83c5393415995b5d93ec0b4b --- /dev/null +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCustomerTrajectoryServiceImpl.java @@ -0,0 +1,11 @@ +package com.linkwechat.wecom.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.linkwechat.wecom.domain.WeCustomerTrajectory; +import com.linkwechat.wecom.mapper.WeCustomerTrajectoryMapper; +import com.linkwechat.wecom.service.IWeCustomerTrajectoryService; +import org.springframework.stereotype.Service; + +@Service +public class WeCustomerTrajectoryServiceImpl extends ServiceImpl implements IWeCustomerTrajectoryService { +} diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeCustomerTrajectoryMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeCustomerTrajectoryMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..f3613c0ed3bb3205cf3a4402916e226715f2fe11 --- /dev/null +++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeCustomerTrajectoryMapper.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file