Skip to content

H
haoban-manage3.0
Commit cd895823 by 墨竹
Options

feat：审核增加企业id查询

parent d0b0eeb5
Showing with 57 additions and 25 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java
...@@ -29,7 +29,7 @@ public interface AuditApiService { ...@@ -29,7 +29,7 @@ public interface AuditApiService {
void insert(AuditDTO audit); void insert(AuditDTO audit);
Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus, BasePageInfo pageInfo); Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus,String enterpriseId, BasePageInfo pageInfo);
Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo, Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo,
Integer auditType, Integer auditStatus,String wxEnterpriseId,String enterpriseId); Integer auditType, Integer auditStatus,String wxEnterpriseId,String enterpriseId);
...@@ -40,9 +40,9 @@ public interface AuditApiService { ...@@ -40,9 +40,9 @@ public interface AuditApiService {
List<BatchAuditLogDTO> listBatchLog(String batchId); List<BatchAuditLogDTO> listBatchLog(String batchId);
AuditDTO findByBindRelatedIdAndAuditType(String relatedId,int auditType); AuditDTO findByBindRelatedIdAndAuditType(String clerkId,int auditType,String wxEnterpriseId, String enterpriseId);
boolean judgeHavePhoneNumberOrCode(String enterpriseId,String clerkCode,String phoneNumber); boolean judgeHavePhoneNumberOrCode(String enterpriseId,String clerkCode,String phoneNumber,String wxEnterpriseId);
int getAuditCount(String wxEnterpriseId,String enterpriseId , String clerkId) ; int getAuditCount(String wxEnterpriseId,String enterpriseId , String clerkId) ;
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java
...@@ -14,13 +14,23 @@ public interface TabHaobanAuditMapper { ...@@ -14,13 +14,23 @@ public interface TabHaobanAuditMapper {
int updateByPrimaryKeySelective(TabHaobanAudit record); int updateByPrimaryKeySelective(TabHaobanAudit record);
Page<TabHaobanAudit> page(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("auditType") Integer auditType, @Param("storeIds") List<String> storeIds, @Param("searchParams") String search, @Param("enterpriseId") String enterpriseId, @Param("auditStatus") Integer auditStatus, @Param("auditFlag") Integer auditFlag); Page<TabHaobanAudit> page(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("auditType") Integer auditType,
@Param("storeIds") List<String> storeIds,
@Param("searchParams") String search,
@Param("enterpriseId") String enterpriseId,
@Param("auditStatus") Integer auditStatus,
@Param("auditFlag") Integer auditFlag);
List<TabHaobanAudit> listByStoreId(String storeId); List<TabHaobanAudit> listByStoreId(String storeId);
TabHaobanAudit findByStoreIdAndChangeField(@Param("storeId") String storeId, @Param("changeField") String changeField); TabHaobanAudit findByStoreIdAndChangeField(@Param("storeId") String storeId,
@Param("changeField") String changeField);
com.github.pagehelper.Page listByStaffId(@Param("staffId") String staffId, @Param("auditType") Integer auditType, @Param("auditStatus") Integer auditStatus); com.github.pagehelper.Page listByStaffId(@Param("staffId") String staffId,
@Param("auditType") Integer auditType,
@Param("auditStatus") Integer auditStatus,
@Param("enterpriseId") String enterpriseId);
com.github.pagehelper.Page pageStoreListByParams(@Param("storeIds") List<String> storeIds, com.github.pagehelper.Page pageStoreListByParams(@Param("storeIds") List<String> storeIds,
@Param("auditType") Integer auditType, @Param("auditType") Integer auditType,
...@@ -28,9 +38,17 @@ public interface TabHaobanAuditMapper { ...@@ -28,9 +38,17 @@ public interface TabHaobanAuditMapper {
@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId); @Param("enterpriseId") String enterpriseId);
TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId") String relatedId, @Param("auditType") int auditType); TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId") String relatedId,
@Param("auditType") int auditType,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId);
List<TabHaobanAudit> judgeHavePhoneNumberOrCode(@Param("enterpriseId") String enterpriseId, @Param("clerkCode") String clerkCode, @Param("phoneNumber") String phoneNumber); List<TabHaobanAudit> judgeHavePhoneNumberOrCode(@Param("enterpriseId") String enterpriseId,
@Param("clerkCode") String clerkCode,
@Param("phoneNumber") String phoneNumber,
@Param("wxEnterpriseId") String wxEnterpriseId);
int getAuditCount(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("storeIds") List<String> storeIds); int getAuditCount(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId,
@Param("storeIds") List<String> storeIds);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
...@@ -396,9 +396,9 @@ public class AuditApiServiceImpl implements AuditApiService { ...@@ -396,9 +396,9 @@ public class AuditApiServiceImpl implements AuditApiService {
} }
@Override @Override
public Page<AuditDTO> listByStaffId(String staffId, Integer auditType, Integer auditStatus, BasePageInfo pageInfo) { public Page<AuditDTO> listByStaffId(String staffId, Integer auditType, Integer auditStatus,String enterpriseId, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
return PageUtil.changePageHelperToCurrentPage(auditMapper.listByStaffId(staffId, auditType, auditStatus), AuditDTO.class); return PageUtil.changePageHelperToCurrentPage(auditMapper.listByStaffId(staffId, auditType, auditStatus,enterpriseId), AuditDTO.class);
} }
@Override @Override
...@@ -443,16 +443,15 @@ public class AuditApiServiceImpl implements AuditApiService { ...@@ -443,16 +443,15 @@ public class AuditApiServiceImpl implements AuditApiService {
} }
@Override @Override
public AuditDTO findByBindRelatedIdAndAuditType(String relatedId, public AuditDTO findByBindRelatedIdAndAuditType(String relatedId, int auditType,String wxEnterpriseId,String enterpriseId) {
int auditType) { TabHaobanAudit tab = auditMapper.findByBindRelatedIdAndAuditType(relatedId, auditType,wxEnterpriseId,enterpriseId);
TabHaobanAudit tab = auditMapper.findByBindRelatedIdAndAuditType(relatedId, auditType);
return EntityUtil.changeEntityByJSON(AuditDTO.class, tab); return EntityUtil.changeEntityByJSON(AuditDTO.class, tab);
} }
@Override @Override
public boolean judgeHavePhoneNumberOrCode(String enterpriseId, public boolean judgeHavePhoneNumberOrCode(String enterpriseId,
String clerkCode, String phoneNumber) { String clerkCode, String phoneNumber,String wxEnterpriseId) {
List<TabHaobanAudit> list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber); List<TabHaobanAudit> list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber,wxEnterpriseId);
return !CollectionUtil.isEmpty(list); return !CollectionUtil.isEmpty(list);
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
...@@ -165,6 +165,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -165,6 +165,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
logger.info("开始绑定clerk:{}", JSONObject.toJSONString(staffClerkRelationDTO)); logger.info("开始绑定clerk:{}", JSONObject.toJSONString(staffClerkRelationDTO));
String clerkId = staffClerkRelationDTO.getClerkId(); String clerkId = staffClerkRelationDTO.getClerkId();
String wxEnterpriseId = staffClerkRelationDTO.getWxEnterpriseId(); String wxEnterpriseId = staffClerkRelationDTO.getWxEnterpriseId();
String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
String staffId = staffClerkRelationDTO.getStaffId(); String staffId = staffClerkRelationDTO.getStaffId();
Integer manageFlag = staffClerkRelationDTO.getManageFlag(); Integer manageFlag = staffClerkRelationDTO.getManageFlag();
if (manageFlag != null && manageFlag == 1) { if (manageFlag != null && manageFlag == 1) {
...@@ -179,7 +180,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe ...@@ -179,7 +180,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
} }
} }
AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_BIND.getCode()); AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_BIND.getCode(),wxEnterpriseId,enterpriseId);
if (null != auditDTO) { if (null != auditDTO) {
return ServiceResponse.failure("4", "该导购已经被被申请绑定，请审核处理后再绑定"); return ServiceResponse.failure("4", "该导购已经被被申请绑定，请审核处理后再绑定");
} }
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml
...@@ -198,6 +198,9 @@ ...@@ -198,6 +198,9 @@
<if test="auditStatus != null"> <if test="auditStatus != null">
and audit_status = #{auditStatus} and audit_status = #{auditStatus}
</if> </if>
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId}
</if>
order by create_time desc order by create_time desc
</select> </select>
...@@ -236,6 +239,12 @@ ...@@ -236,6 +239,12 @@
and related_Id = #{relatedId} and related_Id = #{relatedId}
and audit_type = #{auditType} and audit_type = #{auditType}
and audit_status = 0 and audit_status = 0
<if test="wxEnterpriseId != null">
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId}
</if>
</select> </select>
<select id="judgeHavePhoneNumberOrCode" resultMap="BaseResultMap"> <select id="judgeHavePhoneNumberOrCode" resultMap="BaseResultMap">
...@@ -252,6 +261,9 @@ ...@@ -252,6 +261,9 @@
or old_value like concat ('%',#{phoneNumber},'%') or old_value like concat ('%',#{phoneNumber},'%')
</if> </if>
) )
<if test="wxEnterpriseId != null">
and wx_enterprise_id = #{wxEnterpriseId}
</if>
</select> </select>
<select id="getAuditCount" resultType="int"> <select id="getAuditCount" resultType="int">
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java → haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
...@@ -55,8 +55,8 @@ import java.util.*; ...@@ -55,8 +55,8 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@RestController @RestController
public class ClerkController extends WebBaseController { public class WxStaffController extends WebBaseController {
private static final Logger logger = LoggerFactory.getLogger(ClerkController.class); private static final Logger logger = LoggerFactory.getLogger(WxStaffController.class);
@Autowired @Autowired
private ClerkService clerkService; private ClerkService clerkService;
...@@ -335,7 +335,7 @@ public class ClerkController extends WebBaseController { ...@@ -335,7 +335,7 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_10009); return resultResponse(HaoBanErrCode.ERR_10009);
} }
String enterpriseId = store.getEnterpriseId(); String enterpriseId = store.getEnterpriseId();
boolean b = auditApiService.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber); boolean b = auditApiService.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber,wxEnterpriseId);
if (b) { if (b) {
//待审核中存在code或该手机号 //待审核中存在code或该手机号
return resultResponse(HaoBanErrCode.ERR_10021); return resultResponse(HaoBanErrCode.ERR_10021);
...@@ -347,7 +347,7 @@ public class ClerkController extends WebBaseController { ...@@ -347,7 +347,7 @@ public class ClerkController extends WebBaseController {
} }
AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId); AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
if (dto.getAuditFlag() == 1 && dto.getClerkChangeFlag() == 1) { if (dto.getAuditFlag() == 1 && dto.getClerkChangeFlag() == 1) {
AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkCode, AuditType.CLERK_ADD.getCode()); AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkCode, AuditType.CLERK_ADD.getCode(),wxEnterpriseId,enterpriseId);
if (auditDTO != null) { if (auditDTO != null) {
logger.info("已经存在了审核记录，待审核{}", clerkCode); logger.info("已经存在了审核记录，待审核{}", clerkCode);
return resultResponse(HaoBanErrCode.ERR_10018); return resultResponse(HaoBanErrCode.ERR_10018);
...@@ -421,7 +421,7 @@ public class ClerkController extends WebBaseController { ...@@ -421,7 +421,7 @@ public class ClerkController extends WebBaseController {
//删除店员 //删除店员
@HttpLimit @HttpLimit
@RequestMapping("/staff-del") @RequestMapping("/staff-del")
public HaobanResponse staffDel(String wxEnterpriseId, String storeId, Integer version, String clerkIds, String staffId) { public HaobanResponse staffDel(String wxEnterpriseId, String storeId, String clerkIds, String staffId) {
if (StringUtils.isAnyBlank(clerkIds)) { if (StringUtils.isAnyBlank(clerkIds)) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
...@@ -435,7 +435,7 @@ public class ClerkController extends WebBaseController { ...@@ -435,7 +435,7 @@ public class ClerkController extends WebBaseController {
//需要审核 //需要审核
String[] clerkIdArr = clerkIds.split(","); String[] clerkIdArr = clerkIds.split(",");
for (String clerkId : clerkIdArr) { for (String clerkId : clerkIdArr) {
AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_DEL.getCode()); AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_DEL.getCode(),wxEnterpriseId,store.getEnterpriseId());
if (auditDTO != null) { if (auditDTO != null) {
logger.info("已经存在了审核记录，待审核{}", clerkId); logger.info("已经存在了审核记录，待审核{}", clerkId);
continue; continue;
...@@ -843,6 +843,8 @@ public class ClerkController extends WebBaseController { ...@@ -843,6 +843,8 @@ public class ClerkController extends WebBaseController {
@HttpLimit @HttpLimit
@RequestMapping("bind-staff") @RequestMapping("bind-staff")
public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType, Integer manageFlag) { public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType, Integer manageFlag) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
if (StringUtils.isAnyBlank(clerkId, staffId)) { if (StringUtils.isAnyBlank(clerkId, staffId)) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
...@@ -857,7 +859,7 @@ public class ClerkController extends WebBaseController { ...@@ -857,7 +859,7 @@ public class ClerkController extends WebBaseController {
if (staff == null) { if (staff == null) {
return resultResponse(HaoBanErrCode.ERR_10006); return resultResponse(HaoBanErrCode.ERR_10006);
} }
AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_BIND.getCode()); AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_BIND.getCode(),wxEnterpriseId,clerk.getEnterpriseId());
if (auditDTO != null) { if (auditDTO != null) {
return resultResponse(HaoBanErrCode.ERR_10018); return resultResponse(HaoBanErrCode.ERR_10018);
} }
...@@ -879,7 +881,6 @@ public class ClerkController extends WebBaseController { ...@@ -879,7 +881,6 @@ public class ClerkController extends WebBaseController {
String clerkCode = clerk.getClerkCode(); String clerkCode = clerk.getClerkCode();
String enterpriseId = clerk.getEnterpriseId(); String enterpriseId = clerk.getEnterpriseId();
String wxEnterpriseId = staff.getWxEnterpriseId();
String wxUserId = staff.getWxUserId(); String wxUserId = staff.getWxUserId();
StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, enterpriseId); StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
......
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