From a13573d5ef8d16f4bc2535a3c89c2891e6f5b56c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 15:33:30 +0800
Subject: [PATCH] optimize
---
service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailOwnerCmd.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailOwnerCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailOwnerCmd.java
index f85b5ff..0d5e284 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailOwnerCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailOwnerCmd.java
@@ -12,6 +12,7 @@
import com.java110.report.statistics.IFeeStatistics;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -117,14 +118,46 @@
receivedFee = oweFee.add(new BigDecimal(info.get("receivedFee").toString()));
data.put("oweFee" + info.get("feeTypeCd").toString(), info.get("oweFee"));
data.put("receivedFee" + info.get("feeTypeCd").toString(), info.get("receivedFee"));
- data.put("objName",info.get("objName"));
+ data.put("objName", info.get("objName"));
}
data.put("oweFee", oweFee.doubleValue());
data.put("receivedFee", receivedFee.doubleValue());
+ // todo 澶勭悊 鏀惰垂瀵硅薄閲嶅闂
+ delRepeatObjName(data);
}
+
return datas;
}
+ /**
+ * 鍘婚櫎 閲嶅鐨刼bjName
+ * @param data
+ */
+ private void delRepeatObjName(JSONObject data) {
+
+ String objName = data.getString("objName");
+ if (StringUtil.isEmpty(objName)) {
+ return;
+ }
+
+ String[] objNames = objName.split(",");
+ List<String> oNames = new ArrayList<>();
+ for (String oName : objNames) {
+ if (!oNames.contains(oName)) {
+ oNames.add(oName);
+ }
+ }
+ objName = "";
+ for (String oName : oNames) {
+ objName += (oName + ",");
+ }
+ if (objName.endsWith(",")) {
+ objName = objName.substring(0, objName.length() - 1);
+ }
+
+ data.put("objName", objName);
+ }
+
}
--
Gitblit v1.8.0