From 4b427634d3daa65f2a79549f11587d40ea1ec1cb Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 05 三月 2025 16:11:31 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java index bbbe3e2..1d2617e 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java @@ -3,13 +3,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; -import com.doumee.dao.business.CompanyMapper; -import com.doumee.dao.business.MemberMapper; +import com.doumee.dao.business.dao.MemberMapper; import com.doumee.dao.business.ProblemLogMapper; +import com.doumee.dao.business.dao.CompanyMapper; import com.doumee.dao.business.join.ProblemLogJoinMapper; import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.Member; @@ -124,7 +124,8 @@ .selectAs(Member::getType,ProblemLog::getType) .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), ProblemLog::getName, pageWrap.getModel().getName()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName()) - .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType()); + .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType()) + .isNotNull(ProblemLog::getUserId); queryWrapper.orderByDesc(ProblemLog::getCreateDate); IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper); return problemLogIPage; @@ -178,12 +179,13 @@ problemLog.setIsdeleted(Constants.ZERO); problemLog.setStatus(Constants.ZERO); problemLog.setOpenid(finishAnswerDTO.getOpenId()); + problemLog.setScore(finishAnswerDTO.getScore()); if(finishAnswerDTO.getUseType().equals(Constants.ZERO)&&StringUtils.isNotBlank(finishAnswerDTO.getUserId())){ Member member = memberMapper.selectById(finishAnswerDTO.getUserId()); if(Objects.isNull(member)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍔冲姟浜哄憳"); } - if(!member.getType().equals(Constants.memberType.lw_visitor)){ + if(!member.getType().equals(Constants.memberType.driver)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲姵鍔′汉鍛樼被鍨嬶紝绛旈澶辫触"); } if(!member.getStatus().equals(Constants.ZERO)){ -- Gitblit v1.9.3