fix: 取值错误1

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/PartyAServiceImpl.java

@@ -1092,8 +1092,8 @@ public class PartyAServiceImpl implements PartyAService {
 		SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 				.equals(member.getUserId())).findFirst().orElse(null);
 
-		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-				.equals(member.getUserId())).findFirst().orElse(null);
+		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+				.equals(member.getIdCardNumber())).findFirst().orElse(null);
 
 		MonitoringIndicator monitoringIndicator = monitoringIndicatorService.getBySubType(note.getSubType());
 		SysDeptSub sysDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
@@ -1321,8 +1321,8 @@ public class PartyAServiceImpl implements PartyAService {
 		SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 				.equals(String.valueOf(user.getUserId()))).findFirst().orElse(null);
 
-		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-				.equals(String.valueOf(user.getUserId()))).findFirst().orElse(null);
+		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+				.equals(user.getIdCardNumber())).findFirst().orElse(null);
 
 		MonitoringIndicator monitoringIndicator =
 				monitoringIndicatorService.getBySubType(SubjectTypeEnum.TYPE_SHUIBANGYUN.getCode());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -363,8 +363,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 					.equals(note.getUserId())).findFirst().orElse(null);
 
-			SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-					.equals(note.getUserId())).findFirst().orElse(null);
+			SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+					.equals(note.getIdCardNumber())).findFirst().orElse(null);
 
 			if (null != monitorOutput) {
 				monitorAmount = monitorAmount.add(monitorOutput.getTotalAmount());
@@ -515,8 +515,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 					.equals(note.getUserId())).findFirst().orElse(null);
 
-			SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-					.equals(note.getUserId())).findFirst().orElse(null);
+			SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+					.equals(note.getIdCardNumber())).findFirst().orElse(null);
 
 			if (null != monitorOutput) {
 				monitorAmount = monitorAmount.add(monitorOutput.getTotalAmount());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -226,8 +226,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 				.equals(note.getUserId())).findFirst().orElse(null);
 
-		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-				.equals(note.getUserId())).findFirst().orElse(null);
+		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+				.equals(user.getIdCardNumber())).findFirst().orElse(null);
 
 		MonitoringIndicator monitoringIndicator = monitoringIndicatorService.getBySubType(note.getSubType());
 		BigDecimal deptLimit = sysDeptSub.getLimitAmount();
@@ -353,8 +353,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 				.equals(note.getUserId())).findFirst().orElse(null);
 
-		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-				.equals(note.getUserId())).findFirst().orElse(null);
+		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+				.equals(user.getIdCardNumber())).findFirst().orElse(null);
 
 		MonitoringIndicator monitoringIndicator = monitoringIndicatorService.getBySubType(note.getSubType());
 		BigDecimal deptLimit = sysDeptSub.getLimitAmount();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -2239,8 +2239,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		SettleAmountMonitorOutput deptMonitorOutput = deptAmountMonitor.stream().filter(item -> item.getUserId()
 				.equals(String.valueOf(user.getUserId()))).findFirst().orElse(null);
 
-		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getUserId()
-				.equals(String.valueOf(user.getUserId()))).findFirst().orElse(null);
+		SettleAmountMonitorOutput yaoyiMonitorOutput = yaoyiAmountMonitor.stream().filter(item -> item.getIdCardNumber()
+				.equals(user.getIdCardNumber())).findFirst().orElse(null);
 
 
 		MonitoringIndicator monitoringIndicator =