Skip to content

H
haoban-manage3.0
Commit df81eeb1 by 徐高华
Options

离职在职继承

parent d2d89d86
Showing with 1102 additions and 198 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/handover/HandoverSaveDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.handover;
import java.io.Serializable;
import java.util.List;
public class HandoverSaveDTO implements Serializable {
/**
* 门店
*/
private String storeId;
/**
* 原成员
*/
private String handoverStaffId;
/**
* 继承成员
*/
private String takeoverStaffId;
/**
* 外部联系人id
*/
private List<String> externalUserIdList;
/**
*是否转移会员归属 1是0否
*/
private Integer memberRelationFlag ;
/**
*是否话务转移 1是0否
*/
private Integer telTaskFlag ;
/**
* 0离职继承 1在职继承
*/
private int handoverType;
public int getHandoverType() {
return handoverType;
}
public void setHandoverType(int handoverType) {
this.handoverType = handoverType;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getHandoverStaffId() {
return handoverStaffId;
}
public void setHandoverStaffId(String handoverStaffId) {
this.handoverStaffId = handoverStaffId;
}
public String getTakeoverStaffId() {
return takeoverStaffId;
}
public void setTakeoverStaffId(String takeoverStaffId) {
this.takeoverStaffId = takeoverStaffId;
}
public List<String> getExternalUserIdList() {
return externalUserIdList;
}
public void setExternalUserIdList(List<String> externalUserIdList) {
this.externalUserIdList = externalUserIdList;
}
public Integer getMemberRelationFlag() {
return memberRelationFlag;
}
public void setMemberRelationFlag(Integer memberRelationFlag) {
this.memberRelationFlag = memberRelationFlag;
}
public Integer getTelTaskFlag() {
return telTaskFlag;
}
public void setTelTaskFlag(Integer telTaskFlag) {
this.telTaskFlag = telTaskFlag;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/handover/HandoverStaffDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.handover;
import java.io.Serializable;
import java.util.Date;
public class HandoverStaffDTO implements Serializable {
/**
*
*/
private String handoverStaffId;
/**
*
*/
private String wxEnterpriseId;
/**
*
*/
private String staffId;
/**
* 主门店id 当时
*/
private String storeId;
private String clerkId ;
private String clerkCode ;
private String clerkName ;
private String staffName ;
/**
* 外部联系人id
*/
private String handoverUserId;
/**
* 离职时间
*/
private Date dimissionTime;
/**
* 好友数量
*/
private Integer friendCount;
/**
* 好办好友数量
*/
private Integer haobanFriendCount;
/**
*
*/
private Integer statusFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getHandoverStaffId() {
return handoverStaffId;
}
public void setHandoverStaffId(String handoverStaffId) {
this.handoverStaffId = handoverStaffId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getHandoverUserId() {
return handoverUserId;
}
public void setHandoverUserId(String handoverUserId) {
this.handoverUserId = handoverUserId;
}
public Date getDimissionTime() {
return dimissionTime;
}
public void setDimissionTime(Date dimissionTime) {
this.dimissionTime = dimissionTime;
}
public Integer getFriendCount() {
return friendCount;
}
public void setFriendCount(Integer friendCount) {
this.friendCount = friendCount;
}
public Integer getHaobanFriendCount() {
return haobanFriendCount;
}
public void setHaobanFriendCount(Integer haobanFriendCount) {
this.haobanFriendCount = haobanFriendCount;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
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;
}
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/handover/ExternalUserListQO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.handover;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
public class ExternalUserListQO extends BasePageInfo implements Serializable {
/**
* 0离职继承 1在职继承
*/
private int handoverType;
private String storeId ;
private String staffId ;
private String memberLevelParams ;
private String memberGroupIds ;
// 0非会员 1会员 null全部
private Integer memberFlag ;
private String clerkId ;
/**
* 好友昵称
*/
private String externalUserName ;
public int getHandoverType() {
return handoverType;
}
public void setHandoverType(int handoverType) {
this.handoverType = handoverType;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getMemberLevelParams() {
return memberLevelParams;
}
public void setMemberLevelParams(String memberLevelParams) {
this.memberLevelParams = memberLevelParams;
}
public String getMemberGroupIds() {
return memberGroupIds;
}
public void setMemberGroupIds(String memberGroupIds) {
this.memberGroupIds = memberGroupIds;
}
public Integer getMemberFlag() {
return memberFlag;
}
public void setMemberFlag(Integer memberFlag) {
this.memberFlag = memberFlag;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getExternalUserName() {
return externalUserName;
}
public void setExternalUserName(String externalUserName) {
this.externalUserName = externalUserName;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/handover/HandoverListQO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.handover;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
public class HandoverListQO extends BasePageInfo implements Serializable {
private String storeId ;
private String handoverStaffId ;
private String takeoverStaffId ;
/**
* 好友昵称
*/
private String externalUserName ;
/**
* 1-接替完毕 2-等待接替 3-客户拒绝 4-接替失败
*/
private Integer transferStatus ;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getHandoverStaffId() {
return handoverStaffId;
}
public void setHandoverStaffId(String handoverStaffId) {
this.handoverStaffId = handoverStaffId;
}
public String getTakeoverStaffId() {
return takeoverStaffId;
}
public void setTakeoverStaffId(String takeoverStaffId) {
this.takeoverStaffId = takeoverStaffId;
}
public String getExternalUserName() {
return externalUserName;
}
public void setExternalUserName(String externalUserName) {
this.externalUserName = externalUserName;
}
public Integer getTransferStatus() {
return transferStatus;
}
public void setTransferStatus(Integer transferStatus) {
this.transferStatus = transferStatus;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/handover/StaffListQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.handover;
import java.io.Serializable;
public class StaffListQDTO implements Serializable {
private String wxEnterpriseId ;
private String enterpriseId ;
private String storeId;
/**
* 0离职继承 1在职继承
*/
private int handoverType;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public int getHandoverType() {
return handoverType;
}
public void setHandoverType(int handoverType) {
this.handoverType = handoverType;
}
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;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/handover/StaffQDTO.java 0 → 100644
package com.gic.haoban.manage.api.qdto.handover;
import java.io.Serializable;
public class StaffQDTO implements Serializable {
private String wxEnterpriseId ;
private String enterpriseId ;
private String params ;
/**
* 1原成员 2继承成员
*/
private int type ;
public String getParams() {
return params;
}
public void setParams(String params) {
this.params = params;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
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;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HandoverApiService.java 0 → 100644
package com.gic.haoban.manage.api.service;
import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.api.dto.handover.HandoverSaveDTO;
import com.gic.haoban.manage.api.dto.handover.HandoverStaffDTO;
import com.gic.haoban.manage.api.qdto.handover.HandoverListQO;
import com.gic.haoban.manage.api.qdto.handover.StaffListQDTO;
import com.gic.haoban.manage.api.qdto.handover.StaffQDTO;
import java.util.List;
/**
* 离职、在职继承
*/
public interface HandoverApiService {
/**
* 离职、在职的成员列表
* @return
*/
List<HandoverStaffDTO> staffList(StaffListQDTO qdto) ;
/**
* 原成员列表、继承成员列表
*/
List<HandoverStaffDTO> transferStaffList(StaffQDTO qdto) ;
/**
* 离职、在职分配记录
*/
Page<HandoverStaffDTO> transferRecordList(Page<HandoverListQO> page) ;
/**
* 会员分配记录
*/
Page<HandoverStaffDTO> memberTransferRecordList(Page<HandoverStaffDTO> page) ;
/**
* 保存分配任务
*/
void saveHandover(HandoverSaveDTO dto) ;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/HandoverExternalMapper.java
......@@ -32,15 +32,6 @@ public interface HandoverExternalMapper {
* 查询待分配客户列表
*
* @param wxEnterpriseId
* @param staffIds
* @return
*/
List<String> listIdByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
/**
* 查询待分配客户列表
*
* @param wxEnterpriseId
* @return
*/
List<TabHandoverExternal> listByIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("ids") List<String> ids);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/HandoverStaffMapper.java
......@@ -10,31 +10,14 @@ import java.util.List;
public interface HandoverStaffMapper {
/**
*/
int deleteByPrimaryKey(String handoverStaffId);
/**
*/
int insert(TabHandoverStaff record);
/**
*/
int insertSelective(TabHandoverStaff record);
/**
*/
TabHandoverStaff selectByPrimaryKey(String handoverStaffId);
/**
*/
int updateByPrimaryKeySelective(TabHandoverStaff record);
/**
*/
int updateByPrimaryKey(TabHandoverStaff record);
/**
*/
TabHandoverStaff getByStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId);
/**
......@@ -59,4 +42,7 @@ public interface HandoverStaffMapper {
* 删除用户
*/
int delByUserIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("userIds") List<String> userIds);
List<TabHandoverStaff> listByHandover(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("storeId")String storeId) ;
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/HandoverTransferMapper.java
......@@ -10,26 +10,10 @@ import java.util.List;
public interface HandoverTransferMapper {
/**
*/
int deleteByPrimaryKey(String handoverTransferId);
/**
*/
int insert(TabHandoverTransfer record);
/**
*/
int insertSelective(TabHandoverTransfer record);
/**
*/
TabHandoverTransfer selectByPrimaryKey(String handoverTransferId);
/**
*/
int updateByPrimaryKeySelective(TabHandoverTransfer record);
/**
*/
int updateByPrimaryKey(TabHandoverTransfer record);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
......@@ -4,6 +4,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
import com.gic.haoban.manage.service.pojo.FriendCountBO;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
......@@ -472,6 +473,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
int getFriendNum(@Param("memberId")String memberId, @Param("storeId")String storeId, @Param("clerkId")String clerkId);
List<FriendCountBO> friendNum(@Param("staffIdList")List<String> staffIdList , @Param("storeId")String storeId) ;
/**
* 通过外部联系人人查member
*/
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
......@@ -153,4 +153,6 @@ public interface TabHaobanStaffClerkRelationMapper {
List<String> listAllStaffIdForOpenStaff(@Param("enterpriseId")String enterpriseId, @Param("wxEnterpriseId")String wxEnterpriseId, @Param("clerkId") String clerkId, @Param(("storeIdList")) List<String> storeIdList);
List<StaffStoreNumBO> staffStoreNum(@Param("staffIdList")List<String> staffIdList);
String getDelClerkId(@Param("storeId")String storeId, @Param("staffId")String staffId) ;
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHandoverExternal.java
......@@ -88,6 +88,16 @@ public class TabHandoverExternal implements Serializable {
*/
private Date updateTime;
private String memberId ;
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
/**
*/
private static final long serialVersionUID = 1L;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHandoverStaff.java
......@@ -32,6 +32,10 @@ public class TabHandoverStaff implements Serializable {
*/
private String storeId;
private String clerkId ;
private String staffName ;
/**
* 外部联系人id
*/
......@@ -71,6 +75,22 @@ public class TabHandoverStaff implements Serializable {
*/
private static final long serialVersionUID = 1L;
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStoreId() {
return storeId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHandoverTransfer.java
......@@ -60,11 +60,119 @@ public class TabHandoverTransfer implements Serializable {
*/
private static final long serialVersionUID = 1L;
/**
* This method returns the value of the database column tab_haoban_handover_transfer.handover_transfer_id
*
* @return the value of tab_haoban_handover_transfer.handover_transfer_id
*/
private int optType ;
private String creatorId ;
private String creatorName ;
private String handoverClerkId ;
private String handoverClerkName ;
private String handoverClerkCode ;
private String takeoverClerkId ;
private String takeoverClerkName ;
private String takeoverClerkCode ;
// 0离职继承 1在职继承
private int handoverType ;
// 是否转移会员归属
private int memberRelationFlag ;
// 是否话务转移
private int telTaskFlag ;
public int getOptType() {
return optType;
}
public void setOptType(int optType) {
this.optType = optType;
}
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 String getHandoverClerkId() {
return handoverClerkId;
}
public void setHandoverClerkId(String handoverClerkId) {
this.handoverClerkId = handoverClerkId;
}
public String getHandoverClerkName() {
return handoverClerkName;
}
public void setHandoverClerkName(String handoverClerkName) {
this.handoverClerkName = handoverClerkName;
}
public String getHandoverClerkCode() {
return handoverClerkCode;
}
public void setHandoverClerkCode(String handoverClerkCode) {
this.handoverClerkCode = handoverClerkCode;
}
public String getTakeoverClerkId() {
return takeoverClerkId;
}
public void setTakeoverClerkId(String takeoverClerkId) {
this.takeoverClerkId = takeoverClerkId;
}
public String getTakeoverClerkName() {
return takeoverClerkName;
}
public void setTakeoverClerkName(String takeoverClerkName) {
this.takeoverClerkName = takeoverClerkName;
}
public String getTakeoverClerkCode() {
return takeoverClerkCode;
}
public void setTakeoverClerkCode(String takeoverClerkCode) {
this.takeoverClerkCode = takeoverClerkCode;
}
public int getHandoverType() {
return handoverType;
}
public void setHandoverType(int handoverType) {
this.handoverType = handoverType;
}
public int getMemberRelationFlag() {
return memberRelationFlag;
}
public void setMemberRelationFlag(int memberRelationFlag) {
this.memberRelationFlag = memberRelationFlag;
}
public int getTelTaskFlag() {
return telTaskFlag;
}
public void setTelTaskFlag(int telTaskFlag) {
this.telTaskFlag = telTaskFlag;
}
public String getHandoverTransferId() {
return handoverTransferId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/FriendCountBO.java 0 → 100644
package com.gic.haoban.manage.service.pojo;
import java.io.Serializable;
public class FriendCountBO implements Serializable {
private String staffId ;
private Integer num ;
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public Integer getNum() {
return num;
}
public void setNum(Integer num) {
this.num = num;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/HaobanHandoverService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.api.dto.handover.HandoverSaveDTO;
import com.gic.haoban.manage.api.dto.handover.HandoverStaffDTO;
import com.gic.haoban.manage.api.qdto.handover.HandoverListQO;
import com.gic.haoban.manage.api.qdto.handover.StaffListQDTO;
import com.gic.haoban.manage.api.qdto.handover.StaffQDTO;
import java.util.List;
public interface HaobanHandoverService {
/**
* 离职、在职的成员列表
* @return
*/
List<HandoverStaffDTO> staffList(StaffListQDTO qdto) ;
/**
* 原成员列表、继承成员列表
*/
List<HandoverStaffDTO> transferStaffList(StaffQDTO qdto) ;
/**
* 离职、在职分配记录
*/
Page<HandoverStaffDTO> transferRecordList(Page<HandoverListQO> page) ;
/**
* 会员分配记录
*/
Page<HandoverStaffDTO> memberTransferRecordList(Page<HandoverStaffDTO> page) ;
/**
* 保存分配任务
*/
void saveHandover(HandoverSaveDTO dto) ;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/HandoverServiceImpl.java
......@@ -10,6 +10,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.manage.service.dao.mapper.*;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -25,12 +26,6 @@ import com.gic.haoban.manage.api.dto.HandoverStaffFriendCountDTO;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.service.dao.mapper.HandoverExternalMapper;
import com.gic.haoban.manage.service.dao.mapper.HandoverStaffMapper;
import com.gic.haoban.manage.service.dao.mapper.HandoverTransferMapper;
import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanClerkMainStoreRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
import com.gic.haoban.manage.service.entity.TabHandoverExternal;
import com.gic.haoban.manage.service.entity.TabHandoverStaff;
import com.gic.haoban.manage.service.entity.TabHandoverTransfer;
......@@ -79,6 +74,8 @@ public class HandoverServiceImpl implements HandoverService {
private StaffClerkRelationService staffClerkRelationService;
@Autowired
private WxEnterpriseService wxEnterpriseService ;
@Autowired
private TabHaobanStaffClerkRelationMapper staffClerkRelationMapper ;
@Override
public boolean saveHandover(String wxEnterpriseId, List<QywxUnassignedInfoDTO> infoList) {
......@@ -177,20 +174,18 @@ public class HandoverServiceImpl implements HandoverService {
TabHaobanClerkMainStoreRelated clerkMainStoreRelated = clerkMainStoreRelatedMapper.getLastNoStatusByStaffId(wxEnterpriseId, haobanStaff.getStaffId());
if (null == clerkMainStoreRelated) {
logger.info("没有主门店：{}", haobanStaff.getStaffId());
// 需要过滤 没有主门店的人 不需要执行
return null;
// return null;
} else {
handoverStaff.setStoreId(clerkMainStoreRelated.getStoreId());
}
handoverStaff.setStoreId(clerkMainStoreRelated.getStoreId());
String clerkId = this.staffClerkRelationMapper.getDelClerkId(clerkMainStoreRelated.getStoreId(), haobanStaff.getStaffId()) ;
handoverStaff.setClerkId(clerkId);
handoverStaff.setStaffId(haobanStaff.getStaffId());
handoverStaff.setHandoverUserId(wxUserId);
handoverStaff.setWxEnterpriseId(wxEnterpriseId);
// handoverStaff.setHandoverStaffId(ToolUtil.randomUUID());
handoverStaff.setCreateTime(new Date());
handoverStaff.setUpdateTime(new Date());
handoverStaff.setStatusFlag(1);
handoverStaff.setStaffId(haobanStaff.getStaffId());
handoverStaff.setStaffName(haobanStaff.getStaffName());
return handoverStaff;
}
......@@ -223,6 +218,7 @@ public class HandoverServiceImpl implements HandoverService {
mid.setExternalUserName(externalClerkRelated.getExternalName());
mid.setHaobanFriendFlag(1);
mid.setExternalHeadUrl(externalClerkRelated.getHeadUrl());
mid.setMemberId(externalClerkRelated.getMemberId());
}
return mid;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/HaobanHandoverServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.impl;
import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.handover.HandoverSaveDTO;
import com.gic.haoban.manage.api.dto.handover.HandoverStaffDTO;
import com.gic.haoban.manage.api.qdto.handover.HandoverListQO;
import com.gic.haoban.manage.api.qdto.handover.StaffListQDTO;
import com.gic.haoban.manage.api.qdto.handover.StaffQDTO;
import com.gic.haoban.manage.service.dao.mapper.HandoverStaffMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
import com.gic.haoban.manage.service.entity.TabHandoverStaff;
import com.gic.haoban.manage.service.entity.TabHandoverTransfer;
import com.gic.haoban.manage.service.pojo.FriendCountBO;
import com.gic.haoban.manage.service.service.HandoverService;
import com.gic.haoban.manage.service.service.HaobanHandoverService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service("haobanHandoverService")
public class HaobanHandoverServiceImpl implements HaobanHandoverService {
@Autowired
private HandoverStaffMapper handoverStaffMapper ;
@Autowired
private TabHaobanStaffClerkRelationMapper staffClerkRelationMapper ;
@Autowired
private TabHaobanExternalClerkRelatedMapper externalClerkRelatedMapper ;
@Autowired
private ClerkService clerkService ;
@Autowired
private HandoverService handoverService ;
@Override
public List<HandoverStaffDTO> staffList(StaffListQDTO qdto) {
String storeId = qdto.getStoreId() ;
String wxEnterpriseId = qdto.getWxEnterpriseId() ;
// 0离职继承 1在职继承
int handoverType = qdto.getHandoverType() ;
if(handoverType==0) {
List<TabHandoverStaff> list = this.handoverStaffMapper.listByHandover(wxEnterpriseId, storeId) ;
List<HandoverStaffDTO> retList = EntityUtil.changeEntityListByJSON(HandoverStaffDTO.class, list) ;
return retList;
}else {
List<StaffClerkRelationDTO> list = this.staffClerkRelationMapper.listByStoreIds(wxEnterpriseId, Arrays.asList(storeId)) ;
List<HandoverStaffDTO> retList = EntityUtil.changeEntityListByJSON(HandoverStaffDTO.class, list) ;
if(CollectionUtils.isNotEmpty(retList)) {
List<String> staffIdList = retList.stream().map(HandoverStaffDTO::getStaffId).collect(Collectors.toList());
List<FriendCountBO> numList= this.externalClerkRelatedMapper.friendNum(staffIdList, storeId) ;
Map<String,Integer> map = numList.stream().collect(Collectors.toMap(FriendCountBO::getStaffId, FriendCountBO::getNum, (e, x) -> e));
for (HandoverStaffDTO handoverStaffDTO : retList) {
handoverStaffDTO.setFriendCount(map.get(handoverStaffDTO.getStaffId()));
handoverStaffDTO.setHaobanFriendCount(handoverStaffDTO.getFriendCount());
ClerkDTO clerk = this.clerkService.getClerkByClerkIdNodel(handoverStaffDTO.getClerkId()) ;
if(null != clerk) {
handoverStaffDTO.setClerkName(clerk.getClerkName());
handoverStaffDTO.setClerkCode(clerk.getClerkCode());
}
}
}
return retList ;
}
}
@Override
public List<HandoverStaffDTO> transferStaffList(StaffQDTO qdto) {
return null;
}
@Override
public Page<HandoverStaffDTO> transferRecordList(Page<HandoverListQO> page) {
return null;
}
@Override
public Page<HandoverStaffDTO> memberTransferRecordList(Page<HandoverStaffDTO> page) {
return null;
}
@Override
public void saveHandover(HandoverSaveDTO dto) {
TabHandoverTransfer transfer = EntityUtil.changeEntityByJSON(TabHandoverTransfer.class, dto) ;
this.handoverService.saveHandoverTransfer(transfer , dto.getExternalUserIdList()) ;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HandoverApiServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.out.impl;
import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.api.dto.handover.HandoverSaveDTO;
import com.gic.haoban.manage.api.dto.handover.HandoverStaffDTO;
import com.gic.haoban.manage.api.qdto.handover.HandoverListQO;
import com.gic.haoban.manage.api.qdto.handover.StaffListQDTO;
import com.gic.haoban.manage.api.qdto.handover.StaffQDTO;
import com.gic.haoban.manage.api.service.HandoverApiService;
import com.gic.haoban.manage.service.service.HaobanHandoverService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("handoverApiService")
public class HandoverApiServiceImpl implements HandoverApiService {
@Autowired
private HaobanHandoverService haobanHandoverService ;
@Override
public List<HandoverStaffDTO> staffList(StaffListQDTO qdto) {
return this.haobanHandoverService.staffList(qdto);
}
@Override
public List<HandoverStaffDTO> transferStaffList(StaffQDTO qdto) {
return this.haobanHandoverService.transferStaffList(qdto);
}
@Override
public Page<HandoverStaffDTO> transferRecordList(Page<HandoverListQO> page) {
return this.haobanHandoverService.transferRecordList(page);
}
@Override
public Page<HandoverStaffDTO> memberTransferRecordList(Page<HandoverStaffDTO> page) {
return this.haobanHandoverService.memberTransferRecordList(page);
}
@Override
public void saveHandover(HandoverSaveDTO dto) {
this.haobanHandoverService.saveHandover(dto);
}
}
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
......@@ -22,6 +22,7 @@
<constructor-arg index="0" value="haoban-manage-service"/>
</bean>
<dubbo:service interface="com.gic.haoban.manage.api.service.HandoverApiService" ref="handoverApiService" timeout="10000"/>
<dubbo:service interface="com.gic.haoban.manage.api.service.OpenStaffImportTaskApiService" ref="openStaffImportTaskApiService" timeout="10000"/>
<dubbo:service interface="com.gic.haoban.manage.api.service.WxEnterpriseActiveDataApiService" ref="wxEnterpriseActiveDataApiService" timeout="10000"/>
<dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatDataApiService" ref="groupChatDataApiService" timeout="10000"/>
......
haoban-manage3-service/src/main/resources/mapper/HandoverExternalMapper.xml
......@@ -18,6 +18,7 @@
<result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="member_id" jdbcType="VARCHAR" property="memberId"/>
</resultMap>
<resultMap id="FiendCountResultMap" type="com.gic.haoban.manage.api.dto.HandoverStaffFriendCountDTO">
......@@ -28,7 +29,7 @@
<sql id="Base_Column_List">
handover_external_id, wx_enterprise_id, staff_id, user_id, external_user_id, external_user_name, relation_id,
haoban_friend_flag, external_head_url, status_flag, handover_transfer_id, takeover_time,
transfer_status, transfer_time, create_time, update_time
transfer_status, transfer_time, create_time, update_time , member_id
</sql>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
......@@ -88,7 +89,7 @@
staff_id, user_id, external_user_id,
external_user_name,relation_id, haoban_friend_flag, external_head_url,
status_flag, create_time,
update_time)
update_time , member_id )
values
<foreach collection="list" separator="," item="item">
(#{item.handoverExternalId,jdbcType=VARCHAR}, #{item.wxEnterpriseId,jdbcType=VARCHAR},
......@@ -96,7 +97,7 @@
#{item.externalUserName,jdbcType=VARCHAR},#{item.relationId}, #{item.haobanFriendFlag,jdbcType=INTEGER},
#{item.externalHeadUrl,jdbcType=VARCHAR},
#{item.statusFlag,jdbcType=INTEGER}, now(),
now())
now() , #{item.memberId,jdbcType=VARCHAR} )
</foreach>
</insert>
......@@ -141,22 +142,6 @@
limit 0 , 5000
</select>
<select id="listIdByStaffIds" resultMap="BaseResultMap">
select
handover_external_id
from tab_haoban_handover_external
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
<if test="staffIds!=null and staffIds.size>0">
and staff_id in
<foreach collection="staffIds" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
and status_flag=1
</select>
<select id="listByIds" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
......
haoban-manage3-service/src/main/resources/mapper/HandoverStaffMapper.xml
......@@ -6,6 +6,8 @@
<result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
<result column="staff_id" jdbcType="VARCHAR" property="staffId"/>
<result column="store_id" jdbcType="VARCHAR" property="storeId"/>
<result column="staff_name" jdbcType="VARCHAR" property="staffName"/>
<result column="clerk_id" jdbcType="VARCHAR" property="clerkId"/>
<result column="handover_user_id" jdbcType="VARCHAR" property="handoverUserId"/>
<result column="dimission_time" jdbcType="TIMESTAMP" property="dimissionTime"/>
<result column="friend_count" jdbcType="INTEGER" property="friendCount"/>
......@@ -16,28 +18,8 @@
</resultMap>
<sql id="Base_Column_List">
handover_staff_id, wx_enterprise_id, staff_id,store_id, handover_user_id, dimission_time,
friend_count, haoban_friend_count, status_flag, create_time, update_time
friend_count, haoban_friend_count, status_flag, create_time, update_time , staff_name , clerk_id
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_handover_staff
where handover_staff_id = #{handoverStaffId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_handover_staff
where handover_staff_id = #{handoverStaffId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHandoverStaff">
insert into tab_haoban_handover_staff (handover_staff_id, wx_enterprise_id,
staff_id,store_id, handover_user_id, dimission_time,
friend_count, haoban_friend_count, status_flag,
create_time, update_time)
values (#{handoverStaffId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
#{staffId,jdbcType=VARCHAR},#{storeId,jdbcType=VARCHAR}, #{handoverUserId,jdbcType=VARCHAR}, #{dimissionTime,jdbcType=TIMESTAMP},
#{friendCount,jdbcType=INTEGER}, #{haobanFriendCount,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverStaff">
insert into tab_haoban_handover_staff
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -74,6 +56,12 @@
<if test="updateTime != null">
update_time,
</if>
<if test="staffName != null">
staff_name,
</if>
<if test="clerkId != null">
clerk_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="handoverStaffId != null">
......@@ -109,20 +97,17 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffName != null">
#{staffName,jdbcType=VARCHAR},
</if>
<if test="clerkId != null">
#{clerkId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverStaff">
update tab_haoban_handover_staff
<set>
<if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="staffId != null">
staff_id = #{staffId,jdbcType=VARCHAR},
</if>
<if test="storeId != null">
store_id = #{storeId,jdbcType=VARCHAR},
</if>
<if test="handoverUserId != null">
handover_user_id = #{handoverUserId,jdbcType=VARCHAR},
</if>
......@@ -138,29 +123,12 @@
<if test="statusFlag != null">
status_flag = #{statusFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where handover_staff_id = #{handoverStaffId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHandoverStaff">
update tab_haoban_handover_staff
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
staff_id = #{staffId,jdbcType=VARCHAR},
store_id = #{storeId,jdbcType=VARCHAR},
handover_user_id = #{handoverUserId,jdbcType=VARCHAR},
dimission_time = #{dimissionTime,jdbcType=TIMESTAMP},
friend_count = #{friendCount,jdbcType=INTEGER},
haoban_friend_count = #{haobanFriendCount,jdbcType=INTEGER},
status_flag = #{statusFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where handover_staff_id = #{handoverStaffId,jdbcType=VARCHAR}
</update>
<select id="getByStaffId" resultMap="BaseResultMap">
select
......@@ -188,6 +156,12 @@
and status_flag=1
</select>
<select id="listByHandover" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/> from tab_haoban_handover_staff
where wx_enterprise_id = #{wxEnterpriseId} and status_flag=1 and store_id = #{storeId}
</select>
<update id="delByUserIds">
update tab_haoban_handover_staff
set
......
haoban-manage3-service/src/main/resources/mapper/HandoverTransferMapper.xml
......@@ -6,36 +6,30 @@
<result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
<result column="store_id" jdbcType="VARCHAR" property="storeId"/>
<result column="handover_staff_id" jdbcType="VARCHAR" property="handoverStaffId"/>
<result column="handover_clerk_id" property="handoverClerkId" />
<result column="handover_clerk_name" jdbcType="VARCHAR" property="handoverClerkName"/>
<result column="handover_clerk_code" jdbcType="VARCHAR" property="handoverClerkCode"/>
<result column="takeover_staff_id" jdbcType="VARCHAR" property="takeoverStaffId"/>
<result column="takeover_clerk_id" jdbcType="VARCHAR" property="takeoverClerkId"/>
<result column="takeover_clerk_name" jdbcType="VARCHAR" property="takeoverClerkName"/>
<result column="handover_clerk_code" jdbcType="VARCHAR" property="handoverClerkCode"/>
<result column="handover_type" jdbcType="INTEGER" property="handoverType"/>
<result column="member_relation_flag" jdbcType="INTEGER" property="memberRelationFlag"/>
<result column="tel_task_flag" jdbcType="INTEGER" property="telTaskFlag"/>
<result column="external_count" jdbcType="INTEGER" property="externalCount"/>
<result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="creator_id" jdbcType="VARCHAR" property="creatorId"/>
<result column="creator_name" jdbcType="VARCHAR" property="creatorName"/>
<result column="opt_type" jdbcType="INTEGER" property="optType"/>
</resultMap>
<sql id="Base_Column_List">
handover_transfer_id, wx_enterprise_id, store_id, handover_staff_id, takeover_staff_id,
external_count, status_flag, create_time, update_time
external_count, status_flag, create_time, update_time , creator_id, creator_name, opt_type ,
handover_clerk_id, handover_clerk_name, handover_clerk_code, takeover_clerk_id, takeover_clerk_name, takeover_clerk_code,
handover_type, member_relation_flag, tel_task_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_handover_transfer
where handover_transfer_id = #{handoverTransferId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_handover_transfer
where handover_transfer_id = #{handoverTransferId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHandoverTransfer">
insert into tab_haoban_handover_transfer (handover_transfer_id, wx_enterprise_id,
store_id, handover_staff_id, takeover_staff_id,
external_count, status_flag, create_time,
update_time)
values (#{handoverTransferId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
#{storeId,jdbcType=VARCHAR}, #{handoverStaffId,jdbcType=VARCHAR}, #{takeoverStaffId,jdbcType=VARCHAR},
#{externalCount,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverTransfer">
insert into tab_haoban_handover_transfer
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -66,6 +60,42 @@
<if test="updateTime != null">
update_time,
</if>
<if test="creatorId != null">
creator_id,
</if>
<if test="creatorName != null">
creator_name,
</if>
<if test="optType != null">
opt_type,
</if>
<if test="handoverClerkId != null">
handover_clerk_id,
</if>
<if test="handoverClerkName != null">
handover_clerk_name,
</if>
<if test="handoverClerkCode != null">
handover_clerk_code,
</if>
<if test="takeoverClerkId != null">
takeover_clerk_id,
</if>
<if test="takeoverClerkName != null">
takeover_clerk_name,
</if>
<if test="takeoverClerkCode != null">
takeover_clerk_code,
</if>
<if test="handoverType != null">
handover_type,
</if>
<if test="memberRelationFlag != null">
member_relation_flag,
</if>
<if test="telTaskFlag != null">
tel_task_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="handoverTransferId != null">
......@@ -95,38 +125,44 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverTransfer">
update tab_haoban_handover_transfer
<set>
<if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
<if test="creatorId != null">
#{creatorId,jdbcType=VARCHAR},
</if>
<if test="storeId != null">
store_id = #{storeId,jdbcType=VARCHAR},
<if test="creatorName != null">
#{creatorName,jdbcType=VARCHAR},
</if>
<if test="handoverStaffId != null">
handover_staff_id = #{handoverStaffId,jdbcType=VARCHAR},
<if test="optType != null">
#{optType,jdbcType=INTEGER},
</if>
<if test="takeoverStaffId != null">
takeover_staff_id = #{takeoverStaffId,jdbcType=VARCHAR},
<if test="handoverClerkId != null">
#{handoverClerkId,jdbcType=VARCHAR},
</if>
<if test="externalCount != null">
external_count = #{externalCount,jdbcType=INTEGER},
<if test="handoverClerkName != null">
#{handoverClerkName,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
status_flag = #{statusFlag,jdbcType=INTEGER},
<if test="handoverClerkCode != null">
#{handoverClerkCode,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
<if test="takeoverClerkId != null">
#{takeoverClerkId,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
<if test="takeoverClerkName != null">
#{takeoverClerkName,jdbcType=VARCHAR},
</if>
<if test="takeoverClerkCode != null">
#{takeoverClerkCode,jdbcType=VARCHAR},
</if>
<if test="handoverType != null">
#{handoverType,jdbcType=INTEGER},
</if>
</set>
where handover_transfer_id = #{handoverTransferId,jdbcType=VARCHAR}
</update>
<if test="memberRelationFlag != null">
#{memberRelationFlag,jdbcType=INTEGER},
</if>
<if test="telTaskFlag != null">
#{telTaskFlag,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHandoverTransfer">
update tab_haoban_handover_transfer
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
......@@ -1005,6 +1005,15 @@
</foreach>
</select>
<select id="friendNum" resultType="com.gic.haoban.manage.service.pojo.FriendCountBO">
select staff_id staffId , count(*) num from tab_haoban_external_clerk_related where
staff_id in
<foreach collection="staffIdList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and store_id = #{storeId} and status_flag = 1 group by staff_id
</select>
<update id="updateHalfTime">
update tab_haoban_external_clerk_related set
half_del_time = #{delTime}
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
......@@ -417,6 +417,7 @@
a.manage_flag manageFlag ,
b.wx_user_id qwUserId,
b.wx_open_user_id openUserId ,
b.staff_name staffName ,
b.head_img staffHeadImg
from tab_haoban_staff_clerk_relation a left join tab_haoban_staff b on b.staff_id = a.staff_id
</sql>
......@@ -525,4 +526,10 @@
group by a.staff_id
</select>
<select id="getDelClerkId" resultType="java.lang.String">
select a.clerk_id from tab_haoban_staff_clerk_relation a
where a.store_id = #{storeId} and a.staff_id = #{staffId}
order by a.update_time desc limit 1
</select>
</mapper>
\ No newline at end of file
haoban-manage3-service/src/test/java/HandoverTest.java
import java.util.ArrayList;
import java.util.List;
import com.gic.haoban.manage.api.dto.handover.HandoverStaffDTO;
import com.gic.haoban.manage.api.qdto.handover.StaffListQDTO;
import com.gic.haoban.manage.api.service.HandoverApiService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
......@@ -29,43 +32,28 @@ public class HandoverTest {
private static Logger logger = LoggerFactory.getLogger(HandoverTest.class);
@Autowired
private HandoverOperationApiService handoverOperationApiService;
@Autowired
private QywxOrderApiService qywxOrderApiService ;
@Autowired
private com.gic.haoban.manage.service.config.Config config ;
private HandoverApiService handoverApiService;
@Test
public void test() {
ServiceResponse<AccountListResponseDTO> resp = this.qywxOrderApiService.listActivedAccount(config.getCorpid(), "wp59NLDQAAJL6DsM6YwOGqJlhCBykkeA", 100, null) ;
System.out.println(JSON.toJSONString(resp));
System.out.println("11");
StaffListQDTO qdto = new StaffListQDTO() ;
qdto.setHandoverType(1);
qdto.setWxEnterpriseId("ca66a01b79474c40b3e7c7f93daf1a3b");
qdto.setStoreId("ff8080816a11a716016a23d2f5a5000d");
List<HandoverStaffDTO> list = this.handoverApiService.staffList(qdto) ;
System.out.println(JSONObject.toJSONString(list,true));
}
@Test
public void test1() {
String wxEnterpriseId = "ef8607976407491fb5ff66611b1d57ea";
handoverOperationApiService.dealQywxEnterpriseHandoverResult(wxEnterpriseId);
}
@Test
public void test2() {
String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
List<String> staffIds = new ArrayList<>();
staffIds.add("471ef6fbeed84319944e68265855ecb4");
Page<HandoverExternalDTO> handoverExternalDTOPage = handoverOperationApiService.pageHandoverFriend(wxEnterpriseId, null, staffIds, null, new BasePageInfo());
System.out.println(JSONObject.toJSONString(handoverExternalDTOPage));
}
@Test
public void test3() {
String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
try {
clientInstance.sendMessage("haobanEcmTaskDataCallback", "11111");
} catch (Exception e) {
}
}
}
haoban-manage3-service/src/test/java/MomentTest.java
......@@ -74,11 +74,11 @@ public class MomentTest {
@Test
public void ok() {
SendResultQDTO plan = new SendResultQDTO() ;
plan.setWxEnterpriseId("6d52f722471343eeb7fbed87994cbdf8");
plan.setClerkId("1664331543ab49769ad5ccfb6dc7986c");
plan.setSendTime(DateUtil.strToDate("2025-05-13 18:31:00","yyyy-MM-dd HH:mm:ss"));
plan.setStaffId("e35fe570efe44201beb3381f1e50f07e");
plan.setPlanId(795415784309457024L);
plan.setWxEnterpriseId("17d5c6777271404cb67d9739ae8a8aa6");
plan.setClerkId("7028d007af534e46a495a83845648676");
plan.setSendTime(DateUtil.strToDate("2025-07-18 09:32:00","yyyy-MM-dd HH:mm:ss"));
plan.setStaffId("81af45aee006499ca56039c0c917bead");
plan.setPlanId(819555588756263142l);
this.qwMomentApiService.finishTask(plan) ;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment