From 1d00e1c8c37e824585768cb3ef7e060dfdff1617 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 22 Feb 2023 16:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/common/ActDefineStartMap.java | 2 ++ .../StandardQA/controller/AskQuestionsController.java | 8 +++++++- .../slrs/sarStandTranslate/entity/SarStandTranslate.java | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index f958b680..3ee1949d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -60,6 +60,8 @@ public class ActDefineStartMap { map.put("26","qbzxdlxjh"); + map.put("27","wdzxlc"); + return map.get(type); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 888049f7..9dd5b33f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; +import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -171,7 +172,12 @@ public class AskQuestionsController extends BaseController { askUserService.saveBatch(askUserList); if(askQuestionsService.save(askQuestions)){ Map objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("askUserList",askUserList); + List askUserListUser = new ArrayList<>(); + for (AskUser user: askUserList){ + askUserListUser.add(user.getUsid()); + } + JSONArray jsonArray = JSONArray.fromObject(askUserListUser); + objectObjectHashMap.put("questioner",jsonArray); objectObjectHashMap.put("askQuestions",askQuestions); return Result.success("200","添加成功",objectObjectHashMap); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java new file mode 100644 index 00000000..8f82841d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandTranslate/entity/SarStandTranslate.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.sarStandTranslate.entity; + +public class SarStandTranslate { +}