Commit 593cf22d by 徐高华

门店列表

parent d75633da
package com.gic.haoban.manage.service.service.out.impl; package com.gic.haoban.manage.service.service.out.impl;
import cn.hutool.core.collection.CollectionUtil; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO; import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService; import com.gic.clerk.api.service.ClerkService;
import com.gic.clerk.api.service.PowerService;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.EnterpriseDTO; import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
import com.gic.enterprise.api.dto.StoreDTO; import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.dto.StoreDetailDTO; import com.gic.enterprise.api.dto.StoreDetailDTO;
import com.gic.enterprise.api.dto.StoreVo; import com.gic.enterprise.api.dto.StoreVo;
import com.gic.enterprise.api.dto.StoreWidgetDTO;
import com.gic.enterprise.api.service.EnterpriseService; import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.StoreService;
import com.gic.enterprise.api.service.StoreWidgetService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.common.utils.UuidUtil; import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi; import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
import com.gic.haoban.manage.api.dto.*; import com.gic.haoban.manage.api.dto.AuditDTO;
import com.gic.haoban.manage.api.enums.*; import com.gic.haoban.manage.api.dto.AuditStaffDTO;
import com.gic.haoban.manage.api.dto.BatchAuditLogDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StoreAddressDTO;
import com.gic.haoban.manage.api.enums.AuditRsultType;
import com.gic.haoban.manage.api.enums.AuditType;
import com.gic.haoban.manage.api.enums.BindTypeEnum;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
import com.gic.haoban.manage.api.enums.StoreFieldEnum;
import com.gic.haoban.manage.api.service.AuditApiService; import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService; import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService; import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
...@@ -31,17 +60,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanBatchAuditLog; ...@@ -31,17 +60,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanBatchAuditLog;
import com.gic.haoban.manage.service.entity.TabHaobanStaff; import com.gic.haoban.manage.service.entity.TabHaobanStaff;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils; import cn.hutool.core.collection.CollectionUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* Created by tgs on 2020/2/9. * Created by tgs on 2020/2/9.
...@@ -70,7 +89,10 @@ public class AuditApiServiceImpl implements AuditApiService { ...@@ -70,7 +89,10 @@ public class AuditApiServiceImpl implements AuditApiService {
private ClerkService clerkService; private ClerkService clerkService;
@Autowired @Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService; private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Autowired
private PowerService powerService ;
@Autowired
private StoreWidgetService storeWidgetService ;
@Override @Override
public Page<AuditDTO> page(Integer auditType, String search, String wxEnterpriseId, public Page<AuditDTO> page(Integer auditType, String search, String wxEnterpriseId,
...@@ -506,11 +528,34 @@ public class AuditApiServiceImpl implements AuditApiService { ...@@ -506,11 +528,34 @@ public class AuditApiServiceImpl implements AuditApiService {
} }
public int getAuditCount(String enterpriseId , String clerkId) { public int getAuditCount(String enterpriseId , String clerkId) {
List<String> storeIdList = null ; List<String> storeIdList = this.getStoreIdList(enterpriseId, clerkId) ;
if(CollectionUtils.isEmpty(storeIdList)) {
storeIdList = null ;
}
return this.auditMapper.getAuditCount(enterpriseId, storeIdList) ; return this.auditMapper.getAuditCount(enterpriseId, storeIdList) ;
} }
public List<String> getStoreIdList(String enterpriseId , String clerkId) {
EnterpriseSettingDTO enterpriseSetting = enterpriseService.getEnterpriseSettingByEnterpriseId(enterpriseId) ;
if (enterpriseSetting.getEnableAccessControl() != null && enterpriseSetting.getEnableAccessControl() == 1) {
String storeWidgetKey = this.powerService.getStoreWidgetId(new Date() , clerkId) ;
logger.info("权限控制-启用,创建人管辖门店的组件={}",storeWidgetKey);
StoreWidgetDTO widget = this.storeWidgetService.getStoreWidgetBykey(storeWidgetKey) ;
if(null == widget || widget.getSelectType()==0) {
return null ;
}
List<String> storeIdList = new ArrayList<>() ;
storeIdList.add("-1-1") ;
Page<StoreDTO> page = new Page<StoreDTO>(1, Integer.MAX_VALUE);
page = storeWidgetService.getStoreWidgetStore(storeWidgetKey , null, enterpriseId, page);
if (page != null && CollectionUtils.isNotEmpty(page.getResult())) {
List<StoreDTO> list = page.getResult();
if (CollectionUtils.isNotEmpty(list)) {
for (StoreDTO dto : list) {
storeIdList.add(dto.getStoreId());
}
}
}
return storeIdList ;
}
return null ;
}
} }
...@@ -453,8 +453,8 @@ ...@@ -453,8 +453,8 @@
#{item} #{item}
</foreach> </foreach>
) )
and audit_status = 0
</if> </if>
and audit_status = 0
</select> </select>
</mapper> </mapper>
\ No newline at end of file
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