From 468042c516adb6da5684a2d9f95a5d1e130553dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 15:36:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java
index a6a7ca4..f3d280a 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java
@@ -38,28 +38,22 @@
@RequestMapping(value = "/saveReportInfoAnswerValue", method = RequestMethod.POST)
public ResponseEntity<String> saveReportInfoAnswerValue(@RequestHeader(value = "user-id") String userId,@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "anValueId", "璇锋眰鎶ユ枃涓湭鍖呭惈anValueId");
- Assert.hasKeyAndValue(reqJson, "userAnId", "璇锋眰鎶ユ枃涓湭鍖呭惈userAnId");
+ Assert.hasKeyAndValue(reqJson, "questionAnswerTitles", "璇锋眰鎶ユ枃涓湭鍖呭惈鍥炵瓟椤�");
Assert.hasKeyAndValue(reqJson, "settingId", "璇锋眰鎶ユ枃涓湭鍖呭惈settingId");
- Assert.hasKeyAndValue(reqJson, "titleId", "璇锋眰鎶ユ枃涓湭鍖呭惈titleId");
- Assert.hasKeyAndValue(reqJson, "valueId", "璇锋眰鎶ユ枃涓湭鍖呭惈valueId");
- Assert.hasKeyAndValue(reqJson, "valueContent", "璇锋眰鎶ユ枃涓湭鍖呭惈valueContent");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKey(reqJson, "questionAnswerTitles", "鏈寘鍚洖绛旈」");
+
JSONArray questionAnswerTitles = reqJson.getJSONArray("questionAnswerTitles");
if (questionAnswerTitles == null || questionAnswerTitles.size() < 1) {
- throw new IllegalArgumentException("鏈寘鍚瓟妗�");
+ throw new IllegalArgumentException("鏈寘鍚鐩強绛旀");
}
JSONObject titleObj = null;
for (int questionAnswerTitleIndex = 0; questionAnswerTitleIndex < questionAnswerTitles.size(); questionAnswerTitleIndex++) {
titleObj = questionAnswerTitles.getJSONObject(questionAnswerTitleIndex);
- Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("qaTitle") + ",鏈～鍐欑瓟妗�");
+ Assert.hasKeyAndValue(titleObj, "valueContent", titleObj.getString("title") + ",鏈～鍐欑瓟妗�");
}
- ReportInfoAnswerValuePo reportInfoAnswerValuePo = BeanConvertUtil.covertBean(reqJson, ReportInfoAnswerValuePo.class);
-
- return saveReportInfoAnswerValueBMOImpl.save(reportInfoAnswerValuePo,questionAnswerTitles);
+ return saveReportInfoAnswerValueBMOImpl.save(reqJson,userId);
}
/**
--
Gitblit v1.8.0