Skip to content

H
haoban-manage3.0
Commit 36abde78 by 墨竹
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 4227025e bc370c76
Showing with 202 additions and 447 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkBindLogDetailDTO.java
...@@ -106,11 +106,20 @@ public class StaffClerkBindLogDetailDTO implements Serializable { ...@@ -106,11 +106,20 @@ public class StaffClerkBindLogDetailDTO implements Serializable {
* *
*/ */
private Date updateTime; private Date updateTime;
private String operName ;
/** /**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getOperName() {
return operName;
}
public void setOperName(String operName) {
this.operName = operName;
}
public String getClerkPhone() { public String getClerkPhone() {
return clerkPhone; return clerkPhone;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffClerkBindLogMapper.java
...@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.dao.mapper; ...@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog; import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import retrofit2.http.PATCH;
import java.util.List; import java.util.List;
...@@ -12,34 +11,14 @@ public interface StaffClerkBindLogMapper { ...@@ -12,34 +11,14 @@ public interface StaffClerkBindLogMapper {
/** /**
* *
*/ */
int deleteByPrimaryKey(Integer logId);
/**
*
*/
int insert(TabHaobanStaffClerkBindLog record); int insert(TabHaobanStaffClerkBindLog record);
/** /**
* *
*/ */
int insertSelective(TabHaobanStaffClerkBindLog record);
/**
*
*/
TabHaobanStaffClerkBindLog selectByPrimaryKey(Integer logId); TabHaobanStaffClerkBindLog selectByPrimaryKey(Integer logId);
/** /**
*
*/
int updateByPrimaryKeySelective(TabHaobanStaffClerkBindLog record);
/**
*
*/
int updateByPrimaryKey(TabHaobanStaffClerkBindLog record);
/**
* 列表 * 列表
* *
* @param clerkIds * @param clerkIds
...@@ -48,8 +27,8 @@ public interface StaffClerkBindLogMapper { ...@@ -48,8 +27,8 @@ public interface StaffClerkBindLogMapper {
* @param optType * @param optType
* @return * @return
*/ */
public List<TabHaobanStaffClerkBindLog> listStaffClerkBindLog(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("clerkIds") List<String> clerkIds public List<TabHaobanStaffClerkBindLog> listStaffClerkBindLog(@Param("wxEnterpriseId") String wxEnterpriseId,
, @Param("staffIds") List<String> staffIds, @Param("enterpriseIds") List<String> enterpriseIds, @Param("optType") int optType, @Param("search") String search); @Param("enterpriseId") String enterpriseId, @Param("optType") int optType, @Param("search") String search);
public List<TabHaobanStaffClerkBindLog> staffClerkUnBindLog(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("clerkId") String clerkIds public List<TabHaobanStaffClerkBindLog> staffClerkUnBindLog(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("clerkId") String clerkIds
, @Param("enterpriseId") String enterpriseIds, @Param("optType") int optType); , @Param("enterpriseId") String enterpriseIds, @Param("optType") int optType);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanTemplateEnterpriseRelationMapper.java
...@@ -7,12 +7,9 @@ import org.apache.ibatis.annotations.Param; ...@@ -7,12 +7,9 @@ import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation; import com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation;
public interface TabHaobanTemplateEnterpriseRelationMapper { public interface TabHaobanTemplateEnterpriseRelationMapper {
int deleteByPrimaryKey(String templateEnterpriseRelationId);
int insert(TabHaobanTemplateEnterpriseRelation record); int insert(TabHaobanTemplateEnterpriseRelation record);
int insertSelective(TabHaobanTemplateEnterpriseRelation record);
TabHaobanTemplateEnterpriseRelation selectByPrimaryKey(String templateEnterpriseRelationId); TabHaobanTemplateEnterpriseRelation selectByPrimaryKey(String templateEnterpriseRelationId);
int updateByPrimaryKeySelective(TabHaobanTemplateEnterpriseRelation record); int updateByPrimaryKeySelective(TabHaobanTemplateEnterpriseRelation record);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaffClerkBindLog.java
...@@ -87,6 +87,26 @@ public class TabHaobanStaffClerkBindLog implements Serializable { ...@@ -87,6 +87,26 @@ public class TabHaobanStaffClerkBindLog implements Serializable {
* *
*/ */
private Date updateTime; private Date updateTime;
private String operName ;
private String clerkName ;
public String getOperName() {
return operName;
}
public String getClerkName() {
return clerkName;
}
public void setOperName(String operName) {
this.operName = operName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
/** /**
*/ */
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkBindLogService.java
...@@ -44,7 +44,7 @@ public interface StaffClerkBindLogService { ...@@ -44,7 +44,7 @@ public interface StaffClerkBindLogService {
/** /**
* @return * @return
*/ */
public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, List<String> clerkIds, List<String> staffIds, List<String> enterpriseIds, int optType, String search, BasePageInfo pageInfo); public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, String enterpriseId, int optType, String search, BasePageInfo pageInfo);
public Page<StaffClerkBindLogDetailDTO> pageUnBindLog(String wxEnterpriseId, String clerkId, String enterpriseId, int optType, BasePageInfo pageInfo); public Page<StaffClerkBindLogDetailDTO> pageUnBindLog(String wxEnterpriseId, String clerkId, String enterpriseId, int optType, BasePageInfo pageInfo);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkBindLogServiceImpl.java
...@@ -40,7 +40,7 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService { ...@@ -40,7 +40,7 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService {
@Override @Override
public void insert(TabHaobanStaffClerkBindLog bindLog) { public void insert(TabHaobanStaffClerkBindLog bindLog) {
bindLog.setCreateTime(new Date()); bindLog.setCreateTime(new Date());
staffClerkBindLogMapper.insertSelective(bindLog); staffClerkBindLogMapper.insert(bindLog);
} }
@Override @Override
...@@ -85,9 +85,9 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService { ...@@ -85,9 +85,9 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService {
} }
@Override @Override
public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, List<String> clerkIds, List<String> staffIds, List<String> enterpriseIds, int optType, String search, BasePageInfo pageInfo) { public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId, String enterpriseId, int optType, String search, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo); PageHelper.startPage(pageInfo);
List<TabHaobanStaffClerkBindLog> clerkBindLogList = staffClerkBindLogMapper.listStaffClerkBindLog(wxEnterpriseId, clerkIds, staffIds, enterpriseIds, optType, search); List<TabHaobanStaffClerkBindLog> clerkBindLogList = staffClerkBindLogMapper.listStaffClerkBindLog(wxEnterpriseId, enterpriseId, optType, search);
Page<StaffClerkBindLogDetailDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindLogList), StaffClerkBindLogDetailDTO.class); Page<StaffClerkBindLogDetailDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindLogList), StaffClerkBindLogDetailDTO.class);
return retPage; return retPage;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TemplateApplicationRelatedServiceImpl.java
...@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.gic.haoban.common.utils.StringUtil; import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateApplicationRelatedMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanTemplateApplicationRelatedMapper;
import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated; import com.gic.haoban.manage.service.entity.TabHaobanTemplateApplicationRelated;
import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService; import com.gic.haoban.manage.service.service.TemplateApplicationRelatedService;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
...@@ -41,42 +41,28 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -41,42 +41,28 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
@Autowired @Autowired
private StaffClerkRelationService staffClerkRelatinService; private StaffClerkRelationService staffClerkRelatinService;
@Autowired @Autowired
private EnterpriseService enterpriseService; private EnterpriseService enterpriseService;
@Autowired @Autowired
private ClerkService clerkService; private ClerkService clerkService;
@Autowired @Autowired
private StoreService storeService; private StoreService storeService;
@Autowired @Autowired
private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper; private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper;
@Autowired @Autowired
private AuditApiService auditApiService; private AuditApiService auditApiService;
@Autowired @Autowired
private ClerkMainStoreRelatedService clerkMainStoreRelatedService; private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
@Autowired @Autowired
private StaffClerkBindLogService staffClerkBindLogService; private StaffClerkBindLogService staffClerkBindLogService;
@Autowired
private WxEnterpriseRelatedService wxEnterpriseRelatedService;
@Autowired @Autowired
private StaffService staffService; private StaffService staffService;
@Autowired @Autowired
private ExternalClerkRelatedService externalClerkRelatedService; private ExternalClerkRelatedService externalClerkRelatedService;
@Autowired @Autowired
private QywxUserApiService qywxUserApiService; private QywxUserApiService qywxUserApiService;
@Autowired @Autowired
private SecretSettingService secretSettingService; private SecretSettingService secretSettingService;
@Autowired @Autowired
private WxEnterpriseService wxEnterpriseService; private WxEnterpriseService wxEnterpriseService;
...@@ -95,26 +81,34 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -95,26 +81,34 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
} }
ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkRelation.getClerkId()); ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkRelation.getClerkId());
String phoneNumber = ""; String phoneNumber = "";
String clerkName = null;
if (null != clerkDTO) { if (null != clerkDTO) {
phoneNumber = clerkDTO.getPhoneNumber(); phoneNumber = clerkDTO.getPhoneNumber();
clerkName = clerkDTO.getClerkName() ;
} }
TabHaobanStaffClerkBindLog staffClerkRelation = new TabHaobanStaffClerkBindLog(); String operClerkId = infoDTO.getOptStaffId() ;
staffClerkRelation.setClerkId(clerkRelation.getClerkId()); clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkRelation.getClerkId());
staffClerkRelation.setChannelCode(infoDTO.getChannelCode()); String operName = null ;
staffClerkRelation.setClerkCode(clerkRelation.getClerkCode()); if (null != clerkDTO) {
staffClerkRelation.setCreateTime(new Date()); operName = clerkDTO.getClerkName() ;
staffClerkRelation.setEnterpriseId(clerkRelation.getEnterpriseId()); }
staffClerkRelation.setOptStaffId(infoDTO.getOptStaffId()); TabHaobanStaffClerkBindLog enity = new TabHaobanStaffClerkBindLog();
staffClerkRelation.setOptType(infoDTO.getOptType()); enity.setClerkId(clerkRelation.getClerkId());
staffClerkRelation.setStatusFlag(1); enity.setChannelCode(infoDTO.getChannelCode());
staffClerkRelation.setStaffId(clerkRelation.getStaffId()); enity.setClerkCode(clerkRelation.getClerkCode());
staffClerkRelation.setWxEnterpriseId(clerkRelation.getWxEnterpriseId()); enity.setCreateTime(new Date());
staffClerkRelation.setRelationId(infoDTO.getRelationId()); enity.setEnterpriseId(clerkRelation.getEnterpriseId());
staffClerkRelation.setClerkPhone(phoneNumber); enity.setOptStaffId(operClerkId);
staffClerkRelation.setUpdateTime(new Date()); enity.setOperName(operName);
enity.setOptType(infoDTO.getOptType());
staffClerkBindLogService.insert(staffClerkRelation); enity.setStatusFlag(1);
enity.setStaffId(clerkRelation.getStaffId());
enity.setWxEnterpriseId(clerkRelation.getWxEnterpriseId());
enity.setRelationId(infoDTO.getRelationId());
enity.setClerkPhone(phoneNumber);
enity.setUpdateTime(new Date());
enity.setClerkName(clerkName);
staffClerkBindLogService.insert(enity);
} }
@Override @Override
...@@ -307,50 +301,24 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -307,50 +301,24 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
@Override @Override
public Page<StaffClerkBindLogDetailDTO> pageStaffClerkBindLog(String wxEnterpriseId, String search, String enterpriseId, int optType, BasePageInfo pageInfo) { public Page<StaffClerkBindLogDetailDTO> pageStaffClerkBindLog(String wxEnterpriseId, String search, String enterpriseId, int optType, BasePageInfo pageInfo) {
List<TabHaobanWxEnterpriseRelated> wxEnterpriseRelateds = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId); Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageBindLog(wxEnterpriseId, enterpriseId, optType, search, pageInfo);
if (CollectionUtils.isEmpty(wxEnterpriseRelateds)) {
logger.info("没有关联企业");
return null;
}
List<String> enterpriseList = wxEnterpriseRelateds.stream().map(TabHaobanWxEnterpriseRelated::getEnterpriseId)
.filter(eid -> {
if (StringUtils.isBlank(enterpriseId)) {
return true;
} else {
return enterpriseId.equals(eid);
}
}).collect(Collectors.toList());
if (CollectionUtils.isEmpty(enterpriseList)) {
logger.info("没有有效的企业");
return null;
}
List<String> clerkIds = null;
Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageBindLog(wxEnterpriseId, clerkIds, null, enterpriseList, optType, search, pageInfo);
if (CollectionUtils.isNotEmpty(retList.getResult())) { if (CollectionUtils.isNotEmpty(retList.getResult())) {
retList.getResult().forEach(staffClerkBindLogDetailDTO -> { retList.getResult().forEach(item -> {
TabHaobanStaff haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getStaffId()); if ("-1".equals(item.getOptStaffId())) {
if (null != haobanStaff) { item.setOptStaffName("系统");
staffClerkBindLogDetailDTO.setStaffName(haobanStaff.getStaffName()); }else {
staffClerkBindLogDetailDTO.setWxUserId(haobanStaff.getWxUserId()); item.setOptStaffName(item.getOperName());
} else {
staffClerkBindLogDetailDTO.setStaffName("未知成员");
} }
if ("-1".equals(staffClerkBindLogDetailDTO.getOptStaffId())) { if(StringUtils.isBlank(item.getOptStaffName())) {
staffClerkBindLogDetailDTO.setOptStaffName("系统"); item.setOptStaffName("未知成员");
} else {
haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getOptStaffId());
if (null != haobanStaff) {
staffClerkBindLogDetailDTO.setOptStaffName(haobanStaff.getStaffName());
} else {
staffClerkBindLogDetailDTO.setOptStaffName("未知成员");
}
} }
if(StringUtils.isBlank(item.getClerkName())) {
ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(staffClerkBindLogDetailDTO.getClerkId()); ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(item.getClerkId());
if (null != clerkDTO) { if (null != clerkDTO) {
staffClerkBindLogDetailDTO.setClerkName(clerkDTO.getClerkName()); item.setClerkName(clerkDTO.getClerkName());
}
} }
staffClerkBindLogDetailDTO.setClerkPhoneNumber(staffClerkBindLogDetailDTO.getClerkPhone()); item.setClerkPhoneNumber(item.getClerkPhone());
}); });
} }
return retList; return retList;
...@@ -364,30 +332,29 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -364,30 +332,29 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
} }
Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageUnBindLog(wxEnterpriseId, clerkId, enterpriseId, optType, pageInfo); Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageUnBindLog(wxEnterpriseId, clerkId, enterpriseId, optType, pageInfo);
if (CollectionUtils.isNotEmpty(retList.getResult())) { if (CollectionUtils.isNotEmpty(retList.getResult())) {
retList.getResult().forEach(staffClerkBindLogDetailDTO -> { retList.getResult().forEach(item -> {
TabHaobanStaff haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getStaffId()); TabHaobanStaff haobanStaff = staffService.selectById(item.getStaffId());
if (null != haobanStaff) { if (null != haobanStaff) {
staffClerkBindLogDetailDTO.setStaffName(haobanStaff.getStaffName()); item.setStaffName(haobanStaff.getStaffName());
staffClerkBindLogDetailDTO.setWxUserId(haobanStaff.getWxUserId()); item.setWxUserId(haobanStaff.getWxUserId());
} else { } else {
staffClerkBindLogDetailDTO.setStaffName("未知成员"); item.setStaffName("未知成员");
} }
if ("-1".equals(staffClerkBindLogDetailDTO.getOptStaffId())) { if ("-1".equals(item.getOptStaffId())) {
staffClerkBindLogDetailDTO.setOptStaffName("系统"); item.setOptStaffName("系统");
} else { }else {
haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getOptStaffId()); item.setOptStaffName(item.getOperName());
if (null != haobanStaff) {
staffClerkBindLogDetailDTO.setOptStaffName(haobanStaff.getStaffName());
} else {
staffClerkBindLogDetailDTO.setOptStaffName("未知成员");
}
} }
if(StringUtils.isBlank(item.getOptStaffName())) {
ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(staffClerkBindLogDetailDTO.getClerkId()); item.setOptStaffName("未知成员");
if (null != clerkDTO) {
staffClerkBindLogDetailDTO.setClerkName(clerkDTO.getClerkName());
} }
staffClerkBindLogDetailDTO.setClerkPhoneNumber(staffClerkBindLogDetailDTO.getClerkPhone()); if(StringUtils.isBlank(item.getClerkName())) {
ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(item.getClerkId());
if (null != clerkDTO) {
item.setClerkName(clerkDTO.getClerkName());
}
}
item.setClerkPhoneNumber(item.getClerkPhone());
}); });
} }
return retList; return retList;
...@@ -398,19 +365,6 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -398,19 +365,6 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
staffClerkBindLogService.pushToMq(staffId, optStaffId, optType, channelCode, relationId); staffClerkBindLogService.pushToMq(staffId, optStaffId, optType, channelCode, relationId);
} }
private void setMainStore(StaffClerkRelationDTO staffClerkRelation) {
if (staffClerkRelation == null) {
logger.info("staffClerkRelation为空");
return;
}
String staffId = staffClerkRelation.getStaffId();
String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
List<StaffClerkRelationDTO> list = staffClerkRelatinService.listByStaffId(wxEnterpriseId, staffId);
if (list != null && list.size() == 1) {
clerkMainStoreRelatedService.setMainStore(staffId, staffClerkRelation.getStoreId(), wxEnterpriseId);
}
}
private void delSetMainStore(TabHaobanStaffClerkRelation staffClerkRelation) { private void delSetMainStore(TabHaobanStaffClerkRelation staffClerkRelation) {
if (staffClerkRelation == null) { if (staffClerkRelation == null) {
logger.info("staffClerkRelation为空"); logger.info("staffClerkRelation为空");
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
...@@ -515,10 +515,9 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela ...@@ -515,10 +515,9 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
if (clerkDTO == null) { if (clerkDTO == null) {
return; return;
} }
StaffDTO staffDTO = staffApiService.selectById(staffId);
//字段 //字段
Map<String, String> params = new HashMap<String, String>(); Map<String, String> params = new HashMap<String, String>();
params.put("staffName", staffDTO.getStaffName()); params.put("staffName", clerkDTO.getClerkName());
params.put("clerkCode", clerkDTO.getClerkCode()); params.put("clerkCode", clerkDTO.getClerkCode());
params.put("reason", reason); params.put("reason", reason);
//参数 //参数
......
haoban-manage3-service/src/main/resources/mapper/StaffClerkBindLogMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.StaffClerkBindLogMapper"> <mapper namespace="com.gic.haoban.manage.service.dao.mapper.StaffClerkBindLogMapper">
<resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog"> <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog">
<id column="log_id" jdbcType="INTEGER" property="logId"/> <id column="log_id" jdbcType="INTEGER" property="logId"/>
<result column="staff_id" jdbcType="VARCHAR" property="staffId"/> <result column="staff_id" jdbcType="VARCHAR" property="staffId"/>
<result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/> <result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
<result column="opt_staff_id" jdbcType="VARCHAR" property="optStaffId"/> <result column="opt_staff_id" jdbcType="VARCHAR" property="optStaffId"/>
<result column="opt_type" jdbcType="INTEGER" property="optType"/> <result column="opt_type" jdbcType="INTEGER" property="optType"/>
<result column="channel_code" jdbcType="INTEGER" property="channelCode"/> <result column="channel_code" jdbcType="INTEGER" property="channelCode"/>
<result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId"/> <result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId"/>
<result column="clerk_id" jdbcType="VARCHAR" property="clerkId"/> <result column="clerk_id" jdbcType="VARCHAR" property="clerkId"/>
<result column="clerk_code" jdbcType="VARCHAR" property="clerkCode"/> <result column="clerk_code" jdbcType="VARCHAR" property="clerkCode"/>
<result column="clerk_phone" jdbcType="VARCHAR" property="clerkPhone"/> <result column="clerk_phone" jdbcType="VARCHAR" property="clerkPhone"/>
<result column="status_flag" jdbcType="INTEGER" property="statusFlag"/> <result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap> <result column="oper_name" property="operName"/>
<sql id="Base_Column_List"> <result column="clerk_name" property="clerkName"/>
log_id
, staff_id, wx_enterprise_id, opt_staff_id, opt_type, channel_code, enterprise_id, </resultMap>
clerk_id, clerk_code,clerk_phone, status_flag, create_time, update_time <sql id="Base_Column_List">
</sql> log_id, staff_id, wx_enterprise_id, opt_staff_id, opt_type, channel_code, enterprise_id,
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> clerk_id, clerk_code,clerk_phone, status_flag, create_time, update_time , oper_name , clerk_name
select </sql>
<include refid="Base_Column_List"/> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
from tab_haoban_staff_clerk_bind_log select
where log_id = #{logId,jdbcType=INTEGER} <include refid="Base_Column_List"/>
</select> from tab_haoban_staff_clerk_bind_log
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> where log_id = #{logId,jdbcType=INTEGER}
delete </select>
from tab_haoban_staff_clerk_bind_log
where log_id = #{logId,jdbcType=INTEGER} <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog">
</delete> insert into tab_haoban_staff_clerk_bind_log (staff_id, wx_enterprise_id,
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog"> opt_staff_id, opt_type, channel_code,
insert into tab_haoban_staff_clerk_bind_log (staff_id, wx_enterprise_id, enterprise_id, clerk_id, clerk_code, clerk_phone,
opt_staff_id, opt_type, channel_code, status_flag, create_time, update_time , oper_name,clerk_name)
enterprise_id, clerk_id, clerk_code, clerk_phone, values (#{staffId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
status_flag, create_time, update_time) #{optStaffId,jdbcType=VARCHAR}, #{optType,jdbcType=INTEGER}, #{channelCode,jdbcType=INTEGER},
values (#{staffId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR}, #{clerkId,jdbcType=VARCHAR}, #{clerkCode,jdbcType=VARCHAR},
#{optStaffId,jdbcType=VARCHAR}, #{optType,jdbcType=INTEGER}, #{channelCode,jdbcType=INTEGER}, #{clerk_phone,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=VARCHAR}, #{clerkId,jdbcType=VARCHAR}, #{clerkCode,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} , #{operName} , #{clerkName})
#{clerk_phone,jdbcType=VARCHAR}, </insert>
#{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert> <select id="listStaffClerkBindLog" resultMap="BaseResultMap">
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog"> select
insert into tab_haoban_staff_clerk_bind_log <include refid="Base_Column_List"/>
<trim prefix="(" suffix=")" suffixOverrides=","> from tab_haoban_staff_clerk_bind_log
<if test="logId != null"> where wx_enterprise_id=#{wxEnterpriseId} and enterprise_id = #{enterpriseId}
log_id, <if test="optType!=-1">
</if> and opt_type=#{optType}
<if test="staffId != null"> </if>
staff_id, <if test="search!=null and search.length()>0">
</if> and (clerk_code = #{search} or clerk_phone = #{search})
<if test="wxEnterpriseId != null"> </if>
wx_enterprise_id, order by create_time desc
</if> </select>
<if test="optStaffId != null"> <select id="staffClerkUnBindLog" resultMap="BaseResultMap">
opt_staff_id, select
</if> <include refid="Base_Column_List"/>
<if test="optType != null"> from tab_haoban_staff_clerk_bind_log
opt_type, where wx_enterprise_id = #{wxEnterpriseId}
</if> <if test="clerkId!=null ">
<if test="channelCode != null"> and clerk_id = #{clerkId}
channel_code, </if>
</if> <if test="enterpriseId!=null">
<if test="enterpriseId != null"> and enterprise_id = #{enterpriseId}
enterprise_id, </if>
</if> <if test="optType!=-1">
<if test="clerkId != null"> and opt_type= #{optType}
clerk_id, </if>
</if> order by create_time desc
<if test="clerkCode != null"> </select>
clerk_code,
</if>
<if test="clerkPhone != null">
clerk_phone,
</if>
<if test="statusFlag != null">
status_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="logId != null">
#{logId,jdbcType=INTEGER},
</if>
<if test="staffId != null">
#{staffId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="optStaffId != null">
#{optStaffId,jdbcType=VARCHAR},
</if>
<if test="optType != null">
#{optType,jdbcType=INTEGER},
</if>
<if test="channelCode != null">
#{channelCode,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="clerkId != null">
#{clerkId,jdbcType=VARCHAR},
</if>
<if test="clerkCode != null">
#{clerkCode,jdbcType=VARCHAR},
</if>
<if test="clerkPhone != null">
#{clerkPhone,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</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.TabHaobanStaffClerkBindLog">
update tab_haoban_staff_clerk_bind_log
<set>
<if test="staffId != null">
staff_id = #{staffId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="optStaffId != null">
opt_staff_id = #{optStaffId,jdbcType=VARCHAR},
</if>
<if test="optType != null">
opt_type = #{optType,jdbcType=INTEGER},
</if>
<if test="channelCode != null">
channel_code = #{channelCode,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="clerkId != null">
clerk_id = #{clerkId,jdbcType=VARCHAR},
</if>
<if test="clerkCode != null">
clerk_code = #{clerkCode,jdbcType=VARCHAR},
</if>
<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 log_id = #{logId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog">
update tab_haoban_staff_clerk_bind_log
set staff_id = #{staffId,jdbcType=VARCHAR},
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
opt_staff_id = #{optStaffId,jdbcType=VARCHAR},
opt_type = #{optType,jdbcType=INTEGER},
channel_code = #{channelCode,jdbcType=INTEGER},
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
clerk_id = #{clerkId,jdbcType=VARCHAR},
clerk_code = #{clerkCode,jdbcType=VARCHAR},
status_flag = #{statusFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where log_id = #{logId,jdbcType=INTEGER}
</update>
<select id="listStaffClerkBindLog" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_clerk_bind_log
where wx_enterprise_id=#{wxEnterpriseId}
<if test="clerkIds!=null and clerkIds.size()>0">
and clerk_id in
<foreach collection="clerkIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="staffIds!=null and staffIds.size()>0">
and staff_id in
<foreach collection="staffIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="enterpriseIds!=null and enterpriseIds.size()>0">
and enterprise_id in
<foreach collection="enterpriseIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="optType!=-1">
and opt_type=#{optType}
</if>
<if test="search!=null and search.length()>0">
and (clerk_code = #{search} or clerk_phone = #{search})
</if>
order by create_time desc
</select>
<select id="staffClerkUnBindLog" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_clerk_bind_log
where wx_enterprise_id = #{wxEnterpriseId}
<if test="clerkId!=null ">
and clerk_id = #{clerkId}
</if>
<if test="enterpriseId!=null">
and enterprise_id = #{enterpriseId}
</if>
<if test="optType!=-1">
and opt_type= #{optType}
</if>
order by create_time desc
</select>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/TabHaobanTemplateEnterpriseRelationMapper.xml
...@@ -20,11 +20,7 @@ ...@@ -20,11 +20,7 @@
from tab_haoban_template_enterprise_relation from tab_haoban_template_enterprise_relation
where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR} where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete
from tab_haoban_template_enterprise_relation
where template_enterprise_relation_id = #{templateEnterpriseRelationId,jdbcType=VARCHAR}
</delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation"> <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
insert into tab_haoban_template_enterprise_relation (template_enterprise_relation_id, wx_enterprise_id, insert into tab_haoban_template_enterprise_relation (template_enterprise_relation_id, wx_enterprise_id,
application_template_id, status_flag, create_time, application_template_id, status_flag, create_time,
...@@ -34,56 +30,7 @@ ...@@ -34,56 +30,7 @@
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{wxEnterpriseName,jdbcType=VARCHAR}) #{updateTime,jdbcType=TIMESTAMP}, #{wxEnterpriseName,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
insert into tab_haoban_template_enterprise_relation
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="templateEnterpriseRelationId != null">
template_enterprise_relation_id,
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id,
</if>
<if test="wxEnterpriseName != null">
wx_enterprise_name,
</if>
<if test="applicationTemplateId != null">
application_template_id,
</if>
<if test="statusFlag != null">
status_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateEnterpriseRelationId != null">
#{templateEnterpriseRelationId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseName != null">
#{wxEnterpriseName,jdbcType=VARCHAR},
</if>
<if test="applicationTemplateId != null">
#{applicationTemplateId,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" <update id="updateByPrimaryKeySelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation"> parameterType="com.gic.haoban.manage.service.entity.TabHaobanTemplateEnterpriseRelation">
update tab_haoban_template_enterprise_relation update tab_haoban_template_enterprise_relation
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java
...@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.CollectionUtil;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO; import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.anno.IgnoreLogin; import com.gic.haoban.common.anno.IgnoreLogin;
...@@ -47,7 +46,6 @@ import com.gic.haoban.manage.web.config.Config; ...@@ -47,7 +46,6 @@ import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.ApplicationVO; import com.gic.haoban.manage.web.vo.ApplicationVO;
import com.gic.haoban.manage.web.vo.ClerkEditInfoVO; import com.gic.haoban.manage.web.vo.ClerkEditInfoVO;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService; import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService; import com.gic.wechat.api.service.qywx.QywxUserApiService;
...@@ -97,15 +95,25 @@ public class ApplicationController extends WebBaseController { ...@@ -97,15 +95,25 @@ public class ApplicationController extends WebBaseController {
} }
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId); List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
Object o = RedisUtil.getCache("haobanWxEnterpriseIdAppOpen"); Iterator<ApplicationDTO> it = list.iterator();
String wxEnterpriseIds = o == null ? "" : o.toString(); // 判断模板
if (!wxEnterpriseIds.contains(wxEnterpriseId)) { List<String> tempIdList = null ;
Iterator<ApplicationDTO> it = list.iterator(); List<ApplicationDTO> tempList = this.applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId) ;
while (it.hasNext()) { if(CollectionUtils.isNotEmpty(tempList)) {
ApplicationDTO s = it.next(); tempIdList = tempList.stream().map(dto->dto.getApplicationId()).collect(Collectors.toList()) ;
// 我的客户、营销任务、看数据、云日报、月指标、商品中心、订单评价、扫码核销、E袋洗、佣金结算 }
if(Arrays.asList("11111","11114","11121","11122").contains(s.getApplicationId())) { while (it.hasNext()) {
it.remove(); ApplicationDTO s = it.next();
// 我的客户、营销任务、看数据、云日报、月指标、商品中心、订单评价、扫码核销、E袋洗、佣金结算
if(Arrays.asList("11111","11114","11121","11122").contains(s.getApplicationId())) {
it.remove();
}
// 11123E袋洗 11124佣金结算
if(CollectionUtils.isNotEmpty(tempIdList)) {
if(Arrays.asList("11123","11124").contains(s.getApplicationId())) {
if(!tempIdList.contains(s.getApplicationId())) {
it.remove();
}
} }
} }
} }
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java
...@@ -439,8 +439,11 @@ public class LoginController extends WebBaseController { ...@@ -439,8 +439,11 @@ public class LoginController extends WebBaseController {
String gicEnterpriseId = jsonObject.getString("enterpriseId"); String gicEnterpriseId = jsonObject.getString("enterpriseId");
String phoneNumber = jsonObject.getString("phoneNumber"); String phoneNumber = jsonObject.getString("phoneNumber");
Long timestamp = jsonObject.getLong("timestamp") ; Long timestamp = jsonObject.getLong("timestamp") ;
logger.info("选择企微列表,gicEnterpriseId={},phoneNumber={}", gicEnterpriseId, phoneNumber); if(null == timestamp) {
if (StringUtils.isAnyBlank(gicEnterpriseId, phoneNumber,timestamp+"")) { return this.fail("登录请求参数异常timestamp");
}
logger.info("选择企微列表,params={}", o);
if (StringUtils.isAnyBlank(gicEnterpriseId, phoneNumber)) {
return this.fail("参数异常"); return this.fail("参数异常");
} }
if(timestamp+1000*60*5 < System.currentTimeMillis()) { if(timestamp+1000*60*5 < System.currentTimeMillis()) {
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
...@@ -339,12 +339,9 @@ public class StaffController extends WebBaseController { ...@@ -339,12 +339,9 @@ public class StaffController extends WebBaseController {
* @return * @return
*/ */
@RequestMapping("del-clerk-relation") @RequestMapping("del-clerk-relation")
public HaobanResponse delStaffClerkList(String staffId, String clerkId) { public HaobanResponse delStaffClerkList(String clerkId) {
StaffDTO staff = staffApiService.selectById(staffId); WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
if (staff == null) { boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId);
return resultResponse(HaoBanErrCode.ERR_10007);
}
boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, clerkId);
return resultResponse(HaoBanErrCode.ERR_1, b); return resultResponse(HaoBanErrCode.ERR_1, b);
} }
...@@ -433,7 +430,7 @@ public class StaffController extends WebBaseController { ...@@ -433,7 +430,7 @@ public class StaffController extends WebBaseController {
relationDTO.setWxUserId(staffDTO.getWxUserId()); relationDTO.setWxUserId(staffDTO.getWxUserId());
ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(relationDTO, login.getStaffId(), ChannelCodeEnum.ADMIN_BIND.getCode()); ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(relationDTO, login.getClerkId(), ChannelCodeEnum.ADMIN_BIND.getCode());
logger.info("返回信息：{}", JSONObject.toJSONString(response)); logger.info("返回信息：{}", JSONObject.toJSONString(response));
if (response.getCode() == 1) { if (response.getCode() == 1) {
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
...@@ -450,8 +447,9 @@ public class StaffController extends WebBaseController { ...@@ -450,8 +447,9 @@ public class StaffController extends WebBaseController {
* @return * @return
*/ */
@RequestMapping("staff-clerk-bind-log") @RequestMapping("staff-clerk-bind-log")
public HaobanResponse bindLogs(String search, String enterpriseId, @RequestParam(defaultValue = "-1") Integer optType, BasePageInfo qo) { public HaobanResponse bindLogs(String search, @RequestParam(defaultValue = "-1") Integer optType, BasePageInfo qo) {
WebLoginDTO login = AuthWebRequestUtil.getLoginUser(); WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
String enterpriseId = login.getEnterpriseId() ;
Page<StaffClerkBindLogDetailDTO> page = staffClerkRelationApiService.pageStaffClerkBindLog(login.getWxEnterpriseId(), search, enterpriseId, optType, qo); Page<StaffClerkBindLogDetailDTO> page = staffClerkRelationApiService.pageStaffClerkBindLog(login.getWxEnterpriseId(), search, enterpriseId, optType, qo);
return resultResponse(HaoBanErrCode.ERR_1, page); return resultResponse(HaoBanErrCode.ERR_1, page);
} }
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
...@@ -163,7 +163,8 @@ public class ClerkController extends WebBaseController { ...@@ -163,7 +163,8 @@ public class ClerkController extends WebBaseController {
} else { } else {
WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, storeDTO.getEnterpriseId()); WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, storeDTO.getEnterpriseId());
Map<String, Object> ret = new HashMap<>(); Map<String, Object> ret = new HashMap<>();
ret.put("clerkEditFlag", enterpriseBindInfo.getClerkEditFlag()); // 待删除
ret.put("clerkEditFlag", ClerkEditInfoVO.info(enterpriseBindInfo.getClerkEditFlag()).getEditClerkFlag());
ret.put("clerkList", resultList); ret.put("clerkList", resultList);
return resultResponse(HaoBanErrCode.ERR_1, ret); return resultResponse(HaoBanErrCode.ERR_1, ret);
} }
...@@ -946,7 +947,7 @@ public class ClerkController extends WebBaseController { ...@@ -946,7 +947,7 @@ public class ClerkController extends WebBaseController {
staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode); staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode);
//加入日志 //加入日志
staffClerkRelationApiService.pushToBindLog(staffClerkRelation.getStaffId(), staffId, BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.SELF_UNBIND.getCode(), staffClerkRelation.getStaffClerkRelationId()); staffClerkRelationApiService.pushToBindLog(staffClerkRelation.getStaffId(), clerkId, BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.SELF_UNBIND.getCode(), staffClerkRelation.getStaffClerkRelationId());
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
} }
......
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