From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index dfe8e0b..9ced7dd
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.fee.BillDto;
@@ -89,16 +90,44 @@
List<FeeAttrDto> feeAttrDtos = BeanConvertUtil.covertBeanList(attrMaps, FeeAttrDto.class);
List<FeeAttrDto> tmpFeeAttrDtos = null;
+ String payerObjName = "";
for (FeeDto tmpFeeDto : fees) {
tmpFeeAttrDtos = new ArrayList<>();
for (FeeAttrDto feeAttrDto : feeAttrDtos) {
-
- if (tmpFeeDto.getFeeId().equals(feeAttrDto.getFeeId())) {
- tmpFeeAttrDtos.add(feeAttrDto);
+ if (!tmpFeeDto.getFeeId().equals(feeAttrDto.getFeeId())) {
+ continue;
+ }
+ tmpFeeAttrDtos.add(feeAttrDto);
+ if(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME.equals(feeAttrDto.getSpecCd())){
+ payerObjName = feeAttrDto.getValue();
}
}
+ tmpFeeDto.setPayerObjName(payerObjName);
tmpFeeDto.setFeeAttrDtos(tmpFeeAttrDtos);
}
+ return fees;
+ }
+
+ @Override
+ public List<FeeDto> querySimpleFees(@RequestBody FeeDto feeDto) {
+
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ int page = feeDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ feeDto.setPage((page - 1) * feeDto.getRow());
+ }
+
+ List<FeeDto> fees = BeanConvertUtil.covertBeanList(feeServiceDaoImpl.getFeeInfo(BeanConvertUtil.beanCovertMap(feeDto)), FeeDto.class);
+
+
+ for (FeeDto tmpFeeDto : fees) {
+ if (!StringUtil.isEmpty(tmpFeeDto.getImportFeeName())) {
+ //fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");
+ tmpFeeDto.setFeeName(tmpFeeDto.getImportFeeName());
+ }
+ }
+
return fees;
}
@@ -295,6 +324,7 @@
}
@Override
+ @Java110Transactional
public int updateFee(@RequestBody PayFeePo payFeePo) {
feeServiceDaoImpl.updateFeeInfoInstance(BeanConvertUtil.beanCovertMap(payFeePo));
return 1;
@@ -310,6 +340,21 @@
Map info = new HashMap();
info.put("payFeePos", fees);
return feeServiceDaoImpl.insertFees(info);
+ }
+
+ @Override
+ @Java110Transactional
+ public int saveOneFee(@RequestBody PayFeePo payFeePo) {
+ List<Map> fees = new ArrayList<>();
+ fees.add(BeanConvertUtil.beanCovertMap(payFeePo));
+ Map info = new HashMap();
+ info.put("payFeePos", fees);
+ return feeServiceDaoImpl.insertFees(info);
+ }
+
+ @Override
+ public int deleteFeesByBatch(@RequestBody PayFeePo payFeePo) {
+ return feeServiceDaoImpl.deleteFeesByBatch(BeanConvertUtil.beanCovertMap(payFeePo));
}
@Override
@@ -334,6 +379,7 @@
return data;
}
+
private void dealFeeConfig(JSONArray data, FeeConfigDto tmpFeeConfigDto) {
JSONObject config = new JSONObject();
Map info = new HashMap();
--
Gitblit v1.8.0