From 7a0a3d837365330be38699894ce0167bade1de58 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 07 十二月 2022 15:00:26 +0800
Subject: [PATCH] 1、优化报修通知信息2、优化缴费审核3、优化发布公告信息4、优化页面显示性问题
---
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
index bc95112..2dc5a5d 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.report.cmd.reportCustomComponent;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
@@ -27,6 +28,7 @@
import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,7 @@
public class ListReportCustomComponentDataCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListReportCustomComponentDataCmd.class);
+
@Autowired
private IReportCustomComponentV1InnerServiceSMO reportCustomComponentV1InnerServiceSMOImpl;
@@ -122,9 +125,15 @@
reqJson.put("page", (page - 1) * reqJson.getIntValue("row"));
}
JSONObject data = queryServiceSMOImpl.execQuerySql(reqJson, sql);
+ if (!sql.trim().contains("test=\"count")) {
+ total = JSONArray.parseArray(data.getString("td")).size();
+ }
+ if (!StringUtil.isEmpty(sql) && !sql.contains("limit #page#,#row#")) {
+ sql = sql + " limit #page#,#row#";
+ data = queryServiceSMOImpl.execQuerySql(reqJson, sql);
+ }
ResultVo resultVo = new ResultVo((int) Math.ceil((double) total / (double) reqJson.getInteger("row")), total, data);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
-
}
--
Gitblit v1.8.0