From 83eb4441779cd5f85061a729039d8d34580d6b21 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 21 十二月 2023 16:51:28 +0800
Subject: [PATCH] 前后端对接,接口调整

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 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 de873b3..ba9e77f 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
@@ -45,25 +45,25 @@
     @Override
     public Integer create(Problems problems) {
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        Problems insert = new Problems();
+        Problems newProblems = new Problems();
 
-        insert.setCreator(loginUserInfo.getId());
-        insert.setCreateDate(new Date());
-        insert.setEditor(loginUserInfo.getId());
-        insert.setEditDate(new Date());
-        insert.setIsdeleted(Constants.ZERO);
-        insert.setRemark(problems.getRemark());
-        insert.setTitle(problems.getTitle());
+        newProblems.setCreator(loginUserInfo.getId());
+        newProblems.setCreateDate(new Date());
+        newProblems.setEditor(loginUserInfo.getId());
+        newProblems.setEditDate(new Date());
+        newProblems.setIsdeleted(Constants.ZERO);
+        newProblems.setRemark(problems.getRemark());
+        newProblems.setTitle(problems.getTitle());
         if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
-            insert.setOptions(JSON.toJSONString(problems.getObjectList()));
+            newProblems.setOptions(JSON.toJSONString(problems.getObjectList()));
         }
-        insert.setAnswer(problems.getAnswer());
-        insert.setSortnu(problems.getSortnu());
-        insert.setType(problems.getType());
-        insert.setScore(problems.getScore());
-        insert.setUseType(problems.getUseType());
-        problemsMapper.insert(problems);
-        return insert.getId();
+        newProblems.setAnswer(problems.getAnswer());
+        newProblems.setSortnu(problems.getSortnu());
+        newProblems.setType(problems.getType());
+        newProblems.setScore(problems.getScore());
+        newProblems.setUseType(problems.getUseType());
+        problemsMapper.insert(newProblems);
+        return newProblems.getId();
     }
 
     @Override
@@ -184,7 +184,17 @@
         }
         queryWrapper.lambda().orderByAsc(Problems::getSortnu);
         queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName");
-        return PageData.from(problemsMapper.selectPage(page, queryWrapper));
+        IPage<Problems> problemsIPage = problemsMapper.selectPage(page, queryWrapper);
+        if(null != problemsIPage && problemsIPage.getRecords().size() > 0) {
+            List<Problems> newProblems = new ArrayList<>();
+            List<Problems> newDatas = problemsIPage.getRecords();
+            for (Problems dto:newDatas) {
+                dto.setObjectList(JSON.parseArray(dto.getOptions(), OptionsObject.class));
+                newProblems.add(dto);
+            }
+            problemsIPage.setRecords(newProblems);
+        }
+        return PageData.from(problemsIPage);
     }
 
     @Override

--
Gitblit v1.9.3