From e59a768f56efb64bf2fad412f62eca2a836b652f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 28 十二月 2023 14:13:00 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index ba9e77f..9dcf9b4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -11,6 +11,7 @@
import com.doumee.dao.admin.request.OptionsObject;
import com.doumee.dao.admin.response.ProblemDTO;
import com.doumee.dao.business.ProblemsMapper;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Problems;
import com.doumee.dao.web.response.ProblemsVO;
import com.doumee.service.business.ProblemsService;
@@ -93,7 +94,9 @@
update.setEditor(loginUserInfo.getId());
update.setEditDate(new Date());
update.setTitle(problems.getTitle());
- update.setOptions(problems.getOptions());
+ if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
+ update.setOptions(JSON.toJSONString(problems.getObjectList()));
+ }
update.setAnswer(problems.getAnswer());
update.setSortnu(problems.getSortnu());
update.setType(problems.getType());
@@ -174,7 +177,7 @@
queryWrapper.lambda().eq(Problems::getSortnu, pageWrap.getModel().getSortnu());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Problems::getType, pageWrap.getModel().getType());
+ queryWrapper.lambda().in(Problems::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getScore() != null) {
queryWrapper.lambda().eq(Problems::getScore, pageWrap.getModel().getScore());
@@ -230,7 +233,8 @@
*/
@Override
public List<ProblemsVO> getProblemsVO(Integer useType){
- List<Problems> problemsList = problemsMapper.selectList(new QueryWrapper<Problems>().lambda().eq(Problems::getUseType,useType)
+ List<Problems> problemsList = problemsMapper.selectList(new QueryWrapper<Problems>().lambda()
+ .and(ms->ms.eq(Problems::getUseType,useType).or().eq(Problems::getUseType,Constants.ZERO))
.eq(Problems::getIsdeleted, Constants.ZERO).orderByAsc(Problems::getSortnu));
List<ProblemsVO> problemsVOList = new ArrayList<>();
for (Problems problems:problemsList) {
--
Gitblit v1.9.3