Skip to content

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

删除wx_user_id

parent d3311953
Showing with 19 additions and 268 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java
......@@ -101,7 +101,7 @@ public interface StaffClerkRelationApiService {
* @param wxUserId
* @return
*/
List<StaffClerkRelationDTO> listByEnterpriseIdAndWxUserId(String enterpriseId, String wxUserId);
List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid);
/**
* 删除关联关系
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java
......@@ -6,22 +6,15 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface StaffDepartmentRelatedMapper {
int deleteByPrimaryKey(String staffDepartmentRelatedId);
int insert(TabHaobanStaffDepartmentRelated record);
int insertSelective(TabHaobanStaffDepartmentRelated record);
TabHaobanStaffDepartmentRelated selectByPrimaryKey(String staffDepartmentRelatedId);
int updateByPrimaryKeySelective(TabHaobanStaffDepartmentRelated record);
int updateByPrimaryKey(TabHaobanStaffDepartmentRelated record);
List<TabHaobanStaffDepartmentRelated> listByDepartmentId(String departmentId);
TabHaobanStaffDepartmentRelated getOneByClerkCode(String clerkCode);
void deleteCode(TabHaobanStaffDepartmentRelated dto);
List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffId(String staffId);
......@@ -34,16 +27,10 @@ public interface StaffDepartmentRelatedMapper {
TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentIds")List<String> departmentIds, @Param("keyword")String keyword);
int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
List<TabHaobanStaffDepartmentRelated> listByWxUserId(@Param("wxUserId")String wxUserId);
List<TabHaobanStaffDepartmentRelated> listByClerkCode(@Param("clerkCode")String clerkCode);
List<TabHaobanStaffDepartmentRelated> listByWxEnterpriseIdAndClerkCode(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("clerkCode")String clerkCode);
List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffIds(@Param("staffIds")List<String> staffIds);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
......@@ -54,14 +41,4 @@ public interface StaffDepartmentRelatedMapper {
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("staffId") String staffId
);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:25:33
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
......@@ -87,13 +87,13 @@ public interface TabHaobanStaffClerkRelationMapper {
void delByClerkId(@Param("clerkId") String clerkId);
List<TabHaobanStaffClerkRelation> listByEnterpriseIdAndWxUserId(@Param("enterpriseId") String enterpriseId, @Param("wxUserId") String wxUserId);
List<TabHaobanStaffClerkRelation> listByEnterpriseIdAndStaffid(@Param("enterpriseId") String enterpriseId, @Param("staffId") String staffId);
List<TabHaobanStaffClerkRelation> lisByStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffId") String staffId, @Param("storeIdList") List<String> storeIdList);
TabHaobanStaffClerkRelation getByCodeAndStoreId(@Param("clerkCode") String clerkCode, @Param("storeId") String storeId);
List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<String> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaffClerkRelation> pageByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
......@@ -170,17 +170,6 @@ public interface TabHaobanStaffClerkRelationMapper {
@Param("enterpriseId") String enterpriseId);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:21:31
*/
int updateUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 根据导购查询wxuserid
*
* @param clerkIds 职员id
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkRelationService.java
......@@ -106,7 +106,7 @@ public interface StaffClerkRelationService {
* @param wxEnterpriseId
* @return
*/
List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(String wxEnterpriseId);
List<String> listByWxEnterpriseId(String wxEnterpriseId);
Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo);
......@@ -138,17 +138,6 @@ public interface StaffClerkRelationService {
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:21:06
*/
int updateUserIdByWxEnterpriseId(String wxEnterpriseId);
/**
* 根据导购查询wxuserid
*
* @param clerkList 职员名单
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffDepartmentRelatedService.java
......@@ -21,15 +21,6 @@ public interface StaffDepartmentRelatedService {
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId);
/**
* 效率很低
* @param departmentId
* @param keyword
* @return
*/
@Deprecated
List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentId, String keyword);
List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId);
StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId);
......@@ -44,15 +35,4 @@ public interface StaffDepartmentRelatedService {
public int update(TabHaobanStaffDepartmentRelated tab);
/**
* 更新用户id wx企业id
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-06-30 16:24:59
*/
int updateUserIdByWxEnterpriseId(String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
......@@ -293,7 +293,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
}
@Override
public List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(String wxEnterpriseId) {
public List<String> listByWxEnterpriseId(String wxEnterpriseId) {
return mapper.listByWxEnterpriseId(wxEnterpriseId);
}
......@@ -325,11 +325,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
}
@Override
public int updateUserIdByWxEnterpriseId(String wxEnterpriseId) {
return mapper.updateUserIdByWxEnterpriseId(wxEnterpriseId);
}
@Override
public List<String> listWxUserIdByClerkIds(List<String> clerkList, String wxEnterpriseId) {
if (CollectionUtils.isEmpty(clerkList)) {
return null;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffDepartmentRelatedServiceImpl.java
......@@ -9,7 +9,6 @@ import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -72,13 +71,6 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
}
@Override
public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentIds, String keyword) {
if(departmentIds == null || departmentIds.isEmpty()){
return Collections.EMPTY_LIST;
}
return mapper.listByDepartmentIdByKeyword(departmentIds,keyword);
}
@Override
public StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId) {
return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, mapper.getById(staffDepartmentStaffRelatedId));
}
......@@ -93,8 +85,4 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
return mapper.updateByPrimaryKeySelective(tab);
}
@Override
public int updateUserIdByWxEnterpriseId(String wxEnterpriseId) {
return mapper.updateUserIdByWxEnterpriseId(wxEnterpriseId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -2126,11 +2126,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
}
pageNum++;
}
//更新导购员工关联关系表
staffClerkRelationService.updateUserIdByWxEnterpriseId(wxEnterpriseId);
//更新员工部门关联关系表
staffDepartmentRelatedService.updateUserIdByWxEnterpriseId(wxEnterpriseId);
//更新好友关系表
memberUnionRelatedService.updateUserIdByWxEnterpriseId(wxEnterpriseId);
//更新会员好友关系表
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -158,8 +158,7 @@ public class StaffApiServiceImpl implements StaffApiService {
public Page<StaffDTO> pageStaff(List<String> departmentIds, Integer activeFlag, String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId) {
List<String> staffIds = new ArrayList<>();
if (relationFlag != null) {
List<TabHaobanStaffClerkRelation> relationList = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
staffIds = relationList.stream().map(TabHaobanStaffClerkRelation::getStaffId).collect(Collectors.toList());
staffIds = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
}
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword, departmentIds, wxEnterpriseId, relationFlag), StaffDTO.class);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
......@@ -306,8 +306,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
}
@Override
public List<StaffClerkRelationDTO> listByEnterpriseIdAndWxUserId(String enterpriseId, String wxUserId) {
List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByEnterpriseIdAndWxUserId(enterpriseId, wxUserId);
public List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid) {
List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByEnterpriseIdAndStaffid(enterpriseId, staffid);
return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
}
......
haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml
......@@ -25,11 +25,7 @@
from tab_haoban_staff_department_related
where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete
from tab_haoban_staff_department_related
where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated">
insert into tab_haoban_staff_department_related (staff_department_related_id, staff_id,
phone_number, nation_code, wx_user_id,
......@@ -40,86 +36,7 @@
#{departmentId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{clerkCode,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{wxEnterpriseId}, #{staffName})
</insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated">
insert into tab_haoban_staff_department_related
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="staffDepartmentRelatedId != null">
staff_department_related_id,
</if>
<if test="staffId != null">
staff_id,
</if>
<if test="phoneNumber != null">
phone_number,
</if>
<if test="nationCode != null">
nation_code,
</if>
<if test="wxUserId != null">
wx_user_id,
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id,
</if>
<if test="departmentId != null">
department_id,
</if>
<if test="statusFlag != null">
status_flag,
</if>
<if test="clerkCode != null">
clerk_code,
</if>
<if test="staffName != null">
staff_name,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="staffDepartmentRelatedId != null">
#{staffDepartmentRelatedId,jdbcType=VARCHAR},
</if>
<if test="staffId != null">
#{staffId,jdbcType=VARCHAR},
</if>
<if test="phoneNumber != null">
#{phoneNumber,jdbcType=VARCHAR},
</if>
<if test="nationCode != null">
#{nationCode,jdbcType=VARCHAR},
</if>
<if test="wxUserId != null">
#{wxUserId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="departmentId != null">
#{departmentId,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="clerkCode != null">
#{clerkCode,jdbcType=VARCHAR},
</if>
<if test="staffName != null">
#{staffName,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated">
update tab_haoban_staff_department_related
......@@ -160,22 +77,6 @@
</set>
where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated">
update tab_haoban_staff_department_related
set staff_id = #{staffId,jdbcType=VARCHAR},
phone_number = #{phoneNumber,jdbcType=VARCHAR},
nation_code = #{nationCode,jdbcType=VARCHAR},
wx_user_id = #{wxUserId,jdbcType=VARCHAR},
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
department_id = #{departmentId,jdbcType=VARCHAR},
status_flag = #{statusFlag,jdbcType=INTEGER},
clerk_code = #{clerkCode,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
</update>
<select id="listByDepartmentId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
......@@ -184,14 +85,6 @@
where department_id = #{departmentId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="getOneByClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where clerk_code = #{clerkCode,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="getById" resultMap="BaseResultMap" parameterType="java.lang.String">
select
......@@ -244,23 +137,6 @@
and status_flag = 1
</select>
<select id="listByClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where clerk_code = #{clerkCode}
and status_flag = 1
</select>
<select id="listByWxEnterpriseIdAndClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where clerk_code = #{clerkCode}
and wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1
</select>
<select id="getDepartmentIdAndCode" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
......@@ -270,22 +146,6 @@
and status_flag = 1
</select>
<select id="listByDepartmentIdByKeyword" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where status_flag = 1
<if test="keyword != null and keyword != ''">
and (clerk_code like CONCAT('%',#{keyword},'%') or phone_number like CONCAT('%',#{keyword},'%') or
staff_name like CONCAT('%',#{keyword},'%'))
</if>
<if test="departmentIds != null and departmentIds.size() > 0">
and department_id in
<foreach collection="departmentIds" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR}
</foreach>
</if>
</select>
<select id="countByDepartmentIds" resultType="java.lang.Integer">
select
......@@ -341,12 +201,4 @@
and wx_enterprise_id = #{wxEnterpriseId} and staff_id = #{staffId}
</select>
<update id="updateUserIdByWxEnterpriseId" parameterType="java.lang.String">
UPDATE tab_haoban_staff_department_related a
LEFT JOIN tab_haoban_staff b ON a.staff_id = b.staff_id
SET a.wx_user_id = b.wx_user_id,a.update_time= now()
WHERE
a.wx_enterprise_id = #{wxEnterpriseId}
AND a.status_flag = 1 and b.status_flag = 1;
</update>
</mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
......@@ -239,13 +239,13 @@
and status_flag = 1
</update>
<select id="listByEnterpriseIdAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
<select id="listByEnterpriseIdAndStaffid" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_clerk_relation
where
enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
and wx_user_id = #{wxUserId}
and staff_id = #{staffId}
</select>
<select id="getByCodeAndStoreId" resultMap="BaseResultMap" parameterType="java.lang.String">
......@@ -258,13 +258,11 @@
and status_flag = 1
</select>
<select id="listByWxEnterpriseId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
<select id="listByWxEnterpriseId" resultType="String">
select staff_id
from tab_haoban_staff_clerk_relation
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag =1
group by wx_user_id
</select>
<select id="lisByStaffId" resultMap="BaseResultMap">
......@@ -291,6 +289,7 @@
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag =1
</select>
<select id="listBindByStoreId" resultMap="BaseResultMap">
select
a.staff_clerk_relation_id staffClerkRelationId,
......@@ -386,7 +385,7 @@
#{item}
</foreach>
and a.status_flag = 1
group by a.staff_id, a.wx_user_id, a.clerk_id) as scr
group by a.staff_id, b.wx_user_id, a.clerk_id) as scr
left join tab_haoban_external_clerk_related as ecr on scr.staff_id = ecr.staff_id
where ecr.status_flag = 1
and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
......@@ -404,7 +403,7 @@
scr.clerk_id as staffClerkId
from (select a.staff_id,
b.wx_open_user_id,
a.wx_user_id,
b.wx_user_id,
a.clerk_id
from tab_haoban_staff_clerk_relation a
left join tab_haoban_staff b on a.staff_id = b.staff_id
......@@ -413,7 +412,7 @@
#{item}
</foreach>
and a.status_flag = 1
group by a.staff_id, a.wx_user_id, a.clerk_id) as scr
group by a.staff_id, b.wx_user_id, a.clerk_id) as scr
left join tab_haoban_external_clerk_related as ecr on scr.staff_id = ecr.staff_id
where ecr.status_flag = 1
and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
......@@ -423,16 +422,6 @@
</foreach>;
</select>
<update id="updateUserIdByWxEnterpriseId" parameterType="java.lang.String">
UPDATE tab_haoban_staff_clerk_relation a
LEFT JOIN tab_haoban_staff b ON a.staff_id = b.staff_id
SET a.wx_user_id = b.wx_user_id,
a.update_time= now()
WHERE a.wx_enterprise_id = #{wxEnterpriseId}
AND a.status_flag = 1
and b.status_flag = 1
</update>
<select id="listWxUserIdByClerkIds" resultType="string">
select
......@@ -465,7 +454,7 @@
a.store_id storeId,
a.wx_enterprise_id wxEnterpriseId,
a.enterprise_id enterpriseId,
a.wx_user_id wxUserId,
b.wx_user_id wxUserId,
a.staff_id staffId,
a.clerk_id clerkId,
b.staff_name staffName,
......@@ -497,7 +486,7 @@
a.store_id storeId,
a.wx_enterprise_id wxEnterpriseId,
a.enterprise_id enterpriseId,
a.wx_user_id wxUserId,
b.wx_user_id wxUserId,
a.staff_id staffId,
a.clerk_id clerkId,
b.staff_name staffName,
......
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