From 49342bf38f61e1d7b1890dd64f2690557b77498e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 06 三月 2025 10:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 7c16f43..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,11 +3,11 @@
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.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;
@@ -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,6 +179,7 @@
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)){
--
Gitblit v1.9.3