|
@@ -116,7 +116,7 @@ public class ChargeFeeVoController {
|
|
|
}
|
|
|
}
|
|
|
Map<String, String> chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
|
|
|
- Map<String, List<ChargeFeeVo>> chargeFeeMap = new HashMap();
|
|
|
+ // Map<String, List<ChargeFeeVo>> chargeFeeMap = new HashMap();
|
|
|
for (ChargeFeeVo co : chargeFeeVos) {
|
|
|
PayMarkEnum payMark = PayMarkEnum.getPayMarkByCode(co.getPayMark());
|
|
|
co.setPayMark(payMark == null ? co.getPayMark() : payMark.name);
|
|
@@ -131,25 +131,25 @@ public class ChargeFeeVoController {
|
|
|
if (YesNoEnum.YES.equals(fitEmpName)) {
|
|
|
co.setOpId(employeeMap.get(co.getOpId()));
|
|
|
}
|
|
|
- List<ChargeFeeVo> tempList = chargeFeeMap.get(co.getSerialNo());
|
|
|
- if (tempList == null) {
|
|
|
- tempList = new ArrayList<>();
|
|
|
- chargeFeeMap.put(co.getSerialNo(), tempList);
|
|
|
- }
|
|
|
- tempList.add(co);
|
|
|
- }
|
|
|
- for (String key : chargeFeeMap.keySet()) {
|
|
|
- if (StringUtils.isNotBlank(key)) {
|
|
|
- List<ChargeFeeVo> tempList = chargeFeeMap.get(key);
|
|
|
- if (tempList.size() > 1) {
|
|
|
- for (ChargeFeeVo co : tempList) {
|
|
|
- if ((Constants.BYJZ_NAME.equals(co.getChequeType()) && StringUtils.isNotBlank(co.getReceiptBill())) || (!Constants.BYJZ_NAME.equals(co.getChequeType()) && StringUtils.isBlank(co.getReceiptBill()))) {
|
|
|
- chargeFeeVos.remove(co);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // List<ChargeFeeVo> tempList = chargeFeeMap.get(co.getSerialNo());
|
|
|
+// if (tempList == null) {
|
|
|
+// tempList = new ArrayList<>();
|
|
|
+// chargeFeeMap.put(co.getSerialNo(), tempList);
|
|
|
+// }
|
|
|
+// tempList.add(co);
|
|
|
+ }
|
|
|
+// for (String key : chargeFeeMap.keySet()) {
|
|
|
+// if (StringUtils.isNotBlank(key)) {
|
|
|
+// List<ChargeFeeVo> tempList = chargeFeeMap.get(key);
|
|
|
+// if (tempList.size() > 1) {
|
|
|
+// for (ChargeFeeVo co : tempList) {
|
|
|
+// if ((Constants.BYJZ_NAME.equals(co.getChequeType()) && StringUtils.isNotBlank(co.getReceiptBill())) || (!Constants.BYJZ_NAME.equals(co.getChequeType()) && StringUtils.isBlank(co.getReceiptBill()))) {
|
|
|
+// chargeFeeVos.remove(co);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
|