Skip to content

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

feat：审核增加查询条件

parent 83809a27
Showing with 53 additions and 38 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java
...@@ -31,7 +31,8 @@ public interface AuditApiService { ...@@ -31,7 +31,8 @@ public interface AuditApiService {
Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus, BasePageInfo pageInfo); Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus, BasePageInfo pageInfo);
Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo, Integer auditType, Integer auditStatus); Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo,
Integer auditType, Integer auditStatus,String wxEnterpriseId,String enterpriseId);
AuditDTO findById(String auditId); AuditDTO findById(String auditId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java
...@@ -14,19 +14,23 @@ public interface TabHaobanAuditMapper { ...@@ -14,19 +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);
com.github.pagehelper.Page listByStaffId(@Param("staffId")String staffId,@Param("auditType")Integer auditType,@Param("auditStatus")Integer auditStatus); 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 pageStoreListByParams(@Param("storeIds") List<String> storeIds,
@Param("auditType") Integer auditType,
@Param("auditStatus") Integer auditStatus,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId);
com.github.pagehelper.Page pageStoreListByParams(@Param("storeIds")List<String> storeIds, @Param("auditType")Integer auditType, @Param("auditStatus")Integer auditStatus); TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId") String relatedId, @Param("auditType") int auditType);
TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId")String relatedId,@Param("auditType")int auditType); 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); 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/impl/StaffClerkRelationServiceImpl.java
...@@ -68,8 +68,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -68,8 +68,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
private ClerkService clerkService; private ClerkService clerkService;
@Override @Override
public List<StaffClerkRelationDTO> listBindCode(String wxEnterpriseId,String enterpriseId, Set<String> clerkCodeList) { public List<StaffClerkRelationDTO> listBindCode(String wxEnterpriseId, String enterpriseId, Set<String> clerkCodeList) {
return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCode(wxEnterpriseId,enterpriseId, clerkCodeList)); return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCode(wxEnterpriseId, enterpriseId, clerkCodeList));
} }
@Override @Override
...@@ -79,7 +79,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -79,7 +79,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
@Override @Override
public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId) { public boolean delBind(String oldClerkId, String optStaffId, int channelCode, String newClerkId) {
TabHaobanStaffClerkRelation clerkRelation = mapper.getByClerkId(oldClerkId,null); TabHaobanStaffClerkRelation clerkRelation = mapper.getByClerkId(oldClerkId, null);
if (null == clerkRelation) { if (null == clerkRelation) {
logger.info("老的绑定关联不存在,clerkId={}", oldClerkId); logger.info("老的绑定关联不存在,clerkId={}", oldClerkId);
return true; return true;
...@@ -163,24 +163,27 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -163,24 +163,27 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
String staffClerkRelationId = insert(dto); String staffClerkRelationId = insert(dto);
if (StringUtils.isNotBlank(staffClerkRelationId)) { if (StringUtils.isNotBlank(staffClerkRelationId)) {
String wxEnterpriseId = dto.getWxEnterpriseId(); String wxEnterpriseId = dto.getWxEnterpriseId();
clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
//推入日志
staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), channelCode, staffClerkRelationId);
Integer manageFlag = dto.getManageFlag(); Integer manageFlag = dto.getManageFlag();
//导购和店长需要设置主门店
if (manageFlag != null && manageFlag == 1) { if (manageFlag != null && manageFlag == 1) {
return staffClerkRelationId; //do nothing
} else {
logger.info("设置主门店并创建活码：manageFlag:{},staffId:{}", manageFlag, staffId);
clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
// 绑定自动创建活码
HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
hmQrcodeQDTO.setHmType(1);
hmQrcodeQDTO.setWxEnterpriseId(wxEnterpriseId);
hmQrcodeQDTO.setEnterpriseId(dto.getEnterpriseId());
hmQrcodeQDTO.setName(tabHaobanStaff.getStaffName());
hmQrcodeQDTO.setPassFlag(1);
hmQrcodeQDTO.setStoreId(dto.getStoreId());
hmQrcodeQDTO.setClerkIdList(Collections.singletonList(dto.getClerkId()));
hmQrcodeQDTO.setInvokingType(channelCode);
hmQrcodeApiService.add(hmQrcodeQDTO);
} }
// 绑定自动创建活码 //推入日志
HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO(); staffClerkBindLogService.pushToMq(staffId, optStaffId, BindTypeEnum.BIND.getVal(), channelCode, staffClerkRelationId);
hmQrcodeQDTO.setHmType(1);
hmQrcodeQDTO.setWxEnterpriseId(wxEnterpriseId);
hmQrcodeQDTO.setEnterpriseId(dto.getEnterpriseId());
hmQrcodeQDTO.setName(tabHaobanStaff.getStaffName());
hmQrcodeQDTO.setPassFlag(1);
hmQrcodeQDTO.setStoreId(dto.getStoreId());
hmQrcodeQDTO.setClerkIdList(Collections.singletonList(dto.getClerkId()));
hmQrcodeQDTO.setInvokingType(channelCode);
hmQrcodeApiService.add(hmQrcodeQDTO);
} }
return staffClerkRelationId; return staffClerkRelationId;
} }
...@@ -245,13 +248,13 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -245,13 +248,13 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
@Override @Override
public StaffClerkRelationDTO getByClerkId(String clerkId) { public StaffClerkRelationDTO getByClerkId(String clerkId) {
return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId,null)); return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId, null));
} }
@Override @Override
public StaffClerkRelationDTO getByClerkId(String clerkId, String wxEnterpriseId) { public StaffClerkRelationDTO getByClerkId(String clerkId, String wxEnterpriseId) {
TabHaobanStaffClerkRelation staffClerkRelation = mapper.getByClerkId(clerkId, wxEnterpriseId); TabHaobanStaffClerkRelation staffClerkRelation = mapper.getByClerkId(clerkId, wxEnterpriseId);
return EntityUtil.changeEntityNew(StaffClerkRelationDTO.class,staffClerkRelation); return EntityUtil.changeEntityNew(StaffClerkRelationDTO.class, staffClerkRelation);
} }
@Override @Override
...@@ -259,7 +262,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService ...@@ -259,7 +262,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if (CollectionUtils.isEmpty(clerkList)) { if (CollectionUtils.isEmpty(clerkList)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
return mapper.listByClerkIds(clerkList,null); return mapper.listByClerkIds(clerkList, null);
} }
@Override @Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
...@@ -403,9 +403,9 @@ public class AuditApiServiceImpl implements AuditApiService { ...@@ -403,9 +403,9 @@ public class AuditApiServiceImpl implements AuditApiService {
@Override @Override
public Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo, Integer auditType, public Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo, Integer auditType,
Integer auditStatus) { Integer auditStatus, String wxEnterpriseId, String enterpriseId) {
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
return PageUtil.changePageHelperToCurrentPage(auditMapper.pageStoreListByParams(storeIds, auditType, auditStatus), AuditDTO.class); return PageUtil.changePageHelperToCurrentPage(auditMapper.pageStoreListByParams(storeIds, auditType, auditStatus, wxEnterpriseId, enterpriseId), AuditDTO.class);
} }
public void insertBatchLog(String batchId, int auditResult, TabHaobanAudit tab) { public void insertBatchLog(String batchId, int auditResult, TabHaobanAudit tab) {
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml
...@@ -187,8 +187,7 @@ ...@@ -187,8 +187,7 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_audit from tab_haoban_audit
where 1=1 where commit_staff_id = #{staffId,jdbcType=VARCHAR}
and commit_staff_id = #{staffId,jdbcType=VARCHAR}
and status_flag = 1 and status_flag = 1
<if test="auditType == null"> <if test="auditType == null">
and audit_type in (2,3,4,5) and audit_type in (2,3,4,5)
...@@ -217,6 +216,12 @@ ...@@ -217,6 +216,12 @@
<if test="auditStatus != null and auditStatus != -1"> <if test="auditStatus != null and auditStatus != -1">
and audit_status = #{auditStatus} and audit_status = #{auditStatus}
</if> </if>
<if test="wxEnterpriseId != null">
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId}
</if>
<include refid="storeSql"></include> <include refid="storeSql"></include>
order by update_time desc order by update_time desc
</select> </select>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
...@@ -130,7 +130,8 @@ public class AuditController extends WebBaseController { ...@@ -130,7 +130,8 @@ public class AuditController extends WebBaseController {
//门店记录列表 //门店记录列表
@RequestMapping("store-apply-list") @RequestMapping("store-apply-list")
public HaobanResponse storeApplyList(String storeId, BasePageInfo pageInfo, Integer auditType, Integer auditStatus,Integer manageFlag,String clerkId) { public HaobanResponse storeApplyList(String storeId, BasePageInfo pageInfo, Integer auditType,
Integer auditStatus, Integer manageFlag, String clerkId, String enterpriseId) {
WellDoneLoginDTO loginUser = this.getLoginUser(); WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId(); String wxEnterpriseId = loginUser.getWxEnterpriseId();
List<String> storeIds = new ArrayList<>(); List<String> storeIds = new ArrayList<>();
...@@ -146,7 +147,7 @@ public class AuditController extends WebBaseController { ...@@ -146,7 +147,7 @@ public class AuditController extends WebBaseController {
if (storeIds.contains("-1")) { if (storeIds.contains("-1")) {
storeIds = null; storeIds = null;
} }
Page<AuditDTO> page = auditApiService.pageStoreListByParams(storeIds, pageInfo, auditType, auditStatus); Page<AuditDTO> page = auditApiService.pageStoreListByParams(storeIds, pageInfo, auditType, auditStatus, wxEnterpriseId, enterpriseId);
List<AuditDTO> list = page.getResult(); List<AuditDTO> list = page.getResult();
List<AuditVO> voList = new ArrayList<AuditVO>(); List<AuditVO> voList = new ArrayList<AuditVO>();
for (AuditDTO auditDTO : list) { for (AuditDTO auditDTO : 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