Skip to content

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

废弃staff_department_related的wx_user_id

parent cec6ccf5
Showing with 9 additions and 54 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDepartmentRelatedDTO.java
......@@ -12,8 +12,6 @@ public class StaffDepartmentRelatedDTO implements Serializable {
private String nationCode;
private String wxUserId;
private String wxEnterpriseId;
private String departmentId;
......@@ -62,14 +60,6 @@ public class StaffDepartmentRelatedDTO implements Serializable {
this.nationCode = nationCode == null ? null : nationCode.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getDepartmentId() {
return departmentId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java
......@@ -21,7 +21,7 @@ public interface StaffDepartmentRelatedMapper {
TabHaobanStaffDepartmentRelated getById(String staffDepartmentRelatedId);
int delByUserid(@Param("userid") String userId);
int delByStaffid(@Param("staffId") String staffId);
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
......@@ -29,8 +29,6 @@ public interface StaffDepartmentRelatedMapper {
int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
List<TabHaobanStaffDepartmentRelated> listByWxUserId(@Param("wxUserId")String wxUserId);
List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffIds(@Param("staffIds")List<String> staffIds);
List<TabHaobanStaffDepartmentRelated> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaffDepartmentRelated.java
......@@ -11,8 +11,6 @@ public class TabHaobanStaffDepartmentRelated implements Serializable {
private String phoneNumber;
private String nationCode;
private String wxUserId;
private String wxEnterpriseId;
......@@ -63,14 +61,6 @@ public class TabHaobanStaffDepartmentRelated implements Serializable {
this.nationCode = nationCode == null ? null : nationCode.trim();
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId == null ? null : wxUserId.trim();
}
public String getDepartmentId() {
return departmentId;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffDepartmentRelatedService.java
......@@ -17,12 +17,10 @@ public interface StaffDepartmentRelatedService {
void del(StaffDepartmentRelatedDTO related);
void delByUserid(String userid);
void delByStaffid(String userid);
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId);
List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId);
StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffDepartmentRelatedServiceImpl.java
......@@ -19,13 +19,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
private StaffDepartmentRelatedMapper mapper;
@Override
public List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId){
List<TabHaobanStaffDepartmentRelated> list = mapper.listByWxUserId(wxUserId);
return list;
}
@Override
public List<TabHaobanStaffDepartmentRelated> listByDepartmentId(String departmentId) {
return mapper.listByDepartmentId(departmentId);
}
......@@ -61,8 +55,8 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
}
@Override
public void delByUserid(String userid) {
mapper.delByUserid(userid);
public void delByStaffid(String staffid) {
mapper.delByStaffid(staffid);
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
......@@ -333,7 +333,7 @@ public class MessageApiServiceImpl implements MessageApiService {
//销毁卡券
innerApiService.delCardByStaffId(staffId);
//删除导购好友关联关系表
this.staffDepartmentRelatedService.delByUserid(userid);
this.staffDepartmentRelatedService.delByStaffid(staffId);
//删除员工表
this.staffService.delByStaffId(staffId);
//员工解绑
......@@ -720,7 +720,7 @@ public class MessageApiServiceImpl implements MessageApiService {
//销毁卡券
innerApiService.delCardByStaffId(staffId);
//删除导购好友关联关系表
this.staffDepartmentRelatedService.delByUserid(userid);
this.staffDepartmentRelatedService.delByStaffid(staffId);
//删除员工表
this.staffService.delByStaffId(staffId);
//员工解绑
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -369,7 +369,6 @@ public class StaffApiServiceImpl implements StaffApiService {
if (!hasRelationMap.containsKey(departmentDTO.getDepartmentId())) {
StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
dto.setPhoneNumber(staff.getPhoneNumber());
dto.setWxUserId(user.getUserid());
dto.setStaffId(staff.getStaffId());
dto.setStaffName(user.getName());
dto.setWxEnterpriseId(wxEnterpriseId);
......@@ -403,7 +402,6 @@ public class StaffApiServiceImpl implements StaffApiService {
if (null != departmentRelated) {
departmentRelated.setPhoneNumber(staff.getPhoneNumber());
departmentRelated.setStaffName(staff.getStaffName());
departmentRelated.setWxUserId(staff.getWxUserId());
departmentRelated.setNationCode(staff.getNationCode());
departmentRelated.setUpdateTime(new Date());
staffDepartmentRelatedService.update(departmentRelated);
......@@ -512,7 +510,6 @@ public class StaffApiServiceImpl implements StaffApiService {
related.setNationCode(staff.getNationCode());
related.setPhoneNumber(staff.getPhoneNumber());
related.setStatusFlag(1);
related.setWxUserId(staff.getWxUserId());
related.setWxEnterpriseId(staff.getWxEnterpriseId());
related.setStaffName(staffName);
staffDepartmentRelatedService.add(related);
......
haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml
......@@ -6,7 +6,6 @@
<result column="staff_id" property="staffId" jdbcType="VARCHAR"/>
<result column="phone_number" property="phoneNumber" jdbcType="VARCHAR"/>
<result column="nation_code" property="nationCode" jdbcType="VARCHAR"/>
<result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR"/>
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
<result column="department_id" property="departmentId" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
......@@ -16,7 +15,7 @@
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
staff_department_related_id, staff_id, phone_number, nation_code, wx_user_id, department_id,
staff_department_related_id, staff_id, phone_number, nation_code, department_id,
status_flag, clerk_code, create_time, update_time,wx_enterprise_id,staff_name
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
......@@ -28,11 +27,11 @@
<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,
phone_number, nation_code,
department_id, status_flag, clerk_code,
create_time, update_time, wx_enterprise_id, staff_name)
values (#{staffDepartmentRelatedId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR},
#{phoneNumber,jdbcType=VARCHAR}, #{nationCode,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR},
#{phoneNumber,jdbcType=VARCHAR}, #{nationCode,jdbcType=VARCHAR},
#{departmentId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{clerkCode,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{wxEnterpriseId}, #{staffName})
</insert>
......@@ -50,9 +49,6 @@
<if test="nationCode != null">
nation_code = #{nationCode,jdbcType=VARCHAR},
</if>
<if test="wxUserId != null">
wx_user_id = #{wxUserId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if>
......@@ -129,14 +125,6 @@
limit 1
</select>
<select id="listByWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where wx_user_id = #{wxUserId}
and status_flag = 1
</select>
<select id="getDepartmentIdAndCode" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
......
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