From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/fee/impl/ListFeeSummarySMOImpl.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/fee/impl/ListFeeSummarySMOImpl.java b/service-api/src/main/java/com/java110/api/smo/fee/impl/ListFeeSummarySMOImpl.java
index f408021..aba1d1e 100644
--- a/service-api/src/main/java/com/java110/api/smo/fee/impl/ListFeeSummarySMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/fee/impl/ListFeeSummarySMOImpl.java
@@ -2,11 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.api.smo.fee.IListFeeSummarySMO;
-import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,22 +29,18 @@
@Override
protected void validate(IPageData pd, JSONObject paramIn) {
-
super.validatePageInfo(pd);
Assert.hasKeyAndValue(paramIn, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
Assert.hasKeyAndValue(paramIn, "feeSummaryType", "鏈寘鍚皬鍖轰俊鎭�");
-
}
@Override
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
-
int page = paramIn.getInteger("page");
int row = paramIn.getInteger("row");
paramIn.put("page", (page - 1) * row);
- paramIn.put("row", page * row);
-
+ paramIn.put("row", row);
if ("1001".equals(paramIn.getString("feeSummaryType"))) {//鏃�
paramIn.put("formatStr", "%Y-%m-%d");
} else if ("1101".equals(paramIn.getString("feeSummaryType"))) {
@@ -54,15 +48,10 @@
} else {
paramIn.put("formatStr", "%Y");
}
-
String apiUrl = "";
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.queryFeeSummary" + mapToUrlParam(paramIn);
-
-
+ apiUrl = "api.queryFeeSummary" + mapToUrlParam(paramIn);
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
- apiUrl,
- HttpMethod.GET);
-
+ apiUrl, HttpMethod.GET);
return responseEntity;
}
--
Gitblit v1.8.0