From 46eed722cd0431aa433bea2470b23015b8d83b3e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 二月 2022 10:03:25 +0800
Subject: [PATCH] 优化三亚物业 临时收费问题
---
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 0baf935..41532d0 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;
@@ -22,13 +23,15 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.PageDto;
import com.java110.dto.reportCustomComponent.ReportCustomComponentDto;
+import com.java110.dto.reportCustomComponentFooter.ReportCustomComponentFooterDto;
+import com.java110.intf.report.IReportCustomComponentFooterV1InnerServiceSMO;
import com.java110.intf.report.IReportCustomComponentV1InnerServiceSMO;
import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -53,6 +56,8 @@
@Autowired
private IReportCustomComponentV1InnerServiceSMO reportCustomComponentV1InnerServiceSMOImpl;
+
+
@Autowired
private IQueryServiceSMO queryServiceSMOImpl;
@@ -61,7 +66,6 @@
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "componentId", "鏈寘鍚粍浠禝D");
}
-
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -83,8 +87,17 @@
}
private void doDealJava(JSONObject reqJson, ReportCustomComponentDto reportCustomComponentDto, ICmdDataFlowContext cmdDataFlowContext) {
-
-
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ String javaScript = reportCustomComponentDto.getJavaScript();
+ int page = reqJson.getInteger("page");
+ if (page != PageDto.DEFAULT_PAGE) {
+ reqJson.put("page", (page - 1) * reqJson.getIntValue("row"));
+ }
+ JSONObject data = queryServiceSMOImpl.execJava(reqJson, javaScript);
+ long total = data.getLong("total");
+ 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);
}
private void doDealSql(JSONObject reqJson, ReportCustomComponentDto reportCustomComponentDto, ICmdDataFlowContext cmdDataFlowContext) {
@@ -101,7 +114,7 @@
}
reqJsonCount.put("count", "1");
JSONObject data = queryServiceSMOImpl.execQuerySql(reqJsonCount, sql);
- total = data.getJSONArray("data").getJSONObject(0).getIntValue("total");
+ total = data.getJSONArray("td").getJSONObject(0).getIntValue("total");
}
reqJson.put("count", "0");
int page = reqJson.getInteger("page");
@@ -113,4 +126,5 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
}
--
Gitblit v1.8.0