From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 72a3998..8b212a9 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
@@ -27,6 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -124,7 +125,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;
@@ -138,6 +140,7 @@
for (ProblemLog obj:problemLogIPage.getRecords()) {
ProblemLogVo vo = new ProblemLogVo();
vo.setName(obj.getName());
+ vo.setScore(Objects.isNull(obj.getScore())?new BigDecimal("100"):obj.getScore());
vo.setPhone(obj.getPhone());
vo.setCompanyName(obj.getCompanyName());
if(null != obj.getType()) {
@@ -178,6 +181,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