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/ReportInfoSettingApi.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java
index e3e4f03..089cff4 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportInfoSettingApi.java
@@ -29,21 +29,20 @@
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
- * @serviceCode /reportInfoSetting/saveReportInfoSetting
- * @path /app/reportInfoSetting/saveReportInfoSetting
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoSetting/saveReportInfoSetting
+ * @path /app/reportInfoSetting/saveReportInfoSetting
*/
@RequestMapping(value = "/saveReportInfoSetting", method = RequestMethod.POST)
public ResponseEntity<String> saveReportInfoSetting(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "settingId", "璇锋眰鎶ユ枃涓湭鍖呭惈settingId");
Assert.hasKeyAndValue(reqJson, "reportType", "璇锋眰鎶ユ枃涓湭鍖呭惈reportType");
Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
ReportInfoSettingPo reportInfoSettingPo = BeanConvertUtil.covertBean(reqJson, ReportInfoSettingPo.class);
@@ -52,10 +51,11 @@
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /reportInfoSetting/updateReportInfoSetting
- * @path /app/reportInfoSetting/updateReportInfoSetting
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoSetting/updateReportInfoSetting
+ * @path /app/reportInfoSetting/updateReportInfoSetting
*/
@RequestMapping(value = "/updateReportInfoSetting", method = RequestMethod.POST)
public ResponseEntity<String> updateReportInfoSetting(@RequestBody JSONObject reqJson) {
@@ -66,7 +66,7 @@
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
+// Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
Assert.hasKeyAndValue(reqJson, "settingId", "settingId涓嶈兘涓虹┖");
@@ -76,10 +76,11 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoSetting/deleteReportInfoSetting
- * @path /app/reportInfoSetting/deleteReportInfoSetting
+ *
* @param reqJson
* @return
+ * @serviceCode /reportInfoSetting/deleteReportInfoSetting
+ * @path /app/reportInfoSetting/deleteReportInfoSetting
*/
@RequestMapping(value = "/deleteReportInfoSetting", method = RequestMethod.POST)
public ResponseEntity<String> deleteReportInfoSetting(@RequestBody JSONObject reqJson) {
@@ -94,19 +95,26 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /reportInfoSetting/queryReportInfoSetting
- * @path /app/reportInfoSetting/queryReportInfoSetting
+ *
* @param communityId 灏忓尯ID
* @return
+ * @serviceCode /reportInfoSetting/queryReportInfoSetting
+ * @path /app/reportInfoSetting/queryReportInfoSetting
*/
@RequestMapping(value = "/queryReportInfoSetting", method = RequestMethod.GET)
public ResponseEntity<String> queryReportInfoSetting(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "settingId", required = false) String settingId,
+ @RequestParam(value = "reportType", required = false) String reportType,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportInfoSettingDto reportInfoSettingDto = new ReportInfoSettingDto();
reportInfoSettingDto.setPage(page);
reportInfoSettingDto.setRow(row);
reportInfoSettingDto.setCommunityId(communityId);
+ reportInfoSettingDto.setNameLike(name);
+ reportInfoSettingDto.setSettingId(settingId);
+ reportInfoSettingDto.setReportType(reportType);
return getReportInfoSettingBMOImpl.get(reportInfoSettingDto);
}
}
--
Gitblit v1.8.0