From 9c484f4cd2ca911f48c867d2769cee25c641810e Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 26 二月 2024 16:26:43 +0800 Subject: [PATCH] ERP接口 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java index 269e4a7..b8682cc 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java @@ -2,11 +2,8 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.PatternPool; -import cn.hutool.core.lang.Validator; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.PhoneUtil; -import cn.hutool.core.util.ReUtil; import com.alibaba.fastjson.JSONObject; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.config.DataSyncConfig; @@ -15,7 +12,6 @@ import com.doumee.core.annotation.excel.ExcelImporter; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; -import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; @@ -29,18 +25,17 @@ import com.doumee.dao.admin.request.LaborMemberDTO; import com.doumee.dao.admin.request.MemberQuery; import com.doumee.dao.admin.response.MemberInfoDTO; +import com.doumee.dao.admin.response.StagingDataVO; import com.doumee.dao.business.*; import com.doumee.dao.business.join.MemberJoinMapper; +import com.doumee.dao.business.join.RetentionJoinMapper; import com.doumee.dao.business.join.UserActionJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.system.model.SystemDictData; -import com.doumee.dao.system.model.SystemUser; import com.doumee.dao.web.reqeust.AccountLoginDTO; import com.doumee.dao.web.reqeust.CheckVisitedDTO; import com.doumee.dao.web.reqeust.VisitMemberDTO; -import com.doumee.dao.web.reqeust.VisitRecordDTO; import com.doumee.dao.web.response.MemberVO; -import com.doumee.dao.web.response.VisitRecordVO; import com.doumee.dao.web.response.WxAuthorizeVO; import com.doumee.service.business.MemberService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -50,7 +45,6 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -96,9 +90,18 @@ private UserActionJoinMapper userActionJoinMapper; @Autowired + private CompanyMapper companyMapper; + + @Autowired private RedisTemplate<String, Object> redisTemplate; @Autowired private DataSyncConfig dataSyncConfig; + + @Autowired + private RetentionJoinMapper retentionJoinMapper; + + @Autowired + private VisitsMapper visitsMapper; @Override @@ -982,6 +985,39 @@ + @Override + public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){ + //浜哄憳淇℃伅 + List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO)); + if(CollectionUtils.isNotEmpty(memberList)){ + stagingHeadVO.setWorkerCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.internal)).count()); + stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.lw_visitor)).count()); + stagingHeadVO.setVisitorCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.visitor)).count()); + } + //TODO + + stagingHeadVO.setSupplierCount(companyMapper.selectCount(new QueryWrapper<Company>().lambda().eq(Company::getIsdeleted,Constants.ZERO))); + return stagingHeadVO; + } + + + @Override + public StagingDataVO stagingBody(StagingDataVO stagingHeadVO){ + List<Map<String,Object>> companyMaps = memberJoinMapper.selectJoinMaps( + new MPJLambdaWrapper<Member>() + .select("count(1) as memberCount, t1.name as companyName") + .leftJoin(Company.class,Company::getId,Member::getCompanyId) + .eq(Member::getType,Constants.memberType.lw_visitor) + .groupBy(Company::getId,Company::getName) + ); + List<Map<String,Object>> retentionMaps = retentionJoinMapper.selectMaps(new MPJLambdaWrapper<Retention>() + .select(" count(1) as memberCount, type as memberType ") + .groupBy(Retention::getType) + ); + stagingHeadVO.setCompanyUsers(companyMaps); + stagingHeadVO.setRetentionUsers(retentionMaps); + return stagingHeadVO; + } -- Gitblit v1.9.3