From b06ccd76e50812d81ee689dcd609bb02ac5c4ed4 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 11 八月 2022 14:48:52 +0800
Subject: [PATCH] 1、优化页面展示行问题
---
service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java
index 66958a6..ebc407f 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleApi.java
@@ -11,6 +11,7 @@
import com.java110.report.bmo.reportInfoSettingTitle.IUpdateReportInfoSettingTitleBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -31,10 +32,11 @@
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/saveReportInfoSettingTitle
- * @path /app/reportInfoSettingTitle/saveReportInfoSettingTitle
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoSettingTitle/saveReportInfoSettingTitle
+ * @path /app/reportInfoSettingTitle/saveReportInfoSettingTitle
*/
@RequestMapping(value = "/saveReportInfoSettingTitle", method = RequestMethod.POST)
public ResponseEntity<String> saveReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
@@ -47,26 +49,31 @@
JSONArray titleValues = null;
if (!ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
titleValues = reqJson.getJSONArray("titleValues");
-
if (titleValues.size() < 1) {
throw new IllegalArgumentException("鏈寘鍚�夐」");
+ }
+ for (int index = 0; index < titleValues.size(); index++) {
+ JSONObject param = titleValues.getJSONObject(index);
+ if (StringUtil.isEmpty(param.getString("qaValue"))) {
+ throw new IllegalArgumentException("棰樼洰閫夐」涓嶈兘涓虹┖");
+ }
}
}
ReportInfoSettingTitlePo reportInfoSettingTitlePo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingTitlePo.class);
- return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo,titleValues);
+ return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo, titleValues);
}
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/updateSettingTitle
- * @path /app/reportInfoSettingTitle/updateReportInfoSettingTitle
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoSettingTitle/updateSettingTitle
+ * @path /app/reportInfoSettingTitle/updateSettingTitle
*/
@RequestMapping(value = "/updateSettingTitle", method = RequestMethod.POST)
public ResponseEntity<String> updateReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "titleId", "璇锋眰鎶ユ枃涓湭鍖呭惈titleId");
Assert.hasKeyAndValue(reqJson, "settingId", "璇锋眰鎶ユ枃涓湭鍖呭惈settingId");
Assert.hasKeyAndValue(reqJson, "title", "璇锋眰鎶ユ枃涓湭鍖呭惈title");
@@ -76,24 +83,30 @@
JSONArray titleValues = null;
if (!ReportInfoSettingTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
titleValues = reqJson.getJSONArray("titleValues");
-
if (titleValues.size() < 1) {
throw new IllegalArgumentException("鏈寘鍚�夐」");
+ }
+ for (int index = 0; index < titleValues.size(); index++) {
+ JSONObject param = titleValues.getJSONObject(index);
+ if (StringUtil.isEmpty(param.getString("qaValue"))) {
+ throw new IllegalArgumentException("棰樼洰閫夐」涓嶈兘涓虹┖");
+ }
}
}
ReportInfoSettingTitlePo reportInfoSettingTitlePo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingTitlePo.class);
deleteReportInfoSettingTitleBMOImpl.delete(reportInfoSettingTitlePo);
- return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo,titleValues);
+ return saveReportInfoSettingTitleBMOImpl.save(reportInfoSettingTitlePo, titleValues);
}
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/deleteSettingTitle
- * @path /app/reportInfoSettingTitle/deleteReportInfoSettingTitle
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoSettingTitle/deleteSettingTitle
+ * @path /app/reportInfoSettingTitle/deleteReportInfoSettingTitle
*/
@RequestMapping(value = "/deleteSettingTitle", method = RequestMethod.POST)
public ResponseEntity<String> deleteReportInfoSettingTitle(@RequestBody JSONObject reqJson) {
@@ -108,19 +121,20 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoSettingTitle/querySettingTitle
- * @path /app/reportInfoSettingTitle/queryReportInfoSettingTitle
+ *
* @param communityId 灏忓尯ID
* @return
+ * @serviceCode /reportInfoSettingTitle/querySettingTitle
+ * @path /app/reportInfoSettingTitle/queryReportInfoSettingTitle
*/
@RequestMapping(value = "/querySettingTitle", method = RequestMethod.GET)
public ResponseEntity<String> queryReportInfoSettingTitle(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "titleType",required = false) String titleType,
- @RequestParam(value = "title",required = false) String title,
- @RequestParam(value = "titleId",required = false) String titleId,
- @RequestParam(value = "settingId",required = false) String settingId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "titleType", required = false) String titleType,
+ @RequestParam(value = "title", required = false) String title,
+ @RequestParam(value = "titleId", required = false) String titleId,
+ @RequestParam(value = "settingId", required = false) String settingId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportInfoSettingTitleDto reportInfoSettingTitleDto = new ReportInfoSettingTitleDto();
reportInfoSettingTitleDto.setPage(page);
reportInfoSettingTitleDto.setRow(row);
--
Gitblit v1.8.0